Skip to content
Projects
Groups
Snippets
Help
Loading...
Help
Support
Submit feedback
Contribute to GitLab
Sign in / Register
Toggle navigation
J
jiedao-api-boot-master
Project
Project
Details
Activity
Releases
Cycle Analytics
Repository
Repository
Files
Commits
Branches
Tags
Contributors
Graph
Compare
Charts
Issues
0
Issues
0
List
Boards
Labels
Milestones
Merge Requests
0
Merge Requests
0
CI / CD
CI / CD
Pipelines
Jobs
Schedules
Charts
Wiki
Wiki
Snippets
Snippets
Members
Members
Collapse sidebar
Close sidebar
Activity
Graph
Charts
Create a new issue
Jobs
Commits
Issue Boards
Open sidebar
lanbaoming
jiedao-api-boot-master
Commits
49d9dfc1
Commit
49d9dfc1
authored
Sep 19, 2024
by
yanghao
Browse files
Options
Browse Files
Download
Email Patches
Plain Diff
fix: #480 【客户详情-订单页签】客户经理与业绩归属客户方数据未完善
parent
d7578025
Changes
3
Hide whitespace changes
Inline
Side-by-side
Showing
3 changed files
with
13 additions
and
1 deletion
+13
-1
OrderBackPageVO.java
.../iocoder/yudao/module/order/vo/order/OrderBackPageVO.java
+6
-0
OrderMapper.xml
...rder-core/src/main/resources/mapper/order/OrderMapper.xml
+6
-0
OrderController.http
.../module/order/controller/admin/order/OrderController.http
+1
-1
No files found.
yudao-module-order/yudao-module-order-core/src/main/java/cn/iocoder/yudao/module/order/vo/order/OrderBackPageVO.java
View file @
49d9dfc1
...
...
@@ -537,6 +537,12 @@ public class OrderBackPageVO {
@ApiModelProperty
(
value
=
"业绩归属客户名称"
)
private
String
customerName
;
@ApiModelProperty
(
value
=
"业绩归属客户的客户经理ID"
)
private
Long
customerService
;
@ApiModelProperty
(
value
=
"业绩归属客户的客户经理名称"
)
private
String
customerServiceName
;
// -----------end -----------
...
...
yudao-module-order/yudao-module-order-core/src/main/resources/mapper/order/OrderMapper.xml
View file @
49d9dfc1
...
...
@@ -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,
...
...
yudao-module-order/yudao-module-order-rest/src/main/java/cn/iocoder/yudao/module/order/controller/admin/order/OrderController.http
View file @
49d9dfc1
...
...
@@ -74,7 +74,7 @@ tenant-id: {{adminTenentId}}
### 查询前20条
GET {{baseUrl}}/ecw/order/customer-order-page?customerDetailId=5
008
GET {{baseUrl}}/ecw/order/customer-order-page?customerDetailId=5
1969
Authorization: Bearer {{token}}
tenant-id: {{adminTenentId}}
...
...
Write
Preview
Markdown
is supported
0%
Try again
or
attach a new file
Attach a file
Cancel
You are about to add
0
people
to the discussion. Proceed with caution.
Finish editing this message first!
Cancel
Please
register
or
sign in
to comment