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

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

@@ -9,6 +9,7 @@ import com.zanxiang.game.back.serve.pojo.entity.GameOceanengineOrderLog;
 import com.zanxiang.game.back.serve.pojo.enums.BackStatusEnum;
 import com.zanxiang.game.back.serve.pojo.vo.GameOceanengineOrderLogVO;
 
+import java.time.LocalDateTime;
 import java.util.List;
 
 public interface IGameOceanengineOrderLogService extends IService<GameOceanengineOrderLog> {
@@ -18,5 +19,5 @@ public interface IGameOceanengineOrderLogService extends IService<GameOceanengin
     IPage<GameOceanengineOrderLogVO> oceanengineOrderLogList(GameOceanengineOrderLogDTO dto);
     boolean oceanengineOrderReport(OrderReportDTO dto);
 
-    Tuple2<BackStatusEnum, String> doCallback(GameOceanengineOrderLog orderLog, Long backMoney);
+    Tuple2<BackStatusEnum, String> doCallback(GameOceanengineOrderLog orderLog, LocalDateTime backTime, Long backMoney);
 }

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

@@ -8,11 +8,13 @@ import com.zanxiang.game.back.serve.pojo.entity.GameTencentMiniGameRoleRegister;
 import com.zanxiang.game.back.serve.pojo.entity.GameTencentMiniGameUser;
 import com.zanxiang.game.back.serve.pojo.enums.BackStatusEnum;
 
+import java.time.LocalDateTime;
+
 public interface IGameTencentMiniGameBackLogService extends IService<GameTencentMiniGameBackLog> {
 
     Tuple2<BackStatusEnum, String> userBack(GameTencentMiniGameUser userLog);
 
-    Tuple2<BackStatusEnum, String> orderBack(GameTencentMiniGameOrder orderLog, Long backMoney);
+    Tuple2<BackStatusEnum, String> orderBack(GameTencentMiniGameOrder orderLog, LocalDateTime backTime, Long backMoney);
 
     Tuple2<BackStatusEnum, String> roleRegisterBack(GameTencentMiniGameRoleRegister roleRegisterLog);
 }

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

@@ -10,6 +10,7 @@ import com.baomidou.mybatisplus.extension.service.IService;
 import com.zanxiang.game.back.serve.pojo.enums.BackStatusEnum;
 import com.zanxiang.game.back.serve.pojo.vo.GameTencentOrderVO;
 
