From e9dc3720785f73cf751cff463b0b5fdeb32b38ba Mon Sep 17 00:00:00 2001 From: gaoqr <13665037151@163.com> Date: Thu, 16 Oct 2025 11:47:23 +0800 Subject: [PATCH] =?UTF-8?q?=E8=B4=AD=E4=B9=B0=E8=AE=B0=E5=BD=95=E7=9A=84?= =?UTF-8?q?=E6=94=AF=E4=BB=98=E5=AE=9D/=E5=BE=AE=E4=BF=A1=E6=94=AF?= =?UTF-8?q?=E4=BB=98=E9=87=91=E9=A2=9D=E7=BB=9F=E4=B8=80=E4=B8=BA=E7=AC=AC?= =?UTF-8?q?=E4=B8=89=E6=96=B9=E6=94=AF=E4=BB=98=E9=87=91=E9=A2=9D?= MIME-Version: 1.0 Content-Type: text/plain; charset=UTF-8 Content-Transfer-Encoding: 8bit --- .../purchase/vo/PurchaseRecordRespVO.java | 8 ++++++ .../funds/purchase/PurchaseRecordDO.java | 16 +++--------- .../funds/purchase/PurchaseRecordMapper.java | 4 +-- .../IncomeExpenseServiceImpl.java | 2 +- .../funds/purchase/PurchaseServiceImpl.java | 2 +- .../service/pay/PayProductProcessor.java | 25 ++++--------------- 6 files changed, 20 insertions(+), 37 deletions(-) diff --git a/cf-module-system/cf-module-system-biz/src/main/java/com/cf/imes/module/system/controller/admin/funds/purchase/vo/PurchaseRecordRespVO.java b/cf-module-system/cf-module-system-biz/src/main/java/com/cf/imes/module/system/controller/admin/funds/purchase/vo/PurchaseRecordRespVO.java index 7e20a41ce..6058b4da0 100644 --- a/cf-module-system/cf-module-system-biz/src/main/java/com/cf/imes/module/system/controller/admin/funds/purchase/vo/PurchaseRecordRespVO.java +++ b/cf-module-system/cf-module-system-biz/src/main/java/com/cf/imes/module/system/controller/admin/funds/purchase/vo/PurchaseRecordRespVO.java @@ -4,12 +4,15 @@ import com.alibaba.excel.annotation.ExcelIgnore; import com.alibaba.excel.annotation.ExcelProperty; import com.cf.imes.framework.excel.core.annotations.EnumFormat; import com.cf.imes.framework.excel.core.convert.EnumConvert; +import com.cf.imes.framework.jackson.core.databind.LocalDateSerializer; import com.cf.imes.module.system.enums.pay.PayProductChannelCodeEnum; import com.cf.imes.module.system.enums.pay.ProductDurationUnitEnum; +import com.fasterxml.jackson.databind.annotation.JsonSerialize; import io.swagger.v3.oas.annotations.media.Schema; import lombok.Data; import java.math.BigDecimal; +import java.time.LocalDate; import java.time.LocalDateTime; @@ -87,4 +90,9 @@ public class PurchaseRecordRespVO { @Schema(description = "操作人") @ExcelProperty("操作人") private String creator; + + @Schema(description = "产品有效时间") + @ExcelProperty("产品有效时间") + @JsonSerialize(using = LocalDateSerializer.class) + private LocalDate endTime; } diff --git a/cf-module-system/cf-module-system-biz/src/main/java/com/cf/imes/module/system/dal/dataobject/funds/purchase/PurchaseRecordDO.java b/cf-module-system/cf-module-system-biz/src/main/java/com/cf/imes/module/system/dal/dataobject/funds/purchase/PurchaseRecordDO.java index 4c7c60f3d..ae5e2bd85 100644 --- a/cf-module-system/cf-module-system-biz/src/main/java/com/cf/imes/module/system/dal/dataobject/funds/purchase/PurchaseRecordDO.java +++ b/cf-module-system/cf-module-system-biz/src/main/java/com/cf/imes/module/system/dal/dataobject/funds/purchase/PurchaseRecordDO.java @@ -130,27 +130,17 @@ public class PurchaseRecordDO extends BaseDO { */ private BigDecimal accountBalanceSpent; - /** - * 支付宝支出 + * 第三方支付金额 */ - private BigDecimal alipaySpent; - - - /** - * 微信支出 - */ - private BigDecimal wechatSpent; - - + private BigDecimal externalSpent; /** * 赠送金 */ private BigDecimal giftMoneySpent; - - + /** * 货币类型 */ diff --git a/cf-module-system/cf-module-system-biz/src/main/java/com/cf/imes/module/system/dal/mysql/funds/purchase/PurchaseRecordMapper.java b/cf-module-system/cf-module-system-biz/src/main/java/com/cf/imes/module/system/dal/mysql/funds/purchase/PurchaseRecordMapper.java index 3f5d69d6d..fb66db0ed 100644 --- a/cf-module-system/cf-module-system-biz/src/main/java/com/cf/imes/module/system/dal/mysql/funds/purchase/PurchaseRecordMapper.java +++ b/cf-module-system/cf-module-system-biz/src/main/java/com/cf/imes/module/system/dal/mysql/funds/purchase/PurchaseRecordMapper.java @@ -122,8 +122,8 @@ public interface PurchaseRecordMapper extends BaseMapperX { .eq(PurchaseRecordDO::getDeleted, false) .ne(PurchaseRecordDO::getInitial, true) .orderByDesc(PurchaseRecordDO::getCreateTime) - .select(PurchaseRecordDO::getId, PurchaseRecordDO::getOrganId, PurchaseRecordDO::getTotalAmount, PurchaseRecordDO::getAccountBalanceSpent, PurchaseRecordDO::getAlipaySpent, - PurchaseRecordDO::getWechatSpent, PurchaseRecordDO::getGiftMoneySpent, PurchaseRecordDO::getCreator, PurchaseRecordDO::getCreateTime) + .select(PurchaseRecordDO::getId, PurchaseRecordDO::getOrganId, PurchaseRecordDO::getTotalAmount, PurchaseRecordDO::getAccountBalanceSpent, PurchaseRecordDO::getExternalSpent, + PurchaseRecordDO::getGiftMoneySpent, PurchaseRecordDO::getCreator, PurchaseRecordDO::getCreateTime) ); } 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 8aa3e681f..434054eb6 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 @@ -73,7 +73,7 @@ public class IncomeExpenseServiceImpl implements IncomeExpenseService { if (ObjectUtil.isNotNull(record)) { respVO.setProductPrice(record.getTotalAmount()); respVO.setBalancePayAmount(record.getAccountBalanceSpent()); - respVO.setRechargePayAmount(record.getAlipaySpent().add(record.getWechatSpent())); + respVO.setRechargePayAmount(record.getExternalSpent()); respVO.setGiftPayAmount(record.getGiftMoneySpent()); } } diff --git a/cf-module-system/cf-module-system-biz/src/main/java/com/cf/imes/module/system/service/funds/purchase/PurchaseServiceImpl.java b/cf-module-system/cf-module-system-biz/src/main/java/com/cf/imes/module/system/service/funds/purchase/PurchaseServiceImpl.java index e962188a1..2b8c636c1 100644 --- a/cf-module-system/cf-module-system-biz/src/main/java/com/cf/imes/module/system/service/funds/purchase/PurchaseServiceImpl.java +++ b/cf-module-system/cf-module-system-biz/src/main/java/com/cf/imes/module/system/service/funds/purchase/PurchaseServiceImpl.java @@ -296,7 +296,7 @@ public class PurchaseServiceImpl implements PurchaseService { // 销售目前都是产品购买 respVO.setTradeType(TradeTypeEnum.PRODUCT.getCode()); // 充值支付=支付宝/微信 - respVO.setRechargeSpent(detailDO.getAlipaySpent().add(detailDO.getWechatSpent())); + respVO.setRechargeSpent(detailDO.getExternalSpent()); // 查询组织名称 OrganizationDO organ = organService.getOrganWithDeleted(detailDO.getOrganId()); if (ObjectUtil.isNotNull(organ)) { diff --git a/cf-module-system/cf-module-system-biz/src/main/java/com/cf/imes/module/system/service/pay/PayProductProcessor.java b/cf-module-system/cf-module-system-biz/src/main/java/com/cf/imes/module/system/service/pay/PayProductProcessor.java index b339f4739..ebf70e7df 100644 --- a/cf-module-system/cf-module-system-biz/src/main/java/com/cf/imes/module/system/service/pay/PayProductProcessor.java +++ b/cf-module-system/cf-module-system-biz/src/main/java/com/cf/imes/module/system/service/pay/PayProductProcessor.java @@ -322,7 +322,7 @@ public class PayProductProcessor { .totalAmount(price) .originalAmount(originalPrice) .monthAverageAmount(monthAverageAmount) - .alipaySpent(price) + .externalSpent(price) .initial(initialized) .status(PurchaseRecordStatusEnum.PENDING.getStatus()) .build(); @@ -359,7 +359,7 @@ public class PayProductProcessor { .totalAmount(price) .originalAmount(originalPrice) .monthAverageAmount(monthAverageAmount) - .wechatSpent(price) + .externalSpent(price) .initial(initialized) .status(PurchaseRecordStatusEnum.PENDING.getStatus()) .build(); @@ -527,12 +527,7 @@ public class PayProductProcessor { PayOrderDO payOrderDO = null; if (remaining.compareTo(BigDecimal.ZERO) > 0) { payOrderDO = goExternalPay(purchaseId, remaining, payChannelCodeEnum); - // 记录第三方支付支出 - if (PayChannelCodeEnum.ALIPAY_PC.equals(payChannelCodeEnum)) { - purchaseRecordDO.setAlipaySpent(remaining); - } else { - purchaseRecordDO.setWechatSpent(remaining); - } + purchaseRecordDO.setExternalSpent(remaining); purchaseRecordDO.setStatus(PurchaseRecordStatusEnum.PENDING.getStatus()); } @@ -608,12 +603,7 @@ public class PayProductProcessor { PayOrderDO payOrderDO = null; if (remaining.compareTo(BigDecimal.ZERO) > 0) { payOrderDO = goExternalPay(purchaseId, remaining, payChannelCodeEnum); - // 记录第三方支付支出 - if (PayChannelCodeEnum.ALIPAY_PC.equals(payChannelCodeEnum)) { - purchaseRecordDO.setAlipaySpent(remaining); - } else { - purchaseRecordDO.setWechatSpent(remaining); - } + purchaseRecordDO.setExternalSpent(remaining); purchaseRecordDO.setStatus(PurchaseRecordStatusEnum.PENDING.getStatus()); justPayGift = false; } @@ -706,12 +696,7 @@ public class PayProductProcessor { PayOrderDO payOrderDO = null; if (remaining.compareTo(BigDecimal.ZERO) > 0) { payOrderDO = goExternalPay(purchaseId, remaining, payChannelCodeEnum); - // 记录第三方支付支出 - if (PayChannelCodeEnum.ALIPAY_PC.equals(payChannelCodeEnum)) { - purchaseRecordDO.setAlipaySpent(remaining); - } else { - purchaseRecordDO.setWechatSpent(remaining); - } + purchaseRecordDO.setExternalSpent(remaining); purchaseRecordDO.setStatus(PurchaseRecordStatusEnum.PENDING.getStatus()); justPayGift = false; }