|
|
@ -183,15 +183,23 @@ public class OrderPaySuccessServiceImpl implements OrderPaySuccessService { |
|
|
|
|
|
|
|
|
|
|
|
for (HighChildOrder childOrder : order.getHighChildOrderList()) { |
|
|
|
for (HighChildOrder childOrder : order.getHighChildOrderList()) { |
|
|
|
if (childOrder.getGoodsType().equals(OrderChildGoodsType.TYPE1.getNumber())) { |
|
|
|
if (childOrder.getGoodsType().equals(OrderChildGoodsType.TYPE1.getNumber())) { |
|
|
|
|
|
|
|
childOrder.setChildOrderStatus(OrderChildStatus.STATUS3.getNumber()); |
|
|
|
couponHandle(order, childOrder); |
|
|
|
couponHandle(order, childOrder); |
|
|
|
|
|
|
|
|
|
|
|
} else if (childOrder.getGoodsType().equals(OrderChildGoodsType.TYPE2.getNumber())) { |
|
|
|
} else if (childOrder.getGoodsType().equals(OrderChildGoodsType.TYPE2.getNumber())) { |
|
|
|
|
|
|
|
order.setOrderStatus(OrderStatus.STATUS3.getNumber()); |
|
|
|
|
|
|
|
order.setFinishTime(new Date()); |
|
|
|
integralHandle(order,childOrder); |
|
|
|
integralHandle(order,childOrder); |
|
|
|
|
|
|
|
|
|
|
|
|
|
|
|
childOrder.setChildOrderStatus(OrderChildStatus.STATUS3.getNumber()); |
|
|
|
|
|
|
|
orderService.updateOrderData(order); |
|
|
|
|
|
|
|
|
|
|
|
} else if (childOrder.getGoodsType().equals(OrderChildGoodsType.TYPE3.getNumber())) { |
|
|
|
} else if (childOrder.getGoodsType().equals(OrderChildGoodsType.TYPE3.getNumber())) { |
|
|
|
order.setOrderStatus(OrderStatus.STATUS3.getNumber()); |
|
|
|
order.setOrderStatus(OrderStatus.STATUS3.getNumber()); |
|
|
|
order.setFinishTime(new Date()); |
|
|
|
order.setFinishTime(new Date()); |
|
|
|
oilHandle(order,childOrder); |
|
|
|
oilHandle(order,childOrder); |
|
|
|
|
|
|
|
|
|
|
|
|
|
|
|
childOrder.setChildOrderStatus(OrderChildStatus.STATUS3.getNumber()); |
|
|
|
orderService.updateOrderData(order); |
|
|
|
orderService.updateOrderData(order); |
|
|
|
|
|
|
|
|
|
|
|
} else if (childOrder.getGoodsType().equals(OrderChildGoodsType.TYPE4.getNumber())) { |
|
|
|
} else if (childOrder.getGoodsType().equals(OrderChildGoodsType.TYPE4.getNumber())) { |
|
|
|