Merge branch 'master' into develop

csm-service/cms-service-user/src/main/java/com/mmc/iuav/user/constant/GeneralConstant.java

+package com.mmc.iuav.user.constant;
+
+import lombok.Data;
+import org.aspectj.weaver.ast.Not;
+import org.springframework.stereotype.Component;
+
+@Data
+@Component
+public class GeneralConstant {
+    public static final String PARTNER_NOT_VIEWED = "user_partner_not_viewed";
+}

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

@@ -8,6 +8,7 @@ import com.mmc.iuav.user.auth.PwdUtil;
 import com.mmc.iuav.user.client.ImsClient;
 import com.mmc.iuav.user.client.OmsClient;
 import com.mmc.iuav.user.client.PmsClient;
+import com.mmc.iuav.user.constant.GeneralConstant;
 import com.mmc.iuav.user.dao.BackUserAccountDao;
 import com.mmc.iuav.user.dao.CooperationDao;
 import com.mmc.iuav.user.dao.RoleDao;
@@ -30,6 +31,7 @@ import org.apache.commons.lang.StringUtils;
 import org.apache.commons.lang3.RandomStringUtils;
 import org.springframework.beans.factory.annotation.Autowired;
 import org.springframework.beans.factory.annotation.Value;
+import org.springframework.data.redis.core.StringRedisTemplate;
 import org.springframework.stereotype.Service;
 import org.springframework.transaction.annotation.Transactional;
 import org.springframework.util.CollectionUtils;
@@ -69,6 +71,9 @@ public class BackUserAccountServiceImpl implements BackUserAccountService {
     @Autowired
     private PmsClient pmsClient;
 
+    @Autowired
+    StringRedisTemplate stringRedisTemplate;
+
     @Transactional
     @Override
     public ResultBody insertBAccount(BUserAccountVO bUserAccountVO, LoginSuccessDTO loginSuccessDTO) {
@@ -302,7 +307,12 @@ public class BackUserAccountServiceImpl implements BackUserAccountService {
         newMessageVO.setOrderMessage(omsClient.getCountNewOrder());
         newMessageVO.setDynamicMessage(imsClient.getDynamicMessageSum());
 
-        newMessageVO.setUserStateMessage(certificationDao.getStateMessage());
+        String StringNumber = stringRedisTemplate.opsForValue().get(GeneralConstant.PARTNER_NOT_VIEWED);
+        if(StringNumber == null){
+            StringNumber = "0";
+        }
+        int num = Integer.parseInt(StringNumber);
+        newMessageVO.setUserStateMessage(num);
         return ResultBody.success(newMessageVO);
     }
 }

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

@@ -2,13 +2,16 @@ package com.mmc.iuav.user.service.impl;
 
 import com.mmc.iuav.page.PageResult;
 import com.mmc.iuav.response.ResultBody;
+import com.mmc.iuav.user.constant.GeneralConstant;
 import com.mmc.iuav.user.entity.UserPartnerDO;
 import com.mmc.iuav.user.dao.UserPartnerDao;
 import com.mmc.iuav.user.model.qo.UserPartnerQO;
 import com.mmc.iuav.user.model.vo.UserPartnerVO;
 import com.mmc.iuav.user.service.UserPartnerService;
 import lombok.extern.slf4j.Slf4j;
+import org.apache.commons.lang.StringUtils;
 import org.springframework.beans.factory.annotation.Autowired;
+import org.springframework.data.redis.core.StringRedisTemplate;
 import org.springframework.stereotype.Service;
 import org.springframework.transaction.annotation.Transactional;
 
@@ -27,6 +30,10 @@ public class UserPartnerServiceImpl implements UserPartnerService {
     @Autowired
     private UserPartnerDao userPartnerDao;
 
+    @Autowired
+    private StringRedisTemplate stringRedisTemplate;
+
+
     /**
      * 通过ID查询单条数据
      *
@@ -47,9 +54,7 @@ public class UserPartnerServiceImpl implements UserPartnerService {
     @Override
     public ResultBody queryByPage(UserPartnerQO userPartner) {
         int total = userPartnerDao.count(userPartner);
-
-
-
+        stringRedisTemplate.opsForValue().set(GeneralConstant.PARTNER_NOT_VIEWED, "0");
         int pageNo = userPartner.getPageNo();
         userPartner.buildCurrentPage();
         List<UserPartnerVO> userPartnerDOS = userPartnerDao.queryAllByLimit(userPartner);
@@ -64,6 +69,7 @@ public class UserPartnerServiceImpl implements UserPartnerService {
      */
     @Override
     public UserPartnerDO insertPartner(UserPartnerDO userPartnerDO) {
+        stringRedisTemplate.opsForValue().increment(GeneralConstant.PARTNER_NOT_VIEWED);
         userPartnerDao.insertPartner(userPartnerDO);
         return userPartnerDO;
     }

csm-service/cms-service-user/src/main/resources/mapper/UserPartnerDao.xml

@@ -54,7 +54,7 @@
     </select>
     <select id="queryAllByLimit" resultType="com.mmc.iuav.user.model.vo.UserPartnerVO">
         select
-        id,user_address, user_name, phone_number, id, create_time, update_time, status,user_account_id
+        id,user_address, user_name, phone_number, create_time, update_time, status,user_account_id
         from user_partner
         <where>
             <if test="userAddress != null and userAddress != ''">
@@ -73,6 +73,7 @@
                 and status = #{status}
             </if>
         </where>
+        order by create_time desc
         limit #{pageNo},#{pageSize}
     </select>
     <select id="queryById" resultType="com.mmc.iuav.user.model.vo.UserPartnerVO">

kustomization/overlays/prod/kustomization.yaml

@@ -18,4 +18,4 @@ patches:
 images:
 - name: REGISTRY/NAMESPACE/IMAGE:TAG
   newName: mmc-registry.cn-shenzhen.cr.aliyuncs.com/sharefly/cms
-  newTag: 846f745c618029d8e6ab6a3ab0be389d79599b71
+  newTag: b533073a0e27e017720dc25b4e25881acbbd899f