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

game-back/game-back-serve/src/main/java/com/zanxiang/game/back/serve/service/impl/GameBackPolicyServiceImpl.java

@@ -152,8 +152,8 @@ public class GameBackPolicyServiceImpl extends ServiceImpl<GameBackPolicyMapper,
                             .eq(GameTencentOrder::getWechatAppId, dto.getWechatAppId())
                             .eq(GameTencentOrder::getAdAccountId, dto.getAdAccountId())
                             .eq(GameTencentOrder::getOrderStatus, 2)
-                            .last("limit " + backUnit)
                             .orderByDesc(GameTencentOrder::getCreateTime)
+                            .last("limit " + backUnit)
                     )).intValue());
         }
         if (dto.getOrderStatus().equals(COMPLETE_ORDER) || doBack) {

game-back/game-back-serve/src/main/java/com/zanxiang/game/back/serve/utils/BackPolicyUtil.java

@@ -73,8 +73,11 @@ public class BackPolicyUtil {
             String[] temp = backRate.split(":");
             int backCount = Integer.parseInt(temp[0]);
             int ignoreCount = Integer.parseInt(temp[1]);
+            if (ignoreCount == 0) {
+                return true;
+            }
             int isBackCount = lastBackFunction.apply(backCount + ignoreCount - 1);
-            return isBackCount >= backCount;
+            return isBackCount < backCount;
         } else if (Objects.equals(backType, GameBackPolicy.POLICY_TYPE_RANDOM_RATE)) {
             // 随机概率回传
             return RandomUtils.nextInt(0, 100) <= Integer.parseInt(backRate);

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

@@ -167,7 +167,7 @@ public class OrderServiceImpl extends ServiceImpl<OrderMapper, Order> implements
         //渠道账号
         AgentDTO agentDTO = agentMap.get(orderVO.getAgentId());
         if (agentDTO != null) {
-            orderVO.setAccountId(agentDTO.getId());
+            orderVO.setAccountId(agentDTO.getAccountId());
             orderVO.setPitcherId(agentDTO.getCreateBy());
             orderVO.setPitcherName(agentDTO.getCreateByName());
             orderVO.setAccountType(agentDTO.getAccountType());

game-module/game-module-sdk/src/main/java/com/zanxiang/game/module/sdk/SDKApplication.java

@@ -23,7 +23,7 @@ public class SDKApplication {
 
     public static void main(String[] args) {
         SpringApplication.run(SDKApplication.class, args);
-        System.out.println("赞象SDK服务启动成功 <被分享人渠道归因修改> ( ´･･)ﾉ(._.`) \n" +
+        System.out.println("赞象SDK服务启动成功 003 ( ´･･)ﾉ(._.`) \n" +
                 " ___________ _   __\n" +
                 "/  ___|  _  \\ | / /\n" +
                 "\\ `--.| | | | |/ / \n" +

game-module/game-module-sdk/src/main/java/com/zanxiang/game/module/sdk/service/impl/AgentServiceImpl.java

@@ -101,7 +101,7 @@ public class AgentServiceImpl extends ServiceImpl<AgentMapper, Agent> implements
         if (agent == null) {
             return Tuples.of(0L, Collections.emptyMap(), Strings.isBlank(shareUserId) ? Strings.EMPTY : shareUserId);
         }
-        return Tuples.of(agent.getId(), urlParamMap, shareUserId);
+        return Tuples.of(agent.getId(), urlParamMap, Strings.isBlank(shareUserId) ? Strings.EMPTY : shareUserId);
     }
 
     private Agent getAgentByKey(Map<String, String> urlParamMap) {

game-module/game-module-sdk/src/main/java/com/zanxiang/game/module/sdk/service/impl/GameAppletServiceImpl.java

@@ -104,24 +104,31 @@ public class GameAppletServiceImpl extends ServiceImpl<GameAppletMapper, GameApp
                     signature, mySignature);
             return result;
         }
+        //消息内容
         AppletMsgDTO appletMsgDTO = JsonUtil.toObj(postData, AppletMsgDTO.class);
-        //消息内容判断, 值回复文本消息为2的内容
-        if (!Objects.equals(appletMsgDTO.getMsgType(), "text") || !Objects.equals(appletMsgDTO.getContent(), "2")) {
-            return result;
-        }
         //用户信息
         UserDTO userDTO = userService.getUserByOpenId(gameAppletDTO.getGameId(), appletMsgDTO.getFromUserName());
-        //查询用户最新订单
-        Order order = orderService.getOne(new LambdaQueryWrapper<Order>()
-                .eq(Order::getUserId, userDTO.getId())
-                .eq(Order::getStatus, OrderStateEnum.READY_PAY.getCode())
-                .orderByDesc(Order::getCreateTime)
-                .last("limit 1"));
-        if (order == null) {
-            return result;
+        //客服支付
+        if (Objects.equals(appletMsgDTO.getMsgType(), "text") && Objects.equals(appletMsgDTO.getContent(), "2")) {
+            //查询用户最新订单
+            Order order = orderService.getOne(new LambdaQueryWrapper<Order>()
+                    .eq(Order::getUserId, userDTO.getId())
+                    .eq(Order::getStatus, OrderStateEnum.READY_PAY.getCode())
+                    .orderByDesc(Order::getCreateTime)
+                    .last("limit 1"));
+            if (order != null) {
+                //发送客服消息
+                return this.sendCustomMessage(gameAppletDTO, userDTO.getOpenId(), order);
+            }
         }
-        //发送客服消息
-        return this.sendCustomMessage(gameAppletDTO, userDTO.getOpenId(), order);
+        //非客服支付, 回复通用消息
+        GameExt gameExt = gameExtService.getByGameId(userDTO.getGameId());
+        String text = "尊敬的玩家您好，请您用QQ添加：" + gameExt.getCustomerQq()
+                + "，联系官方客服哦，客服目前排队比较多，请您耐心等待，请您备注好区服角色，方便客服第一时间为您处理问题";
+        //客服消息参数构造
+        Map<String, Object> textMap = new HashMap<>(1);
+        textMap.put("content", text);
+        return this.sendCustomMessageApi(gameAppletDTO, userDTO.getOpenId(), "text", textMap);
     }
 
     private String sendCustomMessage(GameAppletDTO gameAppletDTO, String openId, Order order) {
@@ -151,11 +158,16 @@ public class GameAppletServiceImpl extends ServiceImpl<GameAppletMapper, GameApp
         linkMap.put("description", "点我充值" + amount + "元,用于购买" + amount + "元档充值");
         linkMap.put("url", url);
         linkMap.put("thumb_url", thumbUrl);
+        //发送客服消息
+        return this.sendCustomMessageApi(gameAppletDTO, openId, "link", linkMap);
+    }
+
+    private String sendCustomMessageApi(GameAppletDTO gameAppletDTO, String openId, String msgType, Map<String, Object> msgMap) {
         //客服消息参数构造
         Map<String, Object> paramMap = new HashMap<>(3);
         paramMap.put("touser", openId);
-        paramMap.put("msgtype", "link");
-        paramMap.put("link", linkMap);
+        paramMap.put("msgtype", msgType);
+        paramMap.put(msgType, msgMap);
         log.error("客服消息发送参数, paramMap : {}", JsonUtil.toString(paramMap));
         //获取接口token
         String accessToken = wxApiService.getAccessToken(gameAppletDTO.getAppId(), gameAppletDTO.getAppSecret());