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
1f1a0781
Commit
1f1a0781
authored
Mar 04, 2025
by
honghy
Browse files
Options
Browse Files
Download
Email Patches
Plain Diff
需求95 报价单页面和列表调整
parent
d8e0cb16
Changes
2
Hide whitespace changes
Inline
Side-by-side
Showing
2 changed files
with
4 additions
and
4 deletions
+4
-4
OfferMapper.java
...ocoder/yudao/module/sale/dal/mysql/offer/OfferMapper.java
+1
-1
OfferAssociationOrderListener.java
...o/module/sale/listener/OfferAssociationOrderListener.java
+3
-3
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 @
1f1a0781
...
...
@@ -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(
2,1,6,8,3
)"
,
"AND o.`status` in(
0,1,2,3,4,5,6,7,9
)"
,
"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 @
1f1a0781
...
...
@@ -36,9 +36,9 @@ public class OfferAssociationOrderListener {
if
(
Objects
.
isNull
(
offerDO
))
{
throw
exception
(
OFFER_NOT_EXISTS
);
}
if
(
offerDO
.
getStatus
()
==
2
)
{
throw
exception
(
OFFER_STATUS_ERROR
);
}
//
if (offerDO.getStatus() == 2) {
//
throw exception(OFFER_STATUS_ERROR);
//
}
if
(
Objects
.
nonNull
(
offerDO
.
getOrderId
())
&&
offerDO
.
getOrderId
()
>
0L
)
{
if
(!
Objects
.
equals
(
offerDO
.
getOrderId
(),
event
.
getOrderId
()))
{
throw
exception
(
ORDER_ASSOCIATION_OFFER_NO_CAN_UPDATE
);
...
...
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