Quellcode durchsuchen

feature: ai贸易订单支持订单号查询

xucaiqin vor 6 Tagen
Ursprung
Commit
de642e6d9d

+ 4 - 0
sckw-modules-api/sckw-order-api/src/main/java/com/sckw/order/api/model/TradeOrderPara.java

@@ -1,5 +1,6 @@
 package com.sckw.order.api.model;
 
+import io.swagger.v3.oas.annotations.media.Schema;
 import jakarta.validation.constraints.NotNull;
 import lombok.Getter;
 import lombok.Setter;
@@ -22,6 +23,9 @@ public class TradeOrderPara implements Serializable {
     @NotNull(message = "开始时间不能为空")
     private LocalDateTime endTime;
 
+    @Schema(description = "贸易订单号")
+    private String orderNo;
+
     private List<Long> entId;
     private Long userId;
     /**

+ 5 - 1
sckw-modules-api/sckw-order-api/src/main/java/com/sckw/order/api/model/TradeOrderVo.java

@@ -2,6 +2,7 @@ package com.sckw.order.api.model;
 
 import com.fasterxml.jackson.annotation.JsonFormat;
 import com.fasterxml.jackson.annotation.JsonProperty;
+import io.swagger.v3.oas.annotations.media.Schema;
 import lombok.Getter;
 import lombok.Setter;
 import lombok.ToString;
@@ -18,6 +19,9 @@ public class TradeOrderVo implements Serializable {
 
     @Serial
     private static final long serialVersionUID = 6909518527687999256L;
+    @Schema(description = "跳转链接")
+    private String url;
+
     private Integer status;
     private String statusLabel;
     @JsonProperty("tOrderNo")
@@ -42,7 +46,7 @@ public class TradeOrderVo implements Serializable {
     private BigDecimal unloadAmount;
     private Integer chargeType;
     private String chargeTypeLabel;
-    @JsonFormat(pattern="yyyy-MM-dd HH:mm:ss", timezone = "GMT+8")
+    @JsonFormat(pattern = "yyyy-MM-dd HH:mm:ss", timezone = "GMT+8")
     private LocalDateTime createTime;
 
     /**

+ 1 - 0
sckw-modules/sckw-order/src/main/java/com/sckw/order/controller/KwoTradeOrderController.java

@@ -57,6 +57,7 @@ public class KwoTradeOrderController {
         tradeOrderPara.setStartTime(LocalDateTimeUtil.parse(orderPara.getStartTime(), "yyyy-MM-dd HH:mm:ss"));
         tradeOrderPara.setEndTime(LocalDateTimeUtil.parse(orderPara.getEndTime(), "yyyy-MM-dd HH:mm:ss"));
         tradeOrderPara.setUserId(orderPara.getUserId());
+        tradeOrderPara.setOrderNo(orderPara.getOrderNo());
         return HttpResult.ok("查询成功", kwoTradeOrderService.queryOrder(tradeOrderPara));
     }
 

+ 2 - 0
sckw-modules/sckw-order/src/main/java/com/sckw/order/enums/OrderPara.java

@@ -18,4 +18,6 @@ public class OrderPara {
     private String endTime;
     @Schema(description = "用户id")
     private Long userId;
+    @Schema(description = "贸易订单号")
+    private String orderNo;
 }

+ 3 - 0
sckw-modules/sckw-order/src/main/resources/mapper/KwoTradeOrderMapper.xml

@@ -757,6 +757,9 @@
             <if test="para.startTime != null and para.endTime != null">
                 and a.create_time between #{para.startTime,jdbcType=TIMESTAMP} and #{para.endTime,jdbcType=TIMESTAMP}
             </if>
+            <if test="para.orderNo != null and para.orderNo != ''">
+                and a.t_order_no = #{para.orderNo}
+            </if>
             <if test="para.entId != null and para.entId.size() > 0">
                 <if test="para.type != null and para.type == 1">
                     and