TRX 1 рік тому
батько
коміт
28788a8662

+ 12 - 0
FullCardServer/src/main/java/com/zhongshu/card/server/core/dataConfig/OrderConfig.java

@@ -0,0 +1,12 @@
+package com.zhongshu.card.server.core.dataConfig;
+
+/**
+ * @author TRX
+ * @date 2025/1/15
+ */
+public class OrderConfig {
+
+    // 订单最大有效时间
+    public static final Long orderExpirationTime = 5 * 60 * 1000L;
+
+}

+ 6 - 3
FullCardServer/src/main/java/com/zhongshu/card/server/core/domain/payment/ExpenseFlow.java

@@ -61,6 +61,12 @@ public class ExpenseFlow extends SuperMain {
     @Schema(description = "支付方式")
     private PaymentType paymentType;
 
+    @Schema(description = "支付来源:刷卡 二维码 刷脸")
+    private OrderFromType orderFromType;
+
+    @Schema(description = "订单失效时间")
+    private Long expirationTime;
+
     //----------------------------消费关联的用户信息 start ----------------------
     @Schema(description = "消费的用户userId")
     private String userId;
@@ -90,9 +96,6 @@ public class ExpenseFlow extends SuperMain {
     @Schema(description = "支付设备和方式")
     private PaymentDeviceType paymentDeviceType;
 
-    @Schema(description = "支付来源:刷卡 二维码 刷脸")
-    private OrderFromType orderFromType;
-
     @Schema(description = "卡片的编号,也是终端刷卡的 卡号")
     private String cardNo = "";
 

+ 1 - 1
FullCardServer/src/main/java/com/zhongshu/card/server/core/httpRequest/conf/IotCenterAPIConfig.java

@@ -21,7 +21,7 @@ public class IotCenterAPIConfig {
     // 项目同步
     public static final String syncFromFullCardProjects = "/projectSync/free/syncFromFullCardProjects";
 
-    public static final String openAPISendMessage = "/iotOpenAPI/manager/v1/sendIotMessage";
+    public static final String openAPISendMessage = "/iotOpenAPI/v1/sendIotMessage";
 
     public static final String sendIotGateWayMessage = "/iotOpenAPI/manager/v1/sendIotGateWayMessage";
 

+ 1 - 0
FullCardServer/src/main/java/com/zhongshu/card/server/core/service/payment/ExpenseFlowServiceImpl.java

@@ -148,6 +148,7 @@ public class ExpenseFlowServiceImpl extends SuperService implements ExpenseFlowS
         // 支付来源设备产品类型
         expenseFlow.setPaymentDeviceType(PaymentDeviceType.HxzConsumTransactions);
 
+        // 订单支付状态
         expenseFlow.setOrderState(OrderState.WAIT_PAYMENT);
         // 默认未结算状态
         expenseFlow.setSettlementState(SettlementState.Unsettled);

+ 17 - 0
FullCardServer/src/main/java/com/zhongshu/card/server/core/service/payment/OrderService.java

@@ -0,0 +1,17 @@
+package com.zhongshu.card.server.core.service.payment;
+
+import com.zhongshu.card.server.core.service.base.SuperService;
+import lombok.extern.slf4j.Slf4j;
+import org.springframework.stereotype.Service;
+
+/**
+ * 设备--创建订单 扫码 -- 指纹  扫脸 等方式
+ *
+ * @author TRX
+ * @date 2025/1/15
+ */
+@Slf4j
+@Service
+public class OrderService extends SuperService {
+
+}