demand: tms-运单管理-根据单号/订单号查询订单详情接口查询返回客户类型，区分普通客户、月结客户

committer: heyu

emis-biz/src/main/java/com/xdadan/erp/emis/domain/EmisWaybill.java

@@ -28,7 +28,6 @@ import java.util.List;
 
 import lombok.Data;
 
-
 /**
  * @ClassName EmisWaybill
  * @Description 运单列表
@@ -38,8 +37,7 @@ import lombok.Data;
 @Data
 @TableName("emis_waybill")
 @DataAuditTable(tableName = "emis_waybill", tableComment = "运单表")
-public class EmisWaybill extends BaseEntity
+public class EmisWaybill extends BaseEntity {
-{
     private static final long serialVersionUID = 1L;
 
     /* id */
@@ -69,6 +67,8 @@ public class EmisWaybill extends BaseEntity
     private Long userId;
     /* 客户编号2502021 */
     private String customerCode;
+    /* 客户类型 1-普通客户 2-月结客户 */
+    private String customerType;
     /* 客户客户名称 */
     private String customerName;
     /* wx openid */

emis-biz/src/main/java/com/xdadan/erp/emis/domain/vo/WaybillOrder.java

@@ -31,14 +31,12 @@ public class WaybillOrder  implements Serializable {
     // 货物清单
     private List<Cargo> cargoList;
 
-
     // 附件清单
     private List<Attachment> attachmentList;
 
     private List<DeclareGoods> declareGoodsList;
     private List<DeclareAttachment> declareAttachmentList;
 
-
     /* 客户单号，合同号 */
     private String custOrderId;
 
@@ -70,6 +68,9 @@ public class WaybillOrder  implements Serializable {
     /* 寄件客户编号2502021 */
     private String customerCode;
 
+    /* 客户类型 1-普通客户 2-月结客户 */
+    private String customerType;
+
     /* 支付方式 : 现金或月结 */
     private String paymentType;
 
@@ -294,7 +295,6 @@ public class WaybillOrder  implements Serializable {
     /* 是否敏感物 */
     private String blSpecialGoods;
 
-
     /* ext_info */
     private String extInfo;
 
@@ -359,14 +359,12 @@ public class WaybillOrder  implements Serializable {
     private String lockFlag;
     private String lockReason;
 
-
     /* 是否问题件 1-是 0-否 */
     private String blIsQuestion;
     /* 问题件原因 */
     private String problemCause;
     private String problemTypeName;
 
-
     private String registerSiteName;
     /* 录单人 */
     private String registerManName;
@@ -422,9 +420,9 @@ public class WaybillOrder  implements Serializable {
     // 目的地名称:destinationName
     // 目的网点名称:dispatchUnderlingSiteName
 
-
     /**
      * 转 VO
+     * 
      * @param dbWaybill
      * @param dbCargoList
      * @param dbFeeitemList
@@ -436,8 +434,7 @@ public class WaybillOrder  implements Serializable {
             List<EmisWaybillFeeitem> dbFeeitemList,
             List<EmisWaybillAttachment> dbAttachmentList,
             List<EmisWaybillDeclareGoods> dbDecareGoodsList,
-                        List<EmisWaybillDeclareAttachment> dbDeclareAttachmentList
+            List<EmisWaybillDeclareAttachment> dbDeclareAttachmentList) {
-    ){
 
         WaybillOrder voItem = new WaybillOrder();
 
@@ -445,7 +442,6 @@ public class WaybillOrder  implements Serializable {
         FeeItem feeItemCvt = new FeeItem();
         Attachment attachmentCvt = new Attachment();
 
-
         DeclareGoods declareGoodsCvt = new DeclareGoods();
         DeclareAttachment declareAttachmentCvt = new DeclareAttachment();
 
@@ -521,6 +517,7 @@ public class WaybillOrder  implements Serializable {
         voItem.setUserId(dbWaybill.getUserId());
         voItem.setCustomerCode(dbWaybill.getCustomerCode());
         voItem.setCustomerName(dbWaybill.getCustomerName());
+        voItem.setCustomerType(dbWaybill.getCustomerType());
         voItem.setSendSiteName(dbWaybill.getSendSiteName());
         voItem.setTakePieceEmployeeName(dbWaybill.getTakePieceEmployeeName());
         voItem.setOperateEmployeeName(dbWaybill.getOperateEmployeeName());
@@ -535,7 +532,6 @@ public class WaybillOrder  implements Serializable {
         voItem.setMasterBillCode(dbWaybill.getMasterBillCode());
         voItem.setVirtualRemark(dbWaybill.getVirtualRemark());
 
-
         voItem.setOpenId(dbWaybill.getOpenId());
 
         voItem.setPaymentType(dbWaybill.getPaymentType());
@@ -714,9 +710,9 @@ public class WaybillOrder  implements Serializable {
         return voItem;
     }
 
-
     /**
      * 转为数据库类型值
+     * 
      * @return
      */
     public EmisWaybill toDb() {

emis-biz/src/main/resources/mapper/EmisWaybillMapper.xml

@@ -230,6 +230,7 @@
         <result property="customerPhone"    column="customer_phone"    />
         <result property="customerNickName"    column="customer_nick_name"    />
         <result property="customerAvatar"    column="customer_avatar"    />
+        <result property="customerType"    column="customer_type"    />
 
         <result property="blVirtual"    column="bl_virtual"    />
         <result property="masterBillCode"    column="master_bill_code"    />
@@ -442,6 +443,7 @@
             a3.avatar as customer_avatar,
             a3.sales_support ,
             a3.sales_executive ,
+            a3.customer_type as customer_type,
 
             p.emp_name as dispatch_man_name,q.site_name as print_site_name,
             r.emp_name as print_man_name,