Merge remote-tracking branch 'origin/develop' into develop

csm-service/cms-service-user/src/main/java/com/mmc/iuav/user/controller/MessageController.java

@@ -172,4 +172,20 @@ public class MessageController  extends BaseController{
     public Integer timeTypeById(@ApiParam(value = "购买聊天时长的类型id，唯一识别id", required = true)  Integer typeId, Integer userId){
         return messageService.timeTypeById(typeId,userId);
     }
+
+    @ApiOperation(value = "获取用户商家聊天次数")
+    @ApiResponses({@ApiResponse(code = 200, message = "OK", response = ResultBody.class)})
+    @GetMapping("/getUserMessageNum")
+    public ResultBody getUserMessageNum(){
+        return messageService.getUserMessageNum();
+    }
+
+
+    @ApiOperation(value = "获取用户与用户聊天次数")
+    @ApiResponses({@ApiResponse(code = 200, message = "OK", response = ResultBody.class)})
+    @GetMapping("/getUserAndUserMessageNum")
+    public ResultBody getUserAndUserMessageNum(){
+        return messageService.getUserAndUserMessageNum();
+    }
+
 }

csm-service/cms-service-user/src/main/java/com/mmc/iuav/user/dao/MessageDao.java

@@ -118,4 +118,8 @@ public interface MessageDao {
     List<MessageTimeVO> listTimeType();
     void updateTimeType(MessageTimeVO messageTimeVO);
     void insertTimeType(MessageTimeVO messageTimeVO);
+
+    Integer getUserMessageNum();
+
+    Integer getUserAndUserMessageNum();
 }

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

@@ -94,4 +94,8 @@ public interface MessageService {
     ResultBody insertTimeType(MessageTimeVO messageTimeVO);
 
     Integer timeTypeById(Integer id,Integer userId);
+
+    ResultBody getUserMessageNum();
+
+    ResultBody getUserAndUserMessageNum();
 }

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

@@ -428,4 +428,16 @@ public class MessageServiceImpl implements MessageService {
         // 如果时间差大于 180 秒（即三分钟），返回 true
         return secondsDiff > 180;
     }
+
+    @Override
+    public ResultBody getUserMessageNum() {
+        Integer userMessageNum = messageDao.getUserMessageNum();
+        return ResultBody.success(userMessageNum);
+    }
+
+    @Override
+    public ResultBody getUserAndUserMessageNum() {
+        Integer userMessageNum = messageDao.getUserAndUserMessageNum();
+        return ResultBody.success(userMessageNum);
+    }
 }

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

@@ -122,6 +122,18 @@ ORDER BY create_time desc
         from user_message_time_type
     </select>
 
+    <select id="getUserMessageNum" resultType="java.lang.Integer">
+        SELECT COUNT(DISTINCT back_user_id)
+        FROM user_message
+        WHERE DATE(create_time) = CURDATE() AND back_user_id IS NOT NULL
+    </select>
+    <select id="getUserAndUserMessageNum" resultType="java.lang.Integer">
+        SELECT
+            COUNT(*) AS count_distinct_pairs
+        FROM
+            ( SELECT DISTINCT sender_user_id, receiver_user_id FROM user_message WHERE DATE( create_time ) = CURDATE() AND back_user_id IS NULL ) AS distinct_pairs
+    </select>
+
     <insert id="insertSystemMessage">
         insert into message
         <trim prefix="(" suffix=")" suffixOverrides=",">

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: 1b93a4e90ab4ce45a338416f382336a71148cbc1
+  newTag: 2af5c2640f4b8983a50a65e3a0eb92abe985f46f