diff --git a/jeecg-module-system/jeecg-system-biz/src/main/java/org/jeecg/payment/controller/StClientMemberBalanceController.java b/jeecg-module-system/jeecg-system-biz/src/main/java/org/jeecg/payment/controller/StClientMemberBalanceController.java index b9b492c..622a26a 100644 --- a/jeecg-module-system/jeecg-system-biz/src/main/java/org/jeecg/payment/controller/StClientMemberBalanceController.java +++ b/jeecg-module-system/jeecg-system-biz/src/main/java/org/jeecg/payment/controller/StClientMemberBalanceController.java @@ -94,6 +94,10 @@ public class StClientMemberBalanceController { LoginUser sysUser = (LoginUser) SecurityUtils.getSubject().getPrincipal(); stClientUserInfoShopPageDTO.setCanteenId(sysUser.getCanteenId()); } + if(StringUtils.isNotBlank(stClientUserInfoShopPageDTO.getStartDate()) && StringUtils.isNotBlank(stClientUserInfoShopPageDTO.getEndDate())){ + stClientUserInfoShopPageDTO.setStartTime(stClientUserInfoShopPageDTO.getStartDate()); + stClientUserInfoShopPageDTO.setEndTime(stClientUserInfoShopPageDTO.getEndDate()); + } List statisticsTheAmountSpentList = iStClientMemberBalanceService.getSpendingOrRechargeInfoListExport(stClientUserInfoShopPageDTO); if(CollectionUtils.isNotEmpty(statisticsTheAmountSpentList)){ String exportFields = "workNo|工号,userName|姓名,phone|联系方式,topUpBalanceTotal|总余额(元),topUpBalance|储值金额(元),rewardBalance|赠送金额(元)," +