winter 1 год назад
Родитель
Сommit
7d22efbd53
2 измененных файлов: 4 добавлений и 1 удалений
  1. +2
    -1
      mallinkService/src/main/java/com/iformall/service/impl/WxFinanceServiceImpl.java
  2. +2
    -0
      mallinkService/src/main/java/com/iformall/service/impl/WxRentContractServiceImpl.java

+ 2
- 1
mallinkService/src/main/java/com/iformall/service/impl/WxFinanceServiceImpl.java Просмотреть файл

@@ -667,7 +667,7 @@ public class WxFinanceServiceImpl implements WxFinanceService {
addreceive.updateTenantInfo(user);
addreceive.setType(cashierType.getCode());
addreceive.setStatus(EnumFinanceReceiveStatus.NORMAL.getCode());
addreceive.setType(type.getCode());
addreceive.setType(cashierType.getCode());
addreceive.setReceiveMoney(receiveMoney);
addreceive.setPayMoney(payMoney);
addreceive.setMerchantId(merchantId);
@@ -681,6 +681,7 @@ public class WxFinanceServiceImpl implements WxFinanceService {
addreceive.setUpdateByName(user.getName());
addreceive.setRemark(remark);
addreceive.setFeesId(feesId);
addreceive.setReceiveType(type.getCode());
return addreceive;
}


+ 2
- 0
mallinkService/src/main/java/com/iformall/service/impl/WxRentContractServiceImpl.java Просмотреть файл

@@ -2568,6 +2568,8 @@ public class WxRentContractServiceImpl implements WxRentContractService {
wxRentContractRevenueSalesMapper.updateById(sale);
}else {
WxRentContractRevenueSales sale = new WxRentContractRevenueSales();
final IdWorker idWorker = IdWorker.get();
sale.setId(idWorker.nextId());
sale.updateTenantInfo(rentcontract);
sale.setBillId(billId);
sale.setRentContractId(rentcontract.getId());


Загрузка…
Отмена
Сохранить