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
58050206
Commit
58050206
authored
Feb 28, 2025
by
honghy
Browse files
Options
Browse Files
Download
Email Patches
Plain Diff
需求95 报价单页面和列表调整
parent
bbef06ab
Changes
3
Hide whitespace changes
Inline
Side-by-side
Showing
3 changed files
with
24 additions
and
10 deletions
+24
-10
20250228hhy.sql
sql/v2.4/20250228hhy.sql
+16
-0
OfferAssociationOrderListener.java
...o/module/sale/listener/OfferAssociationOrderListener.java
+1
-3
OfferServiceImpl.java
...udao/module/sale/service/offer/impl/OfferServiceImpl.java
+7
-7
No files found.
sql/v2.4/20250228hhy.sql
0 → 100644
View file @
58050206
UPDATE
ecw_offer
SET
status
=
8
WHERE
status
=
0
;
UPDATE
ecw_offer
SET
status
=
2
WHERE
status
=
1
;
UPDATE
ecw_offer
SET
status
=
1
WHERE
status
=
2
;
UPDATE
ecw_offer
SET
status
=
1
WHERE
status
=
3
;
UPDATE
ecw_offer
SET
status
=
6
WHERE
status
=
4
;
UPDATE
ecw_offer
SET
status
=
8
WHERE
status
=
5
;
UPDATE
ecw_offer
SET
status
=
3
WHERE
status
=
6
;
UPDATE
ecw_offer
SET
status
=
5
WHERE
status
=
7
;
yudao-module-sale/yudao-module-sale-core/src/main/java/cn/iocoder/yudao/module/sale/listener/OfferAssociationOrderListener.java
View file @
58050206
...
...
@@ -2,10 +2,8 @@ package cn.iocoder.yudao.module.sale.listener;
import
cn.iocoder.yudao.framework.apollo.core.event.OfferAssociationOrderEvent
;
import
cn.iocoder.yudao.framework.apollo.core.event.OfferUpdateOrderNumberEvent
;
import
cn.iocoder.yudao.module.sale.dal.dataobject.offer.OfferDO
;
import
cn.iocoder.yudao.module.sale.service.offer.OfferService
;
import
com.baomidou.mybatisplus.core.conditions.update.LambdaUpdateWrapper
;
import
lombok.AllArgsConstructor
;
import
org.springframework.context.event.EventListener
;
import
org.springframework.stereotype.Component
;
...
...
@@ -48,7 +46,7 @@ public class OfferAssociationOrderListener {
}
offerDO
.
setOrderNo
(
event
.
getOrderNo
());
offerDO
.
setOrderId
(
event
.
getOrderId
());
offerDO
.
setStatus
(
4
);
offerDO
.
setStatus
(
6
);
offerDO
.
setUpdater
(
event
.
getOperator
());
offerDO
.
setUpdateTime
(
new
Date
());
offerService
.
updateById
(
offerDO
);
...
...
yudao-module-sale/yudao-module-sale-core/src/main/java/cn/iocoder/yudao/module/sale/service/offer/impl/OfferServiceImpl.java
View file @
58050206
...
...
@@ -764,7 +764,7 @@ public class OfferServiceImpl extends AbstractService<OfferMapper, OfferDO> impl
specialApplyVO
.
setSeaFreight
(
saleAmount
);
}
offer
.
setOldStatus
(
offer
.
getStatus
());
offer
.
setStatus
(
1
);
// 特价申请中
offer
.
setStatus
(
2
);
// 特价申请中
offer
.
setUpdater
(
updater
);
offer
.
setUpdateTime
(
now
);
offerMapper
.
updateById
(
offer
);
...
...
@@ -815,7 +815,7 @@ public class OfferServiceImpl extends AbstractService<OfferMapper, OfferDO> impl
offerProdMapper
.
updateById
(
offerProdDO
);
if
(
count
==
0
)
{
offer
.
setOldStatus
(
offer
.
getStatus
());
offer
.
setStatus
(
3
);
offer
.
setStatus
(
1
);
offer
.
setUpdater
(
updater
);
offer
.
setUpdateTime
(
now
);
offerMapper
.
updateById
(
offer
);
...
...
@@ -835,7 +835,7 @@ public class OfferServiceImpl extends AbstractService<OfferMapper, OfferDO> impl
// 需要查看是否还有其他审批中的商品
if
(
count
==
0
)
{
offer
.
setOldStatus
(
offer
.
getStatus
());
offer
.
setStatus
(
3
);
offer
.
setStatus
(
1
);
offer
.
setUpdater
(
updater
);
offer
.
setUpdateTime
(
now
);
offerMapper
.
updateById
(
offer
);
...
...
@@ -903,7 +903,7 @@ public class OfferServiceImpl extends AbstractService<OfferMapper, OfferDO> impl
Long
count
=
offerApprovalMapper
.
selectCount
(
new
LambdaQueryWrapper
<
OfferApprovalDO
>().
eq
(
OfferApprovalDO:
:
getOfferId
,
offerDO
.
getOfferId
()).
eq
(
OfferApprovalDO:
:
getStatus
,
1
));
if
(
count
==
0
)
{
offerDO
.
setOldStatus
(
offerDO
.
getStatus
());
offerDO
.
setStatus
(
3
);
offerDO
.
setStatus
(
1
);
}
}
offerMapper
.
updateById
(
offerDO
);
...
...
@@ -919,7 +919,7 @@ public class OfferServiceImpl extends AbstractService<OfferMapper, OfferDO> impl
if
(
Objects
.
isNull
(
offerDO
))
{
throw
exception
(
OFFER_NOT_EXISTS
);
}
if
(
offerDO
.
getStatus
()
==
5
||
offerDO
.
getStatus
()
==
4
)
{
if
(
offerDO
.
getStatus
()
==
8
||
offerDO
.
getStatus
()
==
6
)
{
throw
exception
(
OFFER_IS_END
,
offerDO
.
getNumber
());
}
if
(
offerResultVO
.
getResult
()
==
0
)
{
...
...
@@ -927,7 +927,7 @@ public class OfferServiceImpl extends AbstractService<OfferMapper, OfferDO> impl
offerDO
.
setReason
(
offerResultVO
.
getReason
());
offerDO
.
setReasonDict
(
offerResultVO
.
getReasonDict
());
offerDO
.
setOldStatus
(
offerDO
.
getStatus
());
offerDO
.
setStatus
(
5
);
offerDO
.
setStatus
(
8
);
offerDO
.
setOrderId
(-
1L
);
results
=
"报价单输单"
;
}
else
{
...
...
@@ -967,7 +967,7 @@ public class OfferServiceImpl extends AbstractService<OfferMapper, OfferDO> impl
offerDO
.
setOrderId
(
orderDO
.
getOrderId
());
offerDO
.
setOldStatus
(
offerDO
.
getStatus
());
}
offerDO
.
setStatus
(
4
);
offerDO
.
setStatus
(
6
);
results
=
"报价单赢单"
;
}
offerDO
.
setUpdater
(
updater
);
...
...
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