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