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

sql/v2.4/20250228hhy.sql

+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

@@ -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

@@ -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);