Browse Source

fix

release_toaliyun_real
winter 1 year ago
parent
commit
314b2085b3
6 changed files with 33 additions and 4 deletions
  1. +6
    -0
      mallinkAdmin/src/main/java/com/iformall/controller/contract/WxPropertyContractController.java
  2. +7
    -0
      mallinkAdmin/src/main/java/com/iformall/controller/contract/WxRentContractController.java
  3. +1
    -1
      mallinkService/src/main/java/com/iformall/mapper/WxAllBillMapper.java
  4. +1
    -1
      mallinkService/src/main/java/com/iformall/service/impl/WxPropertyContractServiceImpl.java
  5. +1
    -1
      mallinkService/src/main/java/com/iformall/service/impl/WxRentContractServiceImpl.java
  6. +17
    -1
      mallinkService/src/main/resources/mapper/WxAllBillMapper.xml

+ 6
- 0
mallinkAdmin/src/main/java/com/iformall/controller/contract/WxPropertyContractController.java View File

@@ -536,6 +536,12 @@ public class WxPropertyContractController extends WxContractBaseController {
}
try {
contract.setCustomersId(proertyContract.getCustomersId());
contract.setCustomerType(proertyContract.getCustomerType());
contract.setCustomerName(proertyContract.getCustomerName());
contract.setCustomerLinkPerson(proertyContract.getCustomerLinkPerson());
contract.setCustomerPhone(proertyContract.getCustomerPhone());
contract.setCustomerLegalPerson(proertyContract.getCustomerLegalPerson());
wxPropertyContractService.transfer(contract,user);
}catch(Exception e) {
logger.error("transfer error.",e);


+ 7
- 0
mallinkAdmin/src/main/java/com/iformall/controller/contract/WxRentContractController.java View File

@@ -615,6 +615,13 @@ public class WxRentContractController extends WxContractBaseController {
MallUserInfo user = getUser();
try {
rentContract.setCustomersId(wxRentContract.getCustomersId());
rentContract.setCustomerType(wxRentContract.getCustomerType());
rentContract.setCustomerName(wxRentContract.getCustomerName());
rentContract.setCustomerLinkPerson(wxRentContract.getCustomerLinkPerson());
rentContract.setCustomerPhone(wxRentContract.getCustomerPhone());
rentContract.setCustomerLegalPerson(wxRentContract.getCustomerLegalPerson());
wxRentContractService.transfer(rentContract,user);
}catch(Exception e) {
logger.error("transfer error.",e);


+ 1
- 1
mallinkService/src/main/java/com/iformall/mapper/WxAllBillMapper.java View File

@@ -56,6 +56,6 @@ public interface WxAllBillMapper extends CommonMapper<WxAllBill, Long> {
void updateContractCusName(WxAllBill wxBillRent);
void updateAllContractCusName(WxAllBill wxBillRent);
void transferCusName(WxAllBill wxBillRent);

}

+ 1
- 1
mallinkService/src/main/java/com/iformall/service/impl/WxPropertyContractServiceImpl.java View File

@@ -1509,7 +1509,7 @@ public class WxPropertyContractServiceImpl implements WxPropertyContractService
bill.updateTenantInfo(record);
bill.setPropertyContractId(record.getId());
bill.setCusName(record.getCustomerName());
wxAllBillMapper.updateAllContractCusName(bill);
wxAllBillMapper.transferCusName(bill);
}

@Override


+ 1
- 1
mallinkService/src/main/java/com/iformall/service/impl/WxRentContractServiceImpl.java View File

@@ -2099,7 +2099,7 @@ public class WxRentContractServiceImpl implements WxRentContractService {
bill.updateTenantInfo(rentContract);
bill.setRentContractId(rentContract.getId());
bill.setCusName(rentContract.getCustomerName());
wxAllBillMapper.updateAllContractCusName(bill);
wxAllBillMapper.transferCusName(bill);
if (rentContract.getOperationType().intValue() == EnumContractOperationType.WHOLE.getCode().intValue()) {
WxPropertyContract pq = new WxPropertyContract();


+ 17
- 1
mallinkService/src/main/resources/mapper/WxAllBillMapper.xml View File

@@ -455,7 +455,7 @@
</if>
</update>
<update id="updateAllContractCusName" parameterType="com.iformall.domain.po.WxAllBill">
<update id="transferCusName" parameterType="com.iformall.domain.po.WxAllBill">
update wx_all_bill set cus_name = #{cusName} where tenant_id = #{tenantId}
<if test=" null != rentContractId">
and rent_contract_id = #{rentContractId}
@@ -463,6 +463,22 @@
<if test=" null != propertyContractId">
and property_contract_id = #{propertyContractId}
</if>
and(
<!-- 应收 -->
(
( `receive_pay` - `pay` - IFNULL(`set_off`,'0') + IFNULL(`return_pay`,'0') &gt; 0 and bill_type not in (13,21,5,6,7))
or
( `receive_pay` - `pay` - IFNULL(`set_off`,'0') &gt; 0 and bill_type in (13,21,5,6,7))
)
<!-- 应fu -->
or (
( `receive_pay` - `pay` - IFNULL(`set_off`,'0') + IFNULL(`return_pay`,'0') &lt; 0 and bill_type not in (13,21,5,6,7))
or
( `pay` - IFNULL(`return_pay`,'0') - IFNULL(`use_money`,'0') &gt; 0 and bill_type in (13,21,5,7))
)
)
</update>
</mapper>


Loading…
Cancel
Save