Skip to content

J
jiedao-api-boot-master
Commit 23a4f64b authored by 332784038@qq.com's avatar 332784038@qq.com
Browse files
Options

订单列表查询返回收发货人客户id和客户编号

parent de62364e
Show whitespace changes
Inline Side-by-side
Showing with 53 additions and 0 deletions
yudao-module-order/yudao-module-order-core/src/main/java/cn/iocoder/yudao/module/order/vo/order/OrderBackPageVO.java
View file @ 23a4f64b
......@@ -182,6 +182,15 @@ public class OrderBackPageVO {
@ApiModelProperty(value = "创建时间", required = true)
private Date createTime;
@ExcelProperty("收货人客户id")
@ApiModelProperty(value = "收货人客户id")
private String consigneeCustomerId;
@ExcelProperty("收货人客户编号")
@ApiModelProperty(value = "收货人客户编号")
private String consigneeCustomerNumber;
@ExcelProperty("收货人姓名")
@ApiModelProperty(value = "收货人姓名")
private String consigneeName;
......@@ -201,6 +210,14 @@ public class OrderBackPageVO {
@ApiModelProperty(value = "发货人姓名")
private String consignorName;
@ExcelProperty("发货人客户id")
@ApiModelProperty(value = "发货人客户id")
private String consignorCustomerId;
@ExcelProperty("发货人客户编号")
@ApiModelProperty(value = "发货人客户编号")
private String consignorCustomerNumber;
@ExcelProperty("发货人姓名(英文)")
@ApiModelProperty(value = "发货人姓名(英文)")
private String consignorNameEn;
......
yudao-module-order/yudao-module-order-core/src/main/resources/mapper/order/OrderMapper.xml
View file @ 23a4f64b
......@@ -1171,10 +1171,14 @@
(select min(wi.`in_time`) from ecw_order_warehouse_in wi where wi.deleted = 0 and wi.order_id = o.order_id ) as
in_time,
if(#{query.userType} = 1, 1, 2) as user_type,
nor.customer_id as consignor_customer_id,
nor.customer_number as consignor_customer_number,
nor.name as consignor_name,
nor.name_en as consignor_name_en,
nor.phone as consignor_phone,
nor.country_code as consignor_country_code,
nee.customer_id as consignee_customer_id,
nee.customer_number as consignee_customer_number,
nee.name as consignee_name,
nee.name_en as consignee_name_en,
nee.phone as consignee_phone,
......@@ -1300,10 +1304,14 @@
(select min(wi.`in_time`) from ecw_order_warehouse_in wi where wi.deleted = 0 and wi.order_id = o.order_id ) as
in_time,
if(#{query.userType} = 1, 1, 2) as user_type,
nor.customer_id as consignor_customer_id,
nor.customer_number as consignor_customer_number,
nor.name as consignor_name,
nor.name_en as consignor_name_en,
nor.phone as consignor_phone,
nor.country_code as consignor_country_code,
nee.customer_id as consignee_customer_id,
nee.customer_number as consignee_customer_number,
nee.name as consignee_name,
nee.name_en as consignee_name_en,
nee.phone as consignee_phone,
......@@ -3565,10 +3573,14 @@
(select min(wi.`in_time`) from ecw_order_warehouse_in wi where wi.deleted = 0 and wi.order_id = o.order_id ) as
in_time,
if(#{query.userType} = 1, 1, 2) as user_type,
nor.customer_id as consignor_customer_id,
nor.customer_number as consignor_customer_number,
nor.name as consignor_name,
nor.name_en as consignor_name_en,
nor.phone as consignor_phone,
nor.country_code as consignor_country_code,
nee.customer_id as consignee_customer_id,
nee.customer_number as consignee_customer_number,
nee.name as consignee_name,
nee.name_en as consignee_name_en,
nee.phone as consignee_phone,
......@@ -3676,10 +3688,14 @@
(select min(wi.`in_time`) from ecw_order_warehouse_in wi where wi.deleted = 0 and wi.order_id = o.order_id ) as
in_time,
if(#{query.userType} = 1, 1, 2) as user_type,
nor.customer_id as consignor_customer_id,
nor.customer_number as consignor_customer_number,
nor.name as consignor_name,
nor.name_en as consignor_name_en,
nor.phone as consignor_phone,
nor.country_code as consignor_country_code,
nee.customer_id as consignee_customer_id,
nee.customer_number as consignee_customer_number,
nee.name as consignee_name,
nee.name_en as consignee_name_en,
nee.phone as consignee_phone,
......@@ -3813,10 +3829,14 @@
(select min(wi.`in_time`) from ecw_order_warehouse_in wi where wi.deleted = 0 and wi.order_id = o.order_id ) as
in_time,
if(#{query.userType} = 1, 1, 2) as user_type,
nor.customer_id as consignor_customer_id,
nor.customer_number as consignor_customer_number,
nor.name as consignor_name,
nor.name_en as consignor_name_en,
nor.phone as consignor_phone,
nor.country_code as consignor_country_code,
nee.customer_id as consignee_customer_id,
nee.customer_number as consignee_customer_number,
nee.name as consignee_name,
nee.name_en as consignee_name_en,
nee.phone as consignee_phone,
......@@ -3936,10 +3956,14 @@
(select min(wi.`in_time`) from ecw_order_warehouse_in wi where wi.deleted = 0 and wi.order_id = o.order_id ) as
in_time,
if(#{query.userType} = 1, 1, 2) as user_type,
nor.customer_id as consignor_customer_id,
nor.customer_number as consignor_customer_number,
nor.name as consignor_name,
nor.name_en as consignor_name_en,
nor.phone as consignor_phone,
nor.country_code as consignor_country_code,
nee.customer_id as consignee_customer_id,
nee.customer_number as consignee_customer_number,
nee.name as consignee_name,
nee.name_en as consignee_name_en,
nee.phone as consignee_phone,
......@@ -4028,10 +4052,14 @@
(select min(wi.`in_time`) from ecw_order_warehouse_in wi where wi.deleted = 0 and wi.order_id = o.order_id ) as
in_time,
if(#{query.userType} = 1, 1, 2) as user_type,
nor.customer_id as consignor_customer_id,
nor.customer_number as consignor_customer_number,
nor.name as consignor_name,
nor.name_en as consignor_name_en,
nor.phone as consignor_phone,
nor.country_code as consignor_country_code,
nee.customer_id as consignee_customer_id,
nee.customer_number as consignee_customer_number,
nee.name as consignee_name,
nee.name_en as consignee_name_en,
nee.phone as consignee_phone,
......@@ -4133,10 +4161,14 @@
o.exception_reason,
o.is_exception,
o.create_time,
nor.customer_id as consignor_customer_id,
nor.customer_number as consignor_customer_number,
nor.name as consignor_name,
nor.name_en as consignor_name_en,
nor.phone as consignor_phone,
nor.country_code as consignor_country_code,
nee.customer_id as consignee_customer_id,
nee.customer_number as consignee_customer_number,
nee.name as consignee_name,
nee.name_en as consignee_name_en,
nee.phone as consignee_phone,
......@@ -5084,10 +5116,14 @@
o.exception_reason,
o.create_time,
if(#{query.userType} = 1, 1, 2) as user_type,
nor.customer_id as consignor_customer_id,
nor.customer_number as consignor_customer_number,
nor.name as consignor_name,
nor.name_en as consignor_name_en,
nor.phone as consignor_phone,
nor.country_code as consignor_country_code,
nee.customer_id as consignee_customer_id,
nee.customer_number as consignee_customer_number,
nee.name as consignee_name,
nee.name_en as consignee_name_en,
nee.phone as consignee_phone,
......
Markdown is supported
0% or
You are about to add 0 people to the discussion. Proceed with caution.
Finish editing this message first!
Please register or to comment