winter пре 1 година
родитељ
комит
e24d32c024
26 измењених фајлова са 99 додато и 4 уклоњено
  1. +0
    -3
      mallinkService/src/main/java/com/iformall/domain/po/WxBillRent.java
  2. +3
    -0
      mallinkService/src/main/java/com/iformall/domain/po/base/WxBillBaseEntity.java
  3. +2
    -0
      mallinkService/src/main/java/com/iformall/mapper/WxBillDailyMapper.java
  4. +2
    -0
      mallinkService/src/main/java/com/iformall/mapper/WxBillDepositMapper.java
  5. +2
    -0
      mallinkService/src/main/java/com/iformall/mapper/WxBillOtherDepositMapper.java
  6. +2
    -0
      mallinkService/src/main/java/com/iformall/mapper/WxBillOtherMapper.java
  7. +2
    -0
      mallinkService/src/main/java/com/iformall/mapper/WxBillPropertyDepositMapper.java
  8. +1
    -0
      mallinkService/src/main/java/com/iformall/mapper/WxBillPropertyMapper.java
  9. +1
    -0
      mallinkService/src/main/java/com/iformall/mapper/WxBillRentManageMapper.java
  10. +2
    -0
      mallinkService/src/main/java/com/iformall/mapper/WxBillRentMapper.java
  11. +7
    -0
      mallinkService/src/main/java/com/iformall/service/impl/WxBillDailyServiceImpl.java
  12. +6
    -0
      mallinkService/src/main/java/com/iformall/service/impl/WxBillDepositServiceImpl.java
  13. +6
    -0
      mallinkService/src/main/java/com/iformall/service/impl/WxBillOtherDepositServiceImpl.java
  14. +6
    -0
      mallinkService/src/main/java/com/iformall/service/impl/WxBillOtherServiceImpl.java
  15. +7
    -0
      mallinkService/src/main/java/com/iformall/service/impl/WxBillPropertyDepositServiceImpl.java
  16. +3
    -0
      mallinkService/src/main/java/com/iformall/service/impl/WxBillPropertyServiceImpl.java
  17. +4
    -0
      mallinkService/src/main/java/com/iformall/service/impl/WxBillRentManageServiceImpl.java
  18. +3
    -0
      mallinkService/src/main/java/com/iformall/service/impl/WxBillRentServiceImpl.java
  19. +5
    -0
      mallinkService/src/main/resources/mapper/WxBillDailyMapper.xml
  20. +5
    -0
      mallinkService/src/main/resources/mapper/WxBillDepositMapper.xml
  21. +5
    -0
      mallinkService/src/main/resources/mapper/WxBillOtherDepositMapper.xml
  22. +5
    -1
      mallinkService/src/main/resources/mapper/WxBillOtherMapper.xml
  23. +5
    -0
      mallinkService/src/main/resources/mapper/WxBillPropertyDepositMapper.xml
  24. +5
    -0
      mallinkService/src/main/resources/mapper/WxBillPropertyMapper.xml
  25. +5
    -0
      mallinkService/src/main/resources/mapper/WxBillRentManageMapper.xml
  26. +5
    -0
      mallinkService/src/main/resources/mapper/WxBillRentMapper.xml

+ 0
- 3
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();
}
}

+ 3
- 0
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;
}

+ 2
- 0
mallinkService/src/main/java/com/iformall/mapper/WxBillDailyMapper.java Прегледај датотеку

@@ -39,5 +39,7 @@ public interface WxBillDailyMapper extends CommonMapper<WxBillDaily, Long> {
void insertBills(@Param("tenantId")String tenantId, @Param("list")List<WxBillDaily> resultList);
void deleteEnergyReadingBills(@Param("energyReadingCalcuteId")Long energyReadingCalcuteId,@Param("tenantId")String tenantId);
void deleteNoNeedPayBill(WxBillDaily wxBillRent);

}

+ 2
- 0
mallinkService/src/main/java/com/iformall/mapper/WxBillDepositMapper.java Прегледај датотеку

