Ver código fonte

头条回传优化

wcc 9 meses atrás
pai
commit
43359b55e5

+ 25 - 0
game-back/game-back-base/src/main/java/com/zanxiang/game/back/base/pojo/vo/OrderBackQueryRpcVO.java

@@ -0,0 +1,25 @@
+package com.zanxiang.game.back.base.pojo.vo;
+
+import lombok.AllArgsConstructor;
+import lombok.Builder;
+import lombok.Data;
+import lombok.NoArgsConstructor;
+
+import java.io.Serializable;
+
+@Data
+@NoArgsConstructor
+@AllArgsConstructor
+@Builder
+public class OrderBackQueryRpcVO implements Serializable {
+    private static final long serialVersionUID = 1L;
+
+    private Boolean doBack;
+
+    private Long backMoney;
+
+    /**
+     * 回传信息
+     */
+    private String backMsg;
+}

+ 2 - 1
game-back/game-back-base/src/main/java/com/zanxiang/game/back/base/rpc/ITtAppBackRpc.java

@@ -1,6 +1,7 @@
 package com.zanxiang.game.back.base.rpc;
 package com.zanxiang.game.back.base.rpc;
 
 
 import com.zanxiang.game.back.base.pojo.dto.*;
 import com.zanxiang.game.back.base.pojo.dto.*;
+import com.zanxiang.game.back.base.pojo.vo.OrderBackQueryRpcVO;
 import com.zanxiang.module.util.pojo.ResultVO;
 import com.zanxiang.module.util.pojo.ResultVO;
 
 
 /**
 /**
@@ -34,7 +35,7 @@ public interface ITtAppBackRpc {
     /**
     /**
      * 订单是否回传
      * 订单是否回传
      */
      */
-    ResultVO<Boolean> orderBackQuery(TtAppOrderBackQueryRpcDTO dto);
+    ResultVO<OrderBackQueryRpcVO> orderBackQuery(TtAppOrderBackQueryRpcDTO dto);
 
 
     /**
     /**
      * 创角是否回传
      * 创角是否回传

+ 11 - 3
game-back/game-back-serve/src/main/java/com/zanxiang/game/back/serve/rpc/impl/TtAppBackRpcImpl.java

@@ -3,6 +3,7 @@ package com.zanxiang.game.back.serve.rpc.impl;
 import com.baomidou.mybatisplus.core.conditions.query.LambdaQueryWrapper;
 import com.baomidou.mybatisplus.core.conditions.query.LambdaQueryWrapper;
 import com.zanxiang.game.back.base.pojo.dto.*;
 import com.zanxiang.game.back.base.pojo.dto.*;
 import com.zanxiang.game.back.base.pojo.enums.OrderStatusEnum;
 import com.zanxiang.game.back.base.pojo.enums.OrderStatusEnum;
+import com.zanxiang.game.back.base.pojo.vo.OrderBackQueryRpcVO;
 import com.zanxiang.game.back.base.rpc.ITtAppBackRpc;
 import com.zanxiang.game.back.base.rpc.ITtAppBackRpc;
 import com.zanxiang.game.back.serve.pojo.entity.*;
 import com.zanxiang.game.back.serve.pojo.entity.*;
 import com.zanxiang.game.back.serve.pojo.enums.BackStatusEnum;
 import com.zanxiang.game.back.serve.pojo.enums.BackStatusEnum;
@@ -223,7 +224,7 @@ public class TtAppBackRpcImpl implements ITtAppBackRpc {
     }
     }
 
 
     @Override
     @Override
-    public ResultVO<Boolean> orderBackQuery(TtAppOrderBackQueryRpcDTO dto) {
+    public ResultVO<OrderBackQueryRpcVO> orderBackQuery(TtAppOrderBackQueryRpcDTO dto) {
         log.error("头条APP订单回传结果查询:{}", JsonUtil.toString(dto));
         log.error("头条APP订单回传结果查询:{}", JsonUtil.toString(dto));
 
 
         // 加锁最大等待 60s
         // 加锁最大等待 60s
@@ -237,9 +238,16 @@ public class TtAppBackRpcImpl implements ITtAppBackRpc {
                 .eq(GameOceanengineAppOrderLog::getUserId, dto.getUserId())
                 .eq(GameOceanengineAppOrderLog::getUserId, dto.getUserId())
         );
         );
         if  (orderLog == null) {
         if  (orderLog == null) {
-            return ResultVO.ok(Boolean.FALSE);
+            return ResultVO.ok(OrderBackQueryRpcVO.builder()
+                            .doBack(Boolean.FALSE)
+                            .backMsg("回传异常,找不到订单:" + dto.getOrderId())
+                    .build());
         }
         }
-        return ResultVO.ok(BackStatusEnum.getByValue(orderLog.getBackStatus()) ==  BackStatusEnum.SUCCESS);
+        return ResultVO.ok(OrderBackQueryRpcVO.builder()
+                        .doBack(BackStatusEnum.getByValue(orderLog.getBackStatus()) ==  BackStatusEnum.SUCCESS)
+                        .backMoney(orderLog.getBackMoney())
+                        .backMsg(orderLog.getBackMsg())
+                .build());
     }
     }
 
 
     @Override
     @Override