Compare commits

..

No commits in common. "a7135b440aaed7eae462312a267964c103d4681a" and "3e7ba69963d4e7a63fe55bf793bd05dee38caddb" have entirely different histories.

View File

@ -334,12 +334,11 @@ public class TradeOrderUpdateServiceImpl implements TradeOrderUpdateService {
KeyValue<TradeOrderDO, PayOrderRespDTO> orderResult = validateOrderPayable(id, payOrderId);
TradeOrderDO order = orderResult.getKey();
PayOrderRespDTO payOrder = orderResult.getValue();
System.out.println("交易订单成功id"+id+"和payOrderId"+payOrderId);
//会员用户信息支付状态修改
TradeMemberUserDO tradeMemberUserDO = tradeMemberUserService.getUser(getLoginUserId());
TradePaidMemberUserDO tradePaidMemberUserDO = tradePaidMemberUserService.getByIdAndPayOrderId(id,payOrderId);
if(tradePaidMemberUserDO != null && tradeMemberUserDO != null){
System.out.println("进入会员支付修改操作paid"+tradePaidMemberUserDO+"和member"+tradeMemberUserDO);
tradePaidMemberUserDO.setPayTime(LocalDateTime.now());
tradePaidMemberUserDO.setPaid(true);
//过期时间
@ -351,12 +350,10 @@ public class TradeOrderUpdateServiceImpl implements TradeOrderUpdateService {
tradePaidMemberUserDO.setPayType(payType);
//更新会员订单
tradePaidMemberUserService.update(tradePaidMemberUserDO);
System.out.println("成功更新会员订单paid"+tradePaidMemberUserDO);
//更新用户会员状态
tradeMemberUserService.updateActivate(tradePaidMemberUserDO.getPayMemberType());
System.out.println("成功更新用户的会员状态member"+tradeMemberUserDO);
}
System.out.println("会员修改操作结束!!!");
// 2. 更新 TradeOrderDO 状态为已支付等待发货
int updateCount = tradeOrderMapper.updateByIdAndStatus(id, order.getStatus(),
new TradeOrderDO().setStatus(TradeOrderStatusEnum.UNDELIVERED.getStatus()).setPayStatus(true)