dubblo报错修复
This commit is contained in:
parent
36829066d3
commit
228082bf44
|
|
@ -472,9 +472,7 @@ public class TbMemberConfigServiceImpl extends ServiceImpl<TbMemberConfigMapper,
|
||||||
}
|
}
|
||||||
|
|
||||||
shopUser.setMemberName(memberOrder.getName());
|
shopUser.setMemberName(memberOrder.getName());
|
||||||
if (memberOrder.getReward() != null) {
|
|
||||||
deliver(shopId, userId, TableValueConstant.MemberExpFlow.Type.PAY, memberOrder.getPayAmount(), memberOrder.getReward(), memberOrderId);
|
|
||||||
}
|
|
||||||
|
|
||||||
// 发券流程
|
// 发券流程
|
||||||
if (StrUtil.isNotBlank(memberOrder.getCouponList())) {
|
if (StrUtil.isNotBlank(memberOrder.getCouponList())) {
|
||||||
|
|
@ -494,11 +492,14 @@ public class TbMemberConfigServiceImpl extends ServiceImpl<TbMemberConfigMapper,
|
||||||
|
|
||||||
memberOrder.setStatus(OrderStatusEnums.DONE.getCode());
|
memberOrder.setStatus(OrderStatusEnums.DONE.getCode());
|
||||||
memberOrderService.updateById(memberOrder);
|
memberOrderService.updateById(memberOrder);
|
||||||
|
if (memberOrder.getReward() != null) {
|
||||||
|
deliver(shopId, userId, TableValueConstant.MemberExpFlow.Type.PAY, memberOrder.getPayAmount(), memberOrder.getReward(), memberOrderId);
|
||||||
|
}
|
||||||
if (shopUser.getMemberLevelId() == null) {
|
if (shopUser.getMemberLevelId() == null) {
|
||||||
shopUser.setMemberLevelId(levelConfig.getId());
|
shopUser.setMemberLevelId(levelConfig.getId());
|
||||||
}
|
}
|
||||||
shopUser.setIsVip(1);
|
shopUser.setIsVip(1);
|
||||||
return shopUserService.updateById(shopUser);
|
return shopUserService.updateInfo(shopUser);
|
||||||
}
|
}
|
||||||
|
|
||||||
@Override
|
@Override
|
||||||
|
|
|
||||||
|
|
@ -824,7 +824,7 @@ public class OrderInfoServiceImpl extends ServiceImpl<OrderInfoMapper, OrderInfo
|
||||||
}
|
}
|
||||||
if (StrUtil.isNotBlank(payment.getTradeNumber())) {
|
if (StrUtil.isNotBlank(payment.getTradeNumber())) {
|
||||||
log.info("订单处理过,payment id:{}", payment.getId());
|
log.info("订单处理过,payment id:{}", payment.getId());
|
||||||
return;
|
// return;
|
||||||
}
|
}
|
||||||
payment.setTradeNumber(czgCallBackDto.getPayOrderId());
|
payment.setTradeNumber(czgCallBackDto.getPayOrderId());
|
||||||
payment.setRespJson(resultJson.toString());
|
payment.setRespJson(resultJson.toString());
|
||||||
|
|
|
||||||
Loading…
Reference in New Issue