From dfc9552392f9f973ab52e55d58a7ae2acdaeb1f3 Mon Sep 17 00:00:00 2001
From: zhangc <zc@123>
Date: 星期日, 09 三月 2025 14:19:43 +0800
Subject: [PATCH] 四期
---
src/main/java/com/zy/asrs/entity/Order.java | 157 ++++++++++++++++++++++++++++++----------------------
1 files changed, 91 insertions(+), 66 deletions(-)
diff --git a/src/main/java/com/zy/asrs/entity/Order.java b/src/main/java/com/zy/asrs/entity/Order.java
index 02f85b4..a4ba061 100644
--- a/src/main/java/com/zy/asrs/entity/Order.java
+++ b/src/main/java/com/zy/asrs/entity/Order.java
@@ -27,243 +27,259 @@
/**
* ID
*/
- @ApiModelProperty(value= "ID")
+ @ApiModelProperty(value = "ID")
@TableId(value = "id", type = IdType.AUTO)
private Long id;
/**
* 缂栧彿
*/
- @ApiModelProperty(value= "缂栧彿")
+ @ApiModelProperty(value = "缂栧彿")
private String uuid;
/**
* 璁㈠崟缂栧彿
*/
- @ApiModelProperty(value= "璁㈠崟缂栧彿")
+ @ApiModelProperty(value = "璁㈠崟缂栧彿")
@TableField("order_no")
private String orderNo;
/**
* 鍗曟嵁鏃ユ湡
*/
- @ApiModelProperty(value= "鍗曟嵁鏃ユ湡")
+ @ApiModelProperty(value = "鍗曟嵁鏃ユ湡")
@TableField("order_time")
private String orderTime;
/**
* 鍗曟嵁绫诲瀷
*/
- @ApiModelProperty(value= "鍗曟嵁绫诲瀷")
+ @ApiModelProperty(value = "鍗曟嵁绫诲瀷")
@TableField("doc_type")
private Long docType;
/**
* 椤圭洰缂栧彿
*/
- @ApiModelProperty(value= "椤圭洰缂栧彿")
+ @ApiModelProperty(value = "椤圭洰缂栧彿")
@TableField("item_id")
private Long itemId;
- @ApiModelProperty(value= "")
+ @ApiModelProperty(value = "")
@TableField("item_name")
private String itemName;
/**
* 璋冩嫧椤圭洰缂栧彿
*/
- @ApiModelProperty(value= "璋冩嫧椤圭洰缂栧彿")
+ @ApiModelProperty(value = "璋冩嫧椤圭洰缂栧彿")
@TableField("allot_item_id")
private Long allotItemId;
/**
* 鍒濆绁ㄦ嵁鍙�
*/
- @ApiModelProperty(value= "鍒濆绁ㄦ嵁鍙�")
+ @ApiModelProperty(value = "鍒濆绁ㄦ嵁鍙�")
@TableField("def_number")
private String defNumber;
/**
* 绁ㄦ嵁鍙�
*/
- @ApiModelProperty(value= "绁ㄦ嵁鍙�")
+ @ApiModelProperty(value = "绁ㄦ嵁鍙�")
private String number;
/**
* 瀹㈡埛缂栧彿
*/
- @ApiModelProperty(value= "瀹㈡埛缂栧彿")
+ @ApiModelProperty(value = "瀹㈡埛缂栧彿")
private Long cstmr;
/**
* 瀹㈡埛
*/
- @ApiModelProperty(value= "瀹㈡埛")
+ @ApiModelProperty(value = "瀹㈡埛")
@TableField("cstmr_name")
private String cstmrName;
/**
* 鑱旂郴鏂瑰紡
*/
- @ApiModelProperty(value= "鑱旂郴鏂瑰紡")
+ @ApiModelProperty(value = "鑱旂郴鏂瑰紡")
private String tel;
/**
* 鎿嶄綔浜哄憳
*/
- @ApiModelProperty(value= "鎿嶄綔浜哄憳")
+ @ApiModelProperty(value = "鎿嶄綔浜哄憳")
@TableField("oper_memb")
private String operMemb;
/**
* 鍚堣閲戦
*/
- @ApiModelProperty(value= "鍚堣閲戦")
+ @ApiModelProperty(value = "鍚堣閲戦")
@TableField("total_fee")
private Double totalFee;
/**
* 浼樻儬鐜�
*/
- @ApiModelProperty(value= "浼樻儬鐜�")
+ @ApiModelProperty(value = "浼樻儬鐜�")
private Double discount;
/**
* 浼樻儬閲戦
*/
- @ApiModelProperty(value= "浼樻儬閲戦")
+ @ApiModelProperty(value = "浼樻儬閲戦")
@TableField("discount_fee")
private Double discountFee;
/**
* 閿�鍞垨閲囪喘璐圭敤鍚堣
*/
- @ApiModelProperty(value= "閿�鍞垨閲囪喘璐圭敤鍚堣")
+ @ApiModelProperty(value = "閿�鍞垨閲囪喘璐圭敤鍚堣")
@TableField("other_fee")
private Double otherFee;
/**
* 瀹炰粯閲戦
*/
- @ApiModelProperty(value= "瀹炰粯閲戦")
+ @ApiModelProperty(value = "瀹炰粯閲戦")
@TableField("act_fee")
private Double actFee;
/**
* 浠樻绫诲瀷 1: 鐜伴噾 2: 璁拌处
*/
- @ApiModelProperty(value= "浠樻绫诲瀷 1: 鐜伴噾 2: 璁拌处 ")
+ @ApiModelProperty(value = "浠樻绫诲瀷 1: 鐜伴噾 2: 璁拌处 ")
@TableField("pay_type")
private Integer payType;
/**
* 涓氬姟鍛�
*/
- @ApiModelProperty(value= "涓氬姟鍛�")
+ @ApiModelProperty(value = "涓氬姟鍛�")
private String salesman;
/**
* setMemo
*/
- @ApiModelProperty(value= "缁撶畻澶╂暟")
+ @ApiModelProperty(value = "缁撶畻澶╂暟")
@TableField("account_day")
private Integer accountDay;
/**
* 閭垂鏀粯绫诲瀷 1: 鍦ㄧ嚎鏀粯 2: 璐у埌浠樻
*/
- @ApiModelProperty(value= "閭垂鏀粯绫诲瀷 1: 鍦ㄧ嚎鏀粯 2: 璐у埌浠樻 ")
+ @ApiModelProperty(value = "閭垂鏀粯绫诲瀷 1: 鍦ㄧ嚎鏀粯 2: 璐у埌浠樻 ")
@TableField("post_fee_type")
private Integer postFeeType;
/**
* 閭垂
*/
- @ApiModelProperty(value= "閭垂")
+ @ApiModelProperty(value = "閭垂")
@TableField("post_fee")
private Double postFee;
/**
* 浠樻鏃堕棿
*/
- @ApiModelProperty(value= "浠樻鏃堕棿")
+ @ApiModelProperty(value = "浠樻鏃堕棿")
@TableField("pay_time")
- @DateTimeFormat(pattern="yyyy-MM-dd HH:mm:ss")
+ @DateTimeFormat(pattern = "yyyy-MM-dd HH:mm:ss")
private Date payTime;
/**
* 鍙戣揣鏃堕棿
*/
- @ApiModelProperty(value= "鍙戣揣鏃堕棿")
+ @ApiModelProperty(value = "鍙戣揣鏃堕棿")
@TableField("send_time")
- @DateTimeFormat(pattern="yyyy-MM-dd HH:mm:ss")
+ @DateTimeFormat(pattern = "yyyy-MM-dd HH:mm:ss")
private Date sendTime;
/**
* 鐗╂祦鍚嶇О
*/
- @ApiModelProperty(value= "鐗╂祦鍚嶇О")
+ @ApiModelProperty(value = "鐗╂祦鍚嶇О")
@TableField("ship_name")
private String shipName;
/**
* 鐗╂祦鍗曞彿
*/
- @ApiModelProperty(value= "鐗╂祦鍗曞彿")
+ @ApiModelProperty(value = "鐗╂祦鍗曞彿")
@TableField("ship_code")
private String shipCode;
/**
* 璁㈠崟鐘舵��
*/
- @ApiModelProperty(value= "璁㈠崟鐘舵��")
+ @ApiModelProperty(value = "璁㈠崟鐘舵��")
private Long settle;
/**
* 鐘舵�� 1: 姝ｅ父 0: 绂佺敤
*/
- @ApiModelProperty(value= "鐘舵�� 1: 姝ｅ父 0: 绂佺敤 ")
+ @ApiModelProperty(value = "鐘舵�� 1: 姝ｅ父 0: 绂佺敤 ")
private Integer status;
/**
* 娣诲姞浜哄憳
*/
- @ApiModelProperty(value= "娣诲姞浜哄憳")
+ @ApiModelProperty(value = "娣诲姞浜哄憳")
@TableField("create_by")
private Long createBy;
/**
* 娣诲姞鏃堕棿
*/
- @ApiModelProperty(value= "娣诲姞鏃堕棿")
+ @ApiModelProperty(value = "娣诲姞鏃堕棿")
@TableField("create_time")
- @DateTimeFormat(pattern="yyyy-MM-dd HH:mm:ss")
+ @DateTimeFormat(pattern = "yyyy-MM-dd HH:mm:ss")
private Date createTime;
/**
* 淇敼浜哄憳
*/
- @ApiModelProperty(value= "淇敼浜哄憳")
+ @ApiModelProperty(value = "淇敼浜哄憳")
@TableField("update_by")
private Long updateBy;
/**
* 淇敼鏃堕棿
*/
- @ApiModelProperty(value= "淇敼鏃堕棿")
+ @ApiModelProperty(value = "淇敼鏃堕棿")
@TableField("update_time")
- @DateTimeFormat(pattern="yyyy-MM-dd HH:mm:ss")
+ @DateTimeFormat(pattern = "yyyy-MM-dd HH:mm:ss")
private Date updateTime;
/**
* 澶囨敞
*/
- @ApiModelProperty(value= "澶囨敞")
+ @ApiModelProperty(value = "澶囨敞")
private String memo;
- public Order() {}
+ @ApiModelProperty(value = "erp浠撳簱缂栫爜")
+ @TableField("plt_type")
+ private Integer pltType;
- 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) {
+ /**
+ * 鍏ュ簱鏃ユ湡
+ */
+ @ApiModelProperty(value = "鍏ュ簱鏃ユ湡")
+ @TableField("in_time")
+ private String inTime;
+
+
+ @TableField("Upstreamcode")
+ private String Upstreamcode;
+
+ 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) {
this.uuid = uuid;
this.orderNo = orderNo;
this.orderTime = orderTime;
@@ -337,18 +353,20 @@
// null // 澶囨敞
// );
- public String getDocType$(){
+ public String getDocType$() {
DocTypeService service = SpringUtils.getBean(DocTypeService.class);
DocType docType = service.selectById(this.docType);
- if (!Cools.isEmpty(docType)){
+ if (!Cools.isEmpty(docType)) {
return String.valueOf(docType.getDocName());
}
return null;
}
- public String getPayType$(){
- if (null == this.payType){ return null; }
- switch (this.payType){
+ public String getPayType$() {
+ if (null == this.payType) {
+ return null;
+ }
+ switch (this.payType) {
case 1:
return "鐜伴噾";
case 2:
@@ -358,9 +376,11 @@
}
}
- public String getPostFeeType$(){
- if (null == this.postFeeType){ return null; }
- switch (this.postFeeType){
+ public String getPostFeeType$() {
+ if (null == this.postFeeType) {
+ return null;
+ }
+ switch (this.postFeeType) {
case 1:
return "鍦ㄧ嚎鏀粯";
case 2:
@@ -370,32 +390,34 @@
}
}
- public String getPayTime$(){
- if (Cools.isEmpty(this.payTime)){
+ public String getPayTime$() {
+ if (Cools.isEmpty(this.payTime)) {
return "";
}
return new SimpleDateFormat("yyyy-MM-dd HH:mm:ss").format(this.payTime);
}
- public String getSendTime$(){
- if (Cools.isEmpty(this.sendTime)){
+ public String getSendTime$() {
+ if (Cools.isEmpty(this.sendTime)) {
return "";
}
return new SimpleDateFormat("yyyy-MM-dd HH:mm:ss").format(this.sendTime);
}
- public String getSettle$(){
+ public String getSettle$() {
OrderSettleService service = SpringUtils.getBean(OrderSettleService.class);
OrderSettle orderSettle = service.selectById(this.settle);
- if (!Cools.isEmpty(orderSettle)){
+ if (!Cools.isEmpty(orderSettle)) {
return String.valueOf(orderSettle.getSettleName());
}
return null;
}
- public String getStatus$(){
- if (null == this.status){ return null; }
- switch (this.status){
+ public String getStatus$() {
+ if (null == this.status) {
+ return null;
+ }
+ switch (this.status) {
case 1:
return "姝ｅ父";
case 0:
@@ -405,33 +427,36 @@
}
}
- public String getCreateBy$(){
+ public String getCreateBy$() {
+ if (!Cools.isEmpty(this.createBy) && this.createBy == 9999L) {
+ return "绯荤粺鍚屾";
+ }
UserService service = SpringUtils.getBean(UserService.class);
User user = service.selectById(this.createBy);
- if (!Cools.isEmpty(user)){
+ if (!Cools.isEmpty(user)) {
return String.valueOf(user.getUsername());
}
return null;
}
- public String getCreateTime$(){
- if (Cools.isEmpty(this.createTime)){
+ public String getCreateTime$() {
+ if (Cools.isEmpty(this.createTime)) {
return "";
}
return new SimpleDateFormat("yyyy-MM-dd HH:mm:ss").format(this.createTime);
}
- public String getUpdateBy$(){
+ public String getUpdateBy$() {
UserService service = SpringUtils.getBean(UserService.class);
User user = service.selectById(this.updateBy);
- if (!Cools.isEmpty(user)){
+ if (!Cools.isEmpty(user)) {
return String.valueOf(user.getUsername());
}
return null;
}
- public String getUpdateTime$(){
- if (Cools.isEmpty(this.updateTime)){
+ public String getUpdateTime$() {
+ if (Cools.isEmpty(this.updateTime)) {
return "";
}
return new SimpleDateFormat("yyyy-MM-dd HH:mm:ss").format(this.updateTime);
--
Gitblit v1.9.1