Просмотр исходного кода

解决tOrderId、tOderNo响应到页面变为torderId、torderNo问题

yzc 2 лет назад
Родитель
Сommit
ba60de0a45
16 измененных файлов с 39 добавлено и 0 удалено
  1. 3 0
      sckw-common/sckw-common-mongo/src/main/java/com/sckw/mongo/model/SckwTradeOrder.java
  2. 2 0
      sckw-modules-api/sckw-order-api/src/main/java/com/sckw/order/api/model/CompleteLogisticsOrderParam.java
  3. 2 0
      sckw-modules-api/sckw-order-api/src/main/java/com/sckw/order/api/model/CreateOrCancelLogisticsOrderParam.java
  4. 2 0
      sckw-modules-api/sckw-order-api/src/main/java/com/sckw/order/api/model/OrderDetailRes.java
  5. 2 0
      sckw-modules-api/sckw-order-api/src/main/java/com/sckw/order/api/model/UpdateAssociateStatementParam.java
  6. 2 0
      sckw-modules-api/sckw-order-api/src/main/java/com/sckw/order/api/model/UpdateOrderAmountParam.java
  7. 2 0
      sckw-modules-api/sckw-order-api/src/main/java/com/sckw/order/api/model/UpdateOrderStatusParam.java
  8. 2 0
      sckw-modules/sckw-order/src/main/java/com/sckw/order/model/KwoTradeOrder.java
  9. 3 0
      sckw-modules/sckw-order/src/main/java/com/sckw/order/model/KwoTradeOrderAddress.java
  10. 3 0
      sckw-modules/sckw-order/src/main/java/com/sckw/order/model/KwoTradeOrderContract.java
  11. 3 0
      sckw-modules/sckw-order/src/main/java/com/sckw/order/model/KwoTradeOrderGoods.java
  12. 3 0
      sckw-modules/sckw-order/src/main/java/com/sckw/order/model/KwoTradeOrderTrack.java
  13. 3 0
      sckw-modules/sckw-order/src/main/java/com/sckw/order/model/KwoTradeOrderUnit.java
  14. 2 0
      sckw-modules/sckw-order/src/main/java/com/sckw/order/model/vo/res/OrderDetailRes.java
  15. 2 0
      sckw-modules/sckw-order/src/main/java/com/sckw/order/model/vo/res/OrderListRes.java
  16. 3 0
      sckw-modules/sckw-report/src/main/java/com/sckw/report/service/vo/OrderListRes.java

+ 3 - 0
sckw-common/sckw-common-mongo/src/main/java/com/sckw/mongo/model/SckwTradeOrder.java

@@ -1,6 +1,7 @@
 package com.sckw.mongo.model;
 
 import com.fasterxml.jackson.annotation.JsonFormat;
+import com.fasterxml.jackson.annotation.JsonProperty;
 import lombok.AllArgsConstructor;
 import lombok.Data;
 import lombok.NoArgsConstructor;
