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

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

@@ -364,6 +364,7 @@ public class GameOceanengineOrderLogServiceImpl extends ServiceImpl<GameOceaneng
                 .eq(GameOceanengineUserLog::getAppId, orderLog.getAppId())
                 .eq(GameOceanengineUserLog::getOpenId, orderLog.getOpenId())
                 .eq(GameOceanengineUserLog::getAccountId, orderLog.getAccountId())
+                .orderByDesc(GameOceanengineUserLog::getCreateTime)
                 .last("limit 1")
         );
         if (userLog == null) {

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

@@ -44,7 +44,7 @@ public class BackPolicyUtil {
         }
         if (gameBackPolicy.getSupperSmallAmount() != null && gameBackPolicy.getSupperSmallAmount() >= rechargeMoney) {
             log.error("订单 id[{}]被判定为超小额订单({})，默认不回传", orderId, gameBackPolicy.getSupperSmallAmount());
-            return Tuples.tuple(Boolean.TRUE, rechargeMoney, "超小额订单(<=" + gameBackPolicy.getSupperSmallAmount() + ")，不回传");
+            return Tuples.tuple(Boolean.FALSE, rechargeMoney, "超小额订单(<=" + gameBackPolicy.getSupperSmallAmount() + ")，不回传");
         }
         BackUnitEnum backUnit = gameBackPolicy.getBackUnit() == null ? BackUnitEnum.UNIT_ONCE : BackUnitEnum.getByValue(gameBackPolicy.getBackUnit());
         Long totalRechargeAmount = null;