From 00de62d474fd785336a5b6c2d0e409a59b5bd6df Mon Sep 17 00:00:00 2001 From: furunxin <864795252@qq.com> Date: Wed, 5 Aug 2020 10:44:50 +0800 Subject: [PATCH 1/6] =?UTF-8?q?=E5=90=88=E5=90=8Cbug=E4=BF=AE=E5=A4=8D?= MIME-Version: 1.0 Content-Type: text/plain; charset=UTF-8 Content-Transfer-Encoding: 8bit --- .../src/main/resources/mapper/WxMerchantMapper.xml | 12 +++++++++++- 1 file changed, 11 insertions(+), 1 deletion(-) diff --git a/mallinkService/src/main/resources/mapper/WxMerchantMapper.xml b/mallinkService/src/main/resources/mapper/WxMerchantMapper.xml index 23d11aeae..0feca470f 100644 --- a/mallinkService/src/main/resources/mapper/WxMerchantMapper.xml +++ b/mallinkService/src/main/resources/mapper/WxMerchantMapper.xml @@ -585,5 +585,15 @@ + - +s From dbc5043632e0f4617d739bb9532c00c8d83f57b6 Mon Sep 17 00:00:00 2001 From: furunxin <864795252@qq.com> Date: Wed, 5 Aug 2020 11:11:33 +0800 Subject: [PATCH 2/6] =?UTF-8?q?=E5=90=88=E5=90=8Cbug=E4=BF=AE=E5=A4=8D?= MIME-Version: 1.0 Content-Type: text/plain; charset=UTF-8 Content-Transfer-Encoding: 8bit --- mallinkService/src/main/resources/mapper/WxMerchantMapper.xml | 3 +++ 1 file changed, 3 insertions(+) diff --git a/mallinkService/src/main/resources/mapper/WxMerchantMapper.xml b/mallinkService/src/main/resources/mapper/WxMerchantMapper.xml index 0feca470f..e0834204c 100644 --- a/mallinkService/src/main/resources/mapper/WxMerchantMapper.xml +++ b/mallinkService/src/main/resources/mapper/WxMerchantMapper.xml @@ -214,6 +214,9 @@ and `status` = #{status} + + and `type` = #{type} + order by create_date desc From c32d81981e3445e153bc26e89020015d19080753 Mon Sep 17 00:00:00 2001 From: furunxin <864795252@qq.com> Date: Wed, 5 Aug 2020 11:22:50 +0800 Subject: [PATCH 3/6] =?UTF-8?q?=E5=90=88=E5=90=8C=E7=BB=AD=E7=AD=BE?= MIME-Version: 1.0 Content-Type: text/plain; charset=UTF-8 Content-Transfer-Encoding: 8bit --- mallinkService/src/main/resources/mapper/WxMerchantMapper.xml | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-) diff --git a/mallinkService/src/main/resources/mapper/WxMerchantMapper.xml b/mallinkService/src/main/resources/mapper/WxMerchantMapper.xml index e0834204c..f8882b1bd 100644 --- a/mallinkService/src/main/resources/mapper/WxMerchantMapper.xml +++ b/mallinkService/src/main/resources/mapper/WxMerchantMapper.xml @@ -599,4 +599,4 @@ order by create_date desc -s + From 3b42a2709fd7508bf09fde3c4a8cd4ce0f7a1b59 Mon Sep 17 00:00:00 2001 From: furunxin <864795252@qq.com> Date: Mon, 10 Aug 2020 18:06:46 +0800 Subject: [PATCH 4/6] =?UTF-8?q?=E4=BF=AE=E5=A4=8D=E5=90=88=E5=90=8C?= =?UTF-8?q?=E5=95=86=E6=88=B7=E9=97=AE=E9=A2=98?= MIME-Version: 1.0 Content-Type: text/plain; charset=UTF-8 Content-Transfer-Encoding: 8bit --- .../service/impl/WxMerchantServiceImpl.java | 53 +++++++++---------- 1 file changed, 26 insertions(+), 27 deletions(-) diff --git a/mallinkService/src/main/java/com/iformall/service/impl/WxMerchantServiceImpl.java b/mallinkService/src/main/java/com/iformall/service/impl/WxMerchantServiceImpl.java index 2cac7183e..9180725e4 100644 --- a/mallinkService/src/main/java/com/iformall/service/impl/WxMerchantServiceImpl.java +++ b/mallinkService/src/main/java/com/iformall/service/impl/WxMerchantServiceImpl.java @@ -247,13 +247,10 @@ public class WxMerchantServiceImpl implements WxMerchantService { return; } - if(!wxMerchant.getCarVendorType().equals(EnumCarVendor.CAR_NOTFOUND.getCode())){ + if (!wxMerchant.getCarVendorType().equals(EnumCarVendor.CAR_NOTFOUND.getCode())) { logger.info("不能停用停车商户"); return; } - - wxMerchant.setStatus(EnumMerchantStatus.NOT_VALID.getCode()); - wxMerchantMapper.updateById(wxMerchant); //是否有租赁合同 WxRentContract wxRentContract = new WxRentContract(); wxRentContract.setMerchantId(id); @@ -270,6 +267,8 @@ public class WxMerchantServiceImpl implements WxMerchantService { c.getStatus().equals(EnumRentContractStatus.CONTRACT_END_SOON.getCode())).count(); //解绑商铺-没有租赁合同或物业合同才可以 if (countRentContract == 0 || countPropertyContract == 0) { + wxMerchant.setStatus(EnumMerchantStatus.NOT_VALID.getCode()); + wxMerchantMapper.updateById(wxMerchant); WxMerchantShop wxMerchantShopQuery = new WxMerchantShop(); wxMerchantShopQuery.updateTenantInfo(wxMerchant); wxMerchantShopQuery.setMerchantId(wxMerchant.getId()); @@ -285,30 +284,30 @@ public class WxMerchantServiceImpl implements WxMerchantService { wxShop.setStatus(EnumShopStatus.NOT_RENT.getCode()); wxShopMapper.updateById(wxShop); } + //解绑用户 + WxMerchantBUser bUser = new WxMerchantBUser(); + bUser.setMerchantId(wxMerchant.getId()); + List wxMerchantBUserMapperList = wxMerchantBUserMapper.findList(bUser); + for (WxMerchantBUser wxMerchantBUser : wxMerchantBUserMapperList) { + wxMerchantBUser.setStatus(EnumMerchantBUserStatus.INVALID.getCode()); + wxMerchantBUserMapper.updateById(wxMerchantBUser); + } + //作废卡券 + WxCouponMerchant wxCouponMerchant = new WxCouponMerchant(); + wxCouponMerchant.updateTenantInfo(wxMerchant); + wxCouponMerchant.setMerchantId(wxMerchant.getId()); + wxCouponMerchant.setStatus(EnumCouponMerchantStatus.COUPON_MERCHANT_STATUS_VALID.getCode()); + List wxCouponMerchantList = wxCouponMerchantMapper.findList(wxCouponMerchant); + List couponIds = wxCouponMerchantList.stream().map(cm -> cm.getProductId()).collect(Collectors.toList()); + + couponIds.stream().filter(cid -> !isCouponMerchantValid(cid)).forEach(cid -> { + WxCoupon wxCoupon = new WxCoupon(); + wxCoupon.setId(cid); + wxCoupon.updateTenantInfo(wxMerchant); + wxCoupon.setStatus(EnumCouponStatus.COUPON_STATUS_TAKE_OFFF.getCode()); + wxCouponService.saveOrUpdate(wxCoupon); + }); } - //解绑用户 - WxMerchantBUser bUser = new WxMerchantBUser(); - bUser.setMerchantId(wxMerchant.getId()); - List wxMerchantBUserMapperList = wxMerchantBUserMapper.findList(bUser); - for (WxMerchantBUser wxMerchantBUser : wxMerchantBUserMapperList) { - wxMerchantBUser.setStatus(EnumMerchantBUserStatus.INVALID.getCode()); - wxMerchantBUserMapper.updateById(wxMerchantBUser); - } - //作废卡券 - WxCouponMerchant wxCouponMerchant = new WxCouponMerchant(); - wxCouponMerchant.updateTenantInfo(wxMerchant); - wxCouponMerchant.setMerchantId(wxMerchant.getId()); - wxCouponMerchant.setStatus(EnumCouponMerchantStatus.COUPON_MERCHANT_STATUS_VALID.getCode()); - List wxCouponMerchantList = wxCouponMerchantMapper.findList(wxCouponMerchant); - List couponIds = wxCouponMerchantList.stream().map(cm->cm.getProductId()).collect(Collectors.toList()); - - couponIds.stream().filter(cid->!isCouponMerchantValid(cid)).forEach(cid->{ - WxCoupon wxCoupon = new WxCoupon(); - wxCoupon.setId(cid); - wxCoupon.updateTenantInfo(wxMerchant); - wxCoupon.setStatus(EnumCouponStatus.COUPON_STATUS_TAKE_OFFF.getCode()); - wxCouponService.saveOrUpdate(wxCoupon); - }); } @Transactional(rollbackFor = {Exception.class}) From 66efaeb32092fb62a2eb20dff77c97edf8f3393b Mon Sep 17 00:00:00 2001 From: furunxin <864795252@qq.com> Date: Mon, 10 Aug 2020 18:10:13 +0800 Subject: [PATCH 5/6] =?UTF-8?q?=E5=90=88=E5=90=8C=E7=BB=AD=E7=AD=BE?= MIME-Version: 1.0 Content-Type: text/plain; charset=UTF-8 Content-Transfer-Encoding: 8bit --- .../src/main/java/com/iformall/schedule/ContractSchedule.java | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-) diff --git a/mallinkSchedule/src/main/java/com/iformall/schedule/ContractSchedule.java b/mallinkSchedule/src/main/java/com/iformall/schedule/ContractSchedule.java index bcfac2fca..0f71ecdbd 100644 --- a/mallinkSchedule/src/main/java/com/iformall/schedule/ContractSchedule.java +++ b/mallinkSchedule/src/main/java/com/iformall/schedule/ContractSchedule.java @@ -36,7 +36,7 @@ public class ContractSchedule { /** * 2小时执行一次 */ - @Scheduled(cron = "0 */1 * * * ?") + @Scheduled(cron = "0 0 0/2 * * ?") public void sendMsg() { logger.info("合同状态更新开始"); From 52eda7238921c427864da9a3ae0de8ab2637d078 Mon Sep 17 00:00:00 2001 From: xiaohanzi Date: Mon, 10 Aug 2020 18:27:40 +0800 Subject: [PATCH 6/6] update --- .../src/main/java/com/iformall/schedule/ContractSchedule.java | 4 ++-- .../com/iformall/service/impl/WxRentContractServiceImpl.java | 2 +- 2 files changed, 3 insertions(+), 3 deletions(-) diff --git a/mallinkSchedule/src/main/java/com/iformall/schedule/ContractSchedule.java b/mallinkSchedule/src/main/java/com/iformall/schedule/ContractSchedule.java index 0f71ecdbd..f4b6b2536 100644 --- a/mallinkSchedule/src/main/java/com/iformall/schedule/ContractSchedule.java +++ b/mallinkSchedule/src/main/java/com/iformall/schedule/ContractSchedule.java @@ -34,9 +34,9 @@ public class ContractSchedule { /** - * 2小时执行一次 + * 凌晨5分 */ - @Scheduled(cron = "0 0 0/2 * * ?") + @Scheduled(cron = "0 5 0 * * ?") public void sendMsg() { logger.info("合同状态更新开始"); 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 c56b447ed..6c9df719f 100644 --- a/mallinkService/src/main/java/com/iformall/service/impl/WxRentContractServiceImpl.java +++ b/mallinkService/src/main/java/com/iformall/service/impl/WxRentContractServiceImpl.java @@ -1637,7 +1637,7 @@ public class WxRentContractServiceImpl implements WxRentContractService { WxMerchant merchant = wxMerchantMapper.selectById((Long) merchantId); Integer status = merchant.getStatus(); if (status.equals(EnumMerchantStatus.VALID.getCode())) { - wxMerchantService.disable((Long) merchantId); + //wxMerchantService.disable((Long) merchantId); } } }