diff --git a/mallinkCApi/src/main/java/com/iformall/controller/WxPressOrderController.java b/mallinkCApi/src/main/java/com/iformall/controller/WxPressOrderController.java index 39414f0c4..50661e33b 100644 --- a/mallinkCApi/src/main/java/com/iformall/controller/WxPressOrderController.java +++ b/mallinkCApi/src/main/java/com/iformall/controller/WxPressOrderController.java @@ -176,14 +176,14 @@ public class WxPressOrderController extends BaseController { order.setOrderStatus(EnumOrderStatus.ORDER_STATUS_PRESSING.getCode()); order.setUpdateDate(new Date()); orderRedisTemplate.opsForValue().set(key, order, 3600, TimeUnit.SECONDS); - updatePressOrderPressing(order, key, orderPress, index); + updatePressOrderPressing(order, index); } else { order.setPressCurrentNum(index); order.setPressCurrentValue(order.getPressCurrentValue() - orderPress.getPressValue()); order.setOrderStatus(EnumOrderStatus.ORDER_STATUS_PRESS_COMPLETE.getCode()); order.setUpdateDate(curDate); orderRedisTemplate.opsForValue().set(key, order, 3600, TimeUnit.SECONDS); - updatePressOrder(order, wxCouponCVo, orderPress, index); + updatePressOrderComplete(order, wxCouponCVo, index); } } } catch (MallinkException e) { @@ -195,34 +195,22 @@ public class WxPressOrderController extends BaseController { return new ResultData(); } - private void updatePressOrderPressing(WxOrder order, String key, WxOrderPress orderPress, Integer index) { - - WxOrder orderUpdatePress = new WxOrder(); - orderUpdatePress.setId(order.getId()); - orderUpdatePress.setPressCurrentNum(index); - orderUpdatePress.setPressCurrentValue(order.getPressCurrentValue() - orderPress.getPressValue()); - orderUpdatePress.setOrderStatus(EnumOrderStatus.ORDER_STATUS_PRESSING.getCode()); - orderUpdatePress.setUpdateDate(new Date()); - // 保存订单 - wxOrderService.saveOrUpdate(orderUpdatePress); - } - - private void updatePressOrderPressing(WxOrder order, WxOrderPress orderPress, Integer index) { + private void updatePressOrderPressing(WxOrder order, Integer index) { WxOrder orderUpdatePress = new WxOrder(); orderUpdatePress.setId(order.getId()); orderUpdatePress.setPressCurrentNum(index); - orderUpdatePress.setPressCurrentValue(order.getPressCurrentValue() - orderPress.getPressValue()); + orderUpdatePress.setPressCurrentValue(order.getPressCurrentValue()); orderUpdatePress.setOrderStatus(EnumOrderStatus.ORDER_STATUS_PRESSING.getCode()); orderUpdatePress.setUpdateDate(new Date()); // 保存订单 wxOrderService.saveOrUpdate(orderUpdatePress); } - private void updatePressOrder(WxOrder order, WxCouponCVo wxCouponCVo, WxOrderPress orderPress, Integer index) { + private void updatePressOrderComplete(WxOrder order, WxCouponCVo wxCouponCVo, Integer index) { WxOrder orderUpdatePress = new WxOrder(); orderUpdatePress.setId(order.getId()); orderUpdatePress.setPressCurrentNum(index); - orderUpdatePress.setPressCurrentValue(order.getPressCurrentValue() - orderPress.getPressValue()); + orderUpdatePress.setPressCurrentValue(order.getPressCurrentValue()); orderUpdatePress.setOrderStatus(EnumOrderStatus.ORDER_STATUS_PRESS_COMPLETE.getCode()); orderUpdatePress.setPayment(wxCouponCVo.getSalePrice()); orderUpdatePress.setUpdateDate(new Date());