From 037050e590ee2023fe122bb34f63449f9b28a959 Mon Sep 17 00:00:00 2001 From: winter Date: Mon, 23 Sep 2024 21:49:35 +0800 Subject: [PATCH] fix --- .../controller/market/WxEnergyController.java | 11 ++++++++++- .../java/com/iformall/domain/po/WxEnergyFees.java | 2 ++ 2 files changed, 12 insertions(+), 1 deletion(-) diff --git a/mallinkAdmin/src/main/java/com/iformall/controller/market/WxEnergyController.java b/mallinkAdmin/src/main/java/com/iformall/controller/market/WxEnergyController.java index e0ad8a15a..5c8d9e0e3 100644 --- a/mallinkAdmin/src/main/java/com/iformall/controller/market/WxEnergyController.java +++ b/mallinkAdmin/src/main/java/com/iformall/controller/market/WxEnergyController.java @@ -577,7 +577,16 @@ public class WxEnergyController extends BaseController { public ResultData feesList(@ModelAttribute WxEnergyFees record, Integer pageNum, Integer pageSize) { record.updateTenantInfo(getTenantInfo()); record.setSortColumns(BaseEntity.SortField.CreateTime_DESC); - record.setBillType(EnumBillAllType.DAILY.getCode()); + if (null != record.getIsFeesShopQuery() && record.getIsFeesShopQuery() == EnumYesOrNo.YES.getCode()) { + List billTypeList = new ArrayList(); + billTypeList.add(EnumBillAllType.DAILY.getCode()); + billTypeList.add(EnumBillAllType.OTHER.getCode()); + record.setBillTypeList(billTypeList); + record.setCashierType(EnumFinanceCashierType.RECEIVE.getCode()); + record.setFixedPrice(EnumYesOrNo.NO.getCode()); + }else { + record.setBillType(EnumBillAllType.DAILY.getCode()); + } PageInfo page = wxEnergyService.feesListAsPage(record, pageNum, pageSize,false); return new ResultData(page); } diff --git a/mallinkService/src/main/java/com/iformall/domain/po/WxEnergyFees.java b/mallinkService/src/main/java/com/iformall/domain/po/WxEnergyFees.java index 4f1577489..0a75763ee 100644 --- a/mallinkService/src/main/java/com/iformall/domain/po/WxEnergyFees.java +++ b/mallinkService/src/main/java/com/iformall/domain/po/WxEnergyFees.java @@ -184,5 +184,7 @@ public class WxEnergyFees extends TenantEntity { private List billTypeList; @TableField(exist = false) private Integer isAllList; + @TableField(exist = false) + private Integer isFeesShopQuery; }