修复打赏次数累加的问题

lift-ud-service/src/main/java/cn/com/ty/lift/ud/chat/service/impl/ChatSessionServiceImpl.java

@@ -189,8 +189,7 @@ public class ChatSessionServiceImpl extends ServiceImpl<ChatSessionMapper, ChatS
     public RestResponse createPrivateChatRoom(ChatSessionQuery request) {
         ChatSessionVo vo = new ChatSessionVo();
         // 使用我的用户id和将要聊天的用户id正反去数据库查询房间号是否存在
-        String sessionId =
-                sessionMapper.findOneByUserIdAndCreateUserIdAndDateTable(request.getUserId(), request.getCreateUserId(), 3);
+        String sessionId = sessionMapper.findOneByUserIdAndCreateUserIdAndDateTable(request.getUserId(), request.getCreateUserId(), 3);
 
         if (StringUtils.isBlank(sessionId)) {
             ChatSessionEntity record = new ChatSessionEntity();

lift-ud-service/src/main/java/cn/com/ty/lift/ud/chat/service/impl/LiftCaseServiceImpl.java

@@ -437,7 +437,7 @@ public class LiftCaseServiceImpl extends ServiceImpl<LiftCaseMapper, LiftCaseEnt
 
         if (liftcase.getDataTable() == 1 && chargerId != null) {
             PushUserInfo pushUserInfo = iUserAccountService.getPushUserInfoByUserId(chargerId.toString());
-            PushMessage pushMessage = PushMessage.orderChargeStatus("待接单");
+            PushMessage pushMessage = PushMessage.orderChargeStatus("接入，请及时跟进！");
             pushMessage.sendTokenOnPlatform(jmsMessagingTemplate, pushUserInfo);
         }
 
@@ -529,8 +529,8 @@ public class LiftCaseServiceImpl extends ServiceImpl<LiftCaseMapper, LiftCaseEnt
         userInfo.setServiceCounts(userInfo.getServiceCounts() == null ? 1 : (userInfo.getServiceCounts() + 1));
         userInfoMapper.updateById(userInfo);
 
-        PushUserInfo pushUserInfo = iUserAccountService.getPushUserInfoByUserId(caseEntity.getCreateUserId().toString());
-        PushMessage pushMessage = PushMessage.orderChargeStatus("已接单");
+        PushUserInfo pushUserInfo = iUserAccountService.getPushUserInfoByUserId(caseEntity.getChargerId().toString());
+        PushMessage pushMessage = PushMessage.orderChargeStatus("接入，请及时跟进！");
         pushMessage.sendTokenOnPlatform(jmsMessagingTemplate, pushUserInfo);
 
         return RestResponse.success("success");

lift-ud-service/src/main/java/cn/com/ty/lift/ud/neety/process/ChatProcessor.java

@@ -38,6 +38,7 @@ public class ChatProcessor extends WebSoketSupport implements ProcessorInterface
      */
     @Override
     public void process(Channel client, IMMessage request) {
+        log.info(request.toString());
         //获取发送人信息
         String currentUserId = client.attr(USERID).get();
 
@@ -93,7 +94,17 @@ public class ChatProcessor extends WebSoketSupport implements ProcessorInterface
             //出诊问诊时，专家没有接单的情况下是不能进入聊天室的。
             //这种情况会造成，附近的人聊天，接收人不进入聊天室接收不到消息，
             //通过标记类型，附近的人聊天，直接用userchannel变量中找到链接发送给接收人，并把聊天记录存入redis中
-            if (request.getDataTable() == 3) {
+            for (int i = 0; roomInfo.getUserLIst() != null
+                    && !roomInfo.getUserLIst().isEmpty()
+                    && i < roomInfo.getUserLIst().size(); i++) {
+                UserInfo userInfo = roomInfo.getUserLIst().get(i);
+                Channel channel = userChannel.get(userInfo.getUserId());
+
+                if (null != channel) {
+                    sendMessage(channel, request);
+                }
+            }
+            /*if (request.getDataTable() == 3) {
                 //发给接收人
                 //如果接收人不在线，聊天记录存在redis中，等他上线之后进入聊天室同样也可以看到未读记录
                 Channel channel = userChannel.get(request.getReceiver());
@@ -113,7 +124,7 @@ public class ChatProcessor extends WebSoketSupport implements ProcessorInterface
                         sendMessage(channel, request);
                     }
                 }
-            }
+            }*/
         });
 
 

lift-ud-service/src/main/java/cn/com/ty/lift/ud/userInfo/controller/UserInfoController.java

@@ -264,12 +264,13 @@ public class UserInfoController {
 
     @GetMapping("/getRewardList")
     @ApiOperation(value = "获取用户打赏记录")
-    public RestResponse getRewardList(Long userId) {
-        if(userId == null) {
+//    public RestResponse getRewardList(Long userId) {
+    public RestResponse getRewardList(UserInfoQuery userInfo) {
+        if(userInfo.getUserId() == null) {
             return RestResponse.fail("用户id不能为空");
         }
 
-        return userInfoService.getRewardList(userId);
+        return userInfoService.getRewardList(userInfo);
     }
 
 

lift-ud-service/src/main/java/cn/com/ty/lift/ud/userInfo/mapper/UserInfoMapper.java

@@ -267,8 +267,8 @@ public interface UserInfoMapper extends BaseMapper<UserInfoEntity> {
 
     /**
      * 获取用户打赏清单
-     * @param userId
+     * @param userInfo
      * @return
      */
-    List<UserRewardListVo> getUserRewardList(Long userId);
+    List<UserRewardListVo> getUserRewardList(UserInfoQuery userInfo);
 }

lift-ud-service/src/main/java/cn/com/ty/lift/ud/userInfo/mapper/UserInfoMapper.xml

@@ -239,12 +239,11 @@
 				a.amount amount,
 				a.create_time,
 				b.avatar_url targetAvatarUrl
-			FROM
-				user_bill a
+			FROM user_bill a
 			LEFT JOIN user_info b ON a.target_user_id = b.user_id
-			WHERE
-				a.business_type = 2
+			WHERE a.business_type = 2
 			AND a.user_id = #{userId}
+			limit #{pageIndex},#{pageSize}
 <!-- 	select * from( -->
 <!-- 		select -->
 <!-- 			sv.data_id id, -->

lift-ud-service/src/main/java/cn/com/ty/lift/ud/userInfo/service/IUserInfoService.java

@@ -110,10 +110,10 @@ public interface IUserInfoService extends IService<UserInfoEntity> {
 
     /**
      * 获取用户打赏清单
-     * @param userId
+     * @param userInfo
      * @return
      */
-    RestResponse getRewardList(Long userId);
+    RestResponse getRewardList(UserInfoQuery userInfo);
 
     /**
      * 保存vip id

lift-ud-service/src/main/java/cn/com/ty/lift/ud/userInfo/service/impl/UserInfoServiceImpl.java

@@ -1118,8 +1118,8 @@ public class UserInfoServiceImpl extends ServiceImpl<UserInfoMapper, UserInfoEnt
     }
 
     @Override
-    public RestResponse getRewardList(Long userId) {
-        List<UserRewardListVo> userRewardList = userInfoMapper.getUserRewardList(userId);
+    public RestResponse getRewardList(UserInfoQuery userInfo) {
+        List<UserRewardListVo> userRewardList = userInfoMapper.getUserRewardList(userInfo);
 
         return RestResponse.success(userRewardList);
     }