|
@@ -3,6 +3,7 @@ package com.zanxiang.game.back.serve.rpc.impl;
|
|
|
import com.baomidou.mybatisplus.core.conditions.query.LambdaQueryWrapper;
|
|
|
import com.zanxiang.game.back.base.pojo.dto.*;
|
|
|
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.serve.pojo.entity.*;
|
|
|
import com.zanxiang.game.back.serve.pojo.enums.BackStatusEnum;
|
|
@@ -223,7 +224,7 @@ public class TtAppBackRpcImpl implements ITtAppBackRpc {
|
|
|
}
|
|
|
|
|
|
@Override
|
|
|
- public ResultVO<Boolean> orderBackQuery(TtAppOrderBackQueryRpcDTO dto) {
|
|
|
+ public ResultVO<OrderBackQueryRpcVO> orderBackQuery(TtAppOrderBackQueryRpcDTO dto) {
|
|
|
log.error("头条APP订单回传结果查询:{}", JsonUtil.toString(dto));
|
|
|
|
|
|
// 加锁最大等待 60s
|
|
@@ -237,9 +238,16 @@ public class TtAppBackRpcImpl implements ITtAppBackRpc {
|
|
|
.eq(GameOceanengineAppOrderLog::getUserId, dto.getUserId())
|
|
|
);
|
|
|
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
|