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

@@ -112,21 +112,24 @@ public class GameBackPolicyServiceImpl extends ServiceImpl<GameBackPolicyMapper,
                 .wechatOpenid(dto.getWechatOpenid())
                 .build();
 
+        boolean doBack;
         if (null == dto.getBackPolicyId()){
-            return false;
+            doBack = true;
+        }else {
+            GameBackPolicy gameBackPolicy = gameBackPolicyService.getById(dto.getBackPolicyId());
+
+            doBack = BackPolicyUtil.backOrder(gameBackPolicy, dto.getRechargeMoney(), backUnit -> Long.valueOf(
+                    gameTencentOrderService.list(new LambdaQueryWrapper<GameTencentOrder>()
+                            .eq(GameTencentOrder::getGameId, dto.getGameId())
+                            .eq(GameTencentOrder::getWechatAppId, dto.getWechatAppId())
+                            .eq(GameTencentOrder::getAdAccountId, dto.getAdAccountId())
+                            .eq(GameTencentOrder::getOrderStatus, 2)
+                            .last("limit " + backUnit)
+                            .orderByDesc(GameTencentOrder::getCreateTime)
+                    ).stream().filter(order -> order.getIsBack().equals(BackStatusEnum.SUCCESS.getBackStatus())).count()
+            ).intValue());
         }
-        GameBackPolicy gameBackPolicy = gameBackPolicyService.getById(dto.getBackPolicyId());
 
-        boolean doBack = BackPolicyUtil.backOrder(gameBackPolicy, dto.getRechargeMoney(), backUnit -> Long.valueOf(
-                gameTencentOrderService.list(new LambdaQueryWrapper<GameTencentOrder>()
-                        .eq(GameTencentOrder::getGameId, dto.getGameId())
-                        .eq(GameTencentOrder::getWechatAppId, dto.getWechatAppId())
-                        .eq(GameTencentOrder::getAdAccountId, dto.getAdAccountId())
-                        .eq(GameTencentOrder::getOrderStatus, 2)
-                        .last("limit " + backUnit)
-                        .orderByDesc(GameTencentOrder::getCreateTime)
-                ).stream().filter(order -> order.getIsBack().equals(BackStatusEnum.SUCCESS.getBackStatus())).count()
-        ).intValue());
         try {
             if (dto.getOrderStatus().equals(COMPLETE_ORDER) || doBack) {
                 userActionSetRpc.reportByAppId(dataReportOfAppIdRpcDTO);