From 2c9d73e28cbc79d5bff4fa406e05698fb09c2c94 Mon Sep 17 00:00:00 2001 From: Stormeye Wu Date: Fri, 18 Jan 2019 11:25:10 +0800 Subject: [PATCH] =?UTF-8?q?[=E7=A0=8D=E4=BB=B7][=E4=BF=AE=E6=94=B9]:?= =?UTF-8?q?=E7=A0=8D=E4=BB=B7=E5=88=B8=E4=B8=8B=E6=9E=B6=EF=BC=8C=E7=9B=B8?= =?UTF-8?q?=E5=85=B3=E7=9A=84=E7=A0=8D=E4=BB=B7=E8=AE=A2=E5=8D=95=E4=B8=8B?= =?UTF-8?q?=E6=9E=B6=E5=8F=8A=E5=8F=96=E6=B6=88?= MIME-Version: 1.0 Content-Type: text/plain; charset=UTF-8 Content-Transfer-Encoding: 8bit --- .../main/java/com/iformall/enums/EnumOrderStatus.java | 1 + .../main/java/com/iformall/mapper/WxOrderMapper.java | 1 + .../main/java/com/iformall/service/WxOrderService.java | 2 ++ .../com/iformall/service/impl/WxCouponServiceImpl.java | 7 +++++++ .../com/iformall/service/impl/WxOrderServiceImpl.java | 10 ++++++++++ .../src/main/resources/mapper/WxOrderMapper.xml | 4 ++++ 6 files changed, 25 insertions(+) diff --git a/mallinkService/src/main/java/com/iformall/enums/EnumOrderStatus.java b/mallinkService/src/main/java/com/iformall/enums/EnumOrderStatus.java index 07cc6ae4b..b7125c7bb 100644 --- a/mallinkService/src/main/java/com/iformall/enums/EnumOrderStatus.java +++ b/mallinkService/src/main/java/com/iformall/enums/EnumOrderStatus.java @@ -16,6 +16,7 @@ public enum EnumOrderStatus { ORDER_STATUS_PRESSING(6, "砍价中"), ORDER_STATUS_PRESS_COMPLETE(7, "砍价完成"), ORDER_STATUS_PRESS_OVERTIME(8, "砍价已过期"), + ORDER_STATUS_PRESS_CANCEL(9, "砍价已取消") ; public static EnumOrderStatus getEnum(Integer code) { diff --git a/mallinkService/src/main/java/com/iformall/mapper/WxOrderMapper.java b/mallinkService/src/main/java/com/iformall/mapper/WxOrderMapper.java index 68f365a89..de31e302e 100644 --- a/mallinkService/src/main/java/com/iformall/mapper/WxOrderMapper.java +++ b/mallinkService/src/main/java/com/iformall/mapper/WxOrderMapper.java @@ -42,5 +42,6 @@ public interface WxOrderMapper extends CommonMapper { /**砍价*/ List findListOfPress(WxOrder wxOrder); WxOrderCouponPressVo selectDetailOfPress(WxOrder wxOrder); + void updateStatusByPressCouponId(WxOrder wxOrder); } diff --git a/mallinkService/src/main/java/com/iformall/service/WxOrderService.java b/mallinkService/src/main/java/com/iformall/service/WxOrderService.java index 0bafae37e..22902da61 100644 --- a/mallinkService/src/main/java/com/iformall/service/WxOrderService.java +++ b/mallinkService/src/main/java/com/iformall/service/WxOrderService.java @@ -155,4 +155,6 @@ public interface WxOrderService { PageInfo listPressVoAsPage(WxOrder record, Integer pageIndex, Integer pageSize); WxOrderCouponPressVo detailPressVo(WxOrder record); + + void updateStatusByPressCouponId(Long couponId,String tenantId,int orderStatus); } diff --git a/mallinkService/src/main/java/com/iformall/service/impl/WxCouponServiceImpl.java b/mallinkService/src/main/java/com/iformall/service/impl/WxCouponServiceImpl.java index 0b9f86452..eae37befa 100644 --- a/mallinkService/src/main/java/com/iformall/service/impl/WxCouponServiceImpl.java +++ b/mallinkService/src/main/java/com/iformall/service/impl/WxCouponServiceImpl.java @@ -17,6 +17,7 @@ import com.iformall.mapper.WxMerchantMapper; import com.iformall.service.WxCouponChannelService; import com.iformall.service.WxCouponSendService; import com.iformall.service.WxCouponService; +import com.iformall.service.WxOrderService; import org.apache.commons.lang3.StringUtils; import org.slf4j.Logger; import org.slf4j.LoggerFactory; @@ -46,6 +47,9 @@ public class WxCouponServiceImpl implements WxCouponService { @Autowired WxCouponSendService wxCouponSendService; + @Autowired + WxOrderService wxOrderService; + @Override public PageInfo listAsPage(WxCoupon record, Integer pageIndex, Integer pageSize, Integer type) { @@ -226,6 +230,9 @@ public class WxCouponServiceImpl implements WxCouponService { .updateStatusByCouponId(record.getId(), record.getTenantId(), EnumCouponChannelStatus.STATUS_TAKE_OFFF.getCode()); wxCouponSendService .updateStatusByCouponId(record.getId(), record.getTenantId(), EnumCouponSendStatus.INVALID.getCode()); + //下架所有已砍价券 + wxOrderService.updateStatusByPressCouponId(record.getId(), record.getTenantId(), EnumOrderStatus.ORDER_STATUS_PRESS_CANCEL.getCode()); + } record.setUpdateDate(new Date()); 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 5d139b0c9..d82982a44 100644 --- a/mallinkService/src/main/java/com/iformall/service/impl/WxOrderServiceImpl.java +++ b/mallinkService/src/main/java/com/iformall/service/impl/WxOrderServiceImpl.java @@ -1145,4 +1145,14 @@ public class WxOrderServiceImpl implements WxOrderService { return wxOrderMapper.selectDetailOfPress(record); } + @Override + public void updateStatusByPressCouponId(Long couponId, String tenantId, int orderStatus) { + WxOrder updateOrder = new WxOrder(); + updateOrder.setTenantId(tenantId); + updateOrder.setOrderStatus(orderStatus); + updateOrder.setProductId(couponId); + updateOrder.setUpdateDate(new Date()); + wxOrderMapper.updateStatusByPressCouponId(updateOrder); + } + } diff --git a/mallinkService/src/main/resources/mapper/WxOrderMapper.xml b/mallinkService/src/main/resources/mapper/WxOrderMapper.xml index 4db213d64..482b134ae 100644 --- a/mallinkService/src/main/resources/mapper/WxOrderMapper.xml +++ b/mallinkService/src/main/resources/mapper/WxOrderMapper.xml @@ -185,6 +185,10 @@ co.id as coupon_order_id,co.coupon_order_status + + update wx_order set order_status=#{orderStatus} where tenant_id=#{tenantId} and product_id=#{productId} and press_end_date is not null + +