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
55bd24d6
Commit
55bd24d6
authored
Aug 06, 2024
by
yanghao
Browse files
Options
Browse Files
Download
Email Patches
Plain Diff
fix: 修复捞取公海池客户时其订单的salesmanId为空导致空指针异常的bug
parent
75d16855
Changes
1
Hide whitespace changes
Inline
Side-by-side
Showing
1 changed file
with
1 addition
and
1 deletion
+1
-1
CustomerServiceImpl.java
...module/customer/service/customer/CustomerServiceImpl.java
+1
-1
No files found.
yudao-module-customer/yudao-module-customer-core/src/main/java/cn/iocoder/yudao/module/customer/service/customer/CustomerServiceImpl.java
View file @
55bd24d6
...
@@ -2720,7 +2720,7 @@ public class CustomerServiceImpl extends AbstractService<CustomerMapper,
...
@@ -2720,7 +2720,7 @@ public class CustomerServiceImpl extends AbstractService<CustomerMapper,
List
<
CustomerOrderBackPageVO
>
orderList
=
customerMapper
.
orderList
(
0
,
10
,
new
CustomerOrderQueryDTO
().
setCustomerId
(
customerId
));
List
<
CustomerOrderBackPageVO
>
orderList
=
customerMapper
.
orderList
(
0
,
10
,
new
CustomerOrderQueryDTO
().
setCustomerId
(
customerId
));
if
(
CollectionUtil
.
isNotEmpty
(
orderList
)
&&
orderList
.
size
()
>
0
)
{
//客户成交的订单不为空
if
(
CollectionUtil
.
isNotEmpty
(
orderList
)
&&
orderList
.
size
()
>
0
)
{
//客户成交的订单不为空
CustomerOrderBackPageVO
orderBackPageVO
=
orderList
.
get
(
0
);
CustomerOrderBackPageVO
orderBackPageVO
=
orderList
.
get
(
0
);
if
(
loginUserId
.
equals
(
customer
.
getCustomerService
())
&&
orderBackPageVO
!=
null
&&
orderBackPageVO
.
getSalesmanId
().
equals
(
loginUserId
))
{
//订单的客户经理和当前是同一个
if
(
loginUserId
.
equals
(
customer
.
getCustomerService
())
&&
orderBackPageVO
!=
null
&&
loginUserId
.
equals
(
orderBackPageVO
.
getSalesmanId
()
))
{
//订单的客户经理和当前是同一个
estimateEnterOpenSeaTime
=
isFcl
?
null
:
DateUtil
.
offsetMonth
(
now
,
6
).
toJdkDate
();
//改为6个月
estimateEnterOpenSeaTime
=
isFcl
?
null
:
DateUtil
.
offsetMonth
(
now
,
6
).
toJdkDate
();
//改为6个月
}
}
}
}
...
...
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