From f01b8d29f60b4b1a213dfe4f803444a1a4bfe8df Mon Sep 17 00:00:00 2001 From: Stormeye Wu Date: Sat, 21 Sep 2019 11:16:02 +0800 Subject: [PATCH] =?UTF-8?q?[=E5=8D=A1=E5=AF=86][=E4=BF=AE=E6=94=B9]:?= =?UTF-8?q?=E5=AF=BC=E5=87=BA=E6=97=B6=E6=9B=B4=E6=94=B9=E5=8D=A1=E5=AF=86?= =?UTF-8?q?=E7=8A=B6=E6=80=81?= MIME-Version: 1.0 Content-Type: text/plain; charset=UTF-8 Content-Transfer-Encoding: 8bit --- .../com/iformall/mapper/WxCouponPasswordMapper.java | 3 ++- .../service/impl/WxCouponPasswordServiceImpl.java | 5 +++-- .../com/iformall/service/impl/WxCouponServiceImpl.java | 2 +- .../main/resources/mapper/WxCouponPasswordMapper.xml | 10 ++++++++-- 4 files changed, 14 insertions(+), 6 deletions(-) diff --git a/mallinkService/src/main/java/com/iformall/mapper/WxCouponPasswordMapper.java b/mallinkService/src/main/java/com/iformall/mapper/WxCouponPasswordMapper.java index 82a910167..8088ecaa4 100644 --- a/mallinkService/src/main/java/com/iformall/mapper/WxCouponPasswordMapper.java +++ b/mallinkService/src/main/java/com/iformall/mapper/WxCouponPasswordMapper.java @@ -13,7 +13,8 @@ public interface WxCouponPasswordMapper extends CommonMapper findAvaPasswordListByCouponId(WxCouponPassword wxCouponPassword); void insertCouponPasswds(List pwdlist); - int updateStatusByCouponId(Long couponId); + int disableByCouponId(Long couponId); + int downloadByCouponId(Long couponId); List findCouponGroupList(WxCouponPassword wxCouponPassword); List findCouponCountInfo(WxCouponPassword wxCouponPassword); diff --git a/mallinkService/src/main/java/com/iformall/service/impl/WxCouponPasswordServiceImpl.java b/mallinkService/src/main/java/com/iformall/service/impl/WxCouponPasswordServiceImpl.java index b0c99382c..0e212ecf4 100644 --- a/mallinkService/src/main/java/com/iformall/service/impl/WxCouponPasswordServiceImpl.java +++ b/mallinkService/src/main/java/com/iformall/service/impl/WxCouponPasswordServiceImpl.java @@ -11,7 +11,6 @@ import com.iformall.exception.MallinkException; import com.iformall.mapper.WxCouponPasswordMapper; import com.iformall.service.ExcelService; import com.iformall.service.WxCouponPasswordService; -import com.iformall.utils.DateUtils; import org.slf4j.Logger; import org.slf4j.LoggerFactory; import org.springframework.beans.factory.annotation.Autowired; @@ -142,7 +141,6 @@ public class WxCouponPasswordServiceImpl implements WxCouponPasswordService { newOne.setStatus(EnumCouponPasswordStatus.INIT.getCode()); newOne.setCreateDate(curDate); newOne.setUpdateDate(curDate); - newOne.setExpireDate(DateUtils.getTimeAfterDays(30, curDate)); couponPasswords.add(newOne); } wxCouponPasswordMapper.insertCouponPasswds(couponPasswords); @@ -150,6 +148,9 @@ public class WxCouponPasswordServiceImpl implements WxCouponPasswordService { @Override public void exportData(HttpServletRequest request, HttpServletResponse response, WxCouponPassword couponPassword) { + if (couponPassword.getCouponId() != null) { + wxCouponPasswordMapper.downloadByCouponId(couponPassword.getCouponId()); + } List pwdList = wxCouponPasswordMapper.findAvaPasswordListByCouponId(couponPassword); excelService.exportExcel(pwdList, null, "兑换码", WxCouponPassword.class, "卡兑换码.xlsx", response, false); 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 9bb1c8860..9d7f513ad 100644 --- a/mallinkService/src/main/java/com/iformall/service/impl/WxCouponServiceImpl.java +++ b/mallinkService/src/main/java/com/iformall/service/impl/WxCouponServiceImpl.java @@ -421,7 +421,7 @@ public class WxCouponServiceImpl implements WxCouponService { // 卡下架后,转赠找不到卡相关信息,所以修改卡转赠状态为不可转赠 wxCardInfoMapper.updateTransferStatusByCouponId(record.getId()); // 卡券下架,未使用的卡密要下架 - couponPasswordMapper.updateStatusByCouponId(record.getId()); + couponPasswordMapper.disableByCouponId(record.getId()); } record.setUpdateDate(new Date()); wxCouponMapper.updateByPrimaryKeySelective(record); diff --git a/mallinkService/src/main/resources/mapper/WxCouponPasswordMapper.xml b/mallinkService/src/main/resources/mapper/WxCouponPasswordMapper.xml index d20252d99..933ce1e89 100644 --- a/mallinkService/src/main/resources/mapper/WxCouponPasswordMapper.xml +++ b/mallinkService/src/main/resources/mapper/WxCouponPasswordMapper.xml @@ -108,10 +108,16 @@ - + update wx_coupon_password set status=4, update_date=now() - where status != 3 and tenant_id = #{tenantId} and coupon_id=#{couponId} + where status != 3 and coupon_id=#{couponId} + + + + update wx_coupon_password + set status=1, update_date=now(), expire_date=date_add(now(),interval 30 DAY) + where status=0 and coupon_id=#{couponId}