@@ -33,11 +34,13 @@ public class SckwTradeOrder {
     /**
      * 订单主键
      */
+    @JsonProperty("tOrderId")
     private Long tOrderId;
 
     /**
      * 订单编号
      */
+    @JsonProperty("tOrderNo")
     private String tOrderNo;
 
     /**

+ 2 - 0
sckw-modules-api/sckw-order-api/src/main/java/com/sckw/order/api/model/CompleteLogisticsOrderParam.java

@@ -1,5 +1,6 @@
 package com.sckw.order.api.model;
 
+import com.fasterxml.jackson.annotation.JsonProperty;
 import lombok.Getter;
 import lombok.Setter;
 import lombok.ToString;
@@ -25,6 +26,7 @@ public class CompleteLogisticsOrderParam implements Serializable {
     /**
      * 订单id
      */
+    @JsonProperty("tOrderId")
     private Long tOrderId;
 
     /**

+ 2 - 0
sckw-modules-api/sckw-order-api/src/main/java/com/sckw/order/api/model/CreateOrCancelLogisticsOrderParam.java

@@ -1,5 +1,6 @@
 package com.sckw.order.api.model;
 
+import com.fasterxml.jackson.annotation.JsonProperty;
 import lombok.Getter;
 import lombok.Setter;
 import lombok.ToString;
@@ -25,6 +26,7 @@ public class CreateOrCancelLogisticsOrderParam implements Serializable {
     /**
      * 订单id
      */
+    @JsonProperty("tOrderId")
     private Long tOrderId;
 
     /**

+ 2 - 0
sckw-modules-api/sckw-order-api/src/main/java/com/sckw/order/api/model/OrderDetailRes.java

@@ -1,6 +1,7 @@
 package com.sckw.order.api.model;
 
 import com.fasterxml.jackson.annotation.JsonFormat;
+import com.fasterxml.jackson.annotation.JsonProperty;
 import lombok.Getter;
 import lombok.Setter;
 import lombok.ToString;
@@ -43,6 +44,7 @@ public class OrderDetailRes implements Serializable {
     /**
      * 订单编号
      */
+    @JsonProperty("tOrderNo")
     private String tOrderNo;
 
     /**

+ 2 - 0
sckw-modules-api/sckw-order-api/src/main/java/com/sckw/order/api/model/UpdateAssociateStatementParam.java

@@ -1,5 +1,6 @@
 package com.sckw.order.api.model;
 
+import com.fasterxml.jackson.annotation.JsonProperty;
 import lombok.Getter;
 import lombok.Setter;
 import lombok.ToString;
@@ -23,6 +24,7 @@ public class UpdateAssociateStatementParam implements Serializable {
     /**
      * 订单id
      */
+    @JsonProperty("tOrderId")
     private Long tOrderId;
 
     /**

+ 2 - 0
sckw-modules-api/sckw-order-api/src/main/java/com/sckw/order/api/model/UpdateOrderAmountParam.java

@@ -1,5 +1,6 @@
 package com.sckw.order.api.model;
 
+import com.fasterxml.jackson.annotation.JsonProperty;
 import lombok.Getter;
 import lombok.Setter;
 import lombok.ToString;
@@ -24,6 +25,7 @@ public class UpdateOrderAmountParam implements Serializable {
     /**
      * 订单id
      */
+    @JsonProperty("tOrderId")
     private Long tOrderId;
 
     /**

+ 2 - 0
sckw-modules-api/sckw-order-api/src/main/java/com/sckw/order/api/model/UpdateOrderStatusParam.java

@@ -1,5 +1,6 @@
 package com.sckw.order.api.model;
 
+import com.fasterxml.jackson.annotation.JsonProperty;
 import lombok.Getter;
 import lombok.Setter;
 import lombok.ToString;
@@ -22,6 +23,7 @@ public class UpdateOrderStatusParam implements Serializable {
     /**
      * 订单id
      */
+    @JsonProperty("tOrderId")
     private Long tOrderId;
 
     /**

+ 2 - 0
sckw-modules/sckw-order/src/main/java/com/sckw/order/model/KwoTradeOrder.java

@@ -1,6 +1,7 @@
 package com.sckw.order.model;
 
 import com.baomidou.mybatisplus.annotation.TableName;
+import com.fasterxml.jackson.annotation.JsonProperty;
 import com.sckw.core.model.base.BaseModel;
 import lombok.Getter;
 import lombok.Setter;
@@ -32,6 +33,7 @@ public class KwoTradeOrder extends BaseModel implements Serializable {
     /**
      * 订单编号
      */
+    @JsonProperty("tOrderNo")
     private String tOrderNo;
 
     /**

+ 3 - 0
sckw-modules/sckw-order/src/main/java/com/sckw/order/model/KwoTradeOrderAddress.java

@@ -1,6 +1,7 @@
 package com.sckw.order.model;
 
 import com.baomidou.mybatisplus.annotation.TableName;
+import com.fasterxml.jackson.annotation.JsonProperty;
 import com.sckw.core.model.base.BaseModel;
 import lombok.Getter;
 import lombok.Setter;
@@ -28,11 +29,13 @@ public class KwoTradeOrderAddress extends BaseModel implements Serializable {
     /**
      * 交易订单id
      */
+    @JsonProperty("tOrderId")
     private Long tOrderId;
 
     /**
      * 订单编号
      */
+    @JsonProperty("tOrderNo")
     private String tOrderNo;
 
     /**

+ 3 - 0
sckw-modules/sckw-order/src/main/java/com/sckw/order/model/KwoTradeOrderContract.java

@@ -1,6 +1,7 @@
 package com.sckw.order.model;
 
 import com.baomidou.mybatisplus.annotation.TableName;
+import com.fasterxml.jackson.annotation.JsonProperty;
 import com.sckw.core.model.base.BaseModel;
 import lombok.Getter;
 import lombok.Setter;
@@ -37,11 +38,13 @@ public class KwoTradeOrderContract extends BaseModel implements Serializable {
     /**
      * 订单id(销售订单/采购订单)
      */
+    @JsonProperty("tOrderId")
     private Long tOrderId;
 
     /**
      * 订单编号(销售订单/采购订单)
      */
+    @JsonProperty("tOrderNo")
     private String tOrderNo;
 
 }

