|
|
|
@ -2297,7 +2297,7 @@ public class HighOrderServiceImpl implements HighOrderService { |
|
|
|
|
updateOrder(order); |
|
|
|
|
|
|
|
|
|
HighGasOrderPush orderPush = new HighGasOrderPush(); |
|
|
|
|
JSONObject returnObject = new JSONObject(); |
|
|
|
|
JSONObject returnObject; |
|
|
|
|
|
|
|
|
|
for (HighChildOrder childOrder : order.getHighChildOrderList()) { |
|
|
|
|
childOrder.setChildOrdeStatus(2); |
|
|
|
@ -2343,7 +2343,7 @@ public class HighOrderServiceImpl implements HighOrderService { |
|
|
|
|
|
|
|
|
|
|
|
|
|
|
// 退还积分
|
|
|
|
|
if (order.getPayGold() > 0) { |
|
|
|
|
if (order.getPayGold() != null) { |
|
|
|
|
highUserService.goldHandle(order.getMemId(), order.getPayGold(), 1, 3, order.getId()); |
|
|
|
|
if (order.getPayRealPrice().compareTo(new BigDecimal(0)) == 0) { |
|
|
|
|
order.setOrderStatus(4); |
|
|
|
|