Skip to content

J
jiedao-api-boot-master
Commit f6429c7c authored by honghy's avatar honghy Committed by wux
Browse files
Options

需求95 报价单页面和列表调整

parent a90f776c
Hide whitespace changes
Inline Side-by-side
Showing with 13 additions and 28 deletions
sql/v2.4/20250228hhy.sql
View file @ f6429c7c
UPDATE ecw_offer SET status = 8 UPDATE ecw_offer SET status = sale_stage;
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/service/offer/impl/OfferServiceImpl.java
View file @ f6429c7c
...@@ -763,8 +763,8 @@ public class OfferServiceImpl extends AbstractService<OfferMapper, OfferDO> impl ...@@ -763,8 +763,8 @@ public class OfferServiceImpl extends AbstractService<OfferMapper, OfferDO> impl
saleAmount = saleAmount.add(specialApplyVO.getLightCommissionAmount()); saleAmount = saleAmount.add(specialApplyVO.getLightCommissionAmount());
specialApplyVO.setSeaFreight(saleAmount); specialApplyVO.setSeaFreight(saleAmount);
} }
offer.setOldStatus(offer.getStatus()); // offer.setOldStatus(offer.getStatus());
offer.setStatus(2); // 特价申请中 // offer.setStatus(2); // 特价申请中
offer.setUpdater(updater); offer.setUpdater(updater);
offer.setUpdateTime(now); offer.setUpdateTime(now);
offerMapper.updateById(offer); offerMapper.updateById(offer);
...@@ -815,7 +815,7 @@ public class OfferServiceImpl extends AbstractService<OfferMapper, OfferDO> impl ...@@ -815,7 +815,7 @@ public class OfferServiceImpl extends AbstractService<OfferMapper, OfferDO> impl
offerProdMapper.updateById(offerProdDO); offerProdMapper.updateById(offerProdDO);
if (count == 0) { if (count == 0) {
offer.setOldStatus(offer.getStatus()); offer.setOldStatus(offer.getStatus());
offer.setStatus(1); offer.setStatus(2);
offer.setUpdater(updater); offer.setUpdater(updater);
offer.setUpdateTime(now); offer.setUpdateTime(now);
offerMapper.updateById(offer); offerMapper.updateById(offer);
...@@ -835,7 +835,7 @@ public class OfferServiceImpl extends AbstractService<OfferMapper, OfferDO> impl ...@@ -835,7 +835,7 @@ public class OfferServiceImpl extends AbstractService<OfferMapper, OfferDO> impl
// 需要查看是否还有其他审批中的商品 // 需要查看是否还有其他审批中的商品
if (count == 0) { if (count == 0) {
offer.setOldStatus(offer.getStatus()); offer.setOldStatus(offer.getStatus());
offer.setStatus(1); // offer.setStatus(1);
offer.setUpdater(updater); offer.setUpdater(updater);
offer.setUpdateTime(now); offer.setUpdateTime(now);
offerMapper.updateById(offer); offerMapper.updateById(offer);
...@@ -898,14 +898,14 @@ public class OfferServiceImpl extends AbstractService<OfferMapper, OfferDO> impl ...@@ -898,14 +898,14 @@ public class OfferServiceImpl extends AbstractService<OfferMapper, OfferDO> impl
newEstCostVO.setFeeDtoList(newFeeDtoList); newEstCostVO.setFeeDtoList(newFeeDtoList);
offerDO.setEstCost(JSONObject.toJSONString(newEstCostVO)); offerDO.setEstCost(JSONObject.toJSONString(newEstCostVO));
offerDO.setUpdater(userId); offerDO.setUpdater(userId);
if (type == 3) { // if (type == 3) {
// 需要查看是否还有其他审批中的商品 // // 需要查看是否还有其他审批中的商品
Long count = offerApprovalMapper.selectCount(new LambdaQueryWrapper<OfferApprovalDO>().eq(OfferApprovalDO::getOfferId, offerDO.getOfferId()).eq(OfferApprovalDO::getStatus, 1)); // Long count = offerApprovalMapper.selectCount(new LambdaQueryWrapper<OfferApprovalDO>().eq(OfferApprovalDO::getOfferId, offerDO.getOfferId()).eq(OfferApprovalDO::getStatus, 1));
if (count == 0) { // if (count == 0) {
offerDO.setOldStatus(offerDO.getStatus()); // offerDO.setOldStatus(offerDO.getStatus());
offerDO.setStatus(1); // offerDO.setStatus(1);
} // }
} // }
offerMapper.updateById(offerDO); offerMapper.updateById(offerDO);
} }
......
Markdown is supported
0% or
You are about to add 0 people to the discussion. Proceed with caution.
Finish editing this message first!
Please register or to comment