From a10458af56fef47d252811fb73e84772cf0887eb Mon Sep 17 00:00:00 2001 From: luozukai Date: Sat, 3 Aug 2019 17:37:49 +0800 Subject: [PATCH 1/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 --- .../com/iformall/service/impl/WxRentContractServiceImpl.java | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-) 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 85d16264b..b78bb5fa6 100644 --- a/mallinkService/src/main/java/com/iformall/service/impl/WxRentContractServiceImpl.java +++ b/mallinkService/src/main/java/com/iformall/service/impl/WxRentContractServiceImpl.java @@ -2041,7 +2041,7 @@ public class WxRentContractServiceImpl implements WxRentContractService { if(startInt == endInt){ int months = getMonths(sdM.format(start)+"-01",sdM.format(end)+"-01"); - return months * price; + return (months+1) * price; } //第一个月 From 53ff27d3281875070fd8131fdc5fb5337e439667 Mon Sep 17 00:00:00 2001 From: gongbiao Date: Sat, 3 Aug 2019 18:07:36 +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][=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 --- .../iformall/service/impl/WxCouponChannelServiceImpl.java | 8 ++++++++ 1 file changed, 8 insertions(+) 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 d0fb244c5..3a8b80fb8 100644 --- a/mallinkService/src/main/java/com/iformall/service/impl/WxCouponChannelServiceImpl.java +++ b/mallinkService/src/main/java/com/iformall/service/impl/WxCouponChannelServiceImpl.java @@ -100,6 +100,14 @@ public class WxCouponChannelServiceImpl implements WxCouponChannelService { wxScreenAdService.updateStatusByCouponChannelId(record.getId(),record.getTenantId(),EnumScreenAdStatus.INVALID.getCode()); //下架拼团券 wxOrderService.updateOrderGroupStatusByCouponChannelId(record.getId(), record.getTenantId(), EnumOrderStatus.ORDER_STATUS_COOPERATING_CANCEL.getCode()); + //卡-转赠状态 + if (orignal.getType().equals(EnumCouponChannelType.COUPON_CHANNEL_ID_CARD.getCode())) { + WxCoupon wxCoupon = new WxCoupon(); + wxCoupon.setId(orignal.getCouponId()); + wxCoupon.setSupportTransfer(EnumCouponTransfer.NO.getCode()); + wxCoupon.setUpdateDate(new Date()); + wxCouponService.update(wxCoupon); + } } } record.setUpdateDate(new Date()); From 7d2374b9236a57f579575487052006fb8a04cd0c Mon Sep 17 00:00:00 2001 From: hupeng Date: Sat, 3 Aug 2019 18:18:06 +0800 Subject: [PATCH 3/4] =?UTF-8?q?[=E5=8D=A1=E5=88=B8][=E4=BF=AE=E5=A4=8D]:?= =?UTF-8?q?=E4=BC=98=E5=8C=96=E6=8B=BC=E5=9B=A2=E7=BB=9F=E8=AE=A1=E6=95=B0?= =?UTF-8?q?=E6=8D=AE?= MIME-Version: 1.0 Content-Type: text/plain; charset=UTF-8 Content-Transfer-Encoding: 8bit --- .../main/resources/mapper/WxCouponMapper.xml | 2 +- .../resources/mapper/WxOrderGroupMapper.xml | 33 ++++++++++--------- 2 files changed, 19 insertions(+), 16 deletions(-) diff --git a/mallinkService/src/main/resources/mapper/WxCouponMapper.xml b/mallinkService/src/main/resources/mapper/WxCouponMapper.xml index 4ab13d62d..6015c2a50 100644 --- a/mallinkService/src/main/resources/mapper/WxCouponMapper.xml +++ b/mallinkService/src/main/resources/mapper/WxCouponMapper.xml @@ -662,7 +662,7 @@ FROM wx_coupon c left join (SELECT count(id) as press_count, coupon_id FROM wx_order_press WHERE `tenant_id` = #{tenantId} AND `first` = 1 group by coupon_id) op on op.coupon_id = c.id left join (SELECT count(id) as press_succ_count, product_id FROM wx_order WHERE `tenant_id` = #{tenantId} AND order_status = 1 group by product_id) o on o.product_id = c.id - left join (SELECT count(id) as join_count, coupon_id FROM wx_order_press op WHERE `tenant_id` = #{tenantId} group by coupon_id) op2 on op2.coupon_id = c.id + left join (SELECT count(id) as join_count, coupon_id FROM wx_order_press WHERE `tenant_id` = #{tenantId} group by coupon_id) op2 on op2.coupon_id = c.id left join (SELECT count(id) as xCount, coupon_id FROM wx_coupon_order WHERE `tenant_id` = #{tenantId} AND coupon_order_status = 1 group by coupon_id) cop on cop.coupon_id = c.id where c.type = 8 diff --git a/mallinkService/src/main/resources/mapper/WxOrderGroupMapper.xml b/mallinkService/src/main/resources/mapper/WxOrderGroupMapper.xml index 399d90809..31c418868 100644 --- a/mallinkService/src/main/resources/mapper/WxOrderGroupMapper.xml +++ b/mallinkService/src/main/resources/mapper/WxOrderGroupMapper.xml @@ -91,20 +91,23 @@