Merge remote-tracking branch 'origin/master'

FullCardClient/src/main/java/com/zhongshu/card/client/model/base/SuperSearch.java

@@ -24,8 +24,8 @@ public class SuperSearch implements Serializable {
     @JsonProperty("oid")
     private String oid;
 
-    @Schema(description = "epId")
-    private String epId;
+//    @Schema(description = "epId")
+//    private String epId;
 
     @Schema(description = "所属项目oid")
     private String projectOid;

FullCardServer/src/main/java/com/zhongshu/card/server/core/controller/devices/deviceProduct/DeviceProductBindDeviceController.java

@@ -3,7 +3,6 @@ package com.zhongshu.card.server.core.controller.devices.deviceProduct;
 import com.github.microservice.auth.security.annotations.ResourceAuth;
 import com.github.microservice.auth.security.type.AuthType;
 import com.github.microservice.net.ResultContent;
-import com.zhongshu.card.client.model.base.IDParam;
 import com.zhongshu.card.client.model.base.IDsParam;
 import com.zhongshu.card.client.model.devices.deviceProduct.DeviceProductBindDeviceBind;
 import com.zhongshu.card.client.model.devices.deviceProduct.DeviceProductBindDeviceModel;
@@ -44,14 +43,7 @@ public class DeviceProductBindDeviceController {
     }
 
     @ResourceAuth(value = "user", type = AuthType.User)
-    @Operation(summary = "删除设备", description = "删除设备")
-    @RequestMapping(value = "deleteDeviceInfo", method = {RequestMethod.POST})
-    public ResultContent deleteDeviceInfo(@RequestBody IDParam param) {
-        return this.deviceProductBindDeviceService.deleteDeviceInfo(param.getId());
-    }
-
-    @ResourceAuth(value = "user", type = AuthType.User)
-    @Operation(summary = "删除设备(多个)", description = "删除设备(多个)")
+    @Operation(summary = "移除设备(多个)", description = "移除设备(多个)")
     @RequestMapping(value = "deleteDevicesInfo", method = {RequestMethod.POST})
     public ResultContent deleteDevicesInfo(@RequestBody IDsParam param) {
         return this.deviceProductBindDeviceService.deleteDevicesInfo(param);

FullCardServer/src/main/java/com/zhongshu/card/server/core/controller/gateDoor/GateDoorController.java

@@ -15,7 +15,7 @@ import org.springframework.web.bind.annotation.*;
 
 @Slf4j
 @RestController
-@RequestMapping("openAPI/gateDoor/v1")
+@RequestMapping("/openAPI/gateDoor/v1")
 @Tag(name = "门闸")
 @Hidden
 public class GateDoorController {

FullCardServer/src/main/java/com/zhongshu/card/server/core/controller/openAPI/OrganizationUserOpenApiController.java

@@ -1,7 +1,5 @@
 package com.zhongshu.card.server.core.controller.openAPI;
 
-import com.github.microservice.auth.security.annotations.ResourceAuth;
-import com.github.microservice.auth.security.type.AuthType;
 import com.github.microservice.net.ResultContent;
 import com.zhongshu.card.client.model.base.IDParam;
 import com.zhongshu.card.client.openApi.model.OrganizationUserOpenApiModel;

FullCardServer/src/main/java/com/zhongshu/card/server/core/controller/payment/HxzController.java

@@ -4,7 +4,6 @@ package com.zhongshu.card.server.core.controller.payment;
 import com.github.microservice.models.hxz.*;
 import com.github.microservice.net.ResultContent;
 import com.zhongshu.card.server.core.service.hxz.HxzService;
-import io.swagger.v3.oas.annotations.Hidden;
 import io.swagger.v3.oas.annotations.Operation;
 import io.swagger.v3.oas.annotations.tags.Tag;
 import lombok.extern.slf4j.Slf4j;
@@ -17,9 +16,8 @@ import org.springframework.web.bind.annotation.RestController;
 
 @Slf4j
 @RestController
-@RequestMapping("hxz/v1")
+@RequestMapping("/openAPI/hxz/v1")
 @Tag(name = "云版消费机接口-HXZ")
-@Hidden
 public class HxzController {
 
     @Autowired

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;
+
+}

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 = "";
 

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";
 

FullCardServer/src/main/java/com/zhongshu/card/server/core/service/openAPI/OpenApiRequestService.java

@@ -9,7 +9,6 @@ import com.github.microservice.core.util.net.apache.MethodType;
 import com.github.microservice.core.util.net.apache.ResponseModel;
 import com.github.microservice.http.APIResponseModel;
 import com.github.microservice.http.ApiConfParam;
-import com.github.microservice.models.iot.IotSendGateWayParam;
 import com.github.microservice.models.iot.IotSendParam;
 import com.github.microservice.net.ResultContent;
 import com.zhongshu.card.server.core.dao.org.OrganizationDao;

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);

FullCardServer/src/main/java/com/zhongshu/card/server/core/service/payment/OrderService.java

@@ -0,0 +1,28 @@
+package com.zhongshu.card.server.core.service.payment;
+
+import com.github.microservice.net.ResultContent;
+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 {
+
+    /**
+     * 小程序扫 设备码 下单
+     *
+     * @return
+     */
+    public ResultContent cqrCodeBCreateOrder() {
+
+        return ResultContent.buildSuccess();
+    }
+
+}