From d8592dfce9f43bccc2b3533f0e5ca5c427c2dc78 Mon Sep 17 00:00:00 2001 From: gaoqr <13665037151@163.com> Date: Mon, 13 Oct 2025 17:48:47 +0800 Subject: [PATCH] =?UTF-8?q?1=E3=80=81=E8=B5=84=E9=87=91=E7=AE=A1=E7=90=86?= =?UTF-8?q?=E8=AE=A2=E5=8D=95=E5=8F=B7=E7=94=9F=E6=88=90=E6=A0=BC=E5=BC=8F?= =?UTF-8?q?=E7=A7=BB=E9=99=A4=E7=BB=84=E7=BB=87id=E7=9A=84=E7=BB=84?= =?UTF-8?q?=E6=88=90=EF=BC=9B2=E3=80=81=E5=AE=9A=E4=BB=B7=E5=88=97?= =?UTF-8?q?=E8=A1=A8=E9=BB=98=E8=AE=A4=E4=BB=A5=E6=97=B6=E9=95=BF=E6=8E=92?= =?UTF-8?q?=E5=BA=8F=EF=BC=9B?= MIME-Version: 1.0 Content-Type: text/plain; charset=UTF-8 Content-Transfer-Encoding: 8bit --- .../funds/products/ProductsDetailMapper.java | 1 + .../module/system/enums/pay/PayConstants.java | 4 ++-- .../ManualAdjustAccountBalanceServiceImpl.java | 2 +- .../funds/purchase/PurchaseServiceImpl.java | 4 ++-- .../system/service/pay/PayOrderServiceImpl.java | 6 +++--- .../system/service/pay/PayProductProcessor.java | 15 +++++++-------- 6 files changed, 16 insertions(+), 16 deletions(-) diff --git a/cf-module-system/cf-module-system-biz/src/main/java/com/cf/imes/module/system/dal/mysql/funds/products/ProductsDetailMapper.java b/cf-module-system/cf-module-system-biz/src/main/java/com/cf/imes/module/system/dal/mysql/funds/products/ProductsDetailMapper.java index e4f96f7fc..ff953dafe 100644 --- a/cf-module-system/cf-module-system-biz/src/main/java/com/cf/imes/module/system/dal/mysql/funds/products/ProductsDetailMapper.java +++ b/cf-module-system/cf-module-system-biz/src/main/java/com/cf/imes/module/system/dal/mysql/funds/products/ProductsDetailMapper.java @@ -27,6 +27,7 @@ public interface ProductsDetailMapper extends BaseMapperX { .eqIfPresent(ProductsDetailDO::getDiscount, reqVO.getDiscount()) .eqIfPresent(ProductsDetailDO::getIsDiscounted, reqVO.getIsDiscounted()) .eqIfPresent(ProductsDetailDO::getDeleted, false) + .orderByAsc(ProductsDetailDO::getDuration) ); } diff --git a/cf-module-system/cf-module-system-biz/src/main/java/com/cf/imes/module/system/enums/pay/PayConstants.java b/cf-module-system/cf-module-system-biz/src/main/java/com/cf/imes/module/system/enums/pay/PayConstants.java index e98467f79..21a834cfa 100644 --- a/cf-module-system/cf-module-system-biz/src/main/java/com/cf/imes/module/system/enums/pay/PayConstants.java +++ b/cf-module-system/cf-module-system-biz/src/main/java/com/cf/imes/module/system/enums/pay/PayConstants.java @@ -7,9 +7,9 @@ package com.cf.imes.module.system.enums.pay; * @since 2025/8/12 17:49 */ public class PayConstants { - public static final String PAY_ORDER_PREFIX_FORMAT = "P%dO%s"; // 第三方支付流水号格式 + public static final String PAY_ORDER_PREFIX_FORMAT = "PO%s"; // 第三方支付流水号格式 - public static final String PAY_PRODUCT_DETAIL_BUSINESSNO_PREFIX_FORMAT = "P%dD%s"; // 产品购买流水号格式 + public static final String PAY_PRODUCT_DETAIL_BUSINESSNO_PREFIX_FORMAT = "PD%s"; // 产品购买流水号格式 public static final String PAY_PRODUCT_DETAIL_AUTO_GENERATE_MONTH_ID_FORMAT = "1759029544%d"; // 1~12月定价规则自动生成ID格式 diff --git a/cf-module-system/cf-module-system-biz/src/main/java/com/cf/imes/module/system/service/funds/manualadjust/ManualAdjustAccountBalanceServiceImpl.java b/cf-module-system/cf-module-system-biz/src/main/java/com/cf/imes/module/system/service/funds/manualadjust/ManualAdjustAccountBalanceServiceImpl.java index a5baecf2a..514a13a5e 100644 --- a/cf-module-system/cf-module-system-biz/src/main/java/com/cf/imes/module/system/service/funds/manualadjust/ManualAdjustAccountBalanceServiceImpl.java +++ b/cf-module-system/cf-module-system-biz/src/main/java/com/cf/imes/module/system/service/funds/manualadjust/ManualAdjustAccountBalanceServiceImpl.java @@ -152,7 +152,7 @@ public class ManualAdjustAccountBalanceServiceImpl implements ManualAdjustAccoun Long payOrderId = IdUtil.getSnowflake(mybatisIdProperties.getWorkerId(), mybatisIdProperties.getDatacenterId()).nextId(); payOrderDO.setId(payOrderId); - payOrderDO.setPayNo(String.format(PayConstants.PAY_ORDER_PREFIX_FORMAT, organId, payOrderId)); + payOrderDO.setPayNo(String.format(PayConstants.PAY_ORDER_PREFIX_FORMAT, payOrderId)); payOrderDO.setStatus(PayOrderStatusEnum.SUCCESS); payOrderDO.setPrice(recharge); payOrderDO.setSubject("手工调账"); 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 b71788697..e962188a1 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 @@ -349,7 +349,7 @@ public class PurchaseServiceImpl implements PurchaseService { BigDecimal totalAmount = orgInitialPurchaseRecord.getTotalAmount(); // 定价中有的，以年数量*组织定价*折扣展示 List productDetailRespVOList = new ArrayList<>(); - for (ProductsDetailDO detailDO : page.getList().stream().sorted(Comparator.comparingInt(ProductsDetailDO::getDuration)).collect(Collectors.toList())) { + for (ProductsDetailDO detailDO : page.getList()) { ProductDetailsRespVO newDetailRespVO = BeanUtils.toBean(detailDO, ProductDetailsRespVO.class); // 折扣 BigDecimal discount = detailDO.getDiscount(); @@ -417,7 +417,7 @@ public class PurchaseServiceImpl implements PurchaseService { BigDecimal monthAverageAmount = totalAmount.divide(new BigDecimal(10), 2, RoundingMode.DOWN); List productDetailRespVOList = new ArrayList<>(); - for (ProductsDetailDO detailDO : productsDetailDOS.stream().sorted(Comparator.comparingInt(ProductsDetailDO::getDuration)).collect(Collectors.toList())) { + for (ProductsDetailDO detailDO : productsDetailDOS) { ProductDetailsRespVO newDetailRespVO = BeanUtils.toBean(detailDO, ProductDetailsRespVO.class); // 折扣 BigDecimal discount = detailDO.getDiscount(); diff --git a/cf-module-system/cf-module-system-biz/src/main/java/com/cf/imes/module/system/service/pay/PayOrderServiceImpl.java b/cf-module-system/cf-module-system-biz/src/main/java/com/cf/imes/module/system/service/pay/PayOrderServiceImpl.java index ebb2a9565..275248433 100644 --- a/cf-module-system/cf-module-system-biz/src/main/java/com/cf/imes/module/system/service/pay/PayOrderServiceImpl.java +++ b/cf-module-system/cf-module-system-biz/src/main/java/com/cf/imes/module/system/service/pay/PayOrderServiceImpl.java @@ -477,7 +477,7 @@ public class PayOrderServiceImpl implements PayOrderService { Long organId = SecurityFrameworkUtils.getUserOrganId(); payOrderDO.setId(payOrderId); - payOrderDO.setPayNo(String.format(PayConstants.PAY_ORDER_PREFIX_FORMAT, organId, payOrderId)); + payOrderDO.setPayNo(String.format(PayConstants.PAY_ORDER_PREFIX_FORMAT, payOrderId)); payOrderDO.setStatus(PayOrderStatusEnum.WAITING); payOrderDO.setExpireTime(LocalDateTime.now().plus(payConfig.getPayExpireTime())); payOrderDO.setPrice(price); @@ -715,7 +715,7 @@ public class PayOrderServiceImpl implements PayOrderService { if (PayProductChannelCodeEnum.ALIPAY_PC.getCode().equals(paymentMethod) || PayProductChannelCodeEnum.WECHAT_NATIVE.getCode().equals(paymentMethod)) { IncomeExpenseDetailsDO incomeExpenseDetailsDO = IncomeExpenseDetailsDO.builder() .organId(organId) - .orderNo(String.format(PayConstants.PAY_PRODUCT_DETAIL_BUSINESSNO_PREFIX_FORMAT, organId, purchaseId)) + .orderNo(String.format(PayConstants.PAY_PRODUCT_DETAIL_BUSINESSNO_PREFIX_FORMAT, purchaseId)) .businessNo(snowflakeSerialNoWorker3rd.nextSerialNo()) .tradeType(TradeTypeEnum.PRODUCT.getCode()) .incomeExpenseType(IncomeExpenseTypeEnum.EXPENSES.getCode()) @@ -821,7 +821,7 @@ public class PayOrderServiceImpl implements PayOrderService { // 3、新增退回的收支记录 IncomeExpenseDetailsDO incomeExpenseDetailsDO = IncomeExpenseDetailsDO.builder() .organId(organId) - .orderNo(String.format(PayConstants.PAY_PRODUCT_DETAIL_BUSINESSNO_PREFIX_FORMAT, organId, purchaseId)) + .orderNo(String.format(PayConstants.PAY_PRODUCT_DETAIL_BUSINESSNO_PREFIX_FORMAT, purchaseId)) .businessNo(snowflakeSerialNoWorker3rd.nextSerialNo()) .tradeType(TradeTypeEnum.PRODUCT.getCode()) .incomeExpenseType(IncomeExpenseTypeEnum.INCOME.getCode()) 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 5ed1f2e2d..7200f4904 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 @@ -2,7 +2,6 @@ package com.cf.imes.module.system.service.pay; import cn.hutool.core.collection.CollUtil; import cn.hutool.core.date.DatePattern; -import cn.hutool.core.date.DateUtil; import cn.hutool.core.date.LocalDateTimeUtil; import cn.hutool.core.util.IdUtil; import cn.hutool.core.util.ObjectUtil; @@ -192,7 +191,7 @@ public class PayProductProcessor { } // 新增购买记录 long purchaseId = IdUtil.getSnowflake(mybatisIdProperties.getWorkerId(), mybatisIdProperties.getDatacenterId()).nextId(); - String orderNo = String.format(PayConstants.PAY_PRODUCT_DETAIL_BUSINESSNO_PREFIX_FORMAT, organId, purchaseId); + String orderNo = String.format(PayConstants.PAY_PRODUCT_DETAIL_BUSINESSNO_PREFIX_FORMAT, purchaseId); PurchaseRecordDO purchaseRecordDO = PurchaseRecordDO.builder() .id(purchaseId) .organId(organId) @@ -252,7 +251,7 @@ public class PayProductProcessor { } // 新增购买记录 long purchaseId = IdUtil.getSnowflake(mybatisIdProperties.getWorkerId(), mybatisIdProperties.getDatacenterId()).nextId(); - String orderNo = String.format(PayConstants.PAY_PRODUCT_DETAIL_BUSINESSNO_PREFIX_FORMAT, organId, purchaseId); + String orderNo = String.format(PayConstants.PAY_PRODUCT_DETAIL_BUSINESSNO_PREFIX_FORMAT, purchaseId); PurchaseRecordDO purchaseRecordDO = PurchaseRecordDO.builder() .id(purchaseId) .organId(organId) @@ -388,7 +387,7 @@ public class PayProductProcessor { // 新增购买记录 long purchaseId = IdUtil.getSnowflake(mybatisIdProperties.getWorkerId(), mybatisIdProperties.getDatacenterId()).nextId(); - String orderNo = String.format(PayConstants.PAY_PRODUCT_DETAIL_BUSINESSNO_PREFIX_FORMAT, organId, purchaseId); + String orderNo = String.format(PayConstants.PAY_PRODUCT_DETAIL_BUSINESSNO_PREFIX_FORMAT, purchaseId); PurchaseRecordDO purchaseRecordDO = PurchaseRecordDO.builder() .id(purchaseId) .organId(organId) @@ -468,7 +467,7 @@ public class PayProductProcessor { // 新增购买记录 long purchaseId = IdUtil.getSnowflake(mybatisIdProperties.getWorkerId(), mybatisIdProperties.getDatacenterId()).nextId(); - String orderNo = String.format(PayConstants.PAY_PRODUCT_DETAIL_BUSINESSNO_PREFIX_FORMAT, organId, purchaseId); + String orderNo = String.format(PayConstants.PAY_PRODUCT_DETAIL_BUSINESSNO_PREFIX_FORMAT, purchaseId); PurchaseRecordDO purchaseRecordDO = PurchaseRecordDO.builder() .id(purchaseId) .organId(organId) @@ -547,7 +546,7 @@ public class PayProductProcessor { // 新增购买记录 long purchaseId = IdUtil.getSnowflake(mybatisIdProperties.getWorkerId(), mybatisIdProperties.getDatacenterId()).nextId(); - String orderNo = String.format(PayConstants.PAY_PRODUCT_DETAIL_BUSINESSNO_PREFIX_FORMAT, organId, purchaseId); + String orderNo = String.format(PayConstants.PAY_PRODUCT_DETAIL_BUSINESSNO_PREFIX_FORMAT, purchaseId); PurchaseRecordDO purchaseRecordDO = PurchaseRecordDO.builder() .id(purchaseId) .organId(organId) @@ -628,7 +627,7 @@ public class PayProductProcessor { // 新增购买记录 long purchaseId = IdUtil.getSnowflake(mybatisIdProperties.getWorkerId(), mybatisIdProperties.getDatacenterId()).nextId(); - String orderNo = String.format(PayConstants.PAY_PRODUCT_DETAIL_BUSINESSNO_PREFIX_FORMAT, organId, purchaseId); + String orderNo = String.format(PayConstants.PAY_PRODUCT_DETAIL_BUSINESSNO_PREFIX_FORMAT, purchaseId); PurchaseRecordDO purchaseRecordDO = PurchaseRecordDO.builder() .id(purchaseId) .organId(organId) @@ -718,7 +717,7 @@ public class PayProductProcessor { Long organId = SecurityFrameworkUtils.getUserOrganId(); payOrderDO.setId(payOrderId); - payOrderDO.setPayNo(String.format(PayConstants.PAY_ORDER_PREFIX_FORMAT, organId, payOrderId, DateUtil.format(LocalDateTime.now(), DatePattern.PURE_DATETIME_PATTERN))); + payOrderDO.setPayNo(String.format(PayConstants.PAY_ORDER_PREFIX_FORMAT, payOrderId)); payOrderDO.setStatus(PayOrderStatusEnum.WAITING); payOrderDO.setExpireTime(LocalDateTime.now().plus(payConfig.getPayExpireTime())); payOrderDO.setPrice(price);