【修改】走马灯权限设置，弹框点赞问题调整

suishenbang-wxportal/suishenbang-wxportal-api/src/main/java/com/dgtly/wxportal/controller/WxAlertLogController.java

@@ -5,6 +5,7 @@ import com.dgtly.common.annotation.ApiPassToken;
 import com.dgtly.common.core.controller.ApiBaseController;
 import com.dgtly.common.core.domain.AjaxResult;
 import com.dgtly.common.core.domain.ParameterObject;
+import com.dgtly.common.utils.StringUtils;
 import com.dgtly.system.domain.*;
 import com.dgtly.system.service.*;
 import io.swagger.annotations.*;
@@ -250,12 +251,17 @@ public class WxAlertLogController  extends ApiBaseController {
         Long alertId = Long.valueOf(obj.getString("alertId"));//弹框ID
         String alertContent = String.valueOf(obj.getString("alertContent"));//弹框内容
         String photoUrl = String.valueOf(obj.getString("photoUrl"));//弹框图片
-        Integer status = Integer.valueOf(obj.getString("status"));//状态
+        Integer status=3;//如果没有传status，为查询
+        if (obj.getString("status")!=null){
+            status = Integer.valueOf(obj.getString("status"));//状态
+        }
         //根据用户ID、弹框ID查询是否有记录，，没有新增记录
         AlertUpvoteLog alertUpvoteLog = alertUpvoteLogService.selectUpvoteByUidAndAid(userId, alertId);
         if (alertUpvoteLog!=null){
             //如果有 修改记录
-            alertUpvoteLog.setStatus(status);
+            if (status!=3) {
+                alertUpvoteLog.setStatus(status);
+            }
             alertUpvoteLog.setLoginName(loginName);
             alertUpvoteLog.setUserName(userName);
             alertUpvoteLog.setAlertContent(alertContent);
@@ -271,7 +277,9 @@ public class WxAlertLogController  extends ApiBaseController {
             upvoteLog.setAlertId(alertId);
             upvoteLog.setAlertContent(alertContent);
             upvoteLog.setPhotoUrl(photoUrl);
-            upvoteLog.setStatus(status);
+            if (status!=null) {
+                upvoteLog.setStatus(status);
+            }
             alertUpvoteLogService.insertAlertUpvoteLog(upvoteLog);
             return AjaxResult.success(upvoteLog);
         }

suishenbang-wxportal/suishenbang-wxportal-api/src/main/java/com/dgtly/wxportal/controller/WxPortalController.java

@@ -59,6 +59,8 @@ public class WxPortalController extends ApiBaseController {
     private ISysUserOrderAuthorService sysUserOrderAuthorService;
     @Autowired
     private ISysUserCustomerAuthorizationService authorizationService;
+    @Autowired
+    private ISysUserExtService sysUserExtService;
 
     @ApiOperation(value = "微信门户首页",notes = "参数：{userId:1}")
     @ApiImplicitParams({
@@ -98,12 +100,32 @@ public class WxPortalController extends ApiBaseController {
     })
     @PostMapping("/ridingLantern")
     public Object getRidingLantern(){
-        List<SysRidingLantern> lanternList=sysRidingLanternService.selectLanternList();
-        if(lanternList !=null && lanternList.size()>0){
-        return AjaxResult.success().putKV("lanterns",lanternList);
+        String userType="";
+        ParameterObject obj = getParameterObject();
+        Long userId = Long.valueOf(obj.getString("userId"));
+        SysUserExt sysUserExt = sysUserExtService.selectSysUserExtById(userId);
+        String salesLevel = sysUserExt.getSalesLevel();
+        if(("customer_level").equals(salesLevel)||("reseller_level").equals(salesLevel) ){
+            userType = "1";
         }else{
-        return AjaxResult.error("暂无通知");
-    }
+            userType = "0";
+        }
+        List<SysRidingLantern> lanternList = sysRidingLanternService.selectLanternList();
+        List<SysRidingLantern> lanternListhow=new ArrayList<>();
+        if (lanternList != null && lanternList.size() > 0) {
+            String finalUserType = userType;
+            lanternList.forEach(lantern->{
+                String[] split = lantern.getUserType().split(",");
+                boolean exists = Arrays.stream(split)
+                        .anyMatch(str -> str.equals(String.valueOf(finalUserType)));
+                if (exists){
+                    lanternListhow.add(lantern);
+                }
+            });
+            return AjaxResult.success().putKV("lanterns", lanternListhow);
+        } else {
+            return AjaxResult.error("暂无通知");
+        }
     }
     /**
      * 新增保存磁铁日志