优化订单查询，删除

Api/src/main/java/com/java110/api/listener/purchaseApply/DeletePurchaseApplyListener.java

@@ -6,17 +6,22 @@ import com.java110.api.bmo.purchaseApply.IPurchaseApplyBMO;
 import com.java110.api.listener.AbstractServiceApiListener;
 import com.java110.core.annotation.Java110Listener;
 import com.java110.core.context.DataFlowContext;
+import com.java110.core.smo.purchaseApply.IPurchaseApplyInnerServiceSMO;
+import com.java110.dto.purchaseApply.PurchaseApplyDto;
 import com.java110.entity.center.AppService;
 import com.java110.event.service.api.ServiceDataFlowEvent;
 import com.java110.utils.constant.BusinessTypeConstant;
 import com.java110.utils.constant.CommonConstant;
 import com.java110.utils.constant.ServiceCodePurchaseApplyConstant;
 import com.java110.utils.util.Assert;
+import com.java110.utils.util.BeanConvertUtil;
 import org.springframework.beans.factory.annotation.Autowired;
 import org.springframework.http.HttpHeaders;
 import org.springframework.http.HttpMethod;
 import org.springframework.http.ResponseEntity;
 
+import java.util.List;
+
 /**
  * 删除采购/出库订单
  * add by zcc 2020/04/01
@@ -26,10 +31,17 @@ public class DeletePurchaseApplyListener extends AbstractServiceApiListener {
 
     @Autowired
     private IPurchaseApplyBMO purchaseApplyBMOImpl;
+
+    @Autowired
+    private IPurchaseApplyInnerServiceSMO purchaseApplyInnerServiceSMOImpl;
     @Override
     protected void validate(ServiceDataFlowEvent event, JSONObject reqJson) {
         Assert.hasKeyAndValue(reqJson, "applyOrderId", "订单号不能为空");
-
+        PurchaseApplyDto purchaseApplyDto = BeanConvertUtil.covertBean(reqJson, PurchaseApplyDto.class);
+        List<PurchaseApplyDto> purchaseApplyDtos = purchaseApplyInnerServiceSMOImpl.queryPurchaseApplys(purchaseApplyDto);
+        if(!"1000".equals(purchaseApplyDtos.get(0).getState())){
+            throw new IllegalArgumentException("只能取消未审核的订单");
+        }
     }
 
     @Override

StoreService/src/main/java/com/java110/store/listener/purchaseApply/SavePurchaseApplyInfoListener.java

@@ -171,6 +171,7 @@ public class SavePurchaseApplyInfoListener extends AbstractPurchaseApplyBusiness
         for( PurchaseApplyDetailVo purchaseApplyDetailVo : list){
             purchaseApplyDetailVo.setApplyOrderId(businessPurchaseApply.get("applyOrderId").toString());
             purchaseApplyDetailVo.setbId(business.getbId());
+            purchaseApplyDetailVo.setStatusCd("0");
             purchaseApplyDetailVo.setOperate(StatusConstant.OPERATE_ADD);
         }
         //保存采购申请信息

java110-bean/src/main/java/com/java110/vo/api/purchaseApply/PurchaseApplyDetailVo.java

@@ -15,7 +15,7 @@ public class PurchaseApplyDetailVo {
     private List<String> applyOrderIds;
     private String bId;
     private String operate;
-    private String id;
+    private String statusCd;
 
 
     public String getApplyOrderId() {
@@ -106,12 +106,12 @@ public class PurchaseApplyDetailVo {
         this.operate = operate;
     }
 
-    public String getId() {
-        return id;
+    public String getStatusCd() {
+        return statusCd;
     }
 
-    public void setId(String id) {
-        this.id = id;
+    public void setStatusCd(String statusCd) {
+        this.statusCd = statusCd;
     }
 }
 

java110-db/src/main/resources/mapper/store/PurchaseApplyServiceDaoImplMapper.xml

@@ -41,7 +41,7 @@
 
     <!-- 保存采购明细表备份表 -->
     <insert id="saveBusinessPurchaseApplyDetailInfo" parameterType="List">
-        insert into business_purchase_apply_detail (apply_order_id,res_id,quantity,remark,b_id,operate)
+        insert into business_purchase_apply_detail (apply_order_id,res_id,quantity,remark,b_id,operate,status_cd)
         values
         <foreach collection="list" item="item" index="index" separator=",">
         (
@@ -50,7 +50,8 @@
             #{item.quantity},
             #{item.remark},
             #{item.bId},
-            #{item.operate}
+            #{item.operate},
+            #{item.statusCd}
         )
         </foreach>
     </insert>
@@ -58,7 +59,7 @@
 
     <!-- 保存采购明细表-->
     <insert id="savePurchaseApplyDetailInfo" parameterType="List">
-        insert into purchase_apply_detail (apply_order_id,res_id,quantity,remark,b_id,operate)
+        insert into purchase_apply_detail (apply_order_id,res_id,quantity,remark,b_id,operate,status_cd)
         values
         <foreach collection="list" item="item" index="index" separator=",">
             (
@@ -67,7 +68,8 @@
             #{item.quantity},
             #{item.remark},
             #{item.bId},
-            #{item.operate}
+            #{item.operate},
+            #{item.statusCd}
             )
         </foreach>
     </insert>
@@ -81,7 +83,8 @@
             t.description,
             t.apply_order_id applyOrderId,t.state,
             t.store_id storeId,
-            t.user_name userName,t.b_id bId,t.user_id userId
+            t.user_name userName,t.b_id bId,t.user_id userId,
+            t.status_cd statusCd
         from business_purchase_apply t
         where 1 =1
         <if test="operate !=null and operate != ''">
@@ -113,7 +116,7 @@
 
     <select id="getBusinessPurchaseApplyDetailInfo" parameterType="Map" resultType="Map">
         select
-        t.apply_order_id applyOrderId,t.b_id bId,t.res_id resId,t.quantity,t.remark,t.operate
+        t.apply_order_id applyOrderId,t.b_id bId,t.res_id resId,t.quantity,t.remark,t.operate,t.status_cd statusCd
         from business_purchase_apply_detail t
         where 1 =1
         <if test="operate !=null and operate != ''">