From 802521f215cd2435600f875ac139347290ce76c3 Mon Sep 17 00:00:00 2001 From: gongbiao Date: Wed, 27 Mar 2019 13:19:10 +0800 Subject: [PATCH] =?UTF-8?q?[=E5=88=B8][=E6=B7=BB=E5=8A=A0][=E6=8B=BC?= =?UTF-8?q?=E5=9B=A2=E4=B8=8B=E6=9E=B6]?= MIME-Version: 1.0 Content-Type: text/plain; charset=UTF-8 Content-Transfer-Encoding: 8bit --- .../java/com/iformall/mapper/WxOrderMapper.java | 3 +++ .../java/com/iformall/service/WxOrderService.java | 2 ++ .../iformall/service/impl/WxCouponServiceImpl.java | 14 +++++++++----- .../iformall/service/impl/WxOrderServiceImpl.java | 10 ++++++++++ .../src/main/resources/mapper/WxOrderMapper.xml | 13 +++++++++++-- 5 files changed, 35 insertions(+), 7 deletions(-) diff --git a/mallinkService/src/main/java/com/iformall/mapper/WxOrderMapper.java b/mallinkService/src/main/java/com/iformall/mapper/WxOrderMapper.java index 9a39930a5..2cf358926 100644 --- a/mallinkService/src/main/java/com/iformall/mapper/WxOrderMapper.java +++ b/mallinkService/src/main/java/com/iformall/mapper/WxOrderMapper.java @@ -45,4 +45,7 @@ public interface WxOrderMapper extends CommonMapper { void updateStatusByPressCouponId(WxOrder wxOrder); void updateStatusByOrderGroupId(WxOrder order); + + void updateOrderGroupStatusByCouponId(WxOrder updateOrder); + } diff --git a/mallinkService/src/main/java/com/iformall/service/WxOrderService.java b/mallinkService/src/main/java/com/iformall/service/WxOrderService.java index 4be8ce6b2..28ab52102 100644 --- a/mallinkService/src/main/java/com/iformall/service/WxOrderService.java +++ b/mallinkService/src/main/java/com/iformall/service/WxOrderService.java @@ -161,4 +161,6 @@ public interface WxOrderService { void updateOrderStatus(WxOrder order); + void updateOrderGroupStatusByCouponId(Long id, String tenantId, Integer code); + } 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 d71556567..9fa82ad6c 100644 --- a/mallinkService/src/main/java/com/iformall/service/impl/WxCouponServiceImpl.java +++ b/mallinkService/src/main/java/com/iformall/service/impl/WxCouponServiceImpl.java @@ -1,18 +1,15 @@ package com.iformall.service.impl; -import java.util.*; -import java.util.stream.Collectors; - import com.alibaba.fastjson.JSON; import com.alibaba.fastjson.JSONObject; import com.github.pagehelper.PageHelper; import com.github.pagehelper.PageInfo; import com.iformall.common.ErrorCode; +import com.iformall.common.IdWorker; import com.iformall.common.ResultData; import com.iformall.domain.po.WxCoupon; import com.iformall.domain.po.WxCouponChannel; import com.iformall.domain.po.WxCouponMerchant; -import com.iformall.domain.po.WxScreenAd; import com.iformall.domain.vo.WxCouponCVo; import com.iformall.domain.vo.WxCouponStatisVo; import com.iformall.domain.vo.WxMerchantVo; @@ -27,11 +24,16 @@ import org.slf4j.Logger; import org.slf4j.LoggerFactory; import org.springframework.beans.factory.annotation.Autowired; import org.springframework.stereotype.Service; -import com.iformall.common.IdWorker; import org.springframework.transaction.annotation.Isolation; import org.springframework.transaction.annotation.Propagation; import org.springframework.transaction.annotation.Transactional; +import java.util.ArrayList; +import java.util.Date; +import java.util.List; +import java.util.Map; +import java.util.stream.Collectors; + @Service public class WxCouponServiceImpl implements WxCouponService { @@ -302,6 +304,8 @@ public class WxCouponServiceImpl implements WxCouponService { wxOrderService.updateStatusByPressCouponId(record.getId(), record.getTenantId(), EnumOrderStatus.ORDER_STATUS_PRESS_CANCEL.getCode()); //下架所有相关广告 wxScreenAdService.updateStatusByCouponId(record.getId(), record.getTenantId(), EnumScreenAdStatus.INVALID.getCode()); + //下架拼团券 + wxOrderService.updateOrderGroupStatusByCouponId(record.getId(), record.getTenantId(), EnumOrderStatus.ORDER_STATUS_COOPERATING_CANCEL.getCode()); } record.setUpdateDate(new Date()); wxCouponMapper.updateByPrimaryKeySelective(record); 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 6028e9bc9..913e3b6c4 100644 --- a/mallinkService/src/main/java/com/iformall/service/impl/WxOrderServiceImpl.java +++ b/mallinkService/src/main/java/com/iformall/service/impl/WxOrderServiceImpl.java @@ -1020,6 +1020,16 @@ public class WxOrderServiceImpl implements WxOrderService { } } + @Override + public void updateOrderGroupStatusByCouponId(Long couponId, String tenantId, Integer orderStatus) { + WxOrder updateOrder = new WxOrder(); + updateOrder.setTenantId(tenantId); + updateOrder.setOrderStatus(orderStatus); + updateOrder.setProductId(couponId); + updateOrder.setUpdateDate(new Date()); + wxOrderMapper.updateOrderGroupStatusByCouponId(updateOrder); + } + /** * 微信关闭订单 */ diff --git a/mallinkService/src/main/resources/mapper/WxOrderMapper.xml b/mallinkService/src/main/resources/mapper/WxOrderMapper.xml index fc7b13b72..6500d0f09 100644 --- a/mallinkService/src/main/resources/mapper/WxOrderMapper.xml +++ b/mallinkService/src/main/resources/mapper/WxOrderMapper.xml @@ -202,8 +202,17 @@ and `tenant_id` = #{tenantId} - - + + + update wx_order set order_status=#{orderStatus} + where product_id=#{productId} and order_status = 10 + + and `tenant_id` = #{tenantId} + + + + +