Browse Source

处理阿里规范前后端字段定义问题

lengfaqiang 2 years ago
parent
commit
9c41697a5b

+ 5 - 0
sckw-modules-api/sckw-transport-api/src/main/java/com/sckw/transport/api/model/dto/LogisticsOrderDTO.java

@@ -1,6 +1,7 @@
 package com.sckw.transport.api.model.dto;
 
 import com.fasterxml.jackson.annotation.JsonFormat;
+import com.fasterxml.jackson.annotation.JsonProperty;
 import lombok.Data;
 
 import java.io.Serializable;
@@ -19,21 +20,25 @@ public class LogisticsOrderDTO implements Serializable {
     /**
      * 物流订单id
      */
+    @JsonProperty("lOrderId")
     private String lOrderId;
 
     /**
      * 物流订单编号
      */
+    @JsonProperty("lOrderNO")
     private String lOrderNO;
 
     /**
      * 销售订单id
      */
+    @JsonProperty("tOrderId")
     private String tOrderId;
 
     /**
      * 销售订单编号
      */
+    @JsonProperty("tOrderNO")
     private String tOrderNO;
 
     /**

+ 4 - 0
sckw-modules-api/sckw-transport-api/src/main/java/com/sckw/transport/api/model/vo/KwtLogisticsOrderVO.java

@@ -1,6 +1,7 @@
 package com.sckw.transport.api.model.vo;
 
 import com.baomidou.mybatisplus.annotation.TableLogic;
+import com.fasterxml.jackson.annotation.JsonProperty;
 import lombok.Data;
 
 import java.io.Serializable;
@@ -27,16 +28,19 @@ public class KwtLogisticsOrderVO implements Serializable {
     /**
      * 交易订单id(kwo_trade_order)
      */
+    @JsonProperty("tOrderId")
     private Long tOrderId;
 
     /**
      * 交易订单编号(kwo_trade_order)
      */
+    @JsonProperty("tOrderNo")
     private String tOrderNo;
 
     /**
      * 物流订单编号
      */
+    @JsonProperty("lOrderNo")
     private String lOrderNo;
 
     /**

+ 5 - 0
sckw-modules-api/sckw-transport-api/src/main/java/com/sckw/transport/api/model/vo/LogisticsOrderVO.java

@@ -1,6 +1,7 @@
 package com.sckw.transport.api.model.vo;
 
 import com.fasterxml.jackson.annotation.JsonFormat;
+import com.fasterxml.jackson.annotation.JsonProperty;
 import lombok.Data;
 
 import java.io.Serializable;
@@ -19,21 +20,25 @@ public class LogisticsOrderVO implements Serializable {
     /**
      * 物流订单id
      */
+    @JsonProperty("lOrderId")
     private String lOrderId;
 
     /**
      * 物流订单编号
      */
+    @JsonProperty("lOrderNO")
     private String lOrderNO;
 
     /**
      * 销售订单id
      */
+    @JsonProperty("tOrderId")
     private String tOrderId;
 
     /**
      * 销售订单编号
      */
+    @JsonProperty("tOrderNO")
     private String tOrderNO;
 
     /**

+ 6 - 1
sckw-modules/sckw-report/src/main/java/com/sckw/report/service/vo/AcceptCarriageOrderVo.java

@@ -1,6 +1,7 @@
 package com.sckw.report.service.vo;
 
 import com.fasterxml.jackson.annotation.JsonFormat;
+import com.fasterxml.jackson.annotation.JsonProperty;
 import com.sckw.core.model.page.PageRequest;
 import lombok.Data;
 
@@ -91,10 +92,12 @@ public class AcceptCarriageOrderVo extends PageRequest {
     /**
      * 数据库id
      */
+    @JsonProperty("lOrderId")
     private String lOrderId;
     /**
      * 托运订单号
      */
+    @JsonProperty("lOrderNo")
     private String lOrderNo;
     /**
      * 合理损耗
@@ -157,10 +160,12 @@ public class AcceptCarriageOrderVo extends PageRequest {
     /**
      * 关联承运订单号
      */
+    @JsonProperty("wOrderNo")
     private String wOrderNo;
+
     private String createTime;
-    private String updateTime;
 
+    private String updateTime;
 
     /**
      * 发货单位

+ 6 - 2
sckw-modules/sckw-report/src/main/java/com/sckw/report/service/vo/ConsignOrderVo.java

@@ -1,5 +1,6 @@
 package com.sckw.report.service.vo;
 
+import com.fasterxml.jackson.annotation.JsonProperty;
 import lombok.Data;
 
 import java.io.Serializable;
@@ -75,10 +76,12 @@ public class ConsignOrderVo implements Serializable {
     /**
      * 数据库id
      */
+    @JsonProperty("lOrderId")
     private String lOrderId;
     /**
      * 托运订单号
      */
+    @JsonProperty("lOrderNo")
     private String lOrderNo;
     /**
      * 合理损耗
@@ -143,11 +146,12 @@ public class ConsignOrderVo implements Serializable {
     /**
      * 关联承运订单号
      */
+    @JsonProperty("wOrderNo")
     private String wOrderNo;
-    private String createTime;
-    private String updateTime;
 
+    private String createTime;
 
+    private String updateTime;
 
     /**
      * 发货单位

+ 4 - 0
sckw-modules/sckw-transport/src/main/java/com/sckw/transport/model/vo/ConsignOrderVO.java

@@ -1,5 +1,6 @@
 package com.sckw.transport.model.vo;
 
+import com.fasterxml.jackson.annotation.JsonProperty;
 import com.sckw.core.model.page.PageResult;
 import lombok.Data;
 
@@ -75,10 +76,12 @@ public class ConsignOrderVO extends PageResult implements Serializable {
     /**
      * 数据库id
      */
+    @JsonProperty("lOrderId")
     private String lOrderId;
     /**
      * 托运订单号
      */
+    @JsonProperty("lOrderNo")
     private String lOrderNo;
     /**
      * 合理损耗
@@ -135,5 +138,6 @@ public class ConsignOrderVO extends PageResult implements Serializable {
     /**
      * 关联承运订单号
      */
+    @JsonProperty("wOrderNo")
     private String wOrderNo;
 }

