Commit 49d9dfc1 authored by yanghao's avatar yanghao

fix: #480 【客户详情-订单页签】客户经理与业绩归属客户方数据未完善

parent d7578025
......@@ -537,6 +537,12 @@ public class OrderBackPageVO {
@ApiModelProperty(value = "业绩归属客户名称")
private String customerName;
@ApiModelProperty(value = "业绩归属客户的客户经理ID")
private Long customerService;
@ApiModelProperty(value = "业绩归属客户的客户经理名称")
private String customerServiceName;
// -----------end -----------
......
......@@ -1675,6 +1675,7 @@
o.is_exception,
o.create_time,
o.load_time,
o.customer_id,
(select su.nickname from system_user su where su.deleted = 0 and su.id = o.salesman_id) as salesman_name,
(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,
......@@ -1699,8 +1700,13 @@
nee.country_code as consignee_country_code,
if(#{query.lang} = 0, channel.name_zh, channel.name_en) as channel_name,
o.update_time,
c.name as customer_name,
c.customer_service,
su.nickname as customer_service_name,
#{query.lang} as lang
from ecw_order o
left join ecw_customer c on o.customer_id = c.id
left join system_user su on su.id = c.customer_service
left join (
SELECT
ewl.id AS line_id,
......
......@@ -74,7 +74,7 @@ tenant-id: {{adminTenentId}}
### 查询前20条
GET {{baseUrl}}/ecw/order/customer-order-page?customerDetailId=5008
GET {{baseUrl}}/ecw/order/customer-order-page?customerDetailId=51969
Authorization: Bearer {{token}}
tenant-id: {{adminTenentId}}
......
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