@@ -48,5 +48,7 @@ public interface WxBillDepositMapper extends CommonMapper<WxBillDeposit, Long> {
void deleteById(@Param("id")Long id,@Param("tenantId")String tenantId);
void insertBills(@Param("tenantId")String tenantId, @Param("list") List<WxBillDeposit> resultList);
void deleteNoNeedPayBill(WxBillDeposit wxBillRent);

}

+ 2
- 0
mallinkService/src/main/java/com/iformall/mapper/WxBillOtherDepositMapper.java Прегледај датотеку

@@ -36,4 +36,6 @@ public interface WxBillOtherDepositMapper extends CommonMapper<WxBillOtherDeposi
WxBillOtherDeposit selectById(@Param("id")Long id,@Param("tenantId")String tenantId);

void deleteById(@Param("id")Long id,@Param("tenantId")String tenantId);
void deleteNoNeedPayBill(WxBillOtherDeposit wxBillRent);
}

+ 2
- 0
mallinkService/src/main/java/com/iformall/mapper/WxBillOtherMapper.java Прегледај датотеку

@@ -40,4 +40,6 @@ public interface WxBillOtherMapper extends CommonMapper<WxBillOther, Long> {
WxBillOther selectById(@Param("id")Long id,@Param("tenantId")String tenantId);
void deleteById(@Param("id")Long id,@Param("tenantId")String tenantId);
void deleteNoNeedPayBill(WxBillOther wxBillRent);
}

+ 2
- 0
mallinkService/src/main/java/com/iformall/mapper/WxBillPropertyDepositMapper.java Прегледај датотеку

@@ -43,4 +43,6 @@ public interface WxBillPropertyDepositMapper extends CommonMapper<WxBillProperty
WxBillPropertyDeposit selectById(@Param("id")Long id,@Param("tenantId")String tenantId);
void deleteById(@Param("id")Long id,@Param("tenantId")String tenantId);
void deleteNoNeedPayBill(WxBillPropertyDeposit wxBillRent);
}

+ 1
- 0
mallinkService/src/main/java/com/iformall/mapper/WxBillPropertyMapper.java Прегледај датотеку

@@ -44,6 +44,7 @@ public interface WxBillPropertyMapper extends CommonMapper<WxBillProperty, Long>

void deleteBillByContract(WxPropertyContract wxPropertyContract);
void deletePreviewBill(WxBillProperty wxBillProperty);
void deleteNoNeedPayBill(WxBillProperty wxBillProperty);

void updateForReceivePay(WxBillProperty record);



+ 1
- 0
mallinkService/src/main/java/com/iformall/mapper/WxBillRentManageMapper.java Прегледај датотеку

@@ -31,6 +31,7 @@ public interface WxBillRentManageMapper extends CommonMapper<WxBillRentManage, L
void updateWaitPayStatus(Map<String,Object> params);
void deletePreviewBill(WxBillRentManage wxBillRentManage);
void deleteNoNeedPayBill(WxBillRentManage wxBillRentManage);
long oweBillCount(@Param("contractId") Long contractId);


+ 2
- 0
mallinkService/src/main/java/com/iformall/mapper/WxBillRentMapper.java Прегледај датотеку

@@ -39,6 +39,8 @@ public interface WxBillRentMapper extends CommonMapper<WxBillRent, Long> {

void deleteBillByContract(WxRentContract wxRentContract);
void deletePreviewBill(WxBillRent wxBillRent);
void deleteNoNeedPayBill(WxBillRent wxBillRent);

void updateForReceiverPay(WxBillRent record);



+ 7
- 0
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);


+ 6
- 0
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);


+ 6
- 0
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);


+ 6
- 0
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);


+ 7
- 0
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);


+ 3
- 0
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());


+ 4
- 0
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);


+ 3
- 0
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());