+import java.time.LocalDateTime;
 import java.util.List;
 
 /**
@@ -28,5 +29,5 @@ public interface IGameTencentOrderService extends IService<GameTencentOrder> {
 
     boolean tencentOrderReport(OrderReportDTO dto);
 
-    Tuple2<BackStatusEnum, String> doCallback(GameTencentOrder orderLog, Long backMoney);
+    Tuple2<BackStatusEnum, String> doCallback(GameTencentOrder orderLog, LocalDateTime backTime, Long backMoney);
 }

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

@@ -145,7 +145,7 @@ public class GameOceanengineOrderLogServiceImpl extends ServiceImpl<GameOceaneng
             );
         }
 
-        Tuple2<BackStatusEnum, String> backResult = doCallback(orderLog, backMoney);
+        Tuple2<BackStatusEnum, String> backResult = doCallback(orderLog, orderLog.getPayTime(), backMoney);
         if (StringUtils.isNotBlank(backResult.second)) {
             backMsg = backMsg + ("回传失败：" + backResult.second);
         }
@@ -228,7 +228,7 @@ public class GameOceanengineOrderLogServiceImpl extends ServiceImpl<GameOceaneng
                     } else {
                         log.error("手动直接回传：{}-{}", orderLog.getId(), dto.getBackMoney());
                         long backMoney = NumberUtil.multiply100(dto.getBackMoney()).longValue();
-                        Tuple2<BackStatusEnum, String> backResult = doCallback(orderLog, backMoney);
+                        Tuple2<BackStatusEnum, String> backResult = doCallback(orderLog, orderLog.getPayTime(), backMoney);
                         String backMsg = "手动触发回传";
                         if (StringUtils.isNotBlank(backResult.second)) {
                             backMsg += ("回传失败：" + backResult.second);
@@ -246,7 +246,7 @@ public class GameOceanengineOrderLogServiceImpl extends ServiceImpl<GameOceaneng
 
     @Override
     @Transactional(rollbackFor = Exception.class)
-    public Tuple2<BackStatusEnum, String> doCallback(GameOceanengineOrderLog orderLog, Long backMoney) {
+    public Tuple2<BackStatusEnum, String> doCallback(GameOceanengineOrderLog orderLog, LocalDateTime backTime, Long backMoney) {
         GameOceanengineUserLog userLog = userLog(orderLog);
         if (userLog == null) {
             gameOceanengineBackLogService.save(GameOceanengineBackLog.builder()

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

@@ -61,14 +61,14 @@ public class GameTencentMiniGameBackLogServiceImpl extends ServiceImpl<GameTence
 
     @Override
     @Transactional(rollbackFor = Exception.class)
-    public Tuple2<BackStatusEnum, String> orderBack(GameTencentMiniGameOrder orderLog, Long backMoney) {
+    public Tuple2<BackStatusEnum, String> orderBack(GameTencentMiniGameOrder orderLog, LocalDateTime backTime, Long backMoney) {
         String actionType = orderLog.getOrderStatus().equals(OrderStatusEnum.SUCCESS_PAY.getValue()) ?
                 ActionTypeEnum.PURCHASE.getActionType() : ActionTypeEnum.COMPLETE_ORDER.getActionType();
         GameTencentMiniGameBackLog backLog = GameTencentMiniGameBackLog.builder()
                 .gameId(orderLog.getGameId())
                 .adAccountId(orderLog.getAdAccountId())
                 .clickId(orderLog.getClickId())
-                .actionTime(orderLog.getOrderStatus().equals(OrderStatusEnum.SUCCESS_PAY.getValue()) ? orderLog.getPayTime() : orderLog.getRechargeTime())
+                .actionTime(backTime)
                 .wechatOpenid(orderLog.getWechatOpenid())
                 .wechatAppId(orderLog.getWechatAppId())
                 .actionType(actionType)

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

@@ -155,7 +155,7 @@ public class GameTencentMiniGameOrderServiceImpl extends ServiceImpl<GameTencent
             );
         }
 
-        Tuple2<BackStatusEnum, String> backResult = gameTencentMiniGameBackLogService.orderBack(orderLog, backMoney);
+        Tuple2<BackStatusEnum, String> backResult = gameTencentMiniGameBackLogService.orderBack(orderLog, orderLog.getPayTime(), backMoney);
         if (StringUtils.isNotBlank(backResult.second)) {
             backMsg = backMsg + ("回传失败：" + backResult.second);
         }
@@ -237,7 +237,7 @@ public class GameTencentMiniGameOrderServiceImpl extends ServiceImpl<GameTencent
                     } else {
                         log.error("手动直接回传：{}-{}", orderLog.getId(), dto.getBackMoney());
                         long backMoney = NumberUtil.multiply100(dto.getBackMoney()).longValue();
-                        Tuple2<BackStatusEnum, String> backResult = gameTencentMiniGameBackLogService.orderBack(orderLog, backMoney);
+                        Tuple2<BackStatusEnum, String> backResult = gameTencentMiniGameBackLogService.orderBack(orderLog, orderLog.getPayTime(), backMoney);
                         String backMsg = "手动触发回传！";
                         if (StringUtils.isNotBlank(backResult.second)) {
                             backMsg += ("回传失败：" + backResult.second);

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

@@ -162,7 +162,7 @@ public class GameTencentOrderServiceImpl extends ServiceImpl<GameTencentOrderMap
             );
         }
 
-        Tuple2<BackStatusEnum, String> backResult = doCallback(orderLog, backMoney);
+        Tuple2<BackStatusEnum, String> backResult = doCallback(orderLog, orderLog.getPayTime(), backMoney);
         if (StringUtils.isNotBlank(backResult.second)) {
             backMsg = backMsg + ("回传失败：" + backResult.second);
         }
@@ -276,7 +276,7 @@ public class GameTencentOrderServiceImpl extends ServiceImpl<GameTencentOrderMap
                     } else {
                         log.error("手动直接回传：{}-{}", orderLog.getId(), dto.getBackMoney());
                         long backMoney = NumberUtil.multiply100(dto.getBackMoney()).longValue();
-                        Tuple2<BackStatusEnum, String> backResult = doCallback(orderLog, backMoney);
+                        Tuple2<BackStatusEnum, String> backResult = doCallback(orderLog, orderLog.getPayTime(), backMoney);
                         String backMsg = "手动触发回传！";
                         if (StringUtils.isNotBlank(backResult.second)) {
                             backMsg += ("回传失败：" + backResult.second);
@@ -294,7 +294,7 @@ public class GameTencentOrderServiceImpl extends ServiceImpl<GameTencentOrderMap
 
     @Override
     @Transactional(rollbackFor = Exception.class)
-    public Tuple2<BackStatusEnum, String> doCallback(GameTencentOrder orderLog, Long backMoney) {
+    public Tuple2<BackStatusEnum, String> doCallback(GameTencentOrder orderLog, LocalDateTime backTime, Long backMoney) {
         String actionType = orderLog.getOrderStatus().equals(OrderStatusEnum.SUCCESS_PAY.getValue()) ?
                 ActionTypeEnum.PURCHASE.getActionType() : ActionTypeEnum.COMPLETE_ORDER.getActionType();
         Map<String, Object> actionParam = new HashMap<>(2);
@@ -304,7 +304,7 @@ public class GameTencentOrderServiceImpl extends ServiceImpl<GameTencentOrderMap
                 .appId(orderLog.getWechatAppId())
                 .userActionSetId(orderLog.getUserActionSetId())
                 .action(UserActionRpcDTO.builder()
-                        .actionTime(orderLog.getOrderStatus().equals(OrderStatusEnum.SUCCESS_PAY.getValue()) ? orderLog.getPayTime() : orderLog.getRechargeTime())
+                        .actionTime(backTime)
                         .actionType(actionType)
                         .userId(UserActionRpcDTO.UserIdRpcDTO.builder()
                                 .wechatAppId(orderLog.getWechatAppId())
@@ -317,7 +317,7 @@ public class GameTencentOrderServiceImpl extends ServiceImpl<GameTencentOrderMap
         GameTencentBackLog gameTencentBackLog = GameTencentBackLog.builder()
                 .gameId(orderLog.getGameId())
                 .adAccountId(orderLog.getAdAccountId())
-                .actionTime(orderLog.getOrderStatus().equals(OrderStatusEnum.SUCCESS_PAY.getValue()) ? orderLog.getPayTime() : orderLog.getRechargeTime())
+                .actionTime(backTime)
                 .createTime(LocalDateTime.now())
                 .actionType(actionType)
                 .orderId(orderLog.getOrderId())

game-back/game-back-serve/src/main/java/com/zanxiang/game/back/serve/task/OceanengineOrderSplitBackTask.java

@@ -72,7 +72,7 @@ public class OceanengineOrderSplitBackTask {
     private void callback(GameOceanengineOrderLog order, GameOceanengineOrderSplitLog orderSplitLog) {
         log.error("开始回传拆分订单：{}-{}", orderSplitLog.getOrderNo(), orderSplitLog.getBackIndex());
         try {
-            Tuple2<BackStatusEnum, String> backResult = gameOceanengineOrderLogService.doCallback(order, orderSplitLog.getSplitMoney());
+            Tuple2<BackStatusEnum, String> backResult = gameOceanengineOrderLogService.doCallback(order, orderSplitLog.getBackTime(), orderSplitLog.getSplitMoney());
             gameOceanengineOrderSplitLogService.update(new LambdaUpdateWrapper<GameOceanengineOrderSplitLog>()
                     .set(GameOceanengineOrderSplitLog::getExecuteTime, LocalDateTime.now())
                     .set(GameOceanengineOrderSplitLog::getBackStatus, backResult.first.getBackStatus())

game-back/game-back-serve/src/main/java/com/zanxiang/game/back/serve/task/TencentMiniOrderSplitBackTask.java

@@ -75,7 +75,7 @@ public class TencentMiniOrderSplitBackTask {
     private void callback(GameTencentMiniGameOrder order, GameTencentMiniGameOrderSplitLog orderSplitLog) {
         log.error("开始回传拆分订单：{}-{}", orderSplitLog.getOrderNo(), orderSplitLog.getBackIndex());
         try {
-            Tuple2<BackStatusEnum, String> backResult = gameTencentMiniGameBackLogService.orderBack(order, orderSplitLog.getSplitMoney());
+            Tuple2<BackStatusEnum, String> backResult = gameTencentMiniGameBackLogService.orderBack(order, orderSplitLog.getBackTime(), orderSplitLog.getSplitMoney());
             gameTencentMiniGameOrderSplitLogService.update(new LambdaUpdateWrapper<GameTencentMiniGameOrderSplitLog>()
                     .set(GameTencentMiniGameOrderSplitLog::getExecuteTime, LocalDateTime.now())
                     .set(GameTencentMiniGameOrderSplitLog::getBackStatus, backResult.first.getBackStatus())

game-back/game-back-serve/src/main/java/com/zanxiang/game/back/serve/task/TencentOrderSplitBackTask.java

@@ -72,7 +72,7 @@ public class TencentOrderSplitBackTask {
     private void callback(GameTencentOrder order, GameTencentOrderSplitLog orderSplitLog) {
         log.error("开始回传拆分订单：{}-{}", orderSplitLog.getOrderNo(), orderSplitLog.getBackIndex());
         try {
-            Tuple2<BackStatusEnum, String> backResult = gameTencentOrderService.doCallback(order, orderSplitLog.getSplitMoney());
+            Tuple2<BackStatusEnum, String> backResult = gameTencentOrderService.doCallback(order, orderSplitLog.getBackTime(), orderSplitLog.getSplitMoney());
             gameTencentOrderSplitLogService.update(new LambdaUpdateWrapper<GameTencentOrderSplitLog>()
                     .set(GameTencentOrderSplitLog::getExecuteTime, LocalDateTime.now())
                     .set(GameTencentOrderSplitLog::getBackStatus, backResult.first.getBackStatus())