fix : 客服支付策略

game-module/game-module-manage/src/main/java/com/zanxiang/game/module/manage/constant/RedisKeyConstant.java

@@ -37,4 +37,14 @@ public class RedisKeyConstant {
      */
     public static final String KF_MSG_USER_CONNECT_JOIN = RedisKeyConstant.REDIS_PREFIX + "kf_msg_user_connect_join_";
 
+    /**
+     * 客服支付订单标记
+     */
+    public static final String GAME_CUSTOM_PAY_SIGN = "game_sdk_manage_custom_pay_sign_";
+
+    /**
+     * 客服支付订单重新获取缓存
+     */
+    public static final String GAME_CUSTOM_PAY = "game_sdk_manage_custom_pay_";
+
 }

game-module/game-module-manage/src/main/java/com/zanxiang/game/module/manage/service/impl/KfAppletMsgServiceImpl.java

@@ -3,7 +3,9 @@ package com.zanxiang.game.module.manage.service.impl;
 import com.baomidou.mybatisplus.core.conditions.query.LambdaQueryWrapper;
 import com.baomidou.mybatisplus.core.conditions.update.LambdaUpdateWrapper;
 import com.zanxiang.erp.security.util.SecurityUtil;
+import com.zanxiang.game.back.base.pojo.enums.OrderStatusEnum;
 import com.zanxiang.game.module.manage.constant.RedisKeyConstant;
+import com.zanxiang.game.module.manage.enums.ExpireTimeEnum;
 import com.zanxiang.game.module.manage.enums.KfRoomMsgOwnerEnum;
 import com.zanxiang.game.module.manage.enums.KfRoomMsgTypeEnum;
 import com.zanxiang.game.module.manage.enums.KfWebSocketMsgEnum;
@@ -13,6 +15,7 @@ import com.zanxiang.game.module.manage.pojo.dto.PayApplicationDTO;
 import com.zanxiang.game.module.manage.service.*;
 import com.zanxiang.game.module.manage.service.api.KfWxApiService;
 import com.zanxiang.game.module.manage.utils.FileUtil;
+import com.zanxiang.game.module.manage.utils.RedisUtil;
 import com.zanxiang.game.module.mybatis.entity.*;
 import com.zanxiang.module.oss.service.IOssService;
 import com.zanxiang.module.util.JsonUtil;
