Accueil Explorer Aide
S'inscrire Connexion
GameCenter
/
game-center
2
0
Fork 0

77 Commits 0f05c19dfb ... 2a2ffde34e

Auteur SHA1 Message Date
  wcc 2a2ffde34e 回传策略最大回传订单的bug il y a 2 mois
  zhangxianyu 364a74baca Merge branch 'package' of GameCenter/game-center into dev il y a 2 mois
  zhimo c52b453c43 Merge branch 'package' of GameCenter/game-center into dev il y a 3 mois
  zhimo a6afc94a4e Merge branch 'package' of GameCenter/game-center into dev il y a 3 mois
  zhimo ad80552573 Merge branch 'package' of GameCenter/game-center into dev il y a 3 mois
  zhimo ad50682a34 Merge branch 'package' of GameCenter/game-center into dev il y a 3 mois
  zhimo c785dde6ab Merge branch 'package' of GameCenter/game-center into dev il y a 3 mois
  zhangxianyu 652c56f687 Merge branch 'package' of GameCenter/game-center into dev il y a 3 mois
  zhimo 67d0d08bbc Merge branch 'package' of GameCenter/game-center into dev il y a 3 mois
  zhimo 66068544b8 Merge branch 'package' of GameCenter/game-center into dev il y a 3 mois
  zhangxianyu 31c06227c2 Merge branch 'package' of GameCenter/game-center into dev il y a 3 mois
  zhimo 11466a0e4e Merge branch 'package' of GameCenter/game-center into dev il y a 3 mois
  zhimo 555c11f151 Merge branch 'package' of GameCenter/game-center into dev il y a 3 mois
  zhangxianyu 8f7aa52cd6 Merge branch 'package' of GameCenter/game-center into dev il y a 3 mois
  zhangxianyu 3696f8f3df Merge branch 'package' of GameCenter/game-center into dev il y a 3 mois
  zhangxianyu acbc20042b Merge branch 'package' of GameCenter/game-center into dev il y a 3 mois
  zhangxianyu 0ea8bfcdbf Merge branch 'package' of GameCenter/game-center into dev il y a 3 mois
  zhangxianyu bac0d04d28 Merge branch 'package' of GameCenter/game-center into dev il y a 3 mois
  zhangxianyu 66ccbb350a Merge branch 'package' of GameCenter/game-center into dev il y a 3 mois
  zhimo 85587f07fb Merge branch 'package' of GameCenter/game-center into dev il y a 3 mois
  zhimo 6da78522d5 Merge branch 'package' of GameCenter/game-center into dev il y a 3 mois
  zhimo 26f87e0a24 Merge branch 'package' of GameCenter/game-center into dev il y a 3 mois
  zhimo b3002bc6e8 Merge branch 'package' of GameCenter/game-center into dev il y a 3 mois
  zhimo 52eacbc323 Merge branch 'package' of GameCenter/game-center into dev il y a 3 mois
  zhimo 0283dcdfcb Merge branch 'package' of GameCenter/game-center into dev il y a 3 mois
  zhimo 89eb701d21 Merge branch 'package' of GameCenter/game-center into dev il y a 3 mois
  zhimo b45de3da59 Merge branch 'package' of GameCenter/game-center into dev il y a 4 mois
  zhimo 7d751b846b Merge branch 'package' of GameCenter/game-center into dev il y a 4 mois
  zhimo e845c27627 Merge branch 'package' of GameCenter/game-center into dev il y a 4 mois
  zhimo ab1b787783 Merge branch 'package' of GameCenter/game-center into dev il y a 4 mois
  zhimo d98c7dae56 Merge branch 'package' of GameCenter/game-center into dev il y a 4 mois
  shishaosong c574b22842 Merge branch 'package' of GameCenter/game-center into dev il y a 4 mois
  zhimo 273a1d4908 Merge branch 'package' of GameCenter/game-center into dev il y a 4 mois
  zhimo 9a648ec1c3 Merge branch 'package' of GameCenter/game-center into dev il y a 4 mois
  zhimo b686cbcb0d Merge branch 'package' of GameCenter/game-center into dev il y a 4 mois
  zhimo 539877a851 Merge branch 'package' of GameCenter/game-center into dev il y a 4 mois
  zhimo bcdb1c4057 Merge branch 'package' of GameCenter/game-center into dev il y a 4 mois
  zhimo 34083ac920 Merge branch 'package' of GameCenter/game-center into dev il y a 4 mois
  zhimo 2b6bf2235c Merge branch 'package' of GameCenter/game-center into dev il y a 4 mois
  zhimo d8cccc377f Merge branch 'package' of GameCenter/game-center into dev il y a 4 mois
  zhimo 18926f5df4 Merge branch 'package' of GameCenter/game-center into dev il y a 4 mois
  zhimo 43d51bb4c2 Merge branch 'package' of GameCenter/game-center into dev il y a 5 mois
  zhimo 21bc835e81 Merge branch 'package' of GameCenter/game-center into dev il y a 5 mois
  zhimo fec3e4d2a3 Merge branch 'package' of GameCenter/game-center into dev il y a 5 mois
  zhimo 5baf902216 Merge branch 'package' of GameCenter/game-center into dev il y a 5 mois
  zhimo c72f1e7acd Merge branch 'package' of GameCenter/game-center into dev il y a 5 mois
  zhimo 5054136887 Merge branch 'package' of GameCenter/game-center into dev il y a 5 mois
  zhimo 643f27967f Merge branch 'package' of GameCenter/game-center into dev il y a 5 mois
  zhimo f87ae8ef42 Merge branch 'package' of GameCenter/game-center into dev il y a 5 mois
  zhimo 20e964716a Merge branch 'package' of GameCenter/game-center into dev il y a 5 mois
  zhimo e21c3a88b0 Merge branch 'package' of GameCenter/game-center into dev il y a 5 mois
  zhimo 257e7ffe98 Merge branch 'package' of GameCenter/game-center into dev il y a 5 mois
  zhimo 4b120c4d01 Merge branch 'package' of GameCenter/game-center into dev il y a 5 mois
  zhimo eb29beff38 Merge branch 'package' of GameCenter/game-center into dev il y a 5 mois
  zhimo a2596869cd Merge branch 'package' of GameCenter/game-center into dev il y a 5 mois
  zhimo 49a74406de Merge branch 'package' of GameCenter/game-center into dev il y a 5 mois
  zhimo 81e78b4a94 Merge branch 'package' of GameCenter/game-center into dev il y a 5 mois
  zhimo 228741ae0a Merge branch 'package' of GameCenter/game-center into dev il y a 5 mois
  zhimo d0b1b5550e Merge branch 'package' of GameCenter/game-center into dev il y a 5 mois
  zhimo 65c7d2af7d Merge branch 'package' of GameCenter/game-center into dev il y a 5 mois
  zhimo b982ba9a77 Merge branch 'package' of GameCenter/game-center into dev il y a 5 mois
  zhimo b8fcd70129 Merge branch 'package' of GameCenter/game-center into dev il y a 5 mois
  zhimo bbb08c6a08 Merge branch 'package' of GameCenter/game-center into dev il y a 5 mois
  zhimo d09fb6f4f6 Merge branch 'package' of GameCenter/game-center into dev il y a 5 mois
  zhimo 2552ed7519 Merge branch 'package' of GameCenter/game-center into dev il y a 5 mois
  zhimo 6932ba165d Merge branch 'package' of GameCenter/game-center into dev il y a 5 mois
  zhimo 54f6729db9 Merge branch 'package' of GameCenter/game-center into dev il y a 5 mois
  zhimo 0911179a40 Merge branch 'package' of GameCenter/game-center into dev il y a 5 mois
  zhimo 44769f2e16 Merge branch 'package' of GameCenter/game-center into dev il y a 5 mois
  zhimo 5c18784eb5 Merge branch 'package' of GameCenter/game-center into dev il y a 5 mois
  zhimo 6150634b8d Merge branch 'package' of GameCenter/game-center into dev il y a 5 mois
  zhimo fba5451233 Merge branch 'package' of GameCenter/game-center into dev il y a 5 mois
  zhimo 4b2a86064b Merge branch 'package' of GameCenter/game-center into dev il y a 5 mois
  zhimo a986528dc2 Merge branch 'package' of GameCenter/game-center into dev il y a 5 mois
  zhimo f6192872d5 Merge branch 'package' of GameCenter/game-center into dev il y a 6 mois
  zhimo 0a5841c611 Merge branch 'package' of GameCenter/game-center into dev il y a 7 mois
  shishaosong 1ab4df3e76 Merge branch 'package' of GameCenter/game-center into dev il y a 7 mois
3 fichiers modifiés avec 6 ajouts et 6 suppressions
Vue séparée Afficher les stats Diff
  1. 2 2
      game-back/game-back-serve/src/main/java/com/zanxiang/game/back/serve/service/impl/GameTencentAppApiOrderServiceImpl.java
  2. 2 2
      game-back/game-back-serve/src/main/java/com/zanxiang/game/back/serve/service/impl/GameTencentMiniGameOrderServiceImpl.java
  3. 2 2
      game-back/game-back-serve/src/main/java/com/zanxiang/game/back/serve/service/impl/GameTencentOrderServiceImpl.java

+ 2 - 2
game-back/game-back-serve/src/main/java/com/zanxiang/game/back/serve/service/impl/GameTencentAppApiOrderServiceImpl.java
Voir le fichier 

@@ -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) {

+ 2 - 2
game-back/game-back-serve/src/main/java/com/zanxiang/game/back/serve/service/impl/GameTencentMiniGameOrderServiceImpl.java
Voir le fichier 

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

+ 2 - 2
game-back/game-back-serve/src/main/java/com/zanxiang/game/back/serve/service/impl/GameTencentOrderServiceImpl.java
Voir le fichier 

@@ -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) {