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);