Просмотр исходного кода

Merge branch 'release_toaliyun_real' into release_toaliyun_real_offline_activity

release_toaliyun_real
winter 1 год назад
Родитель
Сommit
ac7e5af908
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.updateTenantInfo(user);
addreceive.setType(cashierType.getCode()); addreceive.setType(cashierType.getCode());
addreceive.setStatus(EnumFinanceReceiveStatus.NORMAL.getCode()); addreceive.setStatus(EnumFinanceReceiveStatus.NORMAL.getCode());
addreceive.setType(type.getCode());
addreceive.setType(cashierType.getCode());
addreceive.setReceiveMoney(receiveMoney); addreceive.setReceiveMoney(receiveMoney);
addreceive.setPayMoney(payMoney); addreceive.setPayMoney(payMoney);
addreceive.setMerchantId(merchantId); addreceive.setMerchantId(merchantId);
@@ -681,6 +681,7 @@ public class WxFinanceServiceImpl implements WxFinanceService {
addreceive.setUpdateByName(user.getName()); addreceive.setUpdateByName(user.getName());
addreceive.setRemark(remark); addreceive.setRemark(remark);
addreceive.setFeesId(feesId); addreceive.setFeesId(feesId);
addreceive.setReceiveType(type.getCode());
return addreceive; 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); wxRentContractRevenueSalesMapper.updateById(sale);
}else { }else {
WxRentContractRevenueSales sale = new WxRentContractRevenueSales(); WxRentContractRevenueSales sale = new WxRentContractRevenueSales();
final IdWorker idWorker = IdWorker.get();
sale.setId(idWorker.nextId());
sale.updateTenantInfo(rentcontract); sale.updateTenantInfo(rentcontract);
sale.setBillId(billId); sale.setBillId(billId);
sale.setRentContractId(rentcontract.getId()); sale.setRentContractId(rentcontract.getId());


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