@@ -84,6 +87,9 @@ public class KfAppletMsgServiceImpl implements IKfAppletMsgService {
     @Autowired
     private IKfRoomMsgService kfRoomMsgService;
 
+    @Autowired
+    private RedisUtil<String> redisUtil;
+
     @Override
     public void appletMsg(String postData) {
         log.error("接收到SDK转发的小程序消息, postData : {}", postData);
@@ -94,10 +100,9 @@ public class KfAppletMsgServiceImpl implements IKfAppletMsgService {
         if (gameApplet == null) {
             return;
         }
-        //用户进入会话事件
-        if (Objects.equals(kfAppletMsgDTO.getMsgType(), KfAppletMsgDTO.MSG_TYPE_EVENT)
-                && Objects.equals(kfAppletMsgDTO.getEvent(), KfAppletMsgDTO.EVENT_USER_ENTER_TEMP_SESSION)) {
-            this.kfSessionUserUpdateSave(kfAppletMsgDTO, gameApplet);
+        //事件消息
+        if (Objects.equals(kfAppletMsgDTO.getMsgType(), KfAppletMsgDTO.MSG_TYPE_EVENT)) {
+            this.eventMsgHandle(gameApplet, kfAppletMsgDTO);
             return;
         }
         //非玩家消息, 不做处理
@@ -109,9 +114,26 @@ public class KfAppletMsgServiceImpl implements IKfAppletMsgService {
                 .eq(KfRoom::getOpenId, kfAppletMsgDTO.getFromUserName())
                 .eq(KfRoom::getGameId, gameApplet.getGameId())
                 .eq(KfRoom::getOnline, Boolean.TRUE));
-        //消息存储
+        //构造房间消息
         KfWebSocketMsgDTO.MsgContentBean msgContent = this.getMsgContent(kfAppletMsgDTO);
         KfRoomMsg kfRoomMsg = this.transform(kfAppletMsgDTO, gameApplet, kfRoom, postData, msgContent);
+        //判断是否请求支付链接
+        String orderId = redisUtil.getCache(RedisKeyConstant.GAME_CUSTOM_PAY + kfAppletMsgDTO.getFromUserName());
+        if (Strings.isNotBlank(orderId) && Objects.equals(kfAppletMsgDTO.getContent(), KfAppletMsgDTO.MSG_CONTENT_PAY)) {
+            Order order = orderService.getOne(new LambdaQueryWrapper<Order>()
+                    .eq(Order::getOrderId, orderId)
+                    .and(qw -> qw.eq(Order::getStatus, OrderStatusEnum.READY_PAY.getValue())
+                            .or().eq(Order::getStatus, OrderStatusEnum.WAIT_PAY.getValue())
+                    )
+            );
+            if (order != null) {
+                this.sendCustomPayMessage(gameApplet.getGameId(), kfAppletMsgDTO.getFromUserName(), kfRoom, order);
+                kfRoomMsg.setReadStatus(Boolean.TRUE);
+                kfRoomMsgService.save(kfRoomMsg);
+                return;
+            }
+        }
+        //保存房间消息
         kfRoomMsgService.save(kfRoomMsg);
         //玩家状态更新为待接入状态
         if (kfRoom == null) {
@@ -125,6 +147,37 @@ public class KfAppletMsgServiceImpl implements IKfAppletMsgService {
         this.pushMessage(this.transform(kfRoom, gameApplet.getGameId(), kfRoomMsg, msgContent));
     }
 
+    private void eventMsgHandle(GameApplet gameApplet, KfAppletMsgDTO kfAppletMsgDTO) {
+        //事件类型
+        String event = kfAppletMsgDTO.getEvent();
+        //非玩家打开会话消息, 不处理
+        if (!Objects.equals(event, KfAppletMsgDTO.EVENT_USER_ENTER_TEMP_SESSION)) {
+            return;
+        }
+        //保存玩家信息
+        this.kfSessionUserUpdateSave(kfAppletMsgDTO, gameApplet);
+        //判断玩家是否存在客服支付订单
+        String customPaySign = RedisKeyConstant.GAME_CUSTOM_PAY_SIGN + kfAppletMsgDTO.getFromUserName();
+        String orderId = redisUtil.getCache(customPaySign);
+        if (Strings.isBlank(orderId)) {
+            return;
+        }
+        //查询订单
+        Order order = orderService.getOne(new LambdaQueryWrapper<Order>()
+                .eq(Order::getOrderId, orderId)
+                .and(qw -> qw.eq(Order::getStatus, OrderStatusEnum.READY_PAY.getValue())
+                        .or().eq(Order::getStatus, OrderStatusEnum.WAIT_PAY.getValue())
+                )
+        );
+        if (order == null) {
+            return;
+        }
+        this.sendCustomPayMessage(gameApplet.getGameId(), kfAppletMsgDTO.getFromUserName(), null, order);
+        redisUtil.deleteCache(customPaySign);
+        redisUtil.setCache(RedisKeyConstant.GAME_CUSTOM_PAY + kfAppletMsgDTO.getFromUserName(),
+                orderId, ExpireTimeEnum.FIVE_MIN.getTime());
+    }
+
     private KfWebSocketMsgDTO transform(KfRoom kfRoom, Long gameId, KfRoomMsg kfRoomMsg, KfWebSocketMsgDTO.MsgContentBean msgContent) {
         //消息类型
         KfWebSocketMsgEnum kfWebSocketMsgEnum = kfRoom == null ? KfWebSocketMsgEnum.WEBSOCKET_MSG_WAIT_LIST
@@ -238,7 +291,7 @@ public class KfAppletMsgServiceImpl implements IKfAppletMsgService {
         return this.realmName + "image/" + fileName;
     }
 
-    private void sendSystemMessage(Long gameId, String openId, Order order) {
+    private void sendCustomPayMessage(Long gameId, String openId, KfRoom kfRoom, Order order) {
         //查询订单支付方式
         GamePayWay gamePayWay = gamePayWayService.getById(order.getGamePayWayId());
         //查询支付应用信息
@@ -265,12 +318,31 @@ public class KfAppletMsgServiceImpl implements IKfAppletMsgService {
         linkMap.put("description", "点我充值" + amount + "元,用于购买" + amount + "元档充值");
         linkMap.put("url", url);
         linkMap.put("thumb_url", thumbUrl);
-        //发送客服消息
+        //发送消息
         Map<String, Object> msgParamMap = new HashMap<>(3);
         msgParamMap.put("touser", openId);
         msgParamMap.put("msgtype", KfRoomMsgTypeEnum.KF_MSG_TYPE_LINK.getValue());
         msgParamMap.put(KfRoomMsgTypeEnum.KF_MSG_TYPE_LINK.getValue(), linkMap);
         kfWxApiService.sendCustomMessageApi(gameId, msgParamMap);
+        //返回发送的消息内容
+        kfRoomMsgService.save(this.transform(openId, gameId, kfRoom, JsonUtil.toString(msgParamMap)));
+    }
+
+    private KfRoomMsg transform(String openId, Long gameId, KfRoom kfRoom, String msgContent) {
+        return KfRoomMsg.builder()
+                .msgId(UUID.randomUUID().toString().replace("-", ""))
+                .msgType(KfRoomMsgTypeEnum.KF_MSG_TYPE_LINK.getValue())
+                .gameId(gameId)
+                .openId(openId)
+                .readStatus(kfRoom != null)
+                .roomId(kfRoom == null ? null : kfRoom.getId())
+                .kfUserId(kfRoom == null ? null : kfRoom.getKfUserId())
+                .msgOwner(KfRoomMsgOwnerEnum.KF_MSG_OWNER_SYSTEM.getValue())
+                .content(msgContent)
+                .source(msgContent)
+                .createTime(LocalDateTime.now())
+                .updateTime(LocalDateTime.now())
+                .build();
     }
 
     /**

game-module/game-module-manage/src/main/java/com/zanxiang/game/module/manage/service/impl/KfRoomServiceImpl.java

@@ -7,6 +7,7 @@ import com.baomidou.mybatisplus.core.toolkit.CollectionUtils;
 import com.baomidou.mybatisplus.extension.plugins.pagination.Page;
 import com.baomidou.mybatisplus.extension.service.impl.ServiceImpl;
 import com.zanxiang.erp.security.util.SecurityUtil;
+import com.zanxiang.game.module.manage.enums.KfRoomMsgOwnerEnum;
 import com.zanxiang.game.module.manage.enums.KfRoomMsgTypeEnum;
 import com.zanxiang.game.module.manage.enums.OrderStateEnum;
 import com.zanxiang.game.module.manage.pojo.dto.KfWebSocketMsgDTO;
@@ -142,7 +143,8 @@ public class KfRoomServiceImpl extends ServiceImpl<KfRoomMapper, KfRoom> impleme
         }
         int unReadMsgCount = kfRoomMsgService.count(new LambdaQueryWrapper<KfRoomMsg>()
                 .eq(KfRoomMsg::getGameId, gameApplet.getGameId())
-                .eq(KfRoomMsg::getReadStatus, Boolean.FALSE));
+                .eq(KfRoomMsg::getReadStatus, Boolean.FALSE)
+                .ne(KfRoomMsg::getMsgOwner, KfRoomMsgOwnerEnum.KF_MSG_OWNER_SYSTEM.getValue()));
         KfWebSocketMsgDTO.GameBean gameBean = BeanUtil.copy(gameApplet, KfWebSocketMsgDTO.GameBean.class);
         gameBean.setUnReadMsgCount(unReadMsgCount);
         return gameBean;
@@ -181,7 +183,8 @@ public class KfRoomServiceImpl extends ServiceImpl<KfRoomMapper, KfRoom> impleme
         //未读消息数量
         int unReadMsgCount = kfRoomMsgService.count(new LambdaQueryWrapper<KfRoomMsg>()
                 .eq(KfRoomMsg::getRoomId, kfRoom.getId())
-                .eq(KfRoomMsg::getReadStatus, Boolean.FALSE));
+                .eq(KfRoomMsg::getReadStatus, Boolean.FALSE)
+                .ne(KfRoomMsg::getMsgOwner, KfRoomMsgOwnerEnum.KF_MSG_OWNER_SYSTEM.getValue()));
         roomBean.setUnReadMsgCount(unReadMsgCount);
         //最后一条消息
         KfRoomMsg kfRoomMsg = kfRoomMsgService.getOne(new LambdaQueryWrapper<KfRoomMsg>()
@@ -272,6 +275,8 @@ public class KfRoomServiceImpl extends ServiceImpl<KfRoomMapper, KfRoom> impleme
         Page<Order> orderPage = orderService.page(new Page<>(pageBean.getPageNum(), pageBean.getPageSize()),
                 new QueryWrapper<Order>().lambda()
                         .eq(Order::getUserId, kfSessionUser.getUserId())
+                        //todo : 这里要放开
+                        //.eq(Order::getStatus, OrderStateEnum.SUCCESS_PAY.getCode())
                         .orderByDesc(Order::getCreateTime)
         );
         //构造订单列表

game-module/game-module-manage/src/main/java/com/zanxiang/game/module/manage/service/impl/KfSessionUserServiceImpl.java

@@ -52,16 +52,8 @@ public class KfSessionUserServiceImpl extends ServiceImpl<KfSessionUserMapper, K
                         .eq(KfRoomMsg::getReadStatus, Boolean.FALSE)
                         .isNull(KfRoomMsg::getRoomId)
                         .orderByDesc(KfRoomMsg::getCreateTime));
-
-        log.error("查询待接入消息 : kfRoomMsgPage : {}", JsonUtil.toString(kfRoomMsgPage));
-
-
         List<KfWebSocketMsgDTO.WaitUserMsgBean> waitUserMsgList = kfRoomMsgPage.getRecords()
                 .stream().map(this::transform).collect(Collectors.toList());
-
-        log.error("设置待接入玩家消息 records : {}, waitUserMsgList : {}", JsonUtil.toString(kfRoomMsgPage.getRecords()),
-                JsonUtil.toString(waitUserMsgList));
-
         waitUserBean.setWaitUserMsgList(waitUserMsgList);
         waitUserBean.setUnReadMsgCount(kfRoomMsgPage.getTotal());
         return waitUserBean;
@@ -73,15 +65,8 @@ public class KfSessionUserServiceImpl extends ServiceImpl<KfSessionUserMapper, K
         }
         //等待消息对象
         KfWebSocketMsgDTO.WaitUserMsgBean waitUserMsgBean = BeanUtil.copy(kfRoomMsg, KfWebSocketMsgDTO.WaitUserMsgBean.class);
-
-        log.error("等待消息对象 waitUserMsgBean : {}", JsonUtil.toString(waitUserMsgBean));
-
         //消息内容解析
         KfWebSocketMsgDTO.MsgContentBean msgContent = JsonUtil.toObj(waitUserMsgBean.getContent(), KfWebSocketMsgDTO.MsgContentBean.class);
-
-        log.error("消息内容解析 msgContent : {}", JsonUtil.toString(msgContent));
-
-
         //消息内容转换
         if (Objects.equals(waitUserMsgBean.getMsgType(), KfRoomMsgTypeEnum.KF_MSG_TYPE_TEXT.getValue())) {
             waitUserMsgBean.setContent(msgContent.getText());