|
|
@@ -945,11 +945,6 @@ public class OrderDonServiceImpl extends ServiceImpl<OrderDonMapper, OrderDon> i
|
|
|
//扣除使用优惠券、余额的订单金额
|
|
|
deductOrderMoney(orderDon, couponUser, payRequest.getBalance(), user, sku.getPrice(), goodsDon.getType(), payRequest.getGcCash(), payRequest.getGcpIds());
|
|
|
this.saveOrUpdate(orderDon);
|
|
|
- //订单金额为0 且订单为已完成 更新虚物车票
|
|
|
- if (orderDon.getMoney().compareTo(BigDecimal.ZERO) == 0) {
|
|
|
- orderDon.setStatus(goodsDon.getType() == 1 && goodsDon.getSecondType() == 2 ? OrderDon.Status.complete : OrderDon.Status.hasPayment);
|
|
|
- updateGroupsTicket(orderDon, goodsDon, sku);
|
|
|
- }
|
|
|
if (orderDon.getStatus() == OrderDon.Status.noPayment) {
|
|
|
jobManager.addJob(EXPIRY_TIME, () -> {
|
|
|
closeOrder(orderDon.getId(), null);
|
|
|
@@ -973,6 +968,12 @@ public class OrderDonServiceImpl extends ServiceImpl<OrderDonMapper, OrderDon> i
|
|
|
}
|
|
|
corpInteractiveUserOrderRelationMapper.insert(corpInteractiveUserOrderRelation);
|
|
|
}
|
|
|
+ //订单金额为0 且订单为已完成 更新虚物车票
|
|
|
+ if (orderDon.getMoney().compareTo(BigDecimal.ZERO) == 0) {
|
|
|
+ OrderDon updateOrder = orderDonMapper.selectById(orderDon.getId());
|
|
|
+ updateOrder.setStatus(goodsDon.getType() == 1 && goodsDon.getSecondType() == 2 ? OrderDon.Status.complete : OrderDon.Status.hasPayment);
|
|
|
+ updateGroupsTicket(updateOrder, goodsDon, sku);
|
|
|
+ }
|
|
|
return orderDon;
|
|
|
}
|
|
|
|