1

jeecg-boot-base/jeecg-boot-base-core/src/main/java/org/jeecg/modules/appletBrowseRecord/entity/AppletBrowseRecord.java

@@ -62,7 +62,7 @@ public class AppletBrowseRecord implements Serializable {
     private java.lang.String userId;
 	/**类型*/
 	@Excel(name = "类型", width = 15)
-    @ApiModelProperty(value = "类型 0帖子-1租房-2工作-3景点-4美食-5活动-6人找车-7车找人-8文章")
+    @ApiModelProperty(value = "类型 0帖子-1租房-2工作-3景点-4美食-5活动-6人找车-7车找人-8文章-9群聊-10抽奖")
     private java.lang.String type;
 	/**来源ID*/
 	@Excel(name = "来源ID", width = 15)
@@ -70,9 +70,11 @@ public class AppletBrowseRecord implements Serializable {
     private java.lang.String formId;
 	/**分类*/
 	@Excel(name = "分类", width = 15)
-    @ApiModelProperty(value = "分类 0浏览 1点赞 2转发")
+    @ApiModelProperty(value = "分类 0浏览 1点赞 2转发 3激励视频")
     private java.lang.String category;
 
+    private String complete;//完成
+
     @TableField(exist = false)
     private HanHaiMember user;
 }

jeecg-boot-module-system/src/main/java/org/jeecg/modules/api/service/impl/YaoDuShopServiceImpl.java

@@ -200,7 +200,7 @@ public class YaoDuShopServiceImpl implements YaoDuShopService {
         line_color.put("g", 0);
         line_color.put("b", 0);
         param.put("line_color", line_color);
-//        param.put("is_hyaline", true);
+        param.put("is_hyaline", true);
 
         // 获取微信小程序码
         String accessToken = wxHttpUtils.getAccessToken();

jeecg-boot-module-system/src/main/java/org/jeecg/modules/api/yaoduapi/YaoDuBrowseRecordController.java

@@ -4,6 +4,7 @@ import com.baomidou.mybatisplus.extension.conditions.query.LambdaQueryChainWrapp
 import com.baomidou.mybatisplus.extension.plugins.pagination.Page;
 import io.swagger.annotations.Api;
 import lombok.extern.slf4j.Slf4j;
+import org.apache.commons.lang.StringUtils;
 import org.jeecg.common.api.vo.Result;
 import org.jeecg.config.shiro.ShiroRealm;
 import org.jeecg.modules.api.bean.PageBean;
@@ -36,22 +37,34 @@ public class YaoDuBrowseRecordController {
     private IHanHaiMemberService hanHaiMemberService;
 
     @RequestMapping(value = "/addBrowseRecord")
-    public Result<?> addBrowseRecord(@RequestHeader("X-Access-Token") String token,AppletBrowseRecord record) {
+    public Result<?> addBrowseRecord(@RequestHeader(value = "X-Access-Token", required = false) String token,AppletBrowseRecord record) {
 
-        HanHaiMember hanHaiMember = shiroRealm.checkUserTokenIsEffectHanHaiOpenId(token);
+        if ("3".equals(record.getCategory())){
+            if (StringUtils.isNotBlank(token)){
+                HanHaiMember hanHaiMember = shiroRealm.checkUserTokenIsEffectHanHaiOpenId(token);
+                record.setUserId(hanHaiMember.getId());
+            }
+            appletBrowseRecordService.save(record);
+            return Result.OK();
+        }
 
-        AppletBrowseRecord browseRecord = appletBrowseRecordService.lambdaQuery()
-                .eq(AppletBrowseRecord::getUserId, hanHaiMember.getId())
-                .eq(AppletBrowseRecord::getFormId, record.getFormId())
-                .eq(AppletBrowseRecord::getType, record.getType())
-                .eq(AppletBrowseRecord::getCategory, record.getCategory())
-                .one();
+        if (StringUtils.isNotBlank(token)){
+            HanHaiMember hanHaiMember = shiroRealm.checkUserTokenIsEffectHanHaiOpenId(token);
 
-        if (browseRecord != null){
-            appletBrowseRecordService.removeById(browseRecord.getId());
-        }else {
-            appletBrowseRecordService.save(record);
+            AppletBrowseRecord browseRecord = appletBrowseRecordService.lambdaQuery()
+                    .eq(AppletBrowseRecord::getUserId, hanHaiMember.getId())
+                    .eq(AppletBrowseRecord::getFormId, record.getFormId())
+                    .eq(AppletBrowseRecord::getType, record.getType())
+                    .eq(AppletBrowseRecord::getCategory, record.getCategory())
+                    .one();
+
+            if (browseRecord != null){
+                appletBrowseRecordService.removeById(browseRecord.getId());
+            }else {
+                appletBrowseRecordService.save(record);
+            }
         }
+
         return Result.OK();
     }