Merge branch 'dev' of GameCenter/game-center into master

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

@@ -386,8 +386,8 @@ implements IGameTencentAppApiOrderService {
                         .eq(GameTencentAppApiOrder::getOrderStatus, OrderStatusEnum.SUCCESS_PAY.getValue())
                         .eq(GameTencentAppApiOrder::getIsBack, BackStatusEnum.SUCCESS.getBackStatus())
                         .eq(GameTencentAppApiOrder::getUserId, userId)
-                        .apply(firstPolicy, "date(recharge_time) = date(pay_time)")
-                        .apply(!firstPolicy, "date(recharge_time) != date(pay_time)")
+                        .apply(firstPolicy, "date(register_time) = date(pay_time)")
+                        .apply(!firstPolicy, "date(register_time) != date(pay_time)")
                         .ne(GameTencentAppApiOrder::getOrderId, orderLog.getOrderId())
                 );
             } else if (backUnit == BackUnitEnum.UNIT_TIME_DAY) {

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

@@ -527,8 +527,8 @@ public class GameTencentMiniGameOrderServiceImpl extends ServiceImpl<GameTencent
                         .eq(GameTencentMiniGameOrder::getOrderStatus, OrderStatusEnum.SUCCESS_PAY.getValue())
                         .eq(GameTencentMiniGameOrder::getBackStatus, BackStatusEnum.SUCCESS.getBackStatus())
                         .eq(GameTencentMiniGameOrder::getWechatOpenid, userId)
-                        .apply(firstPolicy, "date(recharge_time) = date(pay_time)")
-                        .apply(!firstPolicy, "date(recharge_time) != date(pay_time)")
+                        .apply(firstPolicy, "date(register_time) = date(pay_time)")
+                        .apply(!firstPolicy, "date(register_time) != date(pay_time)")
                         .ne(GameTencentMiniGameOrder::getOrderId, orderLog.getOrderId())
                         .eq(GameTencentMiniGameOrder::getBackType, backTypeEnum.getBackType())
                 );

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

@@ -454,8 +454,8 @@ public class GameTencentOrderServiceImpl extends ServiceImpl<GameTencentOrderMap
                         .eq(GameTencentOrder::getOrderStatus, OrderStatusEnum.SUCCESS_PAY.getValue())
                         .eq(GameTencentOrder::getIsBack, BackStatusEnum.SUCCESS.getBackStatus())
                         .eq(GameTencentOrder::getWechatOpenid, userId)
-                        .apply(firstPolicy, "date(recharge_time) = date(pay_time)")
-                        .apply(!firstPolicy, "date(recharge_time) != date(pay_time)")
+                        .apply(firstPolicy, "date(register_time) = date(pay_time)")
+                        .apply(!firstPolicy, "date(register_time) != date(pay_time)")
                         .ne(GameTencentOrder::getOrderId, orderLog.getOrderId())
                 );
             } else if (backUnit == BackUnitEnum.UNIT_TIME_DAY) {