Skip to content

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

订单收发货人跟进客服查询返回

parent 23a4f64b
Show whitespace changes
Inline Side-by-side
Showing with 79 additions and 6 deletions
yudao-module-order/yudao-module-order-core/src/main/java/cn/iocoder/yudao/module/order/vo/order/OrderBackPageVO.java
View file @ f1907a45
...@@ -185,12 +185,16 @@ public class OrderBackPageVO { ...@@ -185,12 +185,16 @@ public class OrderBackPageVO {
@ExcelProperty("收货人客户id") @ExcelProperty("收货人客户id")
@ApiModelProperty(value = "收货人客户id") @ApiModelProperty(value = "收货人客户id")
private String consigneeCustomerId; private Long consigneeCustomerId;
@ExcelProperty("收货人客户编号") @ExcelProperty("收货人客户编号")
@ApiModelProperty(value = "收货人客户编号") @ApiModelProperty(value = "收货人客户编号")
private String consigneeCustomerNumber; private String consigneeCustomerNumber;
@ExcelProperty("收货人跟进客服")
@ApiModelProperty(value = "收货人跟进客服")
private String consigneeFollowCustomerService;
@ExcelProperty("收货人姓名") @ExcelProperty("收货人姓名")
@ApiModelProperty(value = "收货人姓名") @ApiModelProperty(value = "收货人姓名")
private String consigneeName; private String consigneeName;
...@@ -206,18 +210,23 @@ public class OrderBackPageVO { ...@@ -206,18 +210,23 @@ public class OrderBackPageVO {
@ApiModelProperty(value = "收货人手机国家区号") @ApiModelProperty(value = "收货人手机国家区号")
private String consigneeCountryCode; private String consigneeCountryCode;
@ExcelProperty("发货人姓名")
@ApiModelProperty(value = "发货人姓名")
private String consignorName;
@ExcelProperty("发货人客户id") @ExcelProperty("发货人客户id")
@ApiModelProperty(value = "发货人客户id") @ApiModelProperty(value = "发货人客户id")
private String consignorCustomerId; private Long consignorCustomerId;
@ExcelProperty("发货人客户编号") @ExcelProperty("发货人客户编号")
@ApiModelProperty(value = "发货人客户编号") @ApiModelProperty(value = "发货人客户编号")
private String consignorCustomerNumber; private String consignorCustomerNumber;
@ExcelProperty("发货人跟进客服")
@ApiModelProperty(value = "发货人跟进客服")
private String consignorFollowCustomerService;
@ExcelProperty("发货人姓名")
@ApiModelProperty(value = "发货人姓名")
private String consignorName;
@ExcelProperty("发货人姓名(英文)") @ExcelProperty("发货人姓名(英文)")
@ApiModelProperty(value = "发货人姓名(英文)") @ApiModelProperty(value = "发货人姓名(英文)")
private String consignorNameEn; private String consignorNameEn;
......
yudao-module-order/yudao-module-order-core/src/main/resources/mapper/order/OrderMapper.xml
View file @ f1907a45
...@@ -1172,12 +1172,18 @@ ...@@ -1172,12 +1172,18 @@
in_time, in_time,
if(#{query.userType} = 1, 1, 2) as user_type, if(#{query.userType} = 1, 1, 2) as user_type,
nor.customer_id as consignor_customer_id, nor.customer_id as consignor_customer_id,
if(nor.customer_id != null and nor.customer_id > 0L,
(SELECT u1.nickname FROM system_user u1 JOIN system_user u2 on u1.id = u2.customer_service_id JOIN ecw_customer u ON u.customer_service = u2.id WHERE u.id = nor.customer_id),
"") as consignor_follow_customerService,
nor.customer_number as consignor_customer_number, nor.customer_number as consignor_customer_number,
nor.name as consignor_name, nor.name as consignor_name,
nor.name_en as consignor_name_en, nor.name_en as consignor_name_en,
nor.phone as consignor_phone, nor.phone as consignor_phone,
nor.country_code as consignor_country_code, nor.country_code as consignor_country_code,
nee.customer_id as consignee_customer_id, nee.customer_id as consignee_customer_id,
if(nee.customer_id != null and nee.customer_id > 0L,
(SELECT u1.nickname FROM system_user u1 JOIN system_user u2 on u1.id = u2.customer_service_id JOIN ecw_customer u ON u.customer_service = u2.id WHERE u.id = nee.customer_id),
"") as consignee_follow_customerService,
nee.customer_number as consignee_customer_number, nee.customer_number as consignee_customer_number,
nee.name as consignee_name, nee.name as consignee_name,
nee.name_en as consignee_name_en, nee.name_en as consignee_name_en,
...@@ -1305,12 +1311,18 @@ ...@@ -1305,12 +1311,18 @@
in_time, in_time,
if(#{query.userType} = 1, 1, 2) as user_type, if(#{query.userType} = 1, 1, 2) as user_type,
nor.customer_id as consignor_customer_id, nor.customer_id as consignor_customer_id,
if(nor.customer_id != null and nor.customer_id > 0L,
(SELECT u1.nickname FROM system_user u1 JOIN system_user u2 on u1.id = u2.customer_service_id JOIN ecw_customer u ON u.customer_service = u2.id WHERE u.id = nor.customer_id),
"") as consignor_follow_customerService,
nor.customer_number as consignor_customer_number, nor.customer_number as consignor_customer_number,
nor.name as consignor_name, nor.name as consignor_name,
nor.name_en as consignor_name_en, nor.name_en as consignor_name_en,
nor.phone as consignor_phone, nor.phone as consignor_phone,
nor.country_code as consignor_country_code, nor.country_code as consignor_country_code,
nee.customer_id as consignee_customer_id, nee.customer_id as consignee_customer_id,
if(nee.customer_id != null and nee.customer_id > 0L,
(SELECT u1.nickname FROM system_user u1 JOIN system_user u2 on u1.id = u2.customer_service_id JOIN ecw_customer u ON u.customer_service = u2.id WHERE u.id = nee.customer_id),
"") as consignee_follow_customerService,
nee.customer_number as consignee_customer_number, nee.customer_number as consignee_customer_number,
nee.name as consignee_name, nee.name as consignee_name,
nee.name_en as consignee_name_en, nee.name_en as consignee_name_en,
...@@ -3574,12 +3586,18 @@ ...@@ -3574,12 +3586,18 @@
in_time, in_time,
if(#{query.userType} = 1, 1, 2) as user_type, if(#{query.userType} = 1, 1, 2) as user_type,
nor.customer_id as consignor_customer_id, nor.customer_id as consignor_customer_id,
if(nor.customer_id != null and nor.customer_id > 0L,
(SELECT u1.nickname FROM system_user u1 JOIN system_user u2 on u1.id = u2.customer_service_id JOIN ecw_customer u ON u.customer_service = u2.id WHERE u.id = nor.customer_id),
"") as consignor_follow_customerService,
nor.customer_number as consignor_customer_number, nor.customer_number as consignor_customer_number,
nor.name as consignor_name, nor.name as consignor_name,
nor.name_en as consignor_name_en, nor.name_en as consignor_name_en,
nor.phone as consignor_phone, nor.phone as consignor_phone,
nor.country_code as consignor_country_code, nor.country_code as consignor_country_code,
nee.customer_id as consignee_customer_id, nee.customer_id as consignee_customer_id,
if(nee.customer_id != null and nee.customer_id > 0L,
(SELECT u1.nickname FROM system_user u1 JOIN system_user u2 on u1.id = u2.customer_service_id JOIN ecw_customer u ON u.customer_service = u2.id WHERE u.id = nee.customer_id),
"") as consignee_follow_customerService,
nee.customer_number as consignee_customer_number, nee.customer_number as consignee_customer_number,
nee.name as consignee_name, nee.name as consignee_name,
nee.name_en as consignee_name_en, nee.name_en as consignee_name_en,
...@@ -3689,12 +3707,18 @@ ...@@ -3689,12 +3707,18 @@
in_time, in_time,
if(#{query.userType} = 1, 1, 2) as user_type, if(#{query.userType} = 1, 1, 2) as user_type,
nor.customer_id as consignor_customer_id, nor.customer_id as consignor_customer_id,
if(nor.customer_id != null and nor.customer_id > 0L,
(SELECT u1.nickname FROM system_user u1 JOIN system_user u2 on u1.id = u2.customer_service_id JOIN ecw_customer u ON u.customer_service = u2.id WHERE u.id = nor.customer_id),
"") as consignor_follow_customerService,
nor.customer_number as consignor_customer_number, nor.customer_number as consignor_customer_number,
nor.name as consignor_name, nor.name as consignor_name,
nor.name_en as consignor_name_en, nor.name_en as consignor_name_en,
nor.phone as consignor_phone, nor.phone as consignor_phone,
nor.country_code as consignor_country_code, nor.country_code as consignor_country_code,
nee.customer_id as consignee_customer_id, nee.customer_id as consignee_customer_id,
if(nee.customer_id != null and nee.customer_id > 0L,
(SELECT u1.nickname FROM system_user u1 JOIN system_user u2 on u1.id = u2.customer_service_id JOIN ecw_customer u ON u.customer_service = u2.id WHERE u.id = nee.customer_id),
"") as consignee_follow_customerService,
nee.customer_number as consignee_customer_number, nee.customer_number as consignee_customer_number,
nee.name as consignee_name, nee.name as consignee_name,
nee.name_en as consignee_name_en, nee.name_en as consignee_name_en,
...@@ -3830,12 +3854,18 @@ ...@@ -3830,12 +3854,18 @@
in_time, in_time,
if(#{query.userType} = 1, 1, 2) as user_type, if(#{query.userType} = 1, 1, 2) as user_type,
nor.customer_id as consignor_customer_id, nor.customer_id as consignor_customer_id,
if(nor.customer_id != null and nor.customer_id > 0L,
(SELECT u1.nickname FROM system_user u1 JOIN system_user u2 on u1.id = u2.customer_service_id JOIN ecw_customer u ON u.customer_service = u2.id WHERE u.id = nor.customer_id),
"") as consignor_follow_customerService,
nor.customer_number as consignor_customer_number, nor.customer_number as consignor_customer_number,
nor.name as consignor_name, nor.name as consignor_name,
nor.name_en as consignor_name_en, nor.name_en as consignor_name_en,
nor.phone as consignor_phone, nor.phone as consignor_phone,
nor.country_code as consignor_country_code, nor.country_code as consignor_country_code,
nee.customer_id as consignee_customer_id, nee.customer_id as consignee_customer_id,
if(nee.customer_id != null and nee.customer_id > 0L,
(SELECT u1.nickname FROM system_user u1 JOIN system_user u2 on u1.id = u2.customer_service_id JOIN ecw_customer u ON u.customer_service = u2.id WHERE u.id = nee.customer_id),
"") as consignee_follow_customerService,
nee.customer_number as consignee_customer_number, nee.customer_number as consignee_customer_number,
nee.name as consignee_name, nee.name as consignee_name,
nee.name_en as consignee_name_en, nee.name_en as consignee_name_en,
...@@ -3957,12 +3987,18 @@ ...@@ -3957,12 +3987,18 @@
in_time, in_time,
if(#{query.userType} = 1, 1, 2) as user_type, if(#{query.userType} = 1, 1, 2) as user_type,
nor.customer_id as consignor_customer_id, nor.customer_id as consignor_customer_id,
if(nor.customer_id != null and nor.customer_id > 0L,
(SELECT u1.nickname FROM system_user u1 JOIN system_user u2 on u1.id = u2.customer_service_id JOIN ecw_customer u ON u.customer_service = u2.id WHERE u.id = nor.customer_id),
"") as consignor_follow_customerService,
nor.customer_number as consignor_customer_number, nor.customer_number as consignor_customer_number,
nor.name as consignor_name, nor.name as consignor_name,
nor.name_en as consignor_name_en, nor.name_en as consignor_name_en,
nor.phone as consignor_phone, nor.phone as consignor_phone,
nor.country_code as consignor_country_code, nor.country_code as consignor_country_code,
nee.customer_id as consignee_customer_id, nee.customer_id as consignee_customer_id,
if(nee.customer_id != null and nee.customer_id > 0L,
(SELECT u1.nickname FROM system_user u1 JOIN system_user u2 on u1.id = u2.customer_service_id JOIN ecw_customer u ON u.customer_service = u2.id WHERE u.id = nee.customer_id),
"") as consignee_follow_customerService,
nee.customer_number as consignee_customer_number, nee.customer_number as consignee_customer_number,
nee.name as consignee_name, nee.name as consignee_name,
nee.name_en as consignee_name_en, nee.name_en as consignee_name_en,
...@@ -4053,12 +4089,18 @@ ...@@ -4053,12 +4089,18 @@
in_time, in_time,
if(#{query.userType} = 1, 1, 2) as user_type, if(#{query.userType} = 1, 1, 2) as user_type,
nor.customer_id as consignor_customer_id, nor.customer_id as consignor_customer_id,
if(nor.customer_id != null and nor.customer_id > 0L,
(SELECT u1.nickname FROM system_user u1 JOIN system_user u2 on u1.id = u2.customer_service_id JOIN ecw_customer u ON u.customer_service = u2.id WHERE u.id = nor.customer_id),
"") as consignor_follow_customerService,
nor.customer_number as consignor_customer_number, nor.customer_number as consignor_customer_number,
nor.name as consignor_name, nor.name as consignor_name,
nor.name_en as consignor_name_en, nor.name_en as consignor_name_en,
nor.phone as consignor_phone, nor.phone as consignor_phone,
nor.country_code as consignor_country_code, nor.country_code as consignor_country_code,
nee.customer_id as consignee_customer_id, nee.customer_id as consignee_customer_id,
if(nee.customer_id != null and nee.customer_id > 0L,
(SELECT u1.nickname FROM system_user u1 JOIN system_user u2 on u1.id = u2.customer_service_id JOIN ecw_customer u ON u.customer_service = u2.id WHERE u.id = nee.customer_id),
"") as consignee_follow_customerService,
nee.customer_number as consignee_customer_number, nee.customer_number as consignee_customer_number,
nee.name as consignee_name, nee.name as consignee_name,
nee.name_en as consignee_name_en, nee.name_en as consignee_name_en,
...@@ -4162,12 +4204,18 @@ ...@@ -4162,12 +4204,18 @@
o.is_exception, o.is_exception,
o.create_time, o.create_time,
nor.customer_id as consignor_customer_id, nor.customer_id as consignor_customer_id,
if(nor.customer_id != null and nor.customer_id > 0L,
(SELECT u1.nickname FROM system_user u1 JOIN system_user u2 on u1.id = u2.customer_service_id JOIN ecw_customer u ON u.customer_service = u2.id WHERE u.id = nor.customer_id),
"") as consignor_follow_customerService,
nor.customer_number as consignor_customer_number, nor.customer_number as consignor_customer_number,
nor.name as consignor_name, nor.name as consignor_name,
nor.name_en as consignor_name_en, nor.name_en as consignor_name_en,
nor.phone as consignor_phone, nor.phone as consignor_phone,
nor.country_code as consignor_country_code, nor.country_code as consignor_country_code,
nee.customer_id as consignee_customer_id, nee.customer_id as consignee_customer_id,
if(nee.customer_id != null and nee.customer_id > 0L,
(SELECT u1.nickname FROM system_user u1 JOIN system_user u2 on u1.id = u2.customer_service_id JOIN ecw_customer u ON u.customer_service = u2.id WHERE u.id = nee.customer_id),
"") as consignee_follow_customerService,
nee.customer_number as consignee_customer_number, nee.customer_number as consignee_customer_number,
nee.name as consignee_name, nee.name as consignee_name,
nee.name_en as consignee_name_en, nee.name_en as consignee_name_en,
...@@ -5117,12 +5165,18 @@ ...@@ -5117,12 +5165,18 @@
o.create_time, o.create_time,
if(#{query.userType} = 1, 1, 2) as user_type, if(#{query.userType} = 1, 1, 2) as user_type,
nor.customer_id as consignor_customer_id, nor.customer_id as consignor_customer_id,
if(nor.customer_id != null and nor.customer_id > 0L,
(SELECT u1.nickname FROM system_user u1 JOIN system_user u2 on u1.id = u2.customer_service_id JOIN ecw_customer u ON u.customer_service = u2.id WHERE u.id = nor.customer_id),
"") as consignor_follow_customerService,
nor.customer_number as consignor_customer_number, nor.customer_number as consignor_customer_number,
nor.name as consignor_name, nor.name as consignor_name,
nor.name_en as consignor_name_en, nor.name_en as consignor_name_en,
nor.phone as consignor_phone, nor.phone as consignor_phone,
nor.country_code as consignor_country_code, nor.country_code as consignor_country_code,
nee.customer_id as consignee_customer_id, nee.customer_id as consignee_customer_id,
if(nee.customer_id != null and nee.customer_id > 0L,
(SELECT u1.nickname FROM system_user u1 JOIN system_user u2 on u1.id = u2.customer_service_id JOIN ecw_customer u ON u.customer_service = u2.id WHERE u.id = nee.customer_id),
"") as consignee_follow_customerService,
nee.customer_number as consignee_customer_number, nee.customer_number as consignee_customer_number,
nee.name as consignee_name, nee.name as consignee_name,
nee.name_en as consignee_name_en, nee.name_en as consignee_name_en,
...@@ -5209,10 +5263,20 @@ ...@@ -5209,10 +5263,20 @@
o.exception_reason, o.exception_reason,
o.create_time, o.create_time,
if(#{query.userType} = 1, 1, 2) as user_type, if(#{query.userType} = 1, 1, 2) as user_type,
nor.customer_id as consignor_customer_id,
if(nor.customer_id != null and nor.customer_id > 0L,
(SELECT u1.nickname FROM system_user u1 JOIN system_user u2 on u1.id = u2.customer_service_id JOIN ecw_customer u ON u.customer_service = u2.id WHERE u.id = nor.customer_id),
"") as consignor_follow_customerService,
nor.customer_number as consignor_customer_number,
nor.name as consignor_name, nor.name as consignor_name,
nor.name_en as consignor_name_en, nor.name_en as consignor_name_en,
nor.phone as consignor_phone, nor.phone as consignor_phone,
nor.country_code as consignor_country_code, nor.country_code as consignor_country_code,
nee.customer_id as consignee_customer_id,
if(nee.customer_id != null and nee.customer_id > 0L,
(SELECT u1.nickname FROM system_user u1 JOIN system_user u2 on u1.id = u2.customer_service_id JOIN ecw_customer u ON u.customer_service = u2.id WHERE u.id = nee.customer_id),
"") as consignee_follow_customerService,
nee.customer_number as consignee_customer_number,
nee.name as consignee_name, nee.name as consignee_name,
nee.name_en as consignee_name_en, nee.name_en as consignee_name_en,
nee.phone as consignee_phone, 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