diff --git a/mallinkService/src/main/java/com/iformall/service/impl/WxFinanceServiceImpl.java b/mallinkService/src/main/java/com/iformall/service/impl/WxFinanceServiceImpl.java index d8e3d1ee9..e46cbf7ef 100644 --- a/mallinkService/src/main/java/com/iformall/service/impl/WxFinanceServiceImpl.java +++ b/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; } diff --git a/mallinkService/src/main/java/com/iformall/service/impl/WxRentContractServiceImpl.java b/mallinkService/src/main/java/com/iformall/service/impl/WxRentContractServiceImpl.java index 6667ba010..8c86abdbe 100644 --- a/mallinkService/src/main/java/com/iformall/service/impl/WxRentContractServiceImpl.java +++ b/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());