From f1c6a5c3c058972c8004faaabbf90b9ecec4af98 Mon Sep 17 00:00:00 2001 From: gongbiao Date: Sat, 3 Aug 2019 18:38:33 +0800 Subject: [PATCH 1/4] =?UTF-8?q?[C=E7=AB=AF=E6=B6=88=E8=B4=B9=E5=8D=A1][?= =?UTF-8?q?=E4=BF=AE=E6=94=B9][=E5=8F=AF=E8=BD=AC=E8=B5=A0=E7=8A=B6?= =?UTF-8?q?=E6=80=81]?= MIME-Version: 1.0 Content-Type: text/plain; charset=UTF-8 Content-Transfer-Encoding: 8bit --- .../src/main/resources/mapper/WxCouponOrderMapper.xml | 4 ++-- 1 file changed, 2 insertions(+), 2 deletions(-) diff --git a/mallinkService/src/main/resources/mapper/WxCouponOrderMapper.xml b/mallinkService/src/main/resources/mapper/WxCouponOrderMapper.xml index 119318492..61ea320d3 100644 --- a/mallinkService/src/main/resources/mapper/WxCouponOrderMapper.xml +++ b/mallinkService/src/main/resources/mapper/WxCouponOrderMapper.xml @@ -950,13 +950,13 @@ co.id,co.tenant_id,co.coupon_id,co.coupon_type,co.expired_time,co.coupon_order_status,co.create_date,co.update_date, c.cover_img,c.title,c.sub_title,c.detail,c.unit,c.remark, - a.amount,a.remaining_amount,case when c.status=1 then 0 else a.support_transfer end support_transfer + a.amount,a.remaining_amount,case when c.status=1 then 0 else c.support_transfer end support_transfer co.id,co.tenant_id,co.coupon_id,co.coupon_type,co.c_user_id,co.owner_id,co.b_user_id,co.order_id,co.expired_time,co.coupon_order_status,co.create_date,co.update_date,co.coupon_price, c.cover_img,c.title,c.sub_title,c.sale_price,c.price,c.unit,c.detail,c.remark, - a.amount,a.remaining_amount,case when c.status=1 then 0 else a.support_transfer end support_transfer + a.amount,a.remaining_amount,case when c.status=1 then 0 else c.support_transfer end support_transfer From 4d8de66648aa403a486dac409c0782b6f4d42afd Mon Sep 17 00:00:00 2001 From: gongbiao Date: Mon, 5 Aug 2019 10:58:56 +0800 Subject: [PATCH 2/4] =?UTF-8?q?[C=E7=AB=AF=E6=B6=88=E8=B4=B9=E5=8D=A1][?= =?UTF-8?q?=E4=BF=AE=E6=94=B9][=E4=B8=8B=E6=9E=B6=E6=88=96=E4=BD=9C?= =?UTF-8?q?=E5=BA=9F=E6=97=B6=E5=8F=AF=E8=BD=AC=E8=B5=A0=E7=8A=B6=E6=80=81?= =?UTF-8?q?]?= MIME-Version: 1.0 Content-Type: text/plain; charset=UTF-8 Content-Transfer-Encoding: 8bit --- .../java/com/iformall/mapper/WxCardInfoMapper.java | 10 ++++------ .../service/impl/WxCouponChannelServiceImpl.java | 5 +++++ .../com/iformall/service/impl/WxCouponServiceImpl.java | 8 ++++++++ .../src/main/resources/mapper/WxCardInfoMapper.xml | 3 +++ 4 files changed, 20 insertions(+), 6 deletions(-) diff --git a/mallinkService/src/main/java/com/iformall/mapper/WxCardInfoMapper.java b/mallinkService/src/main/java/com/iformall/mapper/WxCardInfoMapper.java index bf4c0fee3..7d4be7a49 100644 --- a/mallinkService/src/main/java/com/iformall/mapper/WxCardInfoMapper.java +++ b/mallinkService/src/main/java/com/iformall/mapper/WxCardInfoMapper.java @@ -1,17 +1,15 @@ package com.iformall.mapper; -import java.util.*; import com.iformall.common.CommonMapper; import com.iformall.domain.po.WxCardInfo; import com.iformall.domain.vo.WxCardVo; +import java.util.List; + public interface WxCardInfoMapper extends CommonMapper { List findVoList(WxCardVo wxCardVo); - - - - - + void updateTransferStatusByCouponId(Long couponId); + } diff --git a/mallinkService/src/main/java/com/iformall/service/impl/WxCouponChannelServiceImpl.java b/mallinkService/src/main/java/com/iformall/service/impl/WxCouponChannelServiceImpl.java index cd9193aed..b1b73dccf 100644 --- a/mallinkService/src/main/java/com/iformall/service/impl/WxCouponChannelServiceImpl.java +++ b/mallinkService/src/main/java/com/iformall/service/impl/WxCouponChannelServiceImpl.java @@ -13,6 +13,7 @@ import com.iformall.domain.vo.WxCouponChannelAddVo; import com.iformall.domain.vo.WxCouponChannelVo; import com.iformall.domain.vo.WxMerchantVo; import com.iformall.enums.*; +import com.iformall.mapper.WxCardInfoMapper; import com.iformall.mapper.WxCouponChannelMapper; import com.iformall.mapper.WxCouponMerchantMapper; import com.iformall.mapper.WxMerchantMapper; @@ -43,6 +44,8 @@ public class WxCouponChannelServiceImpl implements WxCouponChannelService { WxOrderService wxOrderService; @Autowired QrCodeService qrCodeService; + @Autowired + WxCardInfoMapper wxCardInfoMapper; /** * B端业务端 @@ -107,6 +110,8 @@ public class WxCouponChannelServiceImpl implements WxCouponChannelService { wxCoupon.setSupportTransfer(EnumCouponTransfer.NO.getCode()); wxCoupon.setUpdateDate(new Date()); wxCouponService.update(wxCoupon); + //修改卡状态 + wxCardInfoMapper.updateTransferStatusByCouponId(orignal.getCouponId()); } } } 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 bf903a781..7c7c27369 100644 --- a/mallinkService/src/main/java/com/iformall/service/impl/WxCouponServiceImpl.java +++ b/mallinkService/src/main/java/com/iformall/service/impl/WxCouponServiceImpl.java @@ -63,6 +63,9 @@ public class WxCouponServiceImpl implements WxCouponService { @Autowired WxCouponChannelMapper wxCouponChannelMapper; + @Autowired + WxCardInfoMapper wxCardInfoMapper; + @Override public ResultData list(WxCoupon wxCoupon, Integer pageNum, Integer pageSize) { if (null == wxCoupon) wxCoupon = new WxCoupon(); @@ -394,10 +397,15 @@ public class WxCouponServiceImpl implements WxCouponService { wxScreenAdService.updateStatusByCouponId(record.getId(), record.getTenantId(), EnumScreenAdStatus.INVALID.getCode()); //下架拼团券 wxOrderService.updateOrderGroupStatusByCouponId(record.getId(), record.getTenantId(), EnumOrderStatus.ORDER_STATUS_COOPERATING_CANCEL.getCode()); + //卡-转赠状态 + record.setSupportTransfer(EnumCouponTransfer.NO.getCode()); + //修改卡状态 + wxCardInfoMapper.updateTransferStatusByCouponId(record.getId()); } record.setUpdateDate(new Date()); wxCouponMapper.updateByPrimaryKeySelective(record); + } return new ResultData(record.getId()); } diff --git a/mallinkService/src/main/resources/mapper/WxCardInfoMapper.xml b/mallinkService/src/main/resources/mapper/WxCardInfoMapper.xml index 1119c84fc..ffcd1a720 100644 --- a/mallinkService/src/main/resources/mapper/WxCardInfoMapper.xml +++ b/mallinkService/src/main/resources/mapper/WxCardInfoMapper.xml @@ -206,5 +206,8 @@ + + update wx_card_info set support_transfer=0,update_date=now() where support_transfer=1 and coupon_id=#{couponId} + From 57c688c566eab72772eae37cb6adb81643324ea9 Mon Sep 17 00:00:00 2001 From: luozukai Date: Mon, 5 Aug 2019 11:16:27 +0800 Subject: [PATCH 3/4] =?UTF-8?q?[=E5=90=88=E5=90=8C][=E4=BF=AE=E6=94=B9][?= =?UTF-8?q?=E4=BF=AE=E6=94=B9=E9=A2=84=E8=B4=A6=E5=8D=95=E7=94=9F=E6=88=90?= =?UTF-8?q?=E9=80=BB=E8=BE=91]?= MIME-Version: 1.0 Content-Type: text/plain; charset=UTF-8 Content-Transfer-Encoding: 8bit --- .../iformall/service/impl/WxRentContractServiceImpl.java | 9 +++++---- 1 file changed, 5 insertions(+), 4 deletions(-) diff --git a/mallinkService/src/main/java/com/iformall/service/impl/WxRentContractServiceImpl.java b/mallinkService/src/main/java/com/iformall/service/impl/WxRentContractServiceImpl.java index b78bb5fa6..a6928d573 100644 --- a/mallinkService/src/main/java/com/iformall/service/impl/WxRentContractServiceImpl.java +++ b/mallinkService/src/main/java/com/iformall/service/impl/WxRentContractServiceImpl.java @@ -2018,6 +2018,9 @@ public class WxRentContractServiceImpl implements WxRentContractService { Double total = new Double(0); int[] diff; + System.out.println(sd.format(start)); + System.out.println(sd.format(end)); + //同一天 if(sd.format(start).equals(sd.format(end))){ int dayCount = DateUtils.getMonthDayCount(start); @@ -2026,8 +2029,6 @@ public class WxRentContractServiceImpl implements WxRentContractService { //同月 if(sdM.format(start).equals(sdM.format(end))){ - System.out.println(sd.format(start)); - System.out.println(sd.format(end)); diff = DateUtils.getDiff(start,end); int dayCount = DateUtils.getMonthDayCount(start); @@ -2040,8 +2041,8 @@ public class WxRentContractServiceImpl implements WxRentContractService { int endInt = Integer.parseInt(sdD.format(DateUtils.getDaySet(end,Calendar.DATE,1))); if(startInt == endInt){ - int months = getMonths(sdM.format(start)+"-01",sdM.format(end)+"-01"); - return (months+1) * price; + int months = getMonths(sdM.format(start)+"-01",sdM.format(DateUtils.getDaySet(end,Calendar.DATE,1))+"-01"); + return (months) * price; } //第一个月 From b8c753c0839fa6c0689a42daeed66deb8b17448e Mon Sep 17 00:00:00 2001 From: luozukai Date: Mon, 5 Aug 2019 11:22:43 +0800 Subject: [PATCH 4/4] =?UTF-8?q?[=E5=90=88=E5=90=8C][=E4=BF=AE=E6=94=B9][?= =?UTF-8?q?=E4=BF=AE=E6=94=B9=E9=A2=84=E8=B4=A6=E5=8D=95=E7=94=9F=E6=88=90?= =?UTF-8?q?=E9=80=BB=E8=BE=91]?= MIME-Version: 1.0 Content-Type: text/plain; charset=UTF-8 Content-Transfer-Encoding: 8bit --- .../resources/mapper/WxMsgValidationcodeModelMapper.xml | 7 ++----- 1 file changed, 2 insertions(+), 5 deletions(-) diff --git a/mallinkService/src/main/resources/mapper/WxMsgValidationcodeModelMapper.xml b/mallinkService/src/main/resources/mapper/WxMsgValidationcodeModelMapper.xml index 5389fd157..dbcf6d198 100644 --- a/mallinkService/src/main/resources/mapper/WxMsgValidationcodeModelMapper.xml +++ b/mallinkService/src/main/resources/mapper/WxMsgValidationcodeModelMapper.xml @@ -36,11 +36,8 @@ and `type` = #{type} and `tenant_id` = #{tenantId} and `open` = #{open} - - and id not in( - select id from wx_msg_validationcode_model where content like '<%' and `tenant_id` = #{tenantId} - ) - + and `msg_type` = #{msgType} + and `role_type` = #{roleType} and id in