فهرست منبع

fix 主订单id

zoujiajian 2 سال پیش
والد
کامیت
c9f12d2dd7

+ 1 - 0
netflix-service/src/main/java/com/cyksj/service/exchange/impl/ExchangeCodeServiceImpl.java

@@ -335,6 +335,7 @@ public class ExchangeCodeServiceImpl extends ServiceImpl<ExchangeCodeMapper, Exc
 			orderDon.setPayTitle(payTitle.toString());
 			orderDon.setPayTitle(payTitle.toString());
 			//主订单
 			//主订单
 			orderMasterDonMapper.insert(orderMasterDon);
 			orderMasterDonMapper.insert(orderMasterDon);
+			orderDon.setMOid(orderMasterDon.getId());
 			orderDonMapper.insert(orderDon);
 			orderDonMapper.insert(orderDon);
 			log.info("用户{}兑换规格:{}车位成功", user.getId(), orderDon.getSkuId());
 			log.info("用户{}兑换规格:{}车位成功", user.getId(), orderDon.getSkuId());
 		}
 		}

+ 2 - 1
netflix-service/src/main/java/com/cyksj/service/order/impl/OrderDonServiceImpl.java

@@ -1340,7 +1340,6 @@ public class OrderDonServiceImpl extends ServiceImpl<OrderDonMapper, OrderDon> i
 		unifiedOrderPayReq.setBalance(payRequest.getBalance());
 		unifiedOrderPayReq.setBalance(payRequest.getBalance());
 		unifiedOrderPayReq.setGalaxycoin(payRequest.getGalaxycoin());
 		unifiedOrderPayReq.setGalaxycoin(payRequest.getGalaxycoin());
 		deductOrderMoney(orderDon, couponUser, user, sku.getPrice(), goodsDon.getType(), payRequest.getGcCash(), payRequest.getGcpIds(), unifiedOrderPayReq);
 		deductOrderMoney(orderDon, couponUser, user, sku.getPrice(), goodsDon.getType(), payRequest.getGcCash(), payRequest.getGcpIds(), unifiedOrderPayReq);
-		this.saveOrUpdate(orderDon);
 
 
 		//主订单
 		//主订单
 		orderMasterDon.setMoney(orderDon.getMoney());
 		orderMasterDon.setMoney(orderDon.getMoney());
@@ -1359,6 +1358,8 @@ public class OrderDonServiceImpl extends ServiceImpl<OrderDonMapper, OrderDon> i
 		}
 		}
 
 
 		orderMasterDonService.save(orderMasterDon);
 		orderMasterDonService.save(orderMasterDon);
+		orderDon.setMOid(orderMasterDon.getId());
+		this.saveOrUpdate(orderDon);
 		if (orderMasterDon.getStatus() == OrderMasterDon.Status.noPayment) {
 		if (orderMasterDon.getStatus() == OrderMasterDon.Status.noPayment) {
 			jobManager.addJob(EXPIRY_TIME, () -> {
 			jobManager.addJob(EXPIRY_TIME, () -> {
 				closeOrder(orderMasterDon.getId(), null);
 				closeOrder(orderMasterDon.getId(), null);