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
0f8d1df6
Commit
0f8d1df6
authored
Jul 26, 2024
by
332784038@qq.com
Browse files
Options
Browse Files
Download
Plain Diff
Merge branch 'master-fix' into dev
parents
dcf977b6
7c227ec3
Changes
3
Expand all
Hide whitespace changes
Inline
Side-by-side
Showing
3 changed files
with
139 additions
and
179 deletions
+139
-179
OrderBusinessServiceImpl.java
...le/order/service/order/impl/OrderBusinessServiceImpl.java
+80
-20
OrderServiceImpl.java
...dao/module/order/service/order/impl/OrderServiceImpl.java
+58
-159
TargetLogServiceImpl.java
.../module/order/service/targetLog/TargetLogServiceImpl.java
+1
-0
No files found.
yudao-module-order/yudao-module-order-core/src/main/java/cn/iocoder/yudao/module/order/service/order/impl/OrderBusinessServiceImpl.java
View file @
0f8d1df6
This diff is collapsed.
Click to expand it.
yudao-module-order/yudao-module-order-core/src/main/java/cn/iocoder/yudao/module/order/service/order/impl/OrderServiceImpl.java
View file @
0f8d1df6
This diff is collapsed.
Click to expand it.
yudao-module-order/yudao-module-order-core/src/main/java/cn/iocoder/yudao/module/order/service/targetLog/TargetLogServiceImpl.java
View file @
0f8d1df6
...
@@ -171,6 +171,7 @@ public class TargetLogServiceImpl extends AbstractService<TargetLogMapper, Targe
...
@@ -171,6 +171,7 @@ public class TargetLogServiceImpl extends AbstractService<TargetLogMapper, Targe
targetLogDO
.
setOrderId
(
orderId
);
targetLogDO
.
setOrderId
(
orderId
);
targetLogDO
.
setCustomerId
(
info
.
getCustomerId
());
targetLogDO
.
setCustomerId
(
info
.
getCustomerId
());
targetLogDO
.
setUserId
(
Objects
.
isNull
(
info
.
getSalesmanId
())
?
0L
:
info
.
getSalesmanId
());
targetLogDO
.
setUserId
(
Objects
.
isNull
(
info
.
getSalesmanId
())
?
0L
:
info
.
getSalesmanId
());
targetLogDO
.
setDeptId
(
Objects
.
isNull
(
info
.
getDeptId
())
?
0L
:
info
.
getDeptId
());
targetLogDO
.
setAchievementTime
(
achievementTime
);
targetLogDO
.
setAchievementTime
(
achievementTime
);
if
(
info
.
getTransportId
()
==
3
)
{
if
(
info
.
getTransportId
()
==
3
)
{
targetLogDO
.
setLdBoxTime
(
achievementTime
);
targetLogDO
.
setLdBoxTime
(
achievementTime
);
...
...
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