From e24d32c024f67dab317e1ef0f477d0447c80e09b Mon Sep 17 00:00:00 2001 From: winter Date: Thu, 1 Aug 2024 20:08:11 +0800 Subject: [PATCH] fix --- .../src/main/java/com/iformall/domain/po/WxBillRent.java | 3 --- .../java/com/iformall/domain/po/base/WxBillBaseEntity.java | 3 +++ .../main/java/com/iformall/mapper/WxBillDailyMapper.java | 2 ++ .../main/java/com/iformall/mapper/WxBillDepositMapper.java | 2 ++ .../java/com/iformall/mapper/WxBillOtherDepositMapper.java | 2 ++ .../main/java/com/iformall/mapper/WxBillOtherMapper.java | 2 ++ .../com/iformall/mapper/WxBillPropertyDepositMapper.java | 2 ++ .../java/com/iformall/mapper/WxBillPropertyMapper.java | 1 + .../java/com/iformall/mapper/WxBillRentManageMapper.java | 1 + .../main/java/com/iformall/mapper/WxBillRentMapper.java | 2 ++ .../com/iformall/service/impl/WxBillDailyServiceImpl.java | 7 +++++++ .../iformall/service/impl/WxBillDepositServiceImpl.java | 6 ++++++ .../service/impl/WxBillOtherDepositServiceImpl.java | 6 ++++++ .../com/iformall/service/impl/WxBillOtherServiceImpl.java | 6 ++++++ .../service/impl/WxBillPropertyDepositServiceImpl.java | 7 +++++++ .../iformall/service/impl/WxBillPropertyServiceImpl.java | 3 +++ .../iformall/service/impl/WxBillRentManageServiceImpl.java | 4 ++++ .../com/iformall/service/impl/WxBillRentServiceImpl.java | 3 +++ .../src/main/resources/mapper/WxBillDailyMapper.xml | 5 +++++ .../src/main/resources/mapper/WxBillDepositMapper.xml | 5 +++++ .../src/main/resources/mapper/WxBillOtherDepositMapper.xml | 5 +++++ .../src/main/resources/mapper/WxBillOtherMapper.xml | 6 +++++- .../main/resources/mapper/WxBillPropertyDepositMapper.xml | 5 +++++ .../src/main/resources/mapper/WxBillPropertyMapper.xml | 5 +++++ .../src/main/resources/mapper/WxBillRentManageMapper.xml | 5 +++++ .../src/main/resources/mapper/WxBillRentMapper.xml | 5 +++++ 26 files changed, 99 insertions(+), 4 deletions(-) diff --git a/mallinkService/src/main/java/com/iformall/domain/po/WxBillRent.java b/mallinkService/src/main/java/com/iformall/domain/po/WxBillRent.java index 9fdcfaefd..8157fccfa 100644 --- a/mallinkService/src/main/java/com/iformall/domain/po/WxBillRent.java +++ b/mallinkService/src/main/java/com/iformall/domain/po/WxBillRent.java @@ -213,7 +213,4 @@ public class WxBillRent extends WxBillBaseEntity { this.totalFee = new BigDecimal(this.receivePay).add(new BigDecimal(bussinessManageFeeNeedPay)).add(new BigDecimal(operatingManageFeeNeedPay)) .setScale(decimalSize, RoundingMode.HALF_UP).toPlainString(); } - - - } diff --git a/mallinkService/src/main/java/com/iformall/domain/po/base/WxBillBaseEntity.java b/mallinkService/src/main/java/com/iformall/domain/po/base/WxBillBaseEntity.java index d4f93bd45..3defa46a1 100644 --- a/mallinkService/src/main/java/com/iformall/domain/po/base/WxBillBaseEntity.java +++ b/mallinkService/src/main/java/com/iformall/domain/po/base/WxBillBaseEntity.java @@ -224,4 +224,7 @@ public class WxBillBaseEntity extends TenantEntity { @TableField(exist = false) private String currentReceive; + @TableField(exist = false) + private Date shopEndtime; + } diff --git a/mallinkService/src/main/java/com/iformall/mapper/WxBillDailyMapper.java b/mallinkService/src/main/java/com/iformall/mapper/WxBillDailyMapper.java index 78fb33d79..6340bd1b2 100644 --- a/mallinkService/src/main/java/com/iformall/mapper/WxBillDailyMapper.java +++ b/mallinkService/src/main/java/com/iformall/mapper/WxBillDailyMapper.java @@ -39,5 +39,7 @@ public interface WxBillDailyMapper extends CommonMapper { void insertBills(@Param("tenantId")String tenantId, @Param("list")List resultList); void deleteEnergyReadingBills(@Param("energyReadingCalcuteId")Long energyReadingCalcuteId,@Param("tenantId")String tenantId); + + void deleteNoNeedPayBill(WxBillDaily wxBillRent); } diff --git a/mallinkService/src/main/java/com/iformall/mapper/WxBillDepositMapper.java b/mallinkService/src/main/java/com/iformall/mapper/WxBillDepositMapper.java index 66c35e349..4a8f1db49 100644 --- a/mallinkService/src/main/java/com/iformall/mapper/WxBillDepositMapper.java +++ b/mallinkService/src/main/java/com/iformall/mapper/WxBillDepositMapper.java @@ -48,5 +48,7 @@ public interface WxBillDepositMapper extends CommonMapper { void deleteById(@Param("id")Long id,@Param("tenantId")String tenantId); void insertBills(@Param("tenantId")String tenantId, @Param("list") List resultList); + + void deleteNoNeedPayBill(WxBillDeposit wxBillRent); } diff --git a/mallinkService/src/main/java/com/iformall/mapper/WxBillOtherDepositMapper.java b/mallinkService/src/main/java/com/iformall/mapper/WxBillOtherDepositMapper.java index fc7494647..58831e2d3 100644 --- a/mallinkService/src/main/java/com/iformall/mapper/WxBillOtherDepositMapper.java +++ b/mallinkService/src/main/java/com/iformall/mapper/WxBillOtherDepositMapper.java @@ -36,4 +36,6 @@ public interface WxBillOtherDepositMapper extends CommonMapper { WxBillOther selectById(@Param("id")Long id,@Param("tenantId")String tenantId); void deleteById(@Param("id")Long id,@Param("tenantId")String tenantId); + + void deleteNoNeedPayBill(WxBillOther wxBillRent); } diff --git a/mallinkService/src/main/java/com/iformall/mapper/WxBillPropertyDepositMapper.java b/mallinkService/src/main/java/com/iformall/mapper/WxBillPropertyDepositMapper.java index 5f55bad8a..8f00b67c9 100644 --- a/mallinkService/src/main/java/com/iformall/mapper/WxBillPropertyDepositMapper.java +++ b/mallinkService/src/main/java/com/iformall/mapper/WxBillPropertyDepositMapper.java @@ -43,4 +43,6 @@ public interface WxBillPropertyDepositMapper extends CommonMapper void deleteBillByContract(WxPropertyContract wxPropertyContract); void deletePreviewBill(WxBillProperty wxBillProperty); + void deleteNoNeedPayBill(WxBillProperty wxBillProperty); void updateForReceivePay(WxBillProperty record); diff --git a/mallinkService/src/main/java/com/iformall/mapper/WxBillRentManageMapper.java b/mallinkService/src/main/java/com/iformall/mapper/WxBillRentManageMapper.java index 29e47df5d..4adace40f 100644 --- a/mallinkService/src/main/java/com/iformall/mapper/WxBillRentManageMapper.java +++ b/mallinkService/src/main/java/com/iformall/mapper/WxBillRentManageMapper.java @@ -31,6 +31,7 @@ public interface WxBillRentManageMapper extends CommonMapper params); void deletePreviewBill(WxBillRentManage wxBillRentManage); + void deleteNoNeedPayBill(WxBillRentManage wxBillRentManage); long oweBillCount(@Param("contractId") Long contractId); diff --git a/mallinkService/src/main/java/com/iformall/mapper/WxBillRentMapper.java b/mallinkService/src/main/java/com/iformall/mapper/WxBillRentMapper.java index c5f3ca65f..1e9bd100b 100644 --- a/mallinkService/src/main/java/com/iformall/mapper/WxBillRentMapper.java +++ b/mallinkService/src/main/java/com/iformall/mapper/WxBillRentMapper.java @@ -39,6 +39,8 @@ public interface WxBillRentMapper extends CommonMapper { void deleteBillByContract(WxRentContract wxRentContract); void deletePreviewBill(WxBillRent wxBillRent); + void deleteNoNeedPayBill(WxBillRent wxBillRent); + void updateForReceiverPay(WxBillRent record); diff --git a/mallinkService/src/main/java/com/iformall/service/impl/WxBillDailyServiceImpl.java b/mallinkService/src/main/java/com/iformall/service/impl/WxBillDailyServiceImpl.java index be6d9d978..4436958c7 100644 --- a/mallinkService/src/main/java/com/iformall/service/impl/WxBillDailyServiceImpl.java +++ b/mallinkService/src/main/java/com/iformall/service/impl/WxBillDailyServiceImpl.java @@ -685,6 +685,13 @@ public class WxBillDailyServiceImpl extends WxBillBaseService implements WxBillD @Override public void stopMerchantBills(WxMerchant wxMerchant, MallUserInfo userInfo) { + WxBillDaily ddel = new WxBillDaily(); + ddel.setMerchantId(wxMerchant.getId()); + ddel.updateTenantInfo(wxMerchant); + ddel.setShopEndtime(new Date()); + wxBillDailyMapper.deleteNoNeedPayBill(ddel); + + WxBillDaily wxBillRent = new WxBillDaily(); wxBillRent.setMerchantId(wxMerchant.getId()); wxBillRent.updateTenantInfo(wxMerchant); diff --git a/mallinkService/src/main/java/com/iformall/service/impl/WxBillDepositServiceImpl.java b/mallinkService/src/main/java/com/iformall/service/impl/WxBillDepositServiceImpl.java index e92aecc32..bf4ae3004 100644 --- a/mallinkService/src/main/java/com/iformall/service/impl/WxBillDepositServiceImpl.java +++ b/mallinkService/src/main/java/com/iformall/service/impl/WxBillDepositServiceImpl.java @@ -622,6 +622,12 @@ public class WxBillDepositServiceImpl extends WxBillBaseService implements WxBil @Override public void rentContractStop(WxRentContract rentContract, MallUserInfo user) { + WxBillDeposit brDel = new WxBillDeposit(); + brDel.setRentContractId(rentContract.getId()); + brDel.updateTenantInfo(rentContract); + brDel.setShopEndtime(rentContract.getEndContractTime()); + wxBillDepositMapper.deleteNoNeedPayBill(brDel);; + WxBillDeposit br = new WxBillDeposit(); br.setRentContractId(rentContract.getId()); br.updateTenantInfo(rentContract); diff --git a/mallinkService/src/main/java/com/iformall/service/impl/WxBillOtherDepositServiceImpl.java b/mallinkService/src/main/java/com/iformall/service/impl/WxBillOtherDepositServiceImpl.java index 9363804ce..3124e592f 100644 --- a/mallinkService/src/main/java/com/iformall/service/impl/WxBillOtherDepositServiceImpl.java +++ b/mallinkService/src/main/java/com/iformall/service/impl/WxBillOtherDepositServiceImpl.java @@ -637,6 +637,12 @@ public class WxBillOtherDepositServiceImpl extends WxBillBaseService implements @Override public void stopMerchantBills(WxMerchant wxMerchant, MallUserInfo userInfo) { + WxBillOtherDeposit bdel = new WxBillOtherDeposit(); + bdel.setMerchantId(wxMerchant.getId()); + bdel.updateTenantInfo(wxMerchant); + bdel.setShopEndtime(new Date()); + wxBillOtherDepositMapper.deleteNoNeedPayBill(bdel); + WxBillOtherDeposit wxBillRent = new WxBillOtherDeposit(); wxBillRent.setMerchantId(wxMerchant.getId()); wxBillRent.updateTenantInfo(wxMerchant); diff --git a/mallinkService/src/main/java/com/iformall/service/impl/WxBillOtherServiceImpl.java b/mallinkService/src/main/java/com/iformall/service/impl/WxBillOtherServiceImpl.java index 6b1e2cb91..1f2fa7c78 100644 --- a/mallinkService/src/main/java/com/iformall/service/impl/WxBillOtherServiceImpl.java +++ b/mallinkService/src/main/java/com/iformall/service/impl/WxBillOtherServiceImpl.java @@ -561,6 +561,12 @@ public class WxBillOtherServiceImpl extends WxBillBaseService implements WxBillO @Override public void stopMerchantBills(WxMerchant wxMerchant, MallUserInfo userInfo) { + WxBillOther bdel = new WxBillOther(); + bdel.setMerchantId(wxMerchant.getId()); + bdel.updateTenantInfo(wxMerchant); + bdel.setShopEndtime(new Date()); + wxBillOtherMapper.deleteNoNeedPayBill(bdel); + WxBillOther wxBillRent = new WxBillOther(); wxBillRent.setMerchantId(wxMerchant.getId()); wxBillRent.updateTenantInfo(wxMerchant); diff --git a/mallinkService/src/main/java/com/iformall/service/impl/WxBillPropertyDepositServiceImpl.java b/mallinkService/src/main/java/com/iformall/service/impl/WxBillPropertyDepositServiceImpl.java index 3be2b1979..c2a307da7 100644 --- a/mallinkService/src/main/java/com/iformall/service/impl/WxBillPropertyDepositServiceImpl.java +++ b/mallinkService/src/main/java/com/iformall/service/impl/WxBillPropertyDepositServiceImpl.java @@ -611,6 +611,13 @@ public class WxBillPropertyDepositServiceImpl extends WxBillBaseService implemen @Override public void propertyContractStop(WxPropertyContract propertyContract, MallUserInfo user) { + WxBillPropertyDeposit brDel = new WxBillPropertyDeposit(); + brDel.setPropertyContractId(propertyContract.getId()); + brDel.updateTenantInfo(propertyContract); + brDel.setShopEndtime(propertyContract.getEndContractTime()); + wxBillPropertyDepositMapper.deleteNoNeedPayBill(brDel); + + WxBillPropertyDeposit br = new WxBillPropertyDeposit(); br.setPropertyContractId(propertyContract.getId()); br.updateTenantInfo(propertyContract); diff --git a/mallinkService/src/main/java/com/iformall/service/impl/WxBillPropertyServiceImpl.java b/mallinkService/src/main/java/com/iformall/service/impl/WxBillPropertyServiceImpl.java index 1a5dd61c2..c342970f3 100644 --- a/mallinkService/src/main/java/com/iformall/service/impl/WxBillPropertyServiceImpl.java +++ b/mallinkService/src/main/java/com/iformall/service/impl/WxBillPropertyServiceImpl.java @@ -731,6 +731,9 @@ public class WxBillPropertyServiceImpl extends WxBillBaseService implements WxBi brDel.updateTenantInfo(propertyContract); wxBillPropertyMapper.deletePreviewBill(brDel); + brDel.setShopEndtime(propertyContract.getEndContractTime()); + wxBillPropertyMapper.deleteNoNeedPayBill(brDel); + WxBillProperty br = new WxBillProperty(); br.setPropertyContractId(propertyContract.getId()); br.setIsPreview(EnumYesOrNo.NO.getCode()); diff --git a/mallinkService/src/main/java/com/iformall/service/impl/WxBillRentManageServiceImpl.java b/mallinkService/src/main/java/com/iformall/service/impl/WxBillRentManageServiceImpl.java index 73ec2a71d..a265fc8c3 100644 --- a/mallinkService/src/main/java/com/iformall/service/impl/WxBillRentManageServiceImpl.java +++ b/mallinkService/src/main/java/com/iformall/service/impl/WxBillRentManageServiceImpl.java @@ -645,6 +645,10 @@ public class WxBillRentManageServiceImpl extends WxBillBaseService implements W brDel.setIsPreview(EnumIsPreview.YES.getCode()); wxBillRentManageMapper.deletePreviewBill(brDel); + brDel.setShopEndtime(rentContract.getEndContractTime()); + wxBillRentManageMapper.deleteNoNeedPayBill(brDel); + + WxBillRentManage br = new WxBillRentManage(); br.setRentContractId(rentContract.getId()); br.updateTenantInfo(rentContract); diff --git a/mallinkService/src/main/java/com/iformall/service/impl/WxBillRentServiceImpl.java b/mallinkService/src/main/java/com/iformall/service/impl/WxBillRentServiceImpl.java index 9da8f4797..c96555e65 100644 --- a/mallinkService/src/main/java/com/iformall/service/impl/WxBillRentServiceImpl.java +++ b/mallinkService/src/main/java/com/iformall/service/impl/WxBillRentServiceImpl.java @@ -838,6 +838,9 @@ public class WxBillRentServiceImpl extends WxBillBaseService implements WxBillRe brDel.updateTenantInfo(rentContract); brDel.setIsPreview(EnumYesOrNo.YES.getCode()); wxBillRentMapper.deletePreviewBill(brDel); + //删除还未到期的账单 + brDel.setShopEndtime(rentContract.getEndContractTime()); + wxBillRentMapper.deleteNoNeedPayBill(brDel); WxBillRent br = new WxBillRent(); br.setRentContractId(rentContract.getId()); diff --git a/mallinkService/src/main/resources/mapper/WxBillDailyMapper.xml b/mallinkService/src/main/resources/mapper/WxBillDailyMapper.xml index 4595df849..2dece8cf0 100644 --- a/mallinkService/src/main/resources/mapper/WxBillDailyMapper.xml +++ b/mallinkService/src/main/resources/mapper/WxBillDailyMapper.xml @@ -283,4 +283,9 @@ delete from wx_bill_daily where energy_reading_calcuteId = #{energyReadingCalcuteId} and tenant_id = #{tenantId} and status = 2 and pay <= 0 and IFNULL(`set_off`,'0') <= 0 + + delete from wx_bill_daily where merchant_id = #{merchantId} and status = 2 + and starttime > #{shopEndtime} and IFNULL(`pay`,'0') <= 0 AND IFNULL(`set_off`,'0') <= 0 + + diff --git a/mallinkService/src/main/resources/mapper/WxBillDepositMapper.xml b/mallinkService/src/main/resources/mapper/WxBillDepositMapper.xml index 85dfd9705..29e2b93a6 100644 --- a/mallinkService/src/main/resources/mapper/WxBillDepositMapper.xml +++ b/mallinkService/src/main/resources/mapper/WxBillDepositMapper.xml @@ -384,6 +384,11 @@ ) + + + delete from wx_bill_rent_deposit where rent_contract_id = #{rentContractId} and status = 2 + and starttime > #{shopEndtime} and IFNULL(`pay`,'0') <= 0 AND IFNULL(`set_off`,'0') <= 0 AND IFNULL(`return_price`,'0') <= 0 + diff --git a/mallinkService/src/main/resources/mapper/WxBillOtherDepositMapper.xml b/mallinkService/src/main/resources/mapper/WxBillOtherDepositMapper.xml index 8b5de2c4b..9413857ea 100644 --- a/mallinkService/src/main/resources/mapper/WxBillOtherDepositMapper.xml +++ b/mallinkService/src/main/resources/mapper/WxBillOtherDepositMapper.xml @@ -261,6 +261,11 @@ delete from wx_bill_other_deposit where id = #{id} and tenant_id = #{tenantId} + + + delete from wx_bill_other_deposit where merchant_id = #{merchantId} and status = 2 + and starttime > #{shopEndtime} and IFNULL(`pay`,'0') <= 0 AND IFNULL(`set_off`,'0') <= 0 AND IFNULL(`return_price`,'0') <= 0 + diff --git a/mallinkService/src/main/resources/mapper/WxBillOtherMapper.xml b/mallinkService/src/main/resources/mapper/WxBillOtherMapper.xml index 129460d0b..e6bb93079 100644 --- a/mallinkService/src/main/resources/mapper/WxBillOtherMapper.xml +++ b/mallinkService/src/main/resources/mapper/WxBillOtherMapper.xml @@ -304,6 +304,10 @@ delete from wx_bill_other where id = #{id} and tenant_id = #{tenantId} - + + + delete from wx_bill_other where merchant_id = #{merchantId} and status = 2 + and starttime > #{shopEndtime} and IFNULL(`pay`,'0') <= 0 AND IFNULL(`set_off`,'0') <= 0 + diff --git a/mallinkService/src/main/resources/mapper/WxBillPropertyDepositMapper.xml b/mallinkService/src/main/resources/mapper/WxBillPropertyDepositMapper.xml index 2d3c4eb4f..7a5fef33c 100644 --- a/mallinkService/src/main/resources/mapper/WxBillPropertyDepositMapper.xml +++ b/mallinkService/src/main/resources/mapper/WxBillPropertyDepositMapper.xml @@ -272,4 +272,9 @@ delete from wx_bill_property_deposit where id = #{id} and tenant_id = #{tenantId} + + delete from wx_bill_property_deposit where property_contract_id = #{propertyContractId} and status = 2 + and starttime > #{shopEndtime} and IFNULL(`pay`,'0') <= 0 AND IFNULL(`set_off`,'0') <= 0 AND IFNULL(`return_price`,'0') <= 0 + + diff --git a/mallinkService/src/main/resources/mapper/WxBillPropertyMapper.xml b/mallinkService/src/main/resources/mapper/WxBillPropertyMapper.xml index 9a5710370..e0af46074 100644 --- a/mallinkService/src/main/resources/mapper/WxBillPropertyMapper.xml +++ b/mallinkService/src/main/resources/mapper/WxBillPropertyMapper.xml @@ -363,6 +363,11 @@ delete from wx_bill_property where property_contract_id = #{propertyContractId} and is_preview = #{isPreview} + + + delete from wx_bill_property where property_contract_id = #{propertyContractId} and is_preview = 0 and status = 2 + and starttime > #{shopEndtime} and IFNULL(`pay`,'0') <= 0 AND IFNULL(`set_off`,'0') <= 0 + update wx_bill_property set updatetime = now() diff --git a/mallinkService/src/main/resources/mapper/WxBillRentManageMapper.xml b/mallinkService/src/main/resources/mapper/WxBillRentManageMapper.xml index c3c63d7d6..bafd2815c 100644 --- a/mallinkService/src/main/resources/mapper/WxBillRentManageMapper.xml +++ b/mallinkService/src/main/resources/mapper/WxBillRentManageMapper.xml @@ -295,6 +295,11 @@ delete from wx_bill_rent_manage where rent_contract_id = #{rentContractId} and manage_fee_type = #{manageFeeType} and `is_preview` = #{isPreview} + + + delete from wx_bill_rent_manage where rent_contract_id = #{rentContractId} and is_preview = 0 and status = 2 + and starttime > #{shopEndtime} and IFNULL(`pay`,'0') <= 0 AND IFNULL(`set_off`,'0') <= 0 +