对账结算单号生成修改

sckw-common/sckw-common-core/src/main/java/com/sckw/core/model/enums/OrderRuleEnum.java

@@ -25,13 +25,14 @@ public enum OrderRuleEnum {
     /**
      * 对账
      */
-    LEDGER_ORDER("ledgerOrder", "BR", "对账业务类别"),
+    LEDGER_LOGISTICS_ORDER("ledgerLogisticsOrder", "TR", "物流对账业务类别"),
+    LEDGER_TRADE_ORDER("ledgerTradeOrder", "BR", "贸易对账业务类别"),
 
     /**
      * 结算
      */
-    SETTLEMENT_ORDER("settlementOrder", "BP", "结算业务类别"),
-    ;
+    SETTLEMENT_LOGISTICS_ORDER("settlementLogisticsOrder", "TP", "物流结算业务类别"),
+    SETTLEMENT_TRADE_ORDER("settlementTradeOrder", "BP", "贸易结算业务类别")    ;
 
 
     private final String value;

sckw-common/sckw-common-core/src/main/java/com/sckw/core/model/enums/RedisOrderGenerateEnum.java

@@ -29,7 +29,11 @@ public enum RedisOrderGenerateEnum {
     /**
      * 对账key
      */
-    ACCOUNT_CHECKING("accountChecking","logistics_order_no_generator:","对账key"),
+    LEDGER_CHECKING("ledger","logistics_order_no_generator:","对账key"),
+    /**
+     * 结算key
+     */
+    SETTLEMENT_CHECKING("settlement","logistics_order_no_generator:","结算key"),
     ;
 
 

sckw-modules/sckw-payment/src/main/java/com/sckw/payment/service/KwpLedgerLogisticsService.java

@@ -7,12 +7,11 @@ import com.sckw.core.common.enums.NumberConstant;
 import com.sckw.core.common.enums.enums.DictTypeEnum;
 import com.sckw.core.exception.BusinessException;
 import com.sckw.core.model.constant.Global;
+import com.sckw.core.model.enums.OrderRuleEnum;
+import com.sckw.core.model.enums.RedisOrderGenerateEnum;
 import com.sckw.core.model.page.PageRes;
 import com.sckw.core.model.vo.TableTop;
-import com.sckw.core.utils.CollectionUtils;
-import com.sckw.core.utils.IdWorker;
-import com.sckw.core.utils.OrderGenerateUtils;
-import com.sckw.core.utils.StringTimeUtil;
+import com.sckw.core.utils.*;
 import com.sckw.core.web.context.LoginUserHolder;
 import com.sckw.core.web.response.HttpResult;
 import com.sckw.payment.dao.KwpLedgerLogisticsMapper;
@@ -244,7 +243,7 @@ public class KwpLedgerLogisticsService extends AbsLedger {
             kwpLedgerLogistics.setCreateTime(LocalDateTime.now());
             kwpLedgerLogistics.setUpdateBy(LoginUserHolder.getUserId());
             kwpLedgerLogistics.setUpdateTime(LocalDateTime.now());
-            kwpLedgerLogistics.setLLedgerNo(OrderGenerateUtils.generateOrderNo("TR"));
+            kwpLedgerLogistics.setLLedgerNo(OrderGenerateSeqNoUtils.getOtherSeqNo(RedisOrderGenerateEnum.LEDGER_CHECKING, OrderRuleEnum.LEDGER_LOGISTICS_ORDER));
             logisticsMapper.insert(kwpLedgerLogistics);
         } else {
             //校验是否可以修改对账单
@@ -508,7 +507,7 @@ public class KwpLedgerLogisticsService extends AbsLedger {
         kwpSettlementLogistics.setId(new IdWorker(NumberConstant.ONE).nextId());
         kwpSettlementLogistics.setEntId(LoginUserHolder.getEntId());
         kwpSettlementLogistics.setLLedgerId(kwpLedgerLogistics.getId());
-        kwpSettlementLogistics.setSlOrderNo(OrderGenerateUtils.generateOrderNo("TP"));
+        kwpSettlementLogistics.setSlOrderNo(OrderGenerateSeqNoUtils.getOtherSeqNo(RedisOrderGenerateEnum.LEDGER_CHECKING, OrderRuleEnum.SETTLEMENT_LOGISTICS_ORDER));
         //取物流对账单名称
         kwpSettlementLogistics.setName(kwpLedgerLogistics.getName());
         //实际结算金额就是结算单实际需付金额

sckw-modules/sckw-payment/src/main/java/com/sckw/payment/service/KwpLedgerTradeService.java

@@ -8,6 +8,8 @@ import com.sckw.core.common.enums.enums.DictEnum;
 import com.sckw.core.common.enums.enums.DictTypeEnum;
 import com.sckw.core.exception.BusinessException;
 import com.sckw.core.model.constant.Global;
+import com.sckw.core.model.enums.OrderRuleEnum;
+import com.sckw.core.model.enums.RedisOrderGenerateEnum;
 import com.sckw.core.model.page.PageRes;
 import com.sckw.core.model.vo.TableTop;
 import com.sckw.core.utils.*;
@@ -211,7 +213,7 @@ public class KwpLedgerTradeService extends AbsLedger {
 
         kwpLedgerTrade.setDelFlag(Global.UN_DELETED);
         if (Objects.isNull(tradeSendReq.getId())) {
-            kwpLedgerTrade.setTLedgerNo(OrderGenerateUtils.generateOrderNo("BR"));
+            kwpLedgerTrade.setTLedgerNo(OrderGenerateSeqNoUtils.getOtherSeqNo(RedisOrderGenerateEnum.LEDGER_CHECKING, OrderRuleEnum.LEDGER_TRADE_ORDER));
             kwpLedgerTrade.setCreateBy(LoginUserHolder.getUserId());
             kwpLedgerTrade.setCreateTime(LocalDateTime.now());
             kwpLedgerTrade.setUpdateBy(LoginUserHolder.getUserId());
@@ -515,7 +517,7 @@ public class KwpLedgerTradeService extends AbsLedger {
         kwpSettlementTrade.setId(new IdWorker(NumberConstant.ONE).nextId());
         kwpSettlementTrade.setEntId(LoginUserHolder.getEntId());
         kwpSettlementTrade.setTLedgerId(kwpLedgerTrade.getId());
-        kwpSettlementTrade.setStOrderNo(OrderGenerateUtils.generateOrderNo("BP"));
+        kwpSettlementTrade.setStOrderNo(OrderGenerateSeqNoUtils.getOtherSeqNo(RedisOrderGenerateEnum.LEDGER_CHECKING, OrderRuleEnum.SETTLEMENT_TRADE_ORDER));
         kwpSettlementTrade.setName(kwpLedgerTrade.getName());
         kwpSettlementTrade.setTotalPrice(kwpLedgerTrade.getSettlePrice());
         kwpSettlementTrade.setActualPrice(kwpLedgerTrade.getActualPrice());