diff --git a/mallinkService/src/main/java/com/iformall/mapper/WxCouponPasswordMapper.java b/mallinkService/src/main/java/com/iformall/mapper/WxCouponPasswordMapper.java index 4c1fce714..c6960b020 100644 --- a/mallinkService/src/main/java/com/iformall/mapper/WxCouponPasswordMapper.java +++ b/mallinkService/src/main/java/com/iformall/mapper/WxCouponPasswordMapper.java @@ -17,7 +17,7 @@ public interface WxCouponPasswordMapper extends CommonMapper pwdlist); int disableByCouponId(Long couponId); - int downloadByCouponId(Long couponId); + int downloadByCouponId(@Param("couponId")Long couponId,@Param("price")Integer price); 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 f0d16993d..bfacf925b 100644 --- a/mallinkService/src/main/java/com/iformall/service/impl/WxCouponPasswordServiceImpl.java +++ b/mallinkService/src/main/java/com/iformall/service/impl/WxCouponPasswordServiceImpl.java @@ -305,7 +305,11 @@ public class WxCouponPasswordServiceImpl implements WxCouponPasswordService { @Override public void exportData(HttpServletRequest request, HttpServletResponse response, WxCouponPassword couponPassword) { if (couponPassword.getCouponId() != null) { - wxCouponPasswordMapper.downloadByCouponId(couponPassword.getCouponId()); + WxCoupon coupon = wxCouponMapper.selectById(couponPassword.getCouponId(), couponPassword.getTenantId()); + if (null == coupon) { + throw new MallinkException(ErrorCode.SYS_SERVER_ERROR.getCode(),"券未查询到"); + } + wxCouponPasswordMapper.downloadByCouponId(couponPassword.getCouponId(),coupon.getPrice()); } List pwdList = wxCouponPasswordMapper.findAvaPasswordListByCouponId(couponPassword); excelService.exportExcel(pwdList, null, "兑换码", WxCouponPassword.class, "卡兑换码.xlsx", response, false); diff --git a/mallinkService/src/main/resources/mapper/WxCouponPasswordMapper.xml b/mallinkService/src/main/resources/mapper/WxCouponPasswordMapper.xml index d42fca60e..d9023d091 100644 --- a/mallinkService/src/main/resources/mapper/WxCouponPasswordMapper.xml +++ b/mallinkService/src/main/resources/mapper/WxCouponPasswordMapper.xml @@ -132,10 +132,16 @@ where status != 3 and coupon_id=#{couponId} - + update wx_coupon_password set status=1, update_date=now(), expire_date=date_add(now(),interval 365 DAY) + + ,and `price` = #{price} + where status=0 and coupon_id=#{couponId} + + and `price` = 0 +