订单删除问题修改

imcs-admin-boot/imcs-business-biz/src/main/java/com/github/zuihou/business/operationManagementCenter/service/impl/OrderServiceImpl.java

@@ -707,17 +707,22 @@ public class OrderServiceImpl extends SuperServiceImpl<OrderMapper, Order> imple
     }
 
     @Override
+    @Transactional(rollbackFor = Exception.class)
     public Boolean deleteOrder(Order model){
         // 判断计划是否在生产中，如果是在生产中不可删除
         isFalse(checkPlan(model) > 0, "订单已生产，不可删除");
+        PlanProduct planProduct = planProductMapper.selectOne(Wraps.<PlanProduct>lbQ().eq(PlanProduct::getPlanId,model.getId()));
         int count =  planMapper.delete(Wraps.<Plan>lbQ().eq(Plan::getId,model.getId()));
         planProductMapper.delete(Wraps.<PlanProduct>lbQ().eq(PlanProduct::getPlanId,model.getId()));
-//        int count = planMapper.updatePlanStatus(model);
-        if(count == 1){
-            return true;
-        }else{
-            return false;
+        // 删除订单
+        orderProductService.remove(Wraps.<OrderProduct>lbQ().eq(OrderProduct::getOrderId,planProduct.getOrderId()).eq(OrderProduct::getBomId,planProduct.getBomId()));
+        int remindOrderCount = orderProductService.count(Wraps.<OrderProduct>lbQ().eq(OrderProduct::getOrderId,planProduct.getOrderId()));
+        if(remindOrderCount  == 0){
+            // 删除order表数据
+            baseMapper.deleteById(planProduct.getOrderId());
         }
+        return true;
+
     }
 
     /**