Merge branch 'develop'

cms-common/cms-common-model/src/main/java/com/mmc/iuav/user/model/vo/NewMessageVO.java

@@ -27,7 +27,7 @@ public class NewMessageVO {
     private int dynamicMessage;
 
     @ApiModelProperty(value = "未读合伙人信息")
-    private int userStateMessage;
+    private String userStateMessage;
 
     @ApiModelProperty(value = "未发货消息")
     private int pointsMallMessage;

csm-service/cms-service-user/src/main/java/com/mmc/iuav/user/service/impl/BackUserAccountServiceImpl.java

@@ -309,15 +309,11 @@ public class BackUserAccountServiceImpl implements BackUserAccountService {
         newMessageVO.setPointsMallMessage(list.get(1));
         newMessageVO.setDynamicMessage(imsClient.getDynamicMessageSum());
 
-        String StringNumber = stringRedisTemplate.opsForValue().get(GeneralConstant.PARTNER_NOT_VIEWED);
-        String StringNumber1;
-        if(StringNumber == null){
-            StringNumber1 = "0";
-        }else{
-            StringNumber1 = StringNumber.substring(1, StringNumber.length() - 1); // 去除首尾双引号
-        }
-        int num = Integer.parseInt(StringNumber1);
-        newMessageVO.setUserStateMessage(num);
+        String stringNumber = stringRedisTemplate.opsForValue().get(GeneralConstant.PARTNER_NOT_VIEWED);
+        if(stringNumber == null){
+            stringNumber = "0";
+        }
+        newMessageVO.setUserStateMessage(stringNumber);
         return ResultBody.success(newMessageVO);
     }
 

kustomization/overlays/dev/kustomization.yaml

@@ -18,4 +18,4 @@ patches:
 images:
 - name: REGISTRY/NAMESPACE/IMAGE:TAG
   newName: mmc-registry.cn-shenzhen.cr.aliyuncs.com/sharefly-dev/cms
-  newTag: 78f5993c9236a4ee708042ac2ccc5eef3957d48d
+  newTag: 7b01f0ed55237f7a05b8d08c6761cb16d85419db