From 8214202f310c68bca073e75bdb2125161adcb10c Mon Sep 17 00:00:00 2001 From: gongbiao Date: Thu, 28 Mar 2019 18:50:48 +0800 Subject: [PATCH] =?UTF-8?q?[=E6=8B=BC=E5=9B=A2][=E4=BF=AE=E6=94=B9][?= =?UTF-8?q?=E5=BE=85=E6=94=AF=E4=BB=98]?= MIME-Version: 1.0 Content-Type: text/plain; charset=UTF-8 Content-Transfer-Encoding: 8bit --- .../main/java/com/iformall/enums/EnumOrderStatus.java | 4 ++-- .../service/impl/WxOrderGroupServiceImpl.java | 11 +++++++++++ .../com/iformall/service/impl/WxOrderServiceImpl.java | 3 ++- .../src/main/resources/mapper/WxOrderGroupMapper.xml | 2 +- 4 files changed, 16 insertions(+), 4 deletions(-) diff --git a/mallinkService/src/main/java/com/iformall/enums/EnumOrderStatus.java b/mallinkService/src/main/java/com/iformall/enums/EnumOrderStatus.java index 401e56a9a..5db17a0cc 100644 --- a/mallinkService/src/main/java/com/iformall/enums/EnumOrderStatus.java +++ b/mallinkService/src/main/java/com/iformall/enums/EnumOrderStatus.java @@ -22,8 +22,8 @@ public enum EnumOrderStatus { ORDER_STATUS_COOPERATING_OVERTIME(12, "拼团已过期"), ORDER_STATUS_COOPERATING_CANCEL(13, "拼团失败"), ORDER_STATUS_COOPERATING_FAILD(14, "参团失败"), - ORDER_STATUS_COOPERATING_UNPAID(15, "拼团待付款") - + ORDER_STATUS_COOPERATING_UNPAID(15, "拼团待付款"), + ORDER_STATUS_COOPERATING_BREAK(16, "拼团取消") ; public static EnumOrderStatus getEnum(Integer code) { diff --git a/mallinkService/src/main/java/com/iformall/service/impl/WxOrderGroupServiceImpl.java b/mallinkService/src/main/java/com/iformall/service/impl/WxOrderGroupServiceImpl.java index d8581a99a..d57a19e67 100644 --- a/mallinkService/src/main/java/com/iformall/service/impl/WxOrderGroupServiceImpl.java +++ b/mallinkService/src/main/java/com/iformall/service/impl/WxOrderGroupServiceImpl.java @@ -118,6 +118,17 @@ public class WxOrderGroupServiceImpl implements WxOrderGroupService { throw new MallinkException(ErrorCode.ORDER_GROUP_COOPERATING_FAILD); } } + //拼团成功后把待支付的取消 + wxOrder.setOrderStatus(EnumOrderStatus.ORDER_STATUS_COOPERATING_UNPAID.getCode()); + list = wxOrderMapper.select(wxOrder); + for (WxOrder temp : list) { + //去库存 + wxOrderService.updateOrderStatus(temp); + //拼团取消 + temp.setOrderStatus(EnumOrderStatus.ORDER_STATUS_COOPERATING_BREAK.getCode()); + wxOrderMapper.updateByPrimaryKeySelective(temp); + } + } } else { logger.info("首次拼团,创建拼团信息"); diff --git a/mallinkService/src/main/java/com/iformall/service/impl/WxOrderServiceImpl.java b/mallinkService/src/main/java/com/iformall/service/impl/WxOrderServiceImpl.java index 560ab7359..42d50de67 100644 --- a/mallinkService/src/main/java/com/iformall/service/impl/WxOrderServiceImpl.java +++ b/mallinkService/src/main/java/com/iformall/service/impl/WxOrderServiceImpl.java @@ -1025,7 +1025,8 @@ public class WxOrderServiceImpl implements WxOrderService { if (updateOrder.getOrderStatus().equals(EnumOrderStatus.ORDER_STATUS_COOPERATING_OVERTIME.getCode()) || updateOrder.getOrderStatus().equals(EnumOrderStatus.ORDER_STATUS_COOPERATING_CANCEL.getCode()) || updateOrder.getOrderStatus().equals(EnumOrderStatus.ORDER_STATUS_COOPERATING_COMPLETE.getCode()) || - updateOrder.getOrderStatus().equals(EnumOrderStatus.ORDER_STATUS_COOPERATING_FAILD.getCode())) { + updateOrder.getOrderStatus().equals(EnumOrderStatus.ORDER_STATUS_COOPERATING_FAILD.getCode()) || + updateOrder.getOrderStatus().equals(EnumOrderStatus.ORDER_STATUS_COOPERATING_BREAK.getCode())) { try { stockBack(updateOrder); } catch (Exception e) { diff --git a/mallinkService/src/main/resources/mapper/WxOrderGroupMapper.xml b/mallinkService/src/main/resources/mapper/WxOrderGroupMapper.xml index 0233ec545..07ac78acb 100644 --- a/mallinkService/src/main/resources/mapper/WxOrderGroupMapper.xml +++ b/mallinkService/src/main/resources/mapper/WxOrderGroupMapper.xml @@ -85,7 +85,7 @@ and o.order_group_id=#{orderGroupId} - and o.order_status in(10,11,12,13,15) + and o.order_status in(10,11,12,13,14,15,16) order by o.id desc,o.order_status