feat sync source

dengwei
1 parent a28e3d3b
Showing 14 changed files with 113 additions and 79 deletions
cashier-mall/src/main/java/com/diligrp/cashier/mall/context/MallInitializeContext.java
cashier-mall/src/main/java/com/diligrp/cashier/mall/domain/sams/package-info.java
cashier-mall/src/main/java/com/diligrp/cashier/mall/exception/MallException.java
cashier-mall/src/main/java/com/diligrp/cashier/mall/exception/RtMartMallException.java
cashier-mall/src/main/java/com/diligrp/cashier/mall/model/MallBizOrder.java
cashier-mall/src/main/java/com/diligrp/cashier/mall/model/MallBizPayment.java
cashier-mall/src/main/java/com/diligrp/cashier/mall/service/biz/impl/MallBizOrderServiceImpl.java
cashier-mall/src/main/java/com/diligrp/cashier/mall/service/sourcechannel/RtMallChannel.java
cashier-mall/src/main/java/com/diligrp/cashier/mall/service/sourcechannel/SamMallChannel.java
cashier-mall/src/main/java/com/diligrp/cashier/mall/type/OrderSource.java
cashier-mall/src/main/java/com/diligrp/cashier/mall/type/OrderType.java
cashier-mall/src/main/java/com/diligrp/cashier/mall/type/PaymentChanel.java
cashier-shared/src/main/java/com/diligrp/cashier/shared/SharedConfiguration.java
cashier-shared/src/main/java/com/diligrp/cashier/shared/exception/PlatformServiceException.java
@@ -22,7 +22,7 @@ import java.util.Optional;
  */
 @Component
 public class MallInitializeContext implements InitializingBean, DisposableBean {
-    private static final Logger log = LoggerFactory.getLogger(MallInitializeContext.class);
+    private static final Logger LOG = LoggerFactory.getLogger(MallInitializeContext.class);
     public static Map<Integer, AbstractSourceChannel> SOURCE_CHANNEL_MAP = Maps.newConcurrentMap();
     public static Map<Integer, AbstractPayChannel> PAY_CHANNEL_MAP = Maps.newConcurrentMap();
@@ -38,6 +38,7 @@ public class MallInitializeContext implements InitializingBean, DisposableBean {
         SpringContextUtils.getBeanOfTpe(AbstractPayChannel.class).forEach((key, value) -> {
             PAY_CHANNEL_MAP.put(value.getPayChannel(), value);
         });
+        LOG.info("MallInitializeContext initialize success");
     }
     /**
@@ -45,7 +46,7 @@ public class MallInitializeContext implements InitializingBean, DisposableBean {
      */
     @Override
     public void destroy() throws Exception {
-        log.info("spring container destroy");
+        LOG.info("spring container destroy");
     }
     /**
+/**
+ * @ClassName package-info.java
+ * @author dengwei
+ * @version 1.0.0
+ * @Description TODO
+ * @date 2026-01-08 15:00
+ */
+package com.diligrp.cashier.mall.domain.sams;
@@ -13,10 +13,10 @@ import com.diligrp.cashier.shared.exception.PlatformServiceException;
 public class MallException extends PlatformServiceException {
     public MallException(String message) {
-        super(ErrorCode.SYSTEM_UNKNOWN_ERROR, message);
+        super(ErrorCode.SYSTEM_UNKNOWN_ERROR, message, Boolean.TRUE);
     }
     public MallException(String code, String message) {
-        super(code, message);
+        super(code, message, Boolean.TRUE);
     }
 }
 package com.diligrp.cashier.mall.exception;
-import com.diligrp.cashier.mall.MallConstants;
 import com.diligrp.cashier.mall.type.RtMarkErrorCode;
 import com.diligrp.cashier.shared.ErrorCode;
@@ -7,6 +7,7 @@ import com.diligrp.cashier.mall.type.OrderState;
 import com.diligrp.cashier.mall.type.RtmartState;
 import com.diligrp.cashier.mall.util.MallSnowflakeKeyManager;
 import com.diligrp.cashier.shared.domain.BaseDO;
+import com.diligrp.cashier.shared.type.SourceType;
 import com.diligrp.cashier.shared.util.SpringContextUtils;
 import com.diligrp.cashier.trade.type.SnowflakeKey;
 import com.fasterxml.jackson.annotation.JsonIgnoreProperties;
@@ -59,8 +60,8 @@ public class MallBizOrder extends BaseDO {
     private String mchId;
     /**
-     * 订单来源(1大润发 2山姆)-换取回调地址
-     * @see com.diligrp.cashier.mall.type.OrderSource
+     * 订单来源(10大润发 2山姆)-换取回调地址
+     * @see SourceType
      */
     private Integer source;
@@ -108,7 +108,6 @@ public class MallBizPayment extends BaseDO {
     /**
      * 支付渠道(微信 园区卡)
-     * @see com.diligrp.cashier.mall.type.PaymentChanel
      * @see com.diligrp.cashier.pipeline.type.ChannelType
      */
     private Integer channelId;
@@ -17,10 +17,13 @@ import com.diligrp.cashier.mall.model.*;
 import com.diligrp.cashier.mall.service.biz.MallBizOrderService;
 import com.diligrp.cashier.mall.service.biz.MallBizPaymentService;
 import com.diligrp.cashier.mall.type.OrderState;
+import com.diligrp.cashier.mall.type.OrderType;
 import com.diligrp.cashier.mall.type.RtMarkErrorCode;
+import com.diligrp.cashier.shared.exception.PlatformServiceException;
 import com.diligrp.cashier.shared.spi.ICashierDeskManager;
 import com.diligrp.cashier.shared.spi.domain.CashierOrderBO;
 import com.diligrp.cashier.shared.spi.domain.PaymentUrlBO;
+import com.diligrp.cashier.shared.type.SourceType;
 import com.diligrp.cashier.shared.util.JsonUtils;
 import jakarta.annotation.Resource;
 import org.apache.commons.collections4.CollectionUtils;
@@ -40,7 +43,6 @@ import java.util.Optional;
  * @author dengwei
  * @version 1.0.0
  * @Description MallBizOrderServiceImpl
- * @date 2025-12-26 14:42
  */
 @Service
 public class MallBizOrderServiceImpl implements MallBizOrderService {
@@ -63,7 +65,6 @@ public class MallBizOrderServiceImpl implements MallBizOrderService {
     /**
      * createOrder
-     *
      */
     @Override
     @Transactional(rollbackFor = {Exception.class})
@@ -86,7 +87,6 @@ public class MallBizOrderServiceImpl implements MallBizOrderService {
     /**
      * info
-     *
      */
     @Override
     public OrderPaymentVO info(OrderInfoCO orderInfoCo) {
@@ -178,7 +178,6 @@ public class MallBizOrderServiceImpl implements MallBizOrderService {
     /**
      * getByOrderId
-     *
      */
     @Override
     public MallBizOrder getByOrderId(String orderId) {
@@ -241,14 +240,18 @@ public class MallBizOrderServiceImpl implements MallBizOrderService {
         cashierOrderBO.setMchId(Long.valueOf(mallBizPayment.getMchId()));
         cashierOrderBO.setUserId(mallBizPayment.getUserCode());
         cashierOrderBO.setCashierType(2);
-        cashierOrderBO.setGoods("大润发支付");
         cashierOrderBO.setAmount(mallBizPayment.getPayFee());
         cashierOrderBO.setOutTradeNo(mallBizPayment.getPayTradeNo());
         // 支付成功跳转页面
         cashierOrderBO.setRedirectUrl(mallBizPayment.getCashierResultUrl());
-        cashierOrderBO.setDescription("大润发在线支付");
-        cashierOrderBO.setAttach("大润发在线支付");
         cashierOrderBO.setTimeout(mallBizOrders.getFirst().getOrderExpire() * 1000);
+        cashierOrderBO.setSource(mallBizOrders.getFirst().getSource());
+        cashierOrderBO.setGoods(
+                SourceType.getName(mallBizOrders.getFirst().getSource()) +
+                        OrderType.getDescription(mallBizOrders.getFirst().getOrderType()) + "支付！"
+        );
+        cashierOrderBO.setDescription(cashierOrderBO.getGoods());
+        cashierOrderBO.setAttach(cashierOrderBO.getGoods());
         PaymentUrlBO paymentUrlBO = cashierDeskManager.submitOrder(cashierOrderBO);
         Optional.ofNullable(paymentUrlBO).ifPresent(vo -> {
             mallBizPayment.setCashierUrl(vo.paymentUrl());
@@ -11,12 +11,12 @@ import com.diligrp.cashier.mall.model.MallBizPayment;
 import com.diligrp.cashier.mall.model.MallBizPaymentOrder;
 import com.diligrp.cashier.mall.model.MallBizRefund;
 import com.diligrp.cashier.mall.property.RtMallDynamicProperty;
-import com.diligrp.cashier.mall.type.OrderSource;
 import com.diligrp.cashier.mall.type.OrderType;
 import com.diligrp.cashier.mall.util.HttpClientUtils;
 import com.diligrp.cashier.mall.util.RtMallSignMd5Utils;
 import com.diligrp.cashier.shared.spi.domain.PaymentResultBO;
 import com.diligrp.cashier.shared.spi.domain.RefundResultBO;
+import com.diligrp.cashier.shared.type.SourceType;
 import com.diligrp.cashier.shared.util.DateUtils;
 import com.diligrp.cashier.shared.util.JsonUtils;
 import com.diligrp.cashier.shared.util.UrlParamParserUtils;
@@ -125,7 +125,7 @@ public class RtMallChannel extends AbstractSourceChannel {
             param.put("event", event);
             param.put("mallBizPayment", mallBizPayment);
             param.put("callBackMethod", "pay");
-            param.put("source", OrderSource.RT_MART.getCode());
+            param.put("source", mallBizOrder.getSource());
             sendDelayMessage(JsonUtils.toJsonString(param));
         }
         LOG.info("payCallBack message: {}", JsonUtils.toJsonString(message));
@@ -153,7 +153,7 @@ public class RtMallChannel extends AbstractSourceChannel {
             param.put("event", event);
             param.put("mallBizRefund", mallBizRefund);
             param.put("callBackMethod", "refund");
-            param.put("source", OrderSource.RT_MART.getCode());
+            param.put("source", mallBizOrder.getSource());
             sendDelayMessage(JsonUtils.toJsonString(param));
         }
         LOG.info("refundCallBack message: {}", JsonUtils.toJsonString(message));
@@ -180,6 +180,6 @@ public class RtMallChannel extends AbstractSourceChannel {
     @Override
     public Integer source() {
-        return OrderSource.RT_MART.getCode();
+        return SourceType.RTMARK.getCode();
     }
 }
+package com.diligrp.cashier.mall.service.sourcechannel;
+
+import com.diligrp.cashier.mall.domain.rtmall.co.AuthLoginCO;
+import com.diligrp.cashier.mall.domain.rtmall.vo.UserInfoVO;
+import com.diligrp.cashier.mall.model.MallBizPayment;
+import com.diligrp.cashier.mall.model.MallBizRefund;
+import com.diligrp.cashier.mall.property.RtMallDynamicProperty;
+import com.diligrp.cashier.shared.spi.domain.PaymentResultBO;
+import com.diligrp.cashier.shared.spi.domain.RefundResultBO;
+import org.slf4j.Logger;
+import org.slf4j.LoggerFactory;
+import org.springframework.stereotype.Component;
+
+/**
+ * @ClassName SamsMallChannel.java
+ * @author dengwei
+ * @version 1.0.0
+ * 山姆订单来源渠道
+ * @Description SamMallChannel
+ */
+@Component
+public class SamMallChannel extends AbstractSourceChannel {
+    private static final Logger LOG = LoggerFactory.getLogger(SamMallChannel.class);
+
+    @Override
+    public String authUrl(AuthLoginCO authLogin, String token, long timestamp) {
+        return "";
+    }
+
+    @Override
+    public void userInfoChannel(UserInfoVO authLogin, RtMallDynamicProperty.AppSecretDynamicProperty userInfoVO) {
+
+    }
+
+    @Override
+    public void payCallBack(PaymentResultBO event, MallBizPayment mallBizPayment) {
+
+    }
+
+    @Override
+    public void refundCallBack(RefundResultBO event, MallBizRefund mallBizRefund) {
+
+    }
+
+    @Override
+    public Integer source() {
+        return 20;
+    }
+}
-package com.diligrp.cashier.mall.type;
-
-/**
- * @ClassName OrderSrouce.java
- * @author dengwei
- * @version 1.0.0
- * @Description OrderSource
- * @date 2025-12-25 15:11
- */
-public enum OrderSource {
-    RT_MART(1, "大润发"),
-    SAM_CLUB(2, "山姆");
-
-    public final int code;
-    public final String name;
-
-    OrderSource(int code, String name) {
-        this.code = code;
-        this.name = name;
-    }
-
-    public int getCode() {
-        return code;
-    }
-
-    public String getName() {
-        return name;
-    }
-}
 package com.diligrp.cashier.mall.type;
+import java.util.Arrays;
+import java.util.Map;
+import java.util.stream.Collectors;
+
 /**
  * @ClassName OrderType.java
  * @author dengwei
  * @version 1.0.0
  * @Description OrderType
- * @date 2025-12-25 11:17
  */
 public enum OrderType {
     OFFLINE_SCAN(1, "线下扫码购"),
     API_SCAN(2, "接口扫码购"),
-    MINI_PROGRAM(3, "小程序");
+    MINI_PROGRAM(3, "小程序"),
+    ;
     public final int code;
     public final String description;
+    private static final Map<Integer, String> DATA = Arrays
+            .stream(values())
+            .collect(Collectors.toMap(OrderType::getCode, OrderType::getDescription));
+
     OrderType(int code, String description) {
         this.code = code;
         this.description = description;
@@ -27,4 +35,8 @@ public enum OrderType {
     public String getDescription() {
         return description;
     }
+
+    public static String getDescription(int code) {
+        return DATA.get(code);
+    }
 }
-package com.diligrp.cashier.mall.type;
-
-/**
- * @ClassName PaymentChanel.java
- * @author dengwei
- * @version 1.0.0
- * @Description PaymentChanel
- */
-public enum PaymentChanel {
-    WECHAT(10, "微信"),
-    PARK_CARD(19, "园区卡");
-
-    private final int code;
-    private final String description;
-
-    PaymentChanel(int code, String description) {
-        this.code = code;
-        this.description = description;
-    }
-
-    public int getCode() {
-        return code;
-    }
-
-    public String getDescription() {
-        return description;
-    }
-}
@@ -31,6 +31,8 @@ import java.time.LocalDateTime;
 import java.time.LocalTime;
 import java.time.format.DateTimeFormatter;
 import java.util.Date;
+import java.util.concurrent.Executor;
+import java.util.concurrent.Executors;
 @Configuration
 @ComponentScan("com.diligrp.cashier.shared")
@@ -163,4 +165,13 @@ public class SharedConfiguration {
             return new SecretKeySpec(source.getBytes(StandardCharsets.UTF_8), "HmacSHA256");
         }
     }
-}
 \ No newline at end of file
+
+    /**
+     * 配置虚拟线程池
+     * 虚拟线程池不需要设置核心线程数等等factory
+     */
+    @Bean(name = "virtualThreadPoolTaskExecutor")
+    public Executor virtualThreadPoolTaskExecutor() {
+        return Executors.newVirtualThreadPerTaskExecutor();
+    }
+}
@@ -26,6 +26,14 @@ public class PlatformServiceException extends RuntimeException {
         this.stackTrace = false;
     }
+    public PlatformServiceException(String code, String message, boolean stackTrace) {
+        super(message);
+        if (stackTrace) {
+            super.fillInStackTrace();
+        }
+        this.code = code;
+    }
+
     public PlatformServiceException(String message, Throwable ex) {
         super(message, ex);
     }