机构消息bugfix

src/main/java/com/caimei365/user/controller/LoginApi.java

@@ -22,7 +22,7 @@ import java.util.Map;
  * @author : Charles
  * @date : 2021/3/8
  */
-@Api(tags="登录API")
+@Api(tags = "登录API")
 @RestController
 @RequiredArgsConstructor
 @RequestMapping("/user/login")
@@ -33,31 +33,31 @@ public class LoginApi {
 
     /**
      * 登录(用户名，密码)
-     *
+     * <p>
      * spi旧接口：/user/login
      *
      * @param loginPasswordDto {
-     *                           mobileOrEmail 手机号或邮箱
-     *                           password      密码
-     *                           unionId       微信unionId
+     *                         mobileOrEmail 手机号或邮箱
+     *                         password      密码
+     *                         unionId       微信unionId
      *                         }
      * @return UserLoginVo
      */
     @ApiOperation("登录(用户名，密码)")
-    @IpSave(saveName = "用户登录",saveParams = true)
+    @IpSave(saveName = "用户登录", saveParams = true)
     @PostMapping("/password")
-    public ResponseJson<UserLoginVo> passwordLogin(LoginPasswordDto loginPasswordDto)throws ParseException {
+    public ResponseJson<UserLoginVo> passwordLogin(LoginPasswordDto loginPasswordDto) throws ParseException {
         return loginService.passwordLogin(loginPasswordDto);
     }
 
     /**
      * 协销登录(手机号，密码)
-     *
+     * <p>
      * spi旧接口：/seller/login
      *
      * @param loginPasswordDto {
-     *                           mobileOrEmail 手机号
-     *                           password 密码
+     *                         mobileOrEmail 手机号
+     *                         password 密码
      *                         }
      * @return UserLoginVo
      */
@@ -72,17 +72,17 @@ public class LoginApi {
 
     /**
      * 微信授权登录(小程序)，用户数据存入Redis，key前缀：wxInfo:applets:
-     *
+     * <p>
      * spi旧接口：/club/authorization，小程序sessionKey(wxInfo)、PC端sessionKey(wxInfoMap)
      *
      * @param authAppletsDto {
-     *                           code          微信授权code
-     *                           encryptedData 微信加密数据
-     *                           iv            加密算法的初始向量
-     *                         }
+     *                       code          微信授权code
+     *                       encryptedData 微信加密数据
+     *                       iv            加密算法的初始向量
+     *                       }
      */
     @ApiOperation("微信授权登录(小程序)")
-    @IpSave(saveName = "微信授权登录(小程序)",saveParams = false)
+    @IpSave(saveName = "微信授权登录(小程序)", saveParams = false)
     @PostMapping("/auth/applets")
     public ResponseJson<UserLoginVo> appletsAuthorization(AuthAppletsDto authAppletsDto, @RequestHeader HttpHeaders headers) throws ParseException {
         String code = authAppletsDto.getCode();
@@ -93,55 +93,61 @@ public class LoginApi {
 
     @ApiOperation("机构站内消息未读消息记录数")
     @GetMapping("/auth/ClubMessageCount")
-    public ResponseJson<Map<String, Object>> ClubMessageCount(Integer messageType,Integer commonId){
+    public ResponseJson<Map<String, Object>> ClubMessageCount(Integer messageType, Integer commonId) {
 
-        return loginService.ClubMessageCount(messageType,commonId);
+        return loginService.ClubMessageCount(messageType, commonId);
     }
 
     @ApiOperation("供应商站内消息未读消息记录数")
     @GetMapping("/auth/shopMessageCount")
-    public ResponseJson<Map<String, Object>> shopMessageCount(Integer messageType,Integer commonId){
+    public ResponseJson<Map<String, Object>> shopMessageCount(Integer messageType, Integer commonId) {
 
-        return loginService.shopMessageCount(messageType,commonId);
+        return loginService.shopMessageCount(messageType, commonId);
     }
 
     @ApiOperation("供应商站内消息未读消息总记录数")
     @GetMapping("/auth/ShopCount")
-    public ResponseJson<Map<String, Object>> ShopCount(Integer messageType,Integer commonId){
+    public ResponseJson<Map<String, Object>> ShopCount(Integer messageType, Integer commonId) {
 
-        return loginService.ShopCount(messageType,commonId);
+        return loginService.ShopCount(messageType, commonId);
     }
 
     @ApiOperation("机构站内消息未读消息总记录数")
     @GetMapping("/auth/ClubCount")
-    public ResponseJson<Map<String, Object>> ClubCount(Integer messageType,Integer commonId){
+    public ResponseJson<Map<String, Object>> ClubCount(Integer messageType, Integer commonId) {
 
-        return loginService.ClubCount(messageType,commonId);
+        return loginService.ClubCount(messageType, commonId);
     }
 
 
     @ApiOperation("机构站内消息列表")
     @GetMapping("/auth/ClubMessageList")
-    public ResponseJson<PageInfo<MessageCenter>> ClubMessageList(Integer commonId,Integer messageType,Integer source, @RequestParam(value = "pageNum", defaultValue = "1") int pageNum,
-                                                                 @RequestParam(value = "pageSize", defaultValue = "10") int pageSize){
-        return loginService.ClubMessageList(commonId,messageType,source,pageNum,pageSize);
+    public ResponseJson<PageInfo<MessageCenter>> ClubMessageList(Integer commonId,
+                                                                 Integer messageType,
+                                                                 Integer source,
+                                                                 @RequestParam(value = "pageNum", defaultValue = "1") int pageNum,
+                                                                 @RequestParam(value = "pageSize", defaultValue = "10") int pageSize) {
+        return loginService.ClubMessageList(commonId, messageType, source, pageNum, pageSize);
 
     }
 
     @ApiOperation("供应商站内消息列表")
     @GetMapping("/auth/shopMessageList")
-    public ResponseJson<PageInfo<MessageCenter>> shopMessageList(Integer commonId,Integer messageType,Integer source, @RequestParam(value = "pageNum", defaultValue = "1") int pageNum,
-                                                                 @RequestParam(value = "pageSize", defaultValue = "10") int pageSize){
+    public ResponseJson<PageInfo<MessageCenter>> shopMessageList(Integer commonId,
+                                                                 Integer messageType,
+                                                                 Integer source,
+                                                                 @RequestParam(value = "pageNum", defaultValue = "1") int pageNum,
+                                                                 @RequestParam(value = "pageSize", defaultValue = "10") int pageSize) {
 
-        return loginService.shopMessageList(commonId,messageType,source,pageNum,pageSize);
+        return loginService.shopMessageList(commonId, messageType, source, pageNum, pageSize);
     }
 
 
     @ApiOperation("机构站内消息改为已读")
     @GetMapping("/auth/updateMessageAsRead")
-    public ResponseJson<Void> updateMessageAsRead(Integer messageType,Integer commonId){
-        Integer i=loginService.updateMessageAsRead(messageType,commonId);
-        if (i<=0){
+    public ResponseJson<Void> updateMessageAsRead(Integer messageType, Integer commonId) {
+        Integer i = loginService.updateMessageAsRead(messageType, commonId);
+        if (i <= 0) {
             return ResponseJson.error("没有未读消息了！", null);
         }
         return ResponseJson.success("标记已读成功", null);
@@ -149,9 +155,9 @@ public class LoginApi {
 
     @ApiOperation("供应商站内消息改为已读")
     @GetMapping("/auth/updateShopMessageAsRead")
-    public ResponseJson<Void> updateShopMessageAsRead(Integer messageType,Integer commonId){
-        Integer i=loginService.updateShopMessageAsRead(messageType,commonId);
-        if (i<=0){
+    public ResponseJson<Void> updateShopMessageAsRead(Integer messageType, Integer commonId) {
+        Integer i = loginService.updateShopMessageAsRead(messageType, commonId);
+        if (i <= 0) {
             return ResponseJson.error("没有未读消息了！", null);
         }
         return ResponseJson.success("标记已读成功", null);
@@ -159,20 +165,20 @@ public class LoginApi {
 
     @ApiOperation("删除站内消息")
     @PostMapping("/auth/deleteMessage")
-    public ResponseJson<Void> deleteMessage(String id){
-        Integer i=loginService.deleteMessage(id);
-        if (i<=0){
+    public ResponseJson<Void> deleteMessage(String id) {
+        Integer i = loginService.deleteMessage(id);
+        if (i <= 0) {
             return ResponseJson.error("删除失败！", null);
         }
-          return ResponseJson.success("删除成功", null);
+        return ResponseJson.success("删除成功", null);
     }
 
 
     @ApiOperation("站内消息所有消息改为已读")
     @PostMapping("/auth/updateRead")
-    public ResponseJson<Void> updateRead(Integer userType,String Id){
-        Integer i=loginService.updateRead(userType,Id);
-        if (i<=0){
+    public ResponseJson<Void> updateRead(Integer userType, String Id) {
+        Integer i = loginService.updateRead(userType, Id);
+        if (i <= 0) {
             return ResponseJson.error("id错误", null);
         }
         return ResponseJson.success("标记已读成功", null);
@@ -181,7 +187,7 @@ public class LoginApi {
 
     /**
      * 微信公众号授权链接(www)
-     *
+     * <p>
      * spi旧接口：/user/authorizationLink
      *
      * @param redirectUri 用于微信授权的中间页面
@@ -189,8 +195,8 @@ public class LoginApi {
      */
     @ApiOperation("微信公众号授权链接(www)")
     @ApiImplicitParams({
-        @ApiImplicitParam(required = true, name = "redirectUri", value = "用于微信授权的中间页面"),
-        @ApiImplicitParam(required = false, name = "mode", value = "授权方式：1静默授权，其他手动同意授权")
+            @ApiImplicitParam(required = true, name = "redirectUri", value = "用于微信授权的中间页面"),
+            @ApiImplicitParam(required = false, name = "mode", value = "授权方式：1静默授权，其他手动同意授权")
     })
     @GetMapping("/auth/link")
     public ResponseJson<String> getAuthorizationLink(String redirectUri, Integer mode) {
@@ -199,7 +205,7 @@ public class LoginApi {
 
     /**
      * 微信公众号授权登录(www)，用户数据存入Redis，key前缀：wxInfo:website:
-     *
+     * <p>
      * spi旧接口：/user/authorizationLogin，小程序sessionKey(wxInfo)、PC端sessionKey(wxInfoMap)
      *
      * @param code  微信code
@@ -208,11 +214,11 @@ public class LoginApi {
      */
     @ApiOperation("微信公众号授权登录(www)")
     @ApiImplicitParams({
-        @ApiImplicitParam(required = true, name = "code", value = "微信授权code"),
-        @ApiImplicitParam(required = true, name = "state", value = "安全认证key"),
-        @ApiImplicitParam(required = false, name = "mode", value = "1:静默授权,2:用户手动授权")
+            @ApiImplicitParam(required = true, name = "code", value = "微信授权code"),
+            @ApiImplicitParam(required = true, name = "state", value = "安全认证key"),
+            @ApiImplicitParam(required = false, name = "mode", value = "1:静默授权,2:用户手动授权")
     })
-    @IpSave(saveName = "微信公众号授权登录(www)",saveParams = false)
+    @IpSave(saveName = "微信公众号授权登录(www)", saveParams = false)
     @GetMapping("/auth/website")
     public ResponseJson<UserLoginVo> websiteAuthorization(String code, String state, Integer mode, @RequestHeader HttpHeaders headers) {
         return loginService.websiteAuthorization(code, state, mode, headers);
@@ -230,29 +236,29 @@ public class LoginApi {
 
     /**
      * 获取生成微信二维码的参数
-     *
+     * <p>
      * spi旧接口：/user/toWechatLogin
      *
-     * @return Map(appId,redirectUri,state)
+     * @return Map(appId, redirectUri, state)
      */
     @ApiOperation("获取生成微信二维码的参数")
     @GetMapping("/auth/parameters")
-    public ResponseJson<Map<String, String>> getAuthParameters(){
+    public ResponseJson<Map<String, String>> getAuthParameters() {
         return loginService.getAuthParameters();
     }
 
     /**
      * 微信用户扫码,微信服务器回调
-     *
+     * <p>
      * spi旧接口：/user/wechatLogin
      *
-     * @param code      微信code
-     * @param state     安全认证key（第一步获取参数时自定义生成的uuid）
+     * @param code  微信code
+     * @param state 安全认证key（第一步获取参数时自定义生成的uuid）
      */
     @ApiOperation("扫码后微信服务器回调")
     @ApiImplicitParams({
-        @ApiImplicitParam(required = false, name = "code", value = "微信授权code"),
-        @ApiImplicitParam(required = false, name = "state", value = "安全认证key")
+            @ApiImplicitParam(required = false, name = "code", value = "微信授权code"),
+            @ApiImplicitParam(required = false, name = "state", value = "安全认证key")
     })
     @GetMapping("/auth/callback")
     public void qrCodeAuthScan(String code, String state) {
@@ -261,49 +267,49 @@ public class LoginApi {
 
     /**
      * 校验扫码结果，用户数据存入Redis，key前缀：wxInfo:website:
-     *
+     * <p>
      * spi旧接口：/user/polling，小程序sessionKey(wxInfo)、PC端sessionKey(wxInfoMap)
      *
-     * @param state   安全认证key（第一步获取参数时自定义生成的uuid）
+     * @param state 安全认证key（第一步获取参数时自定义生成的uuid）
      * @return UserLoginVo
      */
     @ApiOperation("校验扫码登录结果")
     @ApiImplicitParam(required = true, name = "state", value = "安全认证key")
     @GetMapping("/auth/scan/result")
-    public ResponseJson<UserLoginVo> qrCodeAuthScanResult(String state)throws ParseException{
+    public ResponseJson<UserLoginVo> qrCodeAuthScanResult(String state) throws ParseException {
         return loginService.qrCodeAuthScanResult(state);
     }
 
     /**
      * 微信扫码后,绑定机构账号
-     *
+     * <p>
      * spi旧接口：/user/bindOrganization
      *
      * @param scanBindDto {
-     *                           mobileOrEmail 手机号或邮箱
-     *                           password      密码
-     *                           mobile        手机号
-     *                           smsCode       手机验证码
-     *                           unionId       微信unionId
-     *                           linkName      联系人
-     *                     }
+     *                    mobileOrEmail 手机号或邮箱
+     *                    password      密码
+     *                    mobile        手机号
+     *                    smsCode       手机验证码
+     *                    unionId       微信unionId
+     *                    linkName      联系人
+     *                    }
      */
     @ApiOperation("微信扫码后绑定机构账号")
     @PostMapping("/auth/scan/bind")
-    public ResponseJson<UserLoginVo> qrCodeAuthScanBind(ScanBindDto scanBindDto){
+    public ResponseJson<UserLoginVo> qrCodeAuthScanBind(ScanBindDto scanBindDto) {
         return loginService.qrCodeAuthScanBind(scanBindDto);
     }
 
     /**
      * 运营人员邀请码授权登录
-     *
+     * <p>
      * spi旧接口：/club/invitationCode
      *
      * @param authInvitationDto {
-     *                             invitationCode 邀请码
-     *                             nickName       微信昵称
-     *                             avatarUrl      微信头像(headimgurl)
-     *                             unionId        微信unionId
+     *                          invitationCode 邀请码
+     *                          nickName       微信昵称
+     *                          avatarUrl      微信头像(headimgurl)
+     *                          unionId        微信unionId
      *                          }
      * @return UserLoginVo
      */
@@ -319,17 +325,17 @@ public class LoginApi {
 
     /**
      * 运营人员绑定微信
-     *
+     * <p>
      * spi旧接口：/club/bindingWx
      *
      * @param authBindDto {
-     *                         userId    要绑定的用户Id(userID)
-     *                         mobile    手机号
-     *                         smsCode   手机验证码(verificationCode)
-     *                         unionId   微信unionId
-     *                         nickName       微信昵称
-     *                         avatarUrl      微信头像(headimgurl)
-     *                     }
+     *                    userId    要绑定的用户Id(userID)
+     *                    mobile    手机号
+     *                    smsCode   手机验证码(verificationCode)
+     *                    unionId   微信unionId
+     *                    nickName       微信昵称
+     *                    avatarUrl      微信头像(headimgurl)
+     *                    }
      * @return UserLoginVo
      */
     @ApiOperation("运营人员绑定微信")

src/main/java/com/caimei365/user/model/vo/MessageCenter.java

@@ -3,27 +3,22 @@ package com.caimei365.user.model.vo;
 import lombok.Data;
 
 import java.io.Serializable;
-import java.math.BigDecimal;
 
 /**
  * Description
- *
- * @author : Charles
- * @date : 2022/7/7
  */
 @Data
 public class MessageCenter implements Serializable {
-
     /**
-    *消息id
+     * 消息id
      */
     private Integer id;
     /**
-    供应商id
+     * 供应商id
      */
     private Integer shopId;
     /**
-    机构id
+     * 机构id
      */
     private Integer clubId;
     /**
@@ -31,11 +26,11 @@ public class MessageCenter implements Serializable {
      */
     private Integer orderId;
     /**
-   用户类型1.机构2.供应商
+     * 用户类型1.机构2.供应商
      */
     private Integer userType;
     /**
-     消息类型1.交易物流2.账户通知3.服务通知4.优惠促销
+     * 消息类型1.交易物流2.账户通知3.服务通知4.优惠促销
      */
     private Integer messageType;
     /**
@@ -47,7 +42,7 @@ public class MessageCenter implements Serializable {
      */
     private String time;
     /**
-     *账户通知类型 1.注册成功通知 2.购买超级会员成功 3.超级会员到期提醒 4.超级会员到期提醒 5.升级资质机构成功 6.升级资质机构失败 7.成为机构运营人员通知
+     * 账户通知类型 1.注册成功通知 2.购买超级会员成功 3.超级会员到期提醒 4.超级会员到期提醒 5.升级资质机构成功 6.升级资质机构失败 7.成为机构运营人员通知
      */
     private Integer accountType;
     /**
@@ -61,7 +56,7 @@ public class MessageCenter implements Serializable {
     /**
      * 主图
      */
-   private String mainImage;
+    private String mainImage;
     /**
      * 是否能走线上支付 0可以 1不可以 只能线下
      */
@@ -71,11 +66,11 @@ public class MessageCenter implements Serializable {
      */
     private String productName;
     /**
-     *供应商消息类型 1,账号审核通知,2.成为公司运营人员通知,3.商品上架审核通知,4.新品展示审核通知,5.上架费到期通知 6.商品资质到期通知
+     * 供应商消息类型 1,账号审核通知,2.成为公司运营人员通知,3.商品上架审核通知,4.新品展示审核通知,5.上架费到期通知 6.商品资质到期通知
      */
     private Integer shopMessType;
     /**
-     *供应商服务消息类型 1.上架费
+     * 供应商服务消息类型 1.上架费
      */
     private Integer shopTieredType;
     /**
@@ -89,16 +84,13 @@ public class MessageCenter implements Serializable {
     /**
      * 优惠券类型 1.优惠券待领取通知 2.优惠券过期通知
      */
-private Integer couponMessageType;
-/**
- * 商品记录数
- */
-private Integer productCount;
-/**
- * 退货退款类型：1部分退、2全部退
- */
-private Integer refundType;
-
-
-
+    private Integer couponMessageType;
+    /**
+     * 商品记录数
+     */
+    private Integer productCount;
+    /**
+     * 退货退款类型：1部分退、2全部退
+     */
+    private Integer refundType;
 }

src/main/java/com/caimei365/user/service/impl/LoginServiceImpl.java

@@ -111,20 +111,20 @@ public class LoginServiceImpl implements LoginService {
                 if (count >= 5) {
                     long s = Long.parseLong(split[1]);
                     int l = (int) Math.floor((System.currentTimeMillis() - s) / 1000 / 60);
-                    return ResponseJson.error("该账号暂时被冻结，请" + (30-l) + "分钟后重试或直接修改密码", null);
+                    return ResponseJson.error("该账号暂时被冻结，请" + (30 - l) + "分钟后重试或直接修改密码", null);
                 }
             }
             // 如果前端传入unionId，则存入返回前端
             baseUser.setUnionId(unionId);
 
-            Integer clubId=messageCenterMapper.clubIdCule(baseUser.getUserId());
-            Integer savedCount=null;
-            if(baseUser.getUserId()!=null){
-                Integer shopID=messageCenterMapper.shopID(baseUser.getUserId());
-                Integer newReceiptType= messageCenterMapper.newReceiptType(shopID);
-            Timerw(baseUser.getUserId());
-            Timesjf(baseUser.getUserId());
-        }
+            Integer clubId = messageCenterMapper.clubIdCule(baseUser.getUserId());
+            Integer savedCount = null;
+            if (baseUser.getUserId() != null) {
+                Integer shopID = messageCenterMapper.shopID(baseUser.getUserId());
+                Integer newReceiptType = messageCenterMapper.newReceiptType(shopID);
+                Timerw(baseUser.getUserId());
+                Timesjf(baseUser.getUserId());
+            }
 
             // 比对密码
             String md5Password = Md5Util.md5(password);
@@ -201,17 +201,17 @@ public class LoginServiceImpl implements LoginService {
         log.info("小程序授权登录，返回unionId给前端，用户数据存入Redis，key：wxInfo:applets:" + unionId);
         // 协销授权登录
         UserLoginVo seller = loginMapper.getServiceProviderUserByOpenId(openId);
-        Integer userID=messageCenterMapper.userId(openId);
-        Integer clubId=messageCenterMapper.clubIdCule(userID);
-        Integer savedCount=null;
-if(userID!=null) {
-    Integer shopID = messageCenterMapper.shopID(userID);
-    log.info(">>>>>"+shopID);
-    Integer newReceiptType = messageCenterMapper.newReceiptType(shopID);
-    log.info(">>>>>"+newReceiptType);
-    Timerw(userID);
-    Timesjf(userID);
-    }
+        Integer userID = messageCenterMapper.userId(openId);
+        Integer clubId = messageCenterMapper.clubIdCule(userID);
+        Integer savedCount = null;
+        if (userID != null) {
+            Integer shopID = messageCenterMapper.shopID(userID);
+            log.info(">>>>>" + shopID);
+            Integer newReceiptType = messageCenterMapper.newReceiptType(shopID);
+            log.info(">>>>>" + newReceiptType);
+            Timerw(userID);
+            Timesjf(userID);
+        }
         if (null != seller) {
             loginMapper.updateServiceProviderUnionId(seller.getUserId(), unionId);
             String token = JwtUtil.createToken(seller.getUserId());
@@ -232,49 +232,49 @@ if(userID!=null) {
     }
 
     @Override
-    public ResponseJson<Map<String, Object>> ClubMessageCount(Integer messageType,Integer commonId){
+    public ResponseJson<Map<String, Object>> ClubMessageCount(Integer messageType, Integer commonId) {
 
-        Integer count=messageCenterMapper.Count(1,commonId);
-       Integer tradeCount= messageCenterMapper.MessageCount(1,1,commonId);
-       Integer accountCount=messageCenterMapper.MessageCount(1,2,commonId);
-        Integer notificationCount= messageCenterMapper.MessageCount(1,3,commonId);
-        Integer promotionCount=messageCenterMapper.MessageCount(1,4,commonId);
+        Integer count = messageCenterMapper.Count(1, commonId);
+        Integer tradeCount = messageCenterMapper.MessageCount(1, 1, commonId);
+        Integer accountCount = messageCenterMapper.MessageCount(1, 2, commonId);
+        Integer notificationCount = messageCenterMapper.MessageCount(1, 3, commonId);
+        Integer promotionCount = messageCenterMapper.MessageCount(1, 4, commonId);
         Map<String, Object> map = new HashMap(10);
         map.put("count", count);
         map.put("tradeCount", tradeCount);
-        map.put("account",accountCount);
+        map.put("account", accountCount);
         map.put("notificationCount", notificationCount);
-        map.put("promotionCount",promotionCount);
-
-
+        map.put("promotionCount", promotionCount);
         return ResponseJson.success(map);
     }
+
     @Override
-    public ResponseJson<Map<String, Object>> shopMessageCount(Integer messageType,Integer commonId){
-        Integer count=messageCenterMapper.Count(2,commonId);
-        Integer tradeCount= messageCenterMapper.MessageCount(2,1,commonId);
-        Integer accountCount=messageCenterMapper.MessageCount(2,2,commonId);
-        Integer notificationCount= messageCenterMapper.MessageCount(2,3,commonId);
-        Integer promotionCount=messageCenterMapper.MessageCount(2,4,commonId);
+    public ResponseJson<Map<String, Object>> shopMessageCount(Integer messageType, Integer commonId) {
+        Integer count = messageCenterMapper.Count(2, commonId);
+        Integer tradeCount = messageCenterMapper.MessageCount(2, 1, commonId);
+        Integer accountCount = messageCenterMapper.MessageCount(2, 2, commonId);
+        Integer notificationCount = messageCenterMapper.MessageCount(2, 3, commonId);
+        Integer promotionCount = messageCenterMapper.MessageCount(2, 4, commonId);
         Map<String, Object> map = new HashMap(10);
         map.put("count", count);
         map.put("tradeCount", tradeCount);
-        map.put("accountCount",accountCount);
+        map.put("accountCount", accountCount);
         map.put("notificationCount", notificationCount);
-        map.put("promotionCount",promotionCount);
+        map.put("promotionCount", promotionCount);
         return ResponseJson.success(map);
     }
-   @Override
-   public ResponseJson<Map<String, Object>> ShopCount(Integer messageType,Integer commonId){
-       Integer count=messageCenterMapper.Count(2,commonId);
-       Map<String, Object> map = new HashMap(10);
-       map.put("count", count);
+
+    @Override
+    public ResponseJson<Map<String, Object>> ShopCount(Integer messageType, Integer commonId) {
+        Integer count = messageCenterMapper.Count(2, commonId);
+        Map<String, Object> map = new HashMap(10);
+        map.put("count", count);
         return ResponseJson.success(map);
     }
 
     @Override
-    public ResponseJson<Map<String, Object>> ClubCount(Integer messageType,Integer commonId){
-        Integer count=messageCenterMapper.Count(1,commonId);
+    public ResponseJson<Map<String, Object>> ClubCount(Integer messageType, Integer commonId) {
+        Integer count = messageCenterMapper.Count(1, commonId);
         Map<String, Object> map = new HashMap(10);
         map.put("count", count);
         return ResponseJson.success(map);
@@ -282,91 +282,84 @@ if(userID!=null) {
 
 
     @Override
-    public Integer updateMessageAsRead(Integer messageType,Integer commonId){
-
-
-      return messageCenterMapper.updateMessageAsRead(1,messageType,commonId);
+    public Integer updateMessageAsRead(Integer messageType, Integer commonId) {
+        return messageCenterMapper.updateMessageAsRead(1, messageType, commonId);
     }
 
     @Override
-    public Integer updateShopMessageAsRead(Integer messageType,Integer commonId){
-
-        return messageCenterMapper.updateMessageAsRead(2,messageType,commonId);
-    }
-     @Override
-    public Integer deleteMessage(String id){
-         Integer num=0;
-         String[] IdArr = id.split(",");
-         for (int i = 0; i < IdArr.length; i++) {
-              num= messageCenterMapper.deleteMessage(IdArr[i]);
-         }
-         return num;
+    public Integer updateShopMessageAsRead(Integer messageType, Integer commonId) {
+        return messageCenterMapper.updateMessageAsRead(2, messageType, commonId);
     }
+
     @Override
-    public Integer updateRead(Integer userType,String Id){
-        Integer num=0;
-            String[] IdArr = Id.split(",");
-            for (int i = 0; i < IdArr.length; i++) {
-                num= messageCenterMapper.updateRead(userType,IdArr[i]);
-            }
+    public Integer deleteMessage(String id) {
+        Integer num = 0;
+        String[] IdArr = id.split(",");
+        for (int i = 0; i < IdArr.length; i++) {
+            num = messageCenterMapper.deleteMessage(IdArr[i]);
+        }
+        return num;
+    }
 
+    @Override
+    public Integer updateRead(Integer userType, String Id) {
+        Integer num = 0;
+        String[] IdArr = Id.split(",");
+        for (int i = 0; i < IdArr.length; i++) {
+            num = messageCenterMapper.updateRead(userType, IdArr[i]);
+        }
         return num;
     }
 
 
     @Override
-    public ResponseJson<PageInfo<MessageCenter>> ClubMessageList(Integer commonId,Integer messageType,Integer source,int pageNum, int pageSize){
-
-    PageHelper.startPage(pageNum, pageSize);
-    List<MessageCenter> list=messageCenterMapper.MessageList(1,messageType,commonId);
-    list.forEach(mess -> {
-        if(mess.getClubId()!=null){
-            MessageCenter messageCenter= messageCenterMapper.MainImage(1,commonId);
-            if(messageCenter!=null){
-                mess.setMainImage(messageCenter.getMainImage());
-                mess.setOnlinePayFlag(messageCenter.getOnlinePayFlag());
-                if(messageCenter.getProductName().length()>10){
-                    mess.setProductName(StringUtils.strip(messageCenter.getProductName().substring(0, 11)));
-                }else {
-                    mess.setProductName(messageCenter.getProductName());
+    public ResponseJson<PageInfo<MessageCenter>> ClubMessageList(Integer commonId, Integer messageType, Integer source, int pageNum, int pageSize) {
+        PageHelper.startPage(pageNum, pageSize);
+        List<MessageCenter> list = messageCenterMapper.MessageList(1, messageType, commonId);
+        list.forEach(mess -> {
+            if (null != mess.getClubId()) {
+                MessageCenter messageCenter = messageCenterMapper.MainImage(1, commonId);
+                if (null != messageCenter) {
+                    mess.setMainImage(messageCenter.getMainImage());
+                    mess.setOnlinePayFlag(messageCenter.getOnlinePayFlag());
+                    if (messageCenter.getProductName().length() > 10) {
+                        mess.setProductName(StringUtils.strip(messageCenter.getProductName().substring(0, 11)));
+                    } else {
+                        mess.setProductName(messageCenter.getProductName());
+                    }
+                    mess.setProductCount(messageCenter.getProductCount());
+                    mess.setRefundType(messageCenter.getRefundType());
                 }
-                mess.setProductCount(messageCenter.getProductCount());
-                mess.setRefundType(messageCenter.getRefundType());
             }
-
+        });
+        if (source == 2) {
+            messageCenterMapper.updateMessageAsRead(1, messageType, commonId);
         }
-            });
-    if(source ==2){
-        messageCenterMapper.updateMessageAsRead(1,messageType,commonId);
-    }
-
-    PageInfo<MessageCenter> pageData = new PageInfo<>(list);
+        PageInfo<MessageCenter> pageData = new PageInfo<>(list);
         return ResponseJson.success(pageData);
-}
+    }
 
     @Override
-    public ResponseJson<PageInfo<MessageCenter>> shopMessageList(Integer commonId,Integer messageType,Integer source, int pageNum, int pageSize){
+    public ResponseJson<PageInfo<MessageCenter>> shopMessageList(Integer commonId, Integer messageType, Integer source, int pageNum, int pageSize) {
         PageHelper.startPage(pageNum, pageSize);
-        List<MessageCenter> list=messageCenterMapper.MessageList(2,messageType,commonId);
+        List<MessageCenter> list = messageCenterMapper.MessageList(2, messageType, commonId);
         list.forEach(mess -> {
-            if(mess.getShopId()!=null){
-                MessageCenter messageCenter= messageCenterMapper.MainImage(2,commonId);
-                if(messageCenter!=null){
+            if (mess.getShopId() != null) {
+                MessageCenter messageCenter = messageCenterMapper.MainImage(2, commonId);
+                if (messageCenter != null) {
                     mess.setMainImage(messageCenter.getMainImage());
                     mess.setOnlinePayFlag(messageCenter.getOnlinePayFlag());
-                    if(messageCenter.getProductName().length()>10){
+                    if (messageCenter.getProductName().length() > 10) {
                         mess.setProductName(StringUtils.strip(messageCenter.getProductName().substring(0, 11)));
-                    }else {
+                    } else {
                         mess.setProductName(messageCenter.getProductName());
                     }
                     mess.setProductCount(messageCenter.getProductCount());
                     mess.setRefundType(messageCenter.getRefundType());
                 }
-
             }
-
         });
-        if(source ==2) {
+        if (source == 2) {
             messageCenterMapper.updateMessageAsRead(2, messageType, commonId);
         }
         PageInfo<MessageCenter> pageData = new PageInfo<>(list);
@@ -374,27 +367,24 @@ if(userID!=null) {
     }
 
 
-
-
     /**
      * 当天天下午3点推送
      */
     private Void Timesjf(Integer userId) throws ParseException {
         //1.获取下午3点的时间
-        SimpleDateFormat dnf=new SimpleDateFormat("yyyy-MM-dd HH:mm");
+        SimpleDateFormat dnf = new SimpleDateFormat("yyyy-MM-dd HH:mm");
         Calendar time = Calendar.getInstance();
         time.set(Calendar.HOUR_OF_DAY, 15);
         time.set(Calendar.MINUTE, 00);
         time.set(Calendar.SECOND, 00);
-
         String times = dnf.format(time.getTime());
         System.out.println(times);
         //2.某天的日期
-        Date date=dnf.parse(times);
+        Date date = dnf.parse(times);
         //与当前时间的毫秒数相减得到相差的毫秒用于定时
-        Long h=(date.getTime()-date.getTime());
+        Long h = (date.getTime() - date.getTime());
         //这里如果当前时间大于下午三点会出现负数所以就不推送
-        if(h>0) {
+        if (h > 0) {
             ScheduledExecutorService executorService = Executors.newSingleThreadScheduledExecutor();
             executorService.schedule(new Runnable() {
                 @SneakyThrows
@@ -403,7 +393,7 @@ if(userID!=null) {
                     Integer shopID = messageCenterMapper.shopID(userId);
                     if (shopID != null) {
                         String receiptDate = messageCenterMapper.receiptDate(shopID);
-                        Double receiptAmount=messageCenterMapper.receiptAmount(shopID);
+                        Double receiptAmount = messageCenterMapper.receiptAmount(shopID);
                         Calendar calendar = Calendar.getInstance();
 
                         Integer clubId = messageCenterMapper.clubIdCule(userId);
@@ -474,21 +464,20 @@ if(userID!=null) {
                                 messageCenter.setTime(current);
                                 messageCenterMapper.addMessageCenter(messageCenter);
                             }
-
-                        try {
-                            log.info("***********上架费过期微信公众号推送************");
-                            String accessToken = weChatService.getAccessToken();
-                            String openid = messageCenterMapper.getOpenidListByPermission(messageCenterMapper.FromUnionId(userId));
-                           String date=s.toString();
-                            String remarkText = "如在使用中有任何疑问，请在小程序内联系在线客服";
-                            // 跳转到【小程序付款-选择支付方式页面】
-                            String pagePath = "https://www.caimei365.com/";
-                            // sendTemplateMsg(openid, 标题, 金额, 收款日期, 备注, 跳转链接
-                            log.error("获取openid>>>>>" + openid);
-                            weChatService.sendTemplate(accessToken,openid,date,receiptDate,dateStrings,receiptAmount,remarkText, pagePath);
-                        } catch (Exception e) {
-                            log.error("【上架费过期通知】获取微信公众号access_token异常！", e);
-                        }
+                            try {
+                                log.info("***********上架费过期微信公众号推送************");
+                                String accessToken = weChatService.getAccessToken();
+                                String openid = messageCenterMapper.getOpenidListByPermission(messageCenterMapper.FromUnionId(userId));
+                                String date = s.toString();
+                                String remarkText = "如在使用中有任何疑问，请在小程序内联系在线客服";
+                                // 跳转到【小程序付款-选择支付方式页面】
+                                String pagePath = "https://www.caimei365.com/";
+                                // sendTemplateMsg(openid, 标题, 金额, 收款日期, 备注, 跳转链接
+                                log.error("获取openid>>>>>" + openid);
+                                weChatService.sendTemplate(accessToken, openid, date, receiptDate, dateStrings, receiptAmount, remarkText, pagePath);
+                            } catch (Exception e) {
+                                log.error("【上架费过期通知】获取微信公众号access_token异常！", e);
+                            }
                         }
                     }
                 }
@@ -498,13 +487,12 @@ if(userID!=null) {
     }
 
 
-
     /**
      * 当天天下午3点推送超级会员过期条件
      */
     private Void Timerw(Integer userId) throws ParseException {
         //1.获取下午3点的时间
-        SimpleDateFormat dnf=new SimpleDateFormat("yyyy-MM-dd HH:mm");
+        SimpleDateFormat dnf = new SimpleDateFormat("yyyy-MM-dd HH:mm");
         Calendar time = Calendar.getInstance();
         time.set(Calendar.HOUR_OF_DAY, 15);
         time.set(Calendar.MINUTE, 00);
@@ -513,72 +501,69 @@ if(userID!=null) {
         String times = dnf.format(time.getTime());
         System.out.println(times);
         //2.某天的日期
-        Date date=dnf.parse(times);
+        Date date = dnf.parse(times);
         //与当前时间的毫秒数相减得到相差的毫秒用于定时
-        Long h=(date.getTime()-date.getTime());
+        Long h = (date.getTime() - date.getTime());
         //这里如果当前时间大于下午三点会出现负数所以就不推送
-        if(h>0){
-        ScheduledExecutorService executorService = Executors.newSingleThreadScheduledExecutor();
-        executorService.schedule(new Runnable() {
-            @SneakyThrows
-            @Override
-            public void run() {
-                SuperVipPo superVip = vipMapper.findSuperVip(userId);
-                Integer clubId = messageCenterMapper.clubIdCule(userId);
-                if (clubId != null) {
-                    if (superVip != null) {
-                        Date d = new Date();
-                        //1.日期格式
-                        SimpleDateFormat sdf = new SimpleDateFormat("yyyy-MM-dd hh:mm:ss");
-                        String endTime = sdf.format(superVip.getEndTime());
-                        //2.某天的日期
-                        Date da1 = sdf.parse(endTime);
-                        Long s = (d.getTime() - da1.getTime()) / 24 / 60 / 60 / 1000;
-                        //3.输出间隔天数         getTime获取的是毫秒
-                        log.info("输出间隔天数----------->", s);
-                        SimpleDateFormat dateFormat = new SimpleDateFormat("yyyy-MM-dd HH:mm:ss");
-                        String current = dateFormat.format(new Date());
-                        MessageCenter messageCenter = new MessageCenter();
-                        //推送信息中心-账户通知
-                        if (s == 7) {
-                            messageCenter.setShopId(null);
-                            messageCenter.setClubId(clubId);
-                            messageCenter.setUserType(1);
-                            messageCenter.setMessageType(2);
-                            messageCenter.setAccountType(3);
-                            messageCenter.setContent(s + "日后");
-                            messageCenter.setTime(current);
-                            messageCenterMapper.addMessageCenter(messageCenter);
-                            String mobile = messageCenterMapper.contractMobile(clubId);
-                            String content = "【采美365】您的超级会员将于7日后到期，到期后将无法享受专属会员权益，快戳采美网站链接www.caimei365.com 或微信搜索“采美采购商城”小程序登录采美平台续费吧。关注公众号“采美网”可获取更多优惠和精彩资讯。";
-                            remoteCallService.remoteSendSms(0, 1, mobile, content);
+        if (h > 0) {
+            ScheduledExecutorService executorService = Executors.newSingleThreadScheduledExecutor();
+            executorService.schedule(new Runnable() {
+                @SneakyThrows
+                @Override
+                public void run() {
+                    SuperVipPo superVip = vipMapper.findSuperVip(userId);
+                    Integer clubId = messageCenterMapper.clubIdCule(userId);
+                    if (clubId != null) {
+                        if (superVip != null) {
+                            Date d = new Date();
+                            //1.日期格式
+                            SimpleDateFormat sdf = new SimpleDateFormat("yyyy-MM-dd hh:mm:ss");
+                            String endTime = sdf.format(superVip.getEndTime());
+                            //2.某天的日期
+                            Date da1 = sdf.parse(endTime);
+                            Long s = (d.getTime() - da1.getTime()) / 24 / 60 / 60 / 1000;
+                            //3.输出间隔天数         getTime获取的是毫秒
+                            log.info("输出间隔天数----------->", s);
+                            SimpleDateFormat dateFormat = new SimpleDateFormat("yyyy-MM-dd HH:mm:ss");
+                            String current = dateFormat.format(new Date());
+                            MessageCenter messageCenter = new MessageCenter();
+                            //推送信息中心-账户通知
+                            if (s == 7) {
+                                messageCenter.setShopId(null);
+                                messageCenter.setClubId(clubId);
+                                messageCenter.setUserType(1);
+                                messageCenter.setMessageType(2);
+                                messageCenter.setAccountType(3);
+                                messageCenter.setContent(s + "日后");
+                                messageCenter.setTime(current);
+                                messageCenterMapper.addMessageCenter(messageCenter);
+                                String mobile = messageCenterMapper.contractMobile(clubId);
+                                String content = "【采美365】您的超级会员将于7日后到期，到期后将无法享受专属会员权益，快戳采美网站链接www.caimei365.com 或微信搜索“采美采购商城”小程序登录采美平台续费吧。关注公众号“采美网”可获取更多优惠和精彩资讯。";
+                                remoteCallService.remoteSendSms(0, 1, mobile, content);
 
-                        }
-                        if (s == 1) {
-                            messageCenter.setShopId(null);
-                            messageCenter.setClubId(clubId);
-                            messageCenter.setUserType(1);
-                            messageCenter.setMessageType(2);
-                            messageCenter.setAccountType(3);
-                            messageCenter.setContent("今日后");
-                            messageCenter.setTime(current);
-                            messageCenterMapper.addMessageCenter(messageCenter);
-                            String mobile = messageCenterMapper.contractMobile(clubId);
-                            String content = "【采美365】您的超级会员将于今日到期，到期后将无法享受专属会员权益，快戳采美网站链接www.caimei365.com 或微信搜索“采美采购商城”小程序登录采美平台续费吧。关注公众号“采美网”可获取更多优惠和精彩资讯。";
-                            remoteCallService.remoteSendSms(0, 1, mobile, content);
+                            }
+                            if (s == 1) {
+                                messageCenter.setShopId(null);
+                                messageCenter.setClubId(clubId);
+                                messageCenter.setUserType(1);
+                                messageCenter.setMessageType(2);
+                                messageCenter.setAccountType(3);
+                                messageCenter.setContent("今日后");
+                                messageCenter.setTime(current);
+                                messageCenterMapper.addMessageCenter(messageCenter);
+                                String mobile = messageCenterMapper.contractMobile(clubId);
+                                String content = "【采美365】您的超级会员将于今日到期，到期后将无法享受专属会员权益，快戳采美网站链接www.caimei365.com 或微信搜索“采美采购商城”小程序登录采美平台续费吧。关注公众号“采美网”可获取更多优惠和精彩资讯。";
+                                remoteCallService.remoteSendSms(0, 1, mobile, content);
+                            }
                         }
                     }
                 }
-            }
-        }, h, TimeUnit.MILLISECONDS);
+            }, h, TimeUnit.MILLISECONDS);
         }
         return null;
     }
 
 
-
-
-
     /**
      * 微信公众号授权链接(www)
      *
@@ -804,17 +789,17 @@ if(userID!=null) {
         String openId = (String) infoData.get(WeChatService.Keys.OPEN_ID);
         log.info(">>>>>>pc商城unionId:" + unionId + " ,openId:" + openId);
 
-        Integer userId=messageCenterMapper.userId(openId);
-        Integer clubId=messageCenterMapper.clubIdCule(userId);
-        Integer savedCount=null;
-        if(userId!=null){
-            Integer shopID=messageCenterMapper.shopID(userId);
-            Integer newReceiptType= messageCenterMapper.newReceiptType(shopID);
-            if(shopID==null){
-                savedCount= messageCenterMapper.Count(1,clubId);
+        Integer userId = messageCenterMapper.userId(openId);
+        Integer clubId = messageCenterMapper.clubIdCule(userId);
+        Integer savedCount = null;
+        if (userId != null) {
+            Integer shopID = messageCenterMapper.shopID(userId);
+            Integer newReceiptType = messageCenterMapper.newReceiptType(shopID);
+            if (shopID == null) {
+                savedCount = messageCenterMapper.Count(1, clubId);
                 System.out.println(savedCount);
-            }else {
-                savedCount= messageCenterMapper.Count(2,shopID);
+            } else {
+                savedCount = messageCenterMapper.Count(2, shopID);
             }
         }
         Timerw(userId);
@@ -1000,7 +985,7 @@ if(userID!=null) {
             messageCenter.setTime(current);
             messageCenterMapper.addMessageCenter(messageCenter);
             //发短信
-           String message = "【采美365】恭喜您成功成为运营人员，您可通过微信直接登录采美商城进行采购。";
+            String message = "【采美365】恭喜您成功成为运营人员，您可通过微信直接登录采美商城进行采购。";
             String mobile = messageCenterMapper.contractMobile(operation.getClubId());
             if (mobile != null && mobile != "") {
                 remoteCallService.remoteSendSms(2, 3, mobile, message);
@@ -1010,19 +995,18 @@ if(userID!=null) {
                 log.info("***********机构通过邀请码登入微信公众号推送************");
                 String accessToken = weChatService.getAccessToken();
                 String openid = messageCenterMapper.getOpenidListByPermission(unionId);
-                String time=current;
+                String time = current;
                 String remarkText = "绑定成功后，您可通过微信直接访问采美商城进行采购。";
                 // 跳转到【小程序付款-选择支付方式页面】
                 String pagePath = "https://www.caimei365.com/";
                 // sendTemplateMsg(openid, 标题, 金额, 收款日期, 备注, 跳转链接
                 log.error("获取openid>>>>>" + openid);
-                weChatService.sendTemplateMessg(accessToken,openid,nickName,time,remarkText, pagePath);
+                weChatService.sendTemplateMessg(accessToken, openid, nickName, time, remarkText, pagePath);
             } catch (Exception e) {
                 log.error("【机构通过邀请码登入通知】获取微信公众号access_token异常！", e);
             }
 
 
-
         } else {
             // 供应商Id
             operationPo.setShopId(operation.getShopId());
@@ -1051,13 +1035,13 @@ if(userID!=null) {
                 log.info("***********供应商通过邀请码登入微信公众号推送************");
                 String accessToken = weChatService.getAccessToken();
                 String openid = messageCenterMapper.getOpenidListByPermission(unionId);
-                String time=current;
+                String time = current;
                 String remarkText = "绑定成功后，您可通过微信登录采美商城管理您的账号";
                 // 跳转到【小程序付款-选择支付方式页面】
                 String pagePath = "https://www.caimei365.com/";
                 // sendTemplateMsg(openid, 标题, 金额, 收款日期, 备注, 跳转链接
                 log.error("获取openid>>>>>" + openid);
-                weChatService.sendTemplateMessg(accessToken,openid,nickName,time,remarkText, pagePath);
+                weChatService.sendTemplateMessg(accessToken, openid, nickName, time, remarkText, pagePath);
             } catch (Exception e) {
                 log.error("【供应商通过邀请码登入通知】获取微信公众号access_token异常！", e);
             }
@@ -1172,7 +1156,6 @@ if(userID!=null) {
         }
 
 
-
         // 绑定状态
         operation.setStatus(2);
         // 删除标识

src/main/resources/mapper/MessageCenter.xml

@@ -102,7 +102,7 @@
     </select>
 
     <select id="MainImage" resultType="com.caimei365.user.model.vo.MessageCenter">
-        SELECT co.refundType,COUNT(p.productID)AS productCount ,p.mainImage,co.onlinePayFlag,p.name as productName,co.orderID as orderID
+        SELECT co.refundType,COUNT(p.productID)AS productCount ,p.mainImage,co.onlinePayFlag,ifnull(p.name,'') as productName,co.orderID as orderID
         FROM cm_order co
                  LEFT JOIN bp_order_userinfo bou ON bou.orderId = co.orderID
                  LEFT JOIN USER u ON u.userID = co.userID