From 4f1013ba1c0a770929005a40097082df19f27ee6 Mon Sep 17 00:00:00 2001 From: winter Date: Tue, 13 Aug 2024 11:15:51 +0800 Subject: [PATCH] fix --- .../iformall/controller/rent/WxAllBillController.java | 4 +++- .../iformall/service/impl/WxFinanceServiceImpl.java | 10 ++++++++++ 2 files changed, 13 insertions(+), 1 deletion(-) diff --git a/mallinkAdmin/src/main/java/com/iformall/controller/rent/WxAllBillController.java b/mallinkAdmin/src/main/java/com/iformall/controller/rent/WxAllBillController.java index bc3828d4c..7399f398b 100644 --- a/mallinkAdmin/src/main/java/com/iformall/controller/rent/WxAllBillController.java +++ b/mallinkAdmin/src/main/java/com/iformall/controller/rent/WxAllBillController.java @@ -633,6 +633,7 @@ public class WxAllBillController extends BillBaseController { if (null == wxMerchant.getId()) { return new ResultData(Result.ERROR,"请选择商户"); } + //wxMerchant.setIsPreview(EnumYesOrNo.NO.getCode()); wxMerchant.updateTenantInfo(getTenantInfo()); wxMerchant.setNeedPayPreDays(getNearBillBeforeDays()); List list = billAllHelper.getMerchantBillList(wxMerchant); @@ -671,8 +672,9 @@ public class WxAllBillController extends BillBaseController { if (null == wxMerchant.getId()) { return new ResultData(Result.ERROR,"请选择商户"); } + wxMerchant.setIsPreview(EnumYesOrNo.NO.getCode()); wxMerchant.updateTenantInfo(getTenantInfo()); - wxMerchant.setToPayMerchant(EnumYesOrNo.YES.getCode()); + //wxMerchant.setToPayMerchant(EnumYesOrNo.YES.getCode()); List list = billAllHelper.getMerchantBillList(wxMerchant); if (null != list && list.size() > 0 ) { List merchnatIds = new ArrayList(); 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 dc72fbe2f..fd5b87a8d 100644 --- a/mallinkService/src/main/java/com/iformall/service/impl/WxFinanceServiceImpl.java +++ b/mallinkService/src/main/java/com/iformall/service/impl/WxFinanceServiceImpl.java @@ -658,6 +658,16 @@ public class WxFinanceServiceImpl implements WxFinanceService { createFinanceReceiveBill(addreceive,bill,be.getCurrentSetOff(),null,Constant.bill_pay_way_setoff); //处理预充关联 createFinanceReceiveSetoff(addreceive,be,bill); + WxBillPayDTO payDto = new WxBillPayDTO(); + payDto.updateTenantInfo(addreceive); + payDto.setId(be.getId()); + payDto.setBillTypeValue(be.getBillType()); + payDto.setAddpay("0"); + payDto.setSetOff(be.getCurrentSetOff()); + payDto.setPayWay(Constant.bill_pay_way_setoff); + payDto.setPayWayObject(payWay0); + payDto.setRemark("收款单收款["+addreceive.getId()+"]冲抵"+addreceive.getRemark()); + wxBillAllHelper.updatePay(payDto, user); } return noNeedCreate; }