From f0a432d2c5918740dd6c7c428ef29ed9f2e55fb0 Mon Sep 17 00:00:00 2001
From: ZY <zc857179121@qq.com>
Date: 星期六, 20 七月 2024 17:03:53 +0800
Subject: [PATCH] 视图sql提交

---
 src/main/java/com/zy/asrs/entity/Order.java |   25 +++++++++++++++++++++++--
 1 files changed, 23 insertions(+), 2 deletions(-)

diff --git a/src/main/java/com/zy/asrs/entity/Order.java b/src/main/java/com/zy/asrs/entity/Order.java
index 99abc64..bbfd19e 100644
--- a/src/main/java/com/zy/asrs/entity/Order.java
+++ b/src/main/java/com/zy/asrs/entity/Order.java
@@ -93,7 +93,7 @@
      * 瀹㈡埛缂栧彿
      */
     @ApiModelProperty(value= "瀹㈡埛缂栧彿")
-    private Long cstmr;
+    private String cstmr;
 
     /**
      * 瀹㈡埛
@@ -261,9 +261,16 @@
     @ApiModelProperty(value= "澶囨敞")
     private String memo;
 
+    /**
+     * 鐘舵�� 1: 杩涜涓�  0: 鍒濆  2:宸插畬鎴�
+     */
+    @ApiModelProperty(value= "鐘舵��  2:宸插畬鎴� 1: 杩涜涓� 0: 鍒濆  ")
+    @TableField("move_status")
+    private Integer moveStatus;
+
     public Order() {}
 
-    public Order(String uuid,String orderNo,String orderTime,Long docType,Long itemId,String itemName,Long allotItemId,String defNumber,String number,Long cstmr,String cstmrName,String tel,String operMemb,Double totalFee,Double discount,Double discountFee,Double otherFee,Double actFee,Integer payType,String salesman,Integer accountDay,Integer postFeeType,Double postFee,Date payTime,Date sendTime,String shipName,String shipCode,Long settle,Integer status,Long createBy,Date createTime,Long updateBy,Date updateTime,String memo) {
+    public Order(String uuid,String orderNo,String orderTime,Long docType,Long itemId,String itemName,Long allotItemId,String defNumber,String number,String cstmr,String cstmrName,String tel,String operMemb,Double totalFee,Double discount,Double discountFee,Double otherFee,Double actFee,Integer payType,String salesman,Integer accountDay,Integer postFeeType,Double postFee,Date payTime,Date sendTime,String shipName,String shipCode,Long settle,Integer status,Long createBy,Date createTime,Long updateBy,Date updateTime,String memo) {
         this.uuid = uuid;
         this.orderNo = orderNo;
         this.orderTime = orderTime;
@@ -405,6 +412,20 @@
         }
     }
 
+    public String getMoveStatus$(){
+        if (null == this.moveStatus){ return null; }
+        switch (this.moveStatus){
+            case 2:
+                return "宸插璐�";
+            case 1:
+                return "澶囪揣涓�";
+            case 0:
+                return "鏈垵濮�";
+            default:
+                return String.valueOf(this.moveStatus);
+        }
+    }
+
     public String getCreateBy$(){
         UserService service = SpringUtils.getBean(UserService.class);
         User user = service.selectById(this.createBy);

--
Gitblit v1.9.1