From e9a649c6d98f79abde34454fb581551599235ae4 Mon Sep 17 00:00:00 2001 From: gaoqr <13665037151@163.com> Date: Thu, 9 Oct 2025 10:50:19 +0800 Subject: [PATCH] =?UTF-8?q?1=E3=80=81=E6=96=B0=E5=A2=9E=E5=8F=AF=E7=94=A8?= =?UTF-8?q?=E5=85=85=E5=80=BC=E6=B4=BB=E5=8A=A8=E6=8E=A5=E5=8F=A3=EF=BC=9B?= =?UTF-8?q?2=E3=80=81=E8=B4=A6=E6=88=B7=E6=98=8E=E7=BB=86=E8=A1=A5?= =?UTF-8?q?=E5=85=85=E6=89=8B=E5=B7=A5=E8=B0=83=E8=B4=A6=E7=9A=84=E8=B5=A0?= =?UTF-8?q?=E9=80=81=E9=87=91=E5=80=BC=EF=BC=9B?= MIME-Version: 1.0 Content-Type: text/plain; charset=UTF-8 Content-Transfer-Encoding: 8bit --- .../recharge/RechargeActiveController.java | 9 +++++++- .../funds/recharge/vo/RechargePageReqVO.java | 12 ++-------- .../recharge/GiftMoneyDetailsMapper.java | 2 +- .../IncomeExpenseServiceImpl.java | 1 + .../funds/recharge/RechargeActiveService.java | 9 ++++++++ .../recharge/RechargeActiveServiceImpl.java | 22 ++++++++++++++++++- .../src/main/resources/application-dev.yaml | 2 +- .../src/main/resources/application-local.yaml | 2 +- 8 files changed, 44 insertions(+), 15 deletions(-) diff --git a/cf-module-system/cf-module-system-biz/src/main/java/com/cf/imes/module/system/controller/admin/funds/recharge/RechargeActiveController.java b/cf-module-system/cf-module-system-biz/src/main/java/com/cf/imes/module/system/controller/admin/funds/recharge/RechargeActiveController.java index 05e31701d..98d2ea94c 100644 --- a/cf-module-system/cf-module-system-biz/src/main/java/com/cf/imes/module/system/controller/admin/funds/recharge/RechargeActiveController.java +++ b/cf-module-system/cf-module-system-biz/src/main/java/com/cf/imes/module/system/controller/admin/funds/recharge/RechargeActiveController.java @@ -17,6 +17,8 @@ import org.springframework.web.bind.annotation.*; import jakarta.annotation.Resource; import jakarta.validation.Valid; +import java.util.List; + import static com.cf.imes.framework.common.pojo.CommonResult.success; @Tag(name = "管理后台 - 充值活动管理") @@ -64,5 +66,10 @@ public class RechargeActiveController { return success(BeanUtils.toBean(pageResult, RechargeRespVO.class)); } - + @GetMapping("/available") + @Operation(summary = "获取可用充值活动") + public CommonResult> getAvailableRechargeActivePage() { + List pageResult = productsService.getAvailableRechargeActiveList(); + return success(BeanUtils.toBean(pageResult, RechargeRespVO.class)); + } } diff --git a/cf-module-system/cf-module-system-biz/src/main/java/com/cf/imes/module/system/controller/admin/funds/recharge/vo/RechargePageReqVO.java b/cf-module-system/cf-module-system-biz/src/main/java/com/cf/imes/module/system/controller/admin/funds/recharge/vo/RechargePageReqVO.java index 6bfa7e6d5..7085a19b4 100644 --- a/cf-module-system/cf-module-system-biz/src/main/java/com/cf/imes/module/system/controller/admin/funds/recharge/vo/RechargePageReqVO.java +++ b/cf-module-system/cf-module-system-biz/src/main/java/com/cf/imes/module/system/controller/admin/funds/recharge/vo/RechargePageReqVO.java @@ -40,23 +40,15 @@ public class RechargePageReqVO extends PageParam { @Schema(description = "赠送金额") private BigDecimal giftAmount; - @Schema(description = "投放开始时间") + @Schema(description = "投放时间") @DateTimeFormat(pattern = FORMAT_YEAR_MONTH_DAY_HOUR_MINUTE_SECOND) private LocalDateTime[] startTime; - @Schema(description = "投放结束时间") - @DateTimeFormat(pattern = FORMAT_YEAR_MONTH_DAY_HOUR_MINUTE_SECOND) - private LocalDateTime[] endTime; - - @Schema(description = "操作时间") - @DateTimeFormat(pattern = FORMAT_YEAR_MONTH_DAY_HOUR_MINUTE_SECOND) - private LocalDateTime[] updateTime; - @Schema(description = "备注") private String remark; @Schema(description = "是否删除") - private Integer deleted; + private Boolean deleted; @Schema(description = "排序", example = "ascend") private String order; diff --git a/cf-module-system/cf-module-system-biz/src/main/java/com/cf/imes/module/system/dal/mysql/funds/recharge/GiftMoneyDetailsMapper.java b/cf-module-system/cf-module-system-biz/src/main/java/com/cf/imes/module/system/dal/mysql/funds/recharge/GiftMoneyDetailsMapper.java index 82f72c088..a4fc20fc3 100644 --- a/cf-module-system/cf-module-system-biz/src/main/java/com/cf/imes/module/system/dal/mysql/funds/recharge/GiftMoneyDetailsMapper.java +++ b/cf-module-system/cf-module-system-biz/src/main/java/com/cf/imes/module/system/dal/mysql/funds/recharge/GiftMoneyDetailsMapper.java @@ -25,7 +25,7 @@ public interface GiftMoneyDetailsMapper extends BaseMapperX .eqIfPresent(GiftMoneyDetailsDO::getGiftAmount, reqVO.getGiftAmount()) .eqIfPresent(GiftMoneyDetailsDO::getRechargeAmount, reqVO.getRechargeAmount()) .betweenIfPresent(GiftMoneyDetailsDO::getStartTime, reqVO.getStartTime()) - .betweenIfPresent(GiftMoneyDetailsDO::getEndTime, reqVO.getEndTime()); + .eqIfPresent(GiftMoneyDetailsDO::getDeleted, reqVO.getDeleted()); Integer rechargeType = reqVO.getRechargeType(); // WECHAT_AND_ALIPAY查全部、否则查WECHAT_AND_ALIPAY+查询类型 diff --git a/cf-module-system/cf-module-system-biz/src/main/java/com/cf/imes/module/system/service/funds/incomeandexpense/IncomeExpenseServiceImpl.java b/cf-module-system/cf-module-system-biz/src/main/java/com/cf/imes/module/system/service/funds/incomeandexpense/IncomeExpenseServiceImpl.java index 2597d8108..f426911c0 100644 --- a/cf-module-system/cf-module-system-biz/src/main/java/com/cf/imes/module/system/service/funds/incomeandexpense/IncomeExpenseServiceImpl.java +++ b/cf-module-system/cf-module-system-biz/src/main/java/com/cf/imes/module/system/service/funds/incomeandexpense/IncomeExpenseServiceImpl.java @@ -78,6 +78,7 @@ public class IncomeExpenseServiceImpl implements IncomeExpenseService { } } else if (TradeTypeEnum.MANUAL_ADJUST.getCode().equals(tradeType)) { respVO.setRechargeAmount(i.getCashAmountChange()); + respVO.setRechargeGiftAmount(i.getGiftAmountChange()); // 手工调账算到充值 respVO.setTradeType(TradeTypeEnum.RECHARGE.getCode()); } diff --git a/cf-module-system/cf-module-system-biz/src/main/java/com/cf/imes/module/system/service/funds/recharge/RechargeActiveService.java b/cf-module-system/cf-module-system-biz/src/main/java/com/cf/imes/module/system/service/funds/recharge/RechargeActiveService.java index 9250dbb2d..b981621f1 100644 --- a/cf-module-system/cf-module-system-biz/src/main/java/com/cf/imes/module/system/service/funds/recharge/RechargeActiveService.java +++ b/cf-module-system/cf-module-system-biz/src/main/java/com/cf/imes/module/system/service/funds/recharge/RechargeActiveService.java @@ -7,6 +7,8 @@ import com.cf.imes.module.system.dal.dataobject.funds.recharge.GiftMoneyDetailsD import jakarta.validation.Valid; +import java.util.List; + /** * 充值活动详情表 gift_money_details Service 接口 * @@ -50,6 +52,13 @@ public interface RechargeActiveService { */ PageResult getPage(RechargePageReqVO pageReqVO); + /** + * 获取可用充值活动 + * + * @return + */ + List getAvailableRechargeActiveList(); + /** * 查询充值活动，不存返回null，无业务异常 * diff --git a/cf-module-system/cf-module-system-biz/src/main/java/com/cf/imes/module/system/service/funds/recharge/RechargeActiveServiceImpl.java b/cf-module-system/cf-module-system-biz/src/main/java/com/cf/imes/module/system/service/funds/recharge/RechargeActiveServiceImpl.java index 408470395..30530fa4a 100644 --- a/cf-module-system/cf-module-system-biz/src/main/java/com/cf/imes/module/system/service/funds/recharge/RechargeActiveServiceImpl.java +++ b/cf-module-system/cf-module-system-biz/src/main/java/com/cf/imes/module/system/service/funds/recharge/RechargeActiveServiceImpl.java @@ -1,6 +1,8 @@ package com.cf.imes.module.system.service.funds.recharge; +import cn.hutool.core.collection.CollUtil; import cn.hutool.core.util.IdUtil; +import com.cf.imes.framework.common.pojo.PageParam; import com.cf.imes.framework.common.pojo.PageResult; import com.cf.imes.framework.common.util.Assert.AssertUtils; import com.cf.imes.framework.common.util.object.BeanUtils; @@ -15,6 +17,9 @@ import org.springframework.validation.annotation.Validated; import jakarta.annotation.Resource; +import java.time.LocalDateTime; +import java.util.List; + import static com.cf.imes.framework.common.exception.util.ServiceExceptionUtil.exception; import static com.cf.imes.module.system.enums.ErrorCodeConstants.RECHARGE_ACTIVE_NAME_IS_EXIST; import static com.cf.imes.module.system.enums.ErrorCodeConstants.RECHARGE_ACTIVE_NO_EXIST; @@ -89,7 +94,22 @@ public class RechargeActiveServiceImpl implements RechargeActiveService{ return giftMoneyDetailsMapper.selectPage(pageReqVO); } - + @Override + public List getAvailableRechargeActiveList() { + RechargePageReqVO rechargePageReqVO = new RechargePageReqVO(); + // 查询全部 + rechargePageReqVO.setPageSize(PageParam.PAGE_SIZE_NONE); + // 查询条件 + rechargePageReqVO.setDeleted(false); + PageResult giftMoneyDetailsDOPageResult = giftMoneyDetailsMapper.selectPage(rechargePageReqVO); + List resultList = giftMoneyDetailsDOPageResult.getList(); + if (CollUtil.isNotEmpty(resultList)) { + LocalDateTime now = LocalDateTime.now(); + // 筛选掉投放时间还没到和过期的 + resultList = resultList.stream().filter(item -> item.getStartTime().isBefore(now) && item.getEndTime().isAfter(now)).toList(); + } + return resultList; + } // 校验是否存在 private GiftMoneyDetailsDO validateRechargeActiveExists(Long id) { diff --git a/cf-module-system/cf-module-system-biz/src/main/resources/application-dev.yaml b/cf-module-system/cf-module-system-biz/src/main/resources/application-dev.yaml index 0e0d6673e..1f87502d5 100644 --- a/cf-module-system/cf-module-system-biz/src/main/resources/application-dev.yaml +++ b/cf-module-system/cf-module-system-biz/src/main/resources/application-dev.yaml @@ -205,7 +205,7 @@ chenfeng: - /admin-api/system/product-details/organ/purchase - /admin-api/system/purchase - /admin-api/system/pay/product - - /admin-api/system/recharge-active/page + - /admin-api/system/recharge-active/available - /admin-api/system/pay/recharge ignore-tables: - system_organization diff --git a/cf-module-system/cf-module-system-biz/src/main/resources/application-local.yaml b/cf-module-system/cf-module-system-biz/src/main/resources/application-local.yaml index 542a9577c..cbd45fb44 100644 --- a/cf-module-system/cf-module-system-biz/src/main/resources/application-local.yaml +++ b/cf-module-system/cf-module-system-biz/src/main/resources/application-local.yaml @@ -221,7 +221,7 @@ chenfeng: - /admin-api/system/product-details/organ/purchase - /admin-api/system/purchase - /admin-api/system/pay/product - - /admin-api/system/recharge-active/page + - /admin-api/system/recharge-active/available - /admin-api/system/pay/recharge ignore-tables: - system_organization