记得上下班打卡 | git大法好,push需谨慎

Commit 23510ee9 authored by 张国柄's avatar 张国柄

Merge remote-tracking branch 'origin/dev_nft_411' into dev_nft_411

parents 824cfd98 18dd8153
......@@ -575,10 +575,10 @@ public class GoblinNftOrderServiceImpl implements IGoblinNftOrderService {
log.error("Nft订单不存在2 param:[orderCode:{}]", orderCode);
return "fail";
}
if (!orderVo.getPayCode().equals(syncOrderParam.getCode())) {
/*if (!orderVo.getPayCode().equals(syncOrderParam.getCode())) {
log.error("Nft订单payCode不匹配 param:[orderCode:{}, payCode:{}, code:{}]", orderCode, orderVo.getPayCode(), syncOrderParam.getCode());
return "fail";
}
}*/
if (
!Objects.equals(orderVo.getStatus(), GoblinStatusConst.NftStatus.ORDER_STATUS_1.getValue())
&&
......
Markdown is supported
0% or
You are about to add 0 people to the discussion. Proceed with caution.
Finish editing this message first!
Please register or to comment