+ 3 - 0
sckw-modules/sckw-order/src/main/java/com/sckw/order/model/KwoTradeOrderGoods.java

@@ -1,6 +1,7 @@
 package com.sckw.order.model;
 
 import com.baomidou.mybatisplus.annotation.TableName;
+import com.fasterxml.jackson.annotation.JsonProperty;
 import com.sckw.core.model.base.BaseModel;
 import lombok.Getter;
 import lombok.Setter;
@@ -28,11 +29,13 @@ public class KwoTradeOrderGoods extends BaseModel implements Serializable {
     /**
      * 交易订单id
      */
+    @JsonProperty("tOrderId")
     private Long tOrderId;
 
     /**
      * 订单编号
      */
+    @JsonProperty("tOrderNo")
     private String tOrderNo;
 
     /**

+ 3 - 0
sckw-modules/sckw-order/src/main/java/com/sckw/order/model/KwoTradeOrderTrack.java

@@ -1,6 +1,7 @@
 package com.sckw.order.model;
 
 import com.baomidou.mybatisplus.annotation.TableName;
+import com.fasterxml.jackson.annotation.JsonProperty;
 import com.sckw.core.model.base.BaseModel;
 import lombok.Getter;
 import lombok.Setter;
@@ -27,11 +28,13 @@ public class KwoTradeOrderTrack extends BaseModel implements Serializable {
     /**
      * 交易订单id
      */
+    @JsonProperty("tOrderId")
     private Long tOrderId;
 
     /**
      * 订单编号
      */
+    @JsonProperty("tOrderNo")
     private String tOrderNo;
 
 }

+ 3 - 0
sckw-modules/sckw-order/src/main/java/com/sckw/order/model/KwoTradeOrderUnit.java

@@ -1,6 +1,7 @@
 package com.sckw.order.model;
 
 import com.baomidou.mybatisplus.annotation.TableName;
+import com.fasterxml.jackson.annotation.JsonProperty;
 import com.sckw.core.model.base.BaseModel;
 import lombok.Getter;
 import lombok.Setter;
@@ -27,11 +28,13 @@ public class KwoTradeOrderUnit extends BaseModel implements Serializable {
     /**
      * 交易订单id
      */
+    @JsonProperty("tOrderId")
     private Long tOrderId;
 
     /**
      * 订单编号
      */
+    @JsonProperty("tOrderNo")
     private String tOrderNo;
 
     /**

+ 2 - 0
sckw-modules/sckw-order/src/main/java/com/sckw/order/model/vo/res/OrderDetailRes.java

@@ -1,6 +1,7 @@
 package com.sckw.order.model.vo.res;
 
 import com.fasterxml.jackson.annotation.JsonFormat;
+import com.fasterxml.jackson.annotation.JsonProperty;
 import com.sckw.order.model.vo.req.ContractInfo;
 import lombok.Getter;
 import lombok.Setter;
@@ -44,6 +45,7 @@ public class OrderDetailRes implements Serializable {
     /**
      * 订单编号
      */
+    @JsonProperty("tOrderNo")
     private String tOrderNo;
 
     /**

+ 2 - 0
sckw-modules/sckw-order/src/main/java/com/sckw/order/model/vo/res/OrderListRes.java

@@ -1,5 +1,6 @@
 package com.sckw.order.model.vo.res;
 
+import com.fasterxml.jackson.annotation.JsonProperty;
 import lombok.Getter;
 import lombok.Setter;
 import lombok.ToString;
@@ -33,6 +34,7 @@ public class OrderListRes implements Serializable {
     /**
      * 订单编号
      */
+    @JsonProperty("tOrderNo")
     private String tOrderNo;
     /**
      * 采购单位

+ 3 - 0
sckw-modules/sckw-report/src/main/java/com/sckw/report/service/vo/OrderListRes.java

@@ -1,6 +1,7 @@
 package com.sckw.report.service.vo;
 
 import com.fasterxml.jackson.annotation.JsonFormat;
+import com.fasterxml.jackson.annotation.JsonProperty;
 import lombok.Getter;
 import lombok.Setter;
 import lombok.ToString;
@@ -24,6 +25,7 @@ public class OrderListRes {
     /**
      * 订单id
      */
+    @JsonProperty("tOrderId")
     private Long tOrderId;
     /**
      * 订单状态
@@ -36,6 +38,7 @@ public class OrderListRes {
     /**
      * 订单编号
      */
+    @JsonProperty("tOrderNo")
     private String tOrderNo;
     /**
      * 采购企业主键ID