Browse Source

删除订单新增判断,新增包材bom

24282 1 year ago
parent
commit
500b4fb698

+ 10 - 8
sd-business/src/main/java/com/sd/business/service/order/impl/OrderServiceImpl.java

@@ -18,10 +18,7 @@ import com.sd.business.entity.order.dto.OrderSkuDto;
 import com.sd.business.entity.order.dto.SkuSpecPriceDto;
 import com.sd.business.entity.order.enums.OrderExceptionTypeEnum;
 import com.sd.business.entity.order.enums.OrderStatusEnum;
-import com.sd.business.entity.order.po.OrderInfo;
-import com.sd.business.entity.order.po.OrderOperatingLog;
-import com.sd.business.entity.order.po.OrderSku;
-import com.sd.business.entity.order.po.OrderSkuBom;
+import com.sd.business.entity.order.po.*;
 import com.sd.business.entity.order.vo.OrderInfoVo;
 import com.sd.business.entity.order.vo.OrderSkuBomVo;
 import com.sd.business.entity.order.vo.OrderSkuVo;
@@ -31,10 +28,7 @@ import com.sd.business.entity.sku.po.SkuSpec;
 import com.sd.business.mapper.order.OrderMapper;
 import com.sd.business.service.bom.BomSpecService;
 import com.sd.business.service.department.DepartmentService;
-import com.sd.business.service.order.OrderOperatingLogService;
-import com.sd.business.service.order.OrderService;
-import com.sd.business.service.order.OrderSkuBomService;
-import com.sd.business.service.order.OrderSkuService;
+import com.sd.business.service.order.*;
 import com.sd.business.service.price.PriceBillingStandardDetailService;
 import com.sd.business.service.sku.SkuSpecService;
 import com.sd.framework.util.Assert;
@@ -73,6 +67,9 @@ public class OrderServiceImpl extends ServiceImpl<OrderMapper, OrderInfo> implem
     private OrderSkuBomService orderSkuBomService;
 
     @Autowired
+    private OrderPackageBomService orderPackageBomService;
+
+    @Autowired
     private OrderOperatingLogService orderOperatingLogService;
 
     @Autowired
@@ -244,9 +241,14 @@ public class OrderServiceImpl extends ServiceImpl<OrderMapper, OrderInfo> implem
     public void delete(Long id) {
         OrderInfo orderInfo = getById(id);
 
+        if (orderInfo.getStatus() > OrderStatusEnum.UNDER_REVIEW.getKey()) {
+            throw new ServiceException("订单已确认,无法直接删除,需要走审批流程");
+        }
+
         this.removeById(id);
         orderSkuService.remove(q -> q.eq(OrderSku::getOrderId, id));
         orderSkuBomService.remove(q -> q.eq(OrderSkuBom::getOrderId, id));
+        orderPackageBomService.remove(q -> q.eq(OrderPackageBom::getOrderId, id));
 
         OrderOperatingLog orderOperatingLog = new OrderOperatingLog();
         orderOperatingLog.setType(30);