+ 5
- 0
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 &lt;= 0 and IFNULL(`set_off`,'0') &lt;= 0
</delete>
<delete id="deleteNoNeedPayBill" parameterType="com.iformall.domain.po.WxBillDaily">
delete from wx_bill_daily where merchant_id = #{merchantId} and status = 2
and starttime &gt; #{shopEndtime} and IFNULL(`pay`,'0') &lt;= 0 AND IFNULL(`set_off`,'0') &lt;= 0
</delete>
</mapper>

+ 5
- 0
mallinkService/src/main/resources/mapper/WxBillDepositMapper.xml Прегледај датотеку

@@ -384,6 +384,11 @@
)
</foreach>
</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 &gt; #{shopEndtime} and IFNULL(`pay`,'0') &lt;= 0 AND IFNULL(`set_off`,'0') &lt;= 0 AND IFNULL(`return_price`,'0') &lt;= 0
</delete>
</mapper>


+ 5
- 0
mallinkService/src/main/resources/mapper/WxBillOtherDepositMapper.xml Прегледај датотеку

@@ -261,6 +261,11 @@
<delete id = "deleteById" parameterType="HashMap">
delete from wx_bill_other_deposit where id = #{id} and tenant_id = #{tenantId}
</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 &gt; #{shopEndtime} and IFNULL(`pay`,'0') &lt;= 0 AND IFNULL(`set_off`,'0') &lt;= 0 AND IFNULL(`return_price`,'0') &lt;= 0
</delete>


</mapper>

+ 5
- 1
mallinkService/src/main/resources/mapper/WxBillOtherMapper.xml Прегледај датотеку

@@ -304,6 +304,10 @@
<delete id = "deleteById" parameterType="HashMap">
delete from wx_bill_other where id = #{id} and tenant_id = #{tenantId}
</delete>

<delete id="deleteNoNeedPayBill" parameterType="com.iformall.domain.po.WxBillOther">
delete from wx_bill_other where merchant_id = #{merchantId} and status = 2
and starttime &gt; #{shopEndtime} and IFNULL(`pay`,'0') &lt;= 0 AND IFNULL(`set_off`,'0') &lt;= 0
</delete>
</mapper>


+ 5
- 0
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>
<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 &gt; #{shopEndtime} and IFNULL(`pay`,'0') &lt;= 0 AND IFNULL(`set_off`,'0') &lt;= 0 AND IFNULL(`return_price`,'0') &lt;= 0
</delete>
</mapper>

+ 5
- 0
mallinkService/src/main/resources/mapper/WxBillPropertyMapper.xml Прегледај датотеку

@@ -363,6 +363,11 @@
delete from wx_bill_property where property_contract_id = #{propertyContractId}
<if test=" null != isPreview "> and is_preview = #{isPreview}</if>
</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 &gt; #{shopEndtime} and IFNULL(`pay`,'0') &lt;= 0 AND IFNULL(`set_off`,'0') &lt;= 0
</delete>

<update id="updateForReceivePay" parameterType="com.iformall.domain.po.WxBillProperty">
update wx_bill_property set updatetime = now()


+ 5
- 0
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}
<if test=" null != isPreview ">and `is_preview` = #{isPreview}</if>
</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 &gt; #{shopEndtime} and IFNULL(`pay`,'0') &lt;= 0 AND IFNULL(`set_off`,'0') &lt;= 0
</delete>

<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


+ 5
- 0
mallinkService/src/main/resources/mapper/WxBillRentMapper.xml Прегледај датотеку

@@ -353,6 +353,11 @@
delete from wx_bill_rent where rent_contract_id = #{rentContractId}
<if test=" null != isPreview "> and is_preview = #{isPreview}</if>
</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 &gt; #{shopEndtime} and IFNULL(`pay`,'0') &lt;= 0 AND IFNULL(`set_off`,'0') &lt;= 0
</delete>

<update id="updateForReceiverPay" parameterType="com.iformall.domain.po.WxBillRent">
update wx_bill_rent set updatetime = now()


Loading…
Откажи
Сачувај