| @@ -213,7 +213,4 @@ public class WxBillRent extends WxBillBaseEntity { | |||||
| this.totalFee = new BigDecimal(this.receivePay).add(new BigDecimal(bussinessManageFeeNeedPay)).add(new BigDecimal(operatingManageFeeNeedPay)) | this.totalFee = new BigDecimal(this.receivePay).add(new BigDecimal(bussinessManageFeeNeedPay)).add(new BigDecimal(operatingManageFeeNeedPay)) | ||||
| .setScale(decimalSize, RoundingMode.HALF_UP).toPlainString(); | .setScale(decimalSize, RoundingMode.HALF_UP).toPlainString(); | ||||
| } | } | ||||
| } | } | ||||
| @@ -224,4 +224,7 @@ public class WxBillBaseEntity extends TenantEntity { | |||||
| @TableField(exist = false) | @TableField(exist = false) | ||||
| private String currentReceive; | private String currentReceive; | ||||
| @TableField(exist = false) | |||||
| private Date shopEndtime; | |||||
| } | } | ||||
| @@ -39,5 +39,7 @@ public interface WxBillDailyMapper extends CommonMapper<WxBillDaily, Long> { | |||||
| void insertBills(@Param("tenantId")String tenantId, @Param("list")List<WxBillDaily> resultList); | void insertBills(@Param("tenantId")String tenantId, @Param("list")List<WxBillDaily> resultList); | ||||
| void deleteEnergyReadingBills(@Param("energyReadingCalcuteId")Long energyReadingCalcuteId,@Param("tenantId")String tenantId); | void deleteEnergyReadingBills(@Param("energyReadingCalcuteId")Long energyReadingCalcuteId,@Param("tenantId")String tenantId); | ||||
| void deleteNoNeedPayBill(WxBillDaily wxBillRent); | |||||
| } | } | ||||
| @@ -48,5 +48,7 @@ public interface WxBillDepositMapper extends CommonMapper<WxBillDeposit, Long> { | |||||
| void deleteById(@Param("id")Long id,@Param("tenantId")String tenantId); | void deleteById(@Param("id")Long id,@Param("tenantId")String tenantId); | ||||
| void insertBills(@Param("tenantId")String tenantId, @Param("list") List<WxBillDeposit> resultList); | void insertBills(@Param("tenantId")String tenantId, @Param("list") List<WxBillDeposit> resultList); | ||||
| void deleteNoNeedPayBill(WxBillDeposit wxBillRent); | |||||
| } | } | ||||
| @@ -36,4 +36,6 @@ public interface WxBillOtherDepositMapper extends CommonMapper<WxBillOtherDeposi | |||||
| WxBillOtherDeposit selectById(@Param("id")Long id,@Param("tenantId")String tenantId); | WxBillOtherDeposit selectById(@Param("id")Long id,@Param("tenantId")String tenantId); | ||||
| void deleteById(@Param("id")Long id,@Param("tenantId")String tenantId); | void deleteById(@Param("id")Long id,@Param("tenantId")String tenantId); | ||||
| void deleteNoNeedPayBill(WxBillOtherDeposit wxBillRent); | |||||
| } | } | ||||
| @@ -40,4 +40,6 @@ public interface WxBillOtherMapper extends CommonMapper<WxBillOther, Long> { | |||||
| WxBillOther selectById(@Param("id")Long id,@Param("tenantId")String tenantId); | WxBillOther selectById(@Param("id")Long id,@Param("tenantId")String tenantId); | ||||
| void deleteById(@Param("id")Long id,@Param("tenantId")String tenantId); | void deleteById(@Param("id")Long id,@Param("tenantId")String tenantId); | ||||
| void deleteNoNeedPayBill(WxBillOther wxBillRent); | |||||
| } | } | ||||
| @@ -43,4 +43,6 @@ public interface WxBillPropertyDepositMapper extends CommonMapper<WxBillProperty | |||||
| WxBillPropertyDeposit selectById(@Param("id")Long id,@Param("tenantId")String tenantId); | WxBillPropertyDeposit selectById(@Param("id")Long id,@Param("tenantId")String tenantId); | ||||
| void deleteById(@Param("id")Long id,@Param("tenantId")String tenantId); | void deleteById(@Param("id")Long id,@Param("tenantId")String tenantId); | ||||
| void deleteNoNeedPayBill(WxBillPropertyDeposit wxBillRent); | |||||
| } | } | ||||
| @@ -44,6 +44,7 @@ public interface WxBillPropertyMapper extends CommonMapper<WxBillProperty, Long> | |||||
| void deleteBillByContract(WxPropertyContract wxPropertyContract); | void deleteBillByContract(WxPropertyContract wxPropertyContract); | ||||
| void deletePreviewBill(WxBillProperty wxBillProperty); | void deletePreviewBill(WxBillProperty wxBillProperty); | ||||
| void deleteNoNeedPayBill(WxBillProperty wxBillProperty); | |||||
| void updateForReceivePay(WxBillProperty record); | void updateForReceivePay(WxBillProperty record); | ||||
| @@ -31,6 +31,7 @@ public interface WxBillRentManageMapper extends CommonMapper<WxBillRentManage, L | |||||
| void updateWaitPayStatus(Map<String,Object> params); | void updateWaitPayStatus(Map<String,Object> params); | ||||
| void deletePreviewBill(WxBillRentManage wxBillRentManage); | void deletePreviewBill(WxBillRentManage wxBillRentManage); | ||||
| void deleteNoNeedPayBill(WxBillRentManage wxBillRentManage); | |||||
| long oweBillCount(@Param("contractId") Long contractId); | long oweBillCount(@Param("contractId") Long contractId); | ||||
| @@ -39,6 +39,8 @@ public interface WxBillRentMapper extends CommonMapper<WxBillRent, Long> { | |||||
| void deleteBillByContract(WxRentContract wxRentContract); | void deleteBillByContract(WxRentContract wxRentContract); | ||||
| void deletePreviewBill(WxBillRent wxBillRent); | void deletePreviewBill(WxBillRent wxBillRent); | ||||
| void deleteNoNeedPayBill(WxBillRent wxBillRent); | |||||
| void updateForReceiverPay(WxBillRent record); | void updateForReceiverPay(WxBillRent record); | ||||
| @@ -685,6 +685,13 @@ public class WxBillDailyServiceImpl extends WxBillBaseService implements WxBillD | |||||
| @Override | @Override | ||||
| public void stopMerchantBills(WxMerchant wxMerchant, MallUserInfo userInfo) { | 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(); | WxBillDaily wxBillRent = new WxBillDaily(); | ||||
| wxBillRent.setMerchantId(wxMerchant.getId()); | wxBillRent.setMerchantId(wxMerchant.getId()); | ||||
| wxBillRent.updateTenantInfo(wxMerchant); | wxBillRent.updateTenantInfo(wxMerchant); | ||||
| @@ -622,6 +622,12 @@ public class WxBillDepositServiceImpl extends WxBillBaseService implements WxBil | |||||
| @Override | @Override | ||||
| public void rentContractStop(WxRentContract rentContract, MallUserInfo user) { | 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(); | WxBillDeposit br = new WxBillDeposit(); | ||||
| br.setRentContractId(rentContract.getId()); | br.setRentContractId(rentContract.getId()); | ||||
| br.updateTenantInfo(rentContract); | br.updateTenantInfo(rentContract); | ||||
| @@ -637,6 +637,12 @@ public class WxBillOtherDepositServiceImpl extends WxBillBaseService implements | |||||
| @Override | @Override | ||||
| public void stopMerchantBills(WxMerchant wxMerchant, MallUserInfo userInfo) { | 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(); | WxBillOtherDeposit wxBillRent = new WxBillOtherDeposit(); | ||||
| wxBillRent.setMerchantId(wxMerchant.getId()); | wxBillRent.setMerchantId(wxMerchant.getId()); | ||||
| wxBillRent.updateTenantInfo(wxMerchant); | wxBillRent.updateTenantInfo(wxMerchant); | ||||
| @@ -561,6 +561,12 @@ public class WxBillOtherServiceImpl extends WxBillBaseService implements WxBillO | |||||
| @Override | @Override | ||||
| public void stopMerchantBills(WxMerchant wxMerchant, MallUserInfo userInfo) { | 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(); | WxBillOther wxBillRent = new WxBillOther(); | ||||
| wxBillRent.setMerchantId(wxMerchant.getId()); | wxBillRent.setMerchantId(wxMerchant.getId()); | ||||
| wxBillRent.updateTenantInfo(wxMerchant); | wxBillRent.updateTenantInfo(wxMerchant); | ||||
| @@ -611,6 +611,13 @@ public class WxBillPropertyDepositServiceImpl extends WxBillBaseService implemen | |||||
| @Override | @Override | ||||
| public void propertyContractStop(WxPropertyContract propertyContract, MallUserInfo user) { | 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(); | WxBillPropertyDeposit br = new WxBillPropertyDeposit(); | ||||
| br.setPropertyContractId(propertyContract.getId()); | br.setPropertyContractId(propertyContract.getId()); | ||||
| br.updateTenantInfo(propertyContract); | br.updateTenantInfo(propertyContract); | ||||
| @@ -731,6 +731,9 @@ public class WxBillPropertyServiceImpl extends WxBillBaseService implements WxBi | |||||
| brDel.updateTenantInfo(propertyContract); | brDel.updateTenantInfo(propertyContract); | ||||
| wxBillPropertyMapper.deletePreviewBill(brDel); | wxBillPropertyMapper.deletePreviewBill(brDel); | ||||
| brDel.setShopEndtime(propertyContract.getEndContractTime()); | |||||
| wxBillPropertyMapper.deleteNoNeedPayBill(brDel); | |||||
| WxBillProperty br = new WxBillProperty(); | WxBillProperty br = new WxBillProperty(); | ||||
| br.setPropertyContractId(propertyContract.getId()); | br.setPropertyContractId(propertyContract.getId()); | ||||
| br.setIsPreview(EnumYesOrNo.NO.getCode()); | br.setIsPreview(EnumYesOrNo.NO.getCode()); | ||||
| @@ -645,6 +645,10 @@ public class WxBillRentManageServiceImpl extends WxBillBaseService implements W | |||||
| brDel.setIsPreview(EnumIsPreview.YES.getCode()); | brDel.setIsPreview(EnumIsPreview.YES.getCode()); | ||||
| wxBillRentManageMapper.deletePreviewBill(brDel); | wxBillRentManageMapper.deletePreviewBill(brDel); | ||||
| brDel.setShopEndtime(rentContract.getEndContractTime()); | |||||
| wxBillRentManageMapper.deleteNoNeedPayBill(brDel); | |||||
| WxBillRentManage br = new WxBillRentManage(); | WxBillRentManage br = new WxBillRentManage(); | ||||
| br.setRentContractId(rentContract.getId()); | br.setRentContractId(rentContract.getId()); | ||||
| br.updateTenantInfo(rentContract); | br.updateTenantInfo(rentContract); | ||||
| @@ -838,6 +838,9 @@ public class WxBillRentServiceImpl extends WxBillBaseService implements WxBillRe | |||||
| brDel.updateTenantInfo(rentContract); | brDel.updateTenantInfo(rentContract); | ||||
| brDel.setIsPreview(EnumYesOrNo.YES.getCode()); | brDel.setIsPreview(EnumYesOrNo.YES.getCode()); | ||||
| wxBillRentMapper.deletePreviewBill(brDel); | wxBillRentMapper.deletePreviewBill(brDel); | ||||
| //删除还未到期的账单 | |||||
| brDel.setShopEndtime(rentContract.getEndContractTime()); | |||||
| wxBillRentMapper.deleteNoNeedPayBill(brDel); | |||||
| WxBillRent br = new WxBillRent(); | WxBillRent br = new WxBillRent(); | ||||
| br.setRentContractId(rentContract.getId()); | br.setRentContractId(rentContract.getId()); | ||||
| @@ -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 energy_reading_calcuteId = #{energyReadingCalcuteId} and tenant_id = #{tenantId} and status = 2 and pay <= 0 and IFNULL(`set_off`,'0') <= 0 | ||||
| </delete> | </delete> | ||||
| <delete id="deleteNoNeedPayBill" parameterType="com.iformall.domain.po.WxBillDaily"> | |||||
| 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 | |||||
| </delete> | |||||
| </mapper> | </mapper> | ||||
| @@ -384,6 +384,11 @@ | |||||
| ) | ) | ||||
| </foreach> | </foreach> | ||||
| </insert> | </insert> | ||||
| <delete id="deleteNoNeedPayBill" parameterType="com.iformall.domain.po.WxBillDeposit"> | |||||
| 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 | |||||
| </delete> | |||||
| </mapper> | </mapper> | ||||
| @@ -261,6 +261,11 @@ | |||||
| <delete id = "deleteById" parameterType="HashMap"> | <delete id = "deleteById" parameterType="HashMap"> | ||||
| delete from wx_bill_other_deposit where id = #{id} and tenant_id = #{tenantId} | delete from wx_bill_other_deposit where id = #{id} and tenant_id = #{tenantId} | ||||
| </delete> | </delete> | ||||
| <delete id="deleteNoNeedPayBill" parameterType="com.iformall.domain.po.WxBillOtherDeposit"> | |||||
| 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 | |||||
| </delete> | |||||
| </mapper> | </mapper> | ||||
| @@ -304,6 +304,10 @@ | |||||
| <delete id = "deleteById" parameterType="HashMap"> | <delete id = "deleteById" parameterType="HashMap"> | ||||
| delete from wx_bill_other where id = #{id} and tenant_id = #{tenantId} | delete from wx_bill_other where id = #{id} and tenant_id = #{tenantId} | ||||
| </delete> | </delete> | ||||
| <delete id="deleteNoNeedPayBill" parameterType="com.iformall.domain.po.WxBillOther"> | |||||
| 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 | |||||
| </delete> | |||||
| </mapper> | </mapper> | ||||
| @@ -272,4 +272,9 @@ | |||||
| delete from wx_bill_property_deposit where id = #{id} and tenant_id = #{tenantId} | delete from wx_bill_property_deposit where id = #{id} and tenant_id = #{tenantId} | ||||
| </delete> | </delete> | ||||
| <delete id="deleteNoNeedPayBill" parameterType="com.iformall.domain.po.WxBillPropertyDeposit"> | |||||
| 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 | |||||
| </delete> | |||||
| </mapper> | </mapper> | ||||
| @@ -363,6 +363,11 @@ | |||||
| delete from wx_bill_property where property_contract_id = #{propertyContractId} | delete from wx_bill_property where property_contract_id = #{propertyContractId} | ||||
| <if test=" null != isPreview "> and is_preview = #{isPreview}</if> | <if test=" null != isPreview "> and is_preview = #{isPreview}</if> | ||||
| </delete> | </delete> | ||||
| <delete id="deleteNoNeedPayBill" parameterType="com.iformall.domain.po.WxBillProperty"> | |||||
| 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 | |||||
| </delete> | |||||
| <update id="updateForReceivePay" parameterType="com.iformall.domain.po.WxBillProperty"> | <update id="updateForReceivePay" parameterType="com.iformall.domain.po.WxBillProperty"> | ||||
| update wx_bill_property set updatetime = now() | update wx_bill_property set updatetime = now() | ||||
| @@ -295,6 +295,11 @@ | |||||
| delete from wx_bill_rent_manage where rent_contract_id = #{rentContractId} and manage_fee_type = #{manageFeeType} | delete from wx_bill_rent_manage where rent_contract_id = #{rentContractId} and manage_fee_type = #{manageFeeType} | ||||
| <if test=" null != isPreview ">and `is_preview` = #{isPreview}</if> | <if test=" null != isPreview ">and `is_preview` = #{isPreview}</if> | ||||
| </delete> | </delete> | ||||
| <delete id="deleteNoNeedPayBill" parameterType="com.iformall.domain.po.WxBillRentManage"> | |||||
| 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 | |||||
| </delete> | |||||
| <select id="oweBillCount" parameterType="java.lang.Long" resultType="java.lang.Long"> | <select id="oweBillCount" parameterType="java.lang.Long" resultType="java.lang.Long"> | ||||
| select count(br.id) from wx_bill_rent_manage br,wx_rent_contract c where c.id = br.rent_contract_id | select count(br.id) from wx_bill_rent_manage br,wx_rent_contract c where c.id = br.rent_contract_id | ||||
| @@ -353,6 +353,11 @@ | |||||
| delete from wx_bill_rent where rent_contract_id = #{rentContractId} | delete from wx_bill_rent where rent_contract_id = #{rentContractId} | ||||
| <if test=" null != isPreview "> and is_preview = #{isPreview}</if> | <if test=" null != isPreview "> and is_preview = #{isPreview}</if> | ||||
| </delete> | </delete> | ||||
| <delete id="deleteNoNeedPayBill" parameterType="com.iformall.domain.po.WxBillRent"> | |||||
| delete from wx_bill_rent 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 | |||||
| </delete> | |||||
| <update id="updateForReceiverPay" parameterType="com.iformall.domain.po.WxBillRent"> | <update id="updateForReceiverPay" parameterType="com.iformall.domain.po.WxBillRent"> | ||||
| update wx_bill_rent set updatetime = now() | update wx_bill_rent set updatetime = now() | ||||