+ 4 - 0
sckw-modules/sckw-transport/src/main/java/com/sckw/transport/model/vo/KwtLogisticsOrderVO.java

@@ -2,6 +2,7 @@ package com.sckw.transport.model.vo;
 
 import com.alibaba.excel.annotation.ExcelProperty;
 import com.baomidou.mybatisplus.annotation.TableLogic;
+import com.fasterxml.jackson.annotation.JsonProperty;
 import com.sckw.excel.annotation.ExcelContext;
 import jakarta.validation.constraints.DecimalMin;
 import jakarta.validation.constraints.Digits;
@@ -39,16 +40,19 @@ public class KwtLogisticsOrderVO implements Serializable {
     /**
      * 交易订单id(kwo_trade_order)
      */
+    @JsonProperty("tOrderId")
     private Long tOrderId;
 
     /**
      * 交易订单编号(kwo_trade_order)
      */
+    @JsonProperty("tOrderNo")
     private String tOrderNo;
 
     /**
      * 物流订单编号
      */
+    @JsonProperty("lOrderNo")
     private String lOrderNo;
 
     /**

+ 2 - 2
sckw-modules/sckw-transport/src/main/resources/bootstrap.yml

@@ -5,8 +5,8 @@ spring:
   application:
     name: sckw-transport
   profiles:
-    active: ${DEPLOY_MODE:dev}
-#    active: @profiles.active@
+#    active: ${DEPLOY_MODE:dev}
+    active: @profiles.active@
   main:
     allow-bean-definition-overriding: true
     allow-circular-references: true