From da4734b50085d31a2797f6adcf8bad3eef908eba Mon Sep 17 00:00:00 2001 From: winter Date: Tue, 10 Sep 2024 16:26:05 +0800 Subject: [PATCH] fix --- .../iformall/controller/rent/WxAllBillController.java | 10 ++++++++++ .../java/com/iformall/domain/vo/WxMerchantBillVo.java | 6 +++--- .../service/impl/WxFinancePrintServiceImpl.java | 2 -- 3 files changed, 13 insertions(+), 5 deletions(-) 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 303b87079..a38848fd9 100644 --- a/mallinkAdmin/src/main/java/com/iformall/controller/rent/WxAllBillController.java +++ b/mallinkAdmin/src/main/java/com/iformall/controller/rent/WxAllBillController.java @@ -18,6 +18,7 @@ import com.iformall.domain.po.WxBillPayWay; import com.iformall.domain.po.WxCoupon; import com.iformall.domain.po.WxEnergyFees; import com.iformall.domain.po.WxMerchant; +import com.iformall.domain.po.WxPayAccountBill; import com.iformall.domain.po.WxUserDataRule; import com.iformall.domain.po.base.BaseEntity; import com.iformall.domain.vo.WxBillBad; @@ -228,6 +229,8 @@ public class WxAllBillController extends BillBaseController { vo.setMerchantName(m.getName()); vo.setShopNumber(billAllHelper.getMerchantShopNumber(m)); vo.setRentArea(billAllHelper.getMerchantShopRentArea(m)); + vo.setStarttime(starttime); + vo.setEndtime(enttime); wxMerchant.setIsPreview(EnumYesOrNo.NO.getCode()); if (null != wxMerchant.getOnlyOwe() && EnumYesOrNo.YES.getCode().intValue() == wxMerchant.getOnlyOwe().intValue()) { wxMerchant.setOweBillBeforeDays(getOweBillBeforeDays()); @@ -271,7 +274,14 @@ public class WxAllBillController extends BillBaseController { if (null == merchant.getId() || null == merchant.getTemplateId() ||null == merchant.getFeesIdList() || merchant.getFeesIdList().size() <= 0 ) { return new ResultData(Result.ERROR,"清选择商户和科目"); } + merchant.updateTenantInfo(getTenantInfo()); + WxPayAccountBill ab = wxPayAccountBillService.getByTenantInfo(merchant); WxMerchantBillVo vo = getMerchantBillVo(merchant); + if (null != ab) { + vo.setMallBankAccount(ab.getBankCardId()); + vo.setMallBankAccountName(ab.getBankAccountName()); + vo.setMallBankName(ab.getBankName()); + } return new ResultData(wxFinancePrintService.parseTemplateData(merchant.getTenantId(),merchant.getTemplateId(),merchant.getFeesIdList(),vo)); } diff --git a/mallinkService/src/main/java/com/iformall/domain/vo/WxMerchantBillVo.java b/mallinkService/src/main/java/com/iformall/domain/vo/WxMerchantBillVo.java index da6249ecf..cbf487f62 100644 --- a/mallinkService/src/main/java/com/iformall/domain/vo/WxMerchantBillVo.java +++ b/mallinkService/src/main/java/com/iformall/domain/vo/WxMerchantBillVo.java @@ -93,10 +93,10 @@ public class WxMerchantBillVo implements Serializable { @TableField(exist = false) private Date endtime; @TableField(exist = false) - private Date mallBankAccountName; + private String mallBankAccountName; @TableField(exist = false) - private Date mallBankName; + private String mallBankName; @TableField(exist = false) - private Date mallBankAccount; + private String mallBankAccount; } diff --git a/mallinkService/src/main/java/com/iformall/service/impl/WxFinancePrintServiceImpl.java b/mallinkService/src/main/java/com/iformall/service/impl/WxFinancePrintServiceImpl.java index 6110dc4d1..44f8a78a4 100644 --- a/mallinkService/src/main/java/com/iformall/service/impl/WxFinancePrintServiceImpl.java +++ b/mallinkService/src/main/java/com/iformall/service/impl/WxFinancePrintServiceImpl.java @@ -315,8 +315,6 @@ public class WxFinancePrintServiceImpl implements WxFinancePrintService { bq.setShopNumber(""); } - - //打哪些科目 List feesId = dataIds; List voList = new ArrayList();