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
042d0cda
Commit
042d0cda
authored
Feb 28, 2025
by
honghy
Browse files
Options
Browse Files
Download
Email Patches
Plain Diff
需求95 报价单页面和列表调整
parent
58050206
Changes
3
Hide whitespace changes
Inline
Side-by-side
Showing
3 changed files
with
10 additions
and
8 deletions
+10
-8
OfferMapper.java
...ocoder/yudao/module/sale/dal/mysql/offer/OfferMapper.java
+1
-1
OfferAssociationOrderListener.java
...o/module/sale/listener/OfferAssociationOrderListener.java
+1
-1
OfferServiceImpl.java
...udao/module/sale/service/offer/impl/OfferServiceImpl.java
+8
-6
No files found.
yudao-module-sale/yudao-module-sale-core/src/main/java/cn/iocoder/yudao/module/sale/dal/mysql/offer/OfferMapper.java
View file @
042d0cda
...
...
@@ -724,7 +724,7 @@ public interface OfferMapper extends BaseMapperX<OfferDO> {
"join ecw_customer_contacts cc on (o.relation = 1 and cc.id = o.consignor_id) or (o.relation = 2 and cc.id = o.consignee_id) "
,
"left join system_user u on u.id = o.follow_up_salesman_id "
,
"where o.deleted = 0"
,
"AND o.`status` in(
1,3,4,5,6
)"
,
"AND o.`status` in(
2,1,6,8,3
)"
,
"AND (o.`order_id` is null or o.`order_id` = 0)"
,
"AND o.`end_time` > now()"
,
"AND (o.`consignor_id` = #{queryVO.consignorId}"
,
...
...
yudao-module-sale/yudao-module-sale-core/src/main/java/cn/iocoder/yudao/module/sale/listener/OfferAssociationOrderListener.java
View file @
042d0cda
...
...
@@ -36,7 +36,7 @@ public class OfferAssociationOrderListener {
if
(
Objects
.
isNull
(
offerDO
))
{
throw
exception
(
OFFER_NOT_EXISTS
);
}
if
(
offerDO
.
getStatus
()
==
1
)
{
if
(
offerDO
.
getStatus
()
==
2
)
{
throw
exception
(
OFFER_STATUS_ERROR
);
}
if
(
Objects
.
nonNull
(
offerDO
.
getOrderId
())
&&
offerDO
.
getOrderId
()
>
0L
)
{
...
...
yudao-module-sale/yudao-module-sale-core/src/main/java/cn/iocoder/yudao/module/sale/service/offer/impl/OfferServiceImpl.java
View file @
042d0cda
...
...
@@ -1504,18 +1504,20 @@ public class OfferServiceImpl extends AbstractService<OfferMapper, OfferDO> impl
}
}
}
else
{
customerContactsDOList
=
customerContactsService
.
getByPhone
(
queryVO
.
getConsignorCode
(),
queryVO
.
getConsignorPhone
());
if
(
StringUtils
.
isNotBlank
(
queryVO
.
getConsignorCode
()))
{
customerContactsDOList
=
customerContactsService
.
getByPhone
(
queryVO
.
getConsignorCode
(),
queryVO
.
getConsignorPhone
());
}
}
if
(
CollectionUtil
.
isEmpty
(
customerContactsDOList
))
{
// 订单发货人客户档案不存在则抛错
throw
exception
(
ORDER_CONSIGNOR_NOT_EXISTS
);
}
else
{
if
(!
CollectionUtil
.
isEmpty
(
customerContactsDOList
))
{
queryVO
.
setConsignorId
(
customerContactsDOList
.
get
(
0
).
getId
());
}
}
// 收货人信息
if
(
Objects
.
isNull
(
queryVO
.
getConsigneeId
())
||
queryVO
.
getConsigneeId
()
==
0
)
{
List
<
CustomerContactsDO
>
customerContactsDOList
=
customerContactsService
.
getByPhone
(
queryVO
.
getConsigneeCode
(),
queryVO
.
getConsigneePhone
());
List
<
CustomerContactsDO
>
customerContactsDOList
=
new
ArrayList
<>();
if
(
StringUtils
.
isNotBlank
(
queryVO
.
getConsigneeCode
()))
{
customerContactsDOList
=
customerContactsService
.
getByPhone
(
queryVO
.
getConsigneeCode
(),
queryVO
.
getConsigneePhone
());
}
// if (CollectionUtil.isEmpty(customerContactsDOList)) {
// if (queryVO.getUserType() == 2) {
// // 管理端查询时,订单收货人客户档案不存在则抛错,客户端忽略
...
...
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