回传金额的 bug

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

@@ -238,8 +238,8 @@ public class GameOceanengineOrderLogServiceImpl extends ServiceImpl<GameOceaneng
             backMsg = backInfo.third;
         }
         BackStatusEnum backStatus = BackStatusEnum.NO;
+        orderLog.setBackMoney(backMoney);
         if (doBack) {
-            orderLog.setBackMoney(backMoney);
             backStatus = doCallback(orderLog);
         }
         return update(new LambdaUpdateWrapper<GameOceanengineOrderLog>()
@@ -310,7 +310,10 @@ public class GameOceanengineOrderLogServiceImpl extends ServiceImpl<GameOceaneng
     public boolean oceanengineOrderReport(List<Long> ids, Long backMoney) {
         listByIds(ids).stream()
                 .filter(order -> !Objects.equals(order.getBackStatus(), BackStatusEnum.SUCCESS.getBackStatus()))
-                .forEach(orderLog -> callback(orderLog, true, backMoney));
+                .forEach(orderLog -> {
+                    log.error("手动回传：{}-{}", orderLog.getId(), backMoney);
+                    callback(orderLog, true, backMoney);
+                });
         return true;
     }
 
@@ -344,7 +347,7 @@ public class GameOceanengineOrderLogServiceImpl extends ServiceImpl<GameOceaneng
                 .union_id(orderLog.getUnionId())
                 .event_type(String.valueOf(MiniGameCallback.EventType.ACTIVE_PAY.getEventType()))
                 .props(MiniGameCallback.MiniGameCallbackRequest.MiniGameCallbackRequestProps.builder()
-                        .pay_amount(orderLog.getAmount())
+                        .pay_amount(orderLog.getBackMoney())
                         .build())
                 .build();
         BackStatusEnum backStatus = BackStatusEnum.SUCCESS;

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

@@ -68,7 +68,7 @@ public class GameTencentMiniGameBackLogServiceImpl extends ServiceImpl<GameTence
                 .wechatOpenid(orderLog.getWechatOpenid())
                 .wechatAppId(orderLog.getWechatAppId())
                 .actionType(actionType)
-                .amount(orderLog.getRechargeMoney())
+                .amount(orderLog.getBackMoney())
                 .orderId(orderLog.getOrderId())
                 .createTime(LocalDateTime.now())
                 .build();

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

@@ -14,7 +14,6 @@ import com.zanxiang.game.back.base.pojo.enums.OrderStatusEnum;
 import com.zanxiang.game.back.serve.dao.mapper.GameTencentMiniGameOrderMapper;
 import com.zanxiang.game.back.serve.pojo.dto.GameTencentMiniGameOrderDTO;
 import com.zanxiang.game.back.serve.pojo.entity.GameBackPolicy;
-import com.zanxiang.game.back.serve.pojo.entity.GameOceanengineOrderLog;
 import com.zanxiang.game.back.serve.pojo.entity.GameTencentMiniGameOrder;
 import com.zanxiang.game.back.serve.pojo.enums.BackStatusEnum;
 import com.zanxiang.game.back.serve.pojo.enums.BackUnitEnum;
@@ -244,8 +243,8 @@ public class GameTencentMiniGameOrderServiceImpl extends ServiceImpl<GameTencent
             backMsg = backInfo.third;
         }
         BackStatusEnum backStatus = BackStatusEnum.NO;
+        orderLog.setBackMoney(backMoney);
         if (doBack) {
-            orderLog.setBackMoney(backMoney);
             backStatus = gameTencentMiniGameBackLogService.orderBack(orderLog);
         }
         return update(new LambdaUpdateWrapper<GameTencentMiniGameOrder>()
@@ -287,7 +286,10 @@ public class GameTencentMiniGameOrderServiceImpl extends ServiceImpl<GameTencent
     public boolean doReport(List<Long> orderLogIds, Long backMoney) {
         listByIds(orderLogIds).stream()
                 .filter(order -> !Objects.equals(order.getBackStatus(), BackStatusEnum.SUCCESS.getBackStatus()))
-                .forEach(orderLog -> orderBack(orderLog, true, backMoney));
+                .forEach(orderLog -> {
+                    log.error("手动回传：{}-{}", orderLog.getId(), backMoney);
+                    orderBack(orderLog, true, backMoney);
+                });
         return true;
     }
 

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

@@ -252,8 +252,8 @@ public class GameTencentOrderServiceImpl extends ServiceImpl<GameTencentOrderMap
             backMsg = backInfo.third;
         }
         BackStatusEnum backStatus = BackStatusEnum.NO;
+        orderLog.setBackMoney(backMoney);
         if (doBack) {
-            orderLog.setBackMoney(backMoney);
             backStatus = doCallback(orderLog);
         }
         return update(new LambdaUpdateWrapper<GameTencentOrder>()
@@ -324,7 +324,10 @@ public class GameTencentOrderServiceImpl extends ServiceImpl<GameTencentOrderMap
     public boolean tencentOrderReport(List<Long> ids, Long backMoney) {
         listByIds(ids).stream()
                 .filter(order -> !Objects.equals(order.getIsBack(), BackStatusEnum.SUCCESS.getBackStatus()))
-                .forEach(orderLog -> orderBack(orderLog, true, backMoney));
+                .forEach(orderLog -> {
+                    log.error("手动回传：{}-{}", orderLog.getId(), backMoney);
+                    orderBack(orderLog, true, backMoney);
+                });
         return true;
     }
 
@@ -333,7 +336,7 @@ public class GameTencentOrderServiceImpl extends ServiceImpl<GameTencentOrderMap
                 ActionTypeEnum.PURCHASE.getActionType() : ActionTypeEnum.COMPLETE_ORDER.getActionType();
         Map<String, Object> actionParam = new HashMap<>(2);
         actionParam.put("claim_type", 0);
-        actionParam.put("value", orderLog.getRechargeMoney());
+        actionParam.put("value", orderLog.getBackMoney());
         DataReportOfAppIdRpcDTO dataReportOfAppIdRpcDTO = DataReportOfAppIdRpcDTO.builder()
                 .appId(orderLog.getWechatAppId())
                 .userActionSetId(orderLog.getUserActionSetId())