From 768a42166035e34360e92f90852f38301aab25ca Mon Sep 17 00:00:00 2001
From: wuxw7 <wuxw7@asiainfo.com>
Date: 星期二, 22 五月 2018 17:29:13 +0800
Subject: [PATCH] 订单受理 同步 异步 逻辑处理完成待测试

---
 java110-core/src/main/java/com/java110/core/factory/DataFlowFactory.java |   56 ++++++++++++++++++++++++++++++++++++++++++++++++++++----
 1 files changed, 52 insertions(+), 4 deletions(-)

diff --git a/java110-core/src/main/java/com/java110/core/factory/DataFlowFactory.java b/java110-core/src/main/java/com/java110/core/factory/DataFlowFactory.java
index 6acb349..72b3a85 100644
--- a/java110-core/src/main/java/com/java110/core/factory/DataFlowFactory.java
+++ b/java110-core/src/main/java/com/java110/core/factory/DataFlowFactory.java
@@ -199,7 +199,7 @@
         busiMap.put("oId",dataFlow.getoId());
         busiMap.put("businessTypeCd",StatusConstant.REQUEST_BUSINESS_TYPE_DELETE);
         busiMap.put("remark",message);
-        busiMap.put("statusCd",StatusConstant.STATUS_CD_DELETE);
+        busiMap.put("statusCd",StatusConstant.STATUS_CD_DELETE_ORDER);
         busiMap.put("bId",SequenceUtil.getBId());
         business.add(busiMap);
         return business;
@@ -267,6 +267,40 @@
         business.put("bId",bId.substring(0,bId.length()-1));
         business.put("finishTime",DateUtil.getCurrentDate());
         business.put("statusCd",StatusConstant.STATUS_CD_COMPLETE);
+        return business;
+    }
+
+    /**
+     * Business 杩囩▼瀹屾垚
+     * @param dataFlow
+     * @return
+     */
+    public static Map getNeedBusinessComplete(DataFlow dataFlow){
+        Map business = new HashMap();
+        String bId = "";
+        for(Business busi:dataFlow.getBusinesses()){
+            bId += "'"+busi.getbId()+"',";
+        }
+        business.put("bId",bId.substring(0,bId.length()-1));
+        business.put("finishTime",DateUtil.getCurrentDate());
+        business.put("statusCd",StatusConstant.STATUS_CD_BUSINESS_COMPLETE);
+        return business;
+    }
+
+    /**
+     * Business 杩囩▼瀹屾垚
+     * @param dataFlow
+     * @return
+     */
+    public static Map getNeedDeleteBusiness(DataFlow dataFlow){
+        Map business = new HashMap();
+        String bId = "";
+        for(Business busi:dataFlow.getBusinesses()){
+            bId += "'"+busi.getbId()+"',";
+        }
+        business.put("bId",bId.substring(0,bId.length()-1));
+        business.put("finishTime",DateUtil.getCurrentDate());
+        business.put("statusCd",StatusConstant.STATUS_CD_DELETE_ORDER);
         return business;
     }
 
@@ -374,6 +408,8 @@
 
     }
 
+
+
     /**
      * 鑾峰彇澶辫触娑堟伅鐨勬姤鏂囷紙璁㈠崟澶辫触鍚庨�氱煡涓氬姟绯荤粺锛�
      * @param business
@@ -387,8 +423,8 @@
             busi.put("bId",business.getbId());
             busi.put("serviceCode",business.getServiceCode());
             busi.put("serviceName",business.getServiceName());
-            busi.put("isInstance",CommonConstant.INSTANCE_Y);
-        busi.put("datas",business.getDatas());
+            //busi.put("isInstance",CommonConstant.INSTANCE_Y);
+        //busi.put("datas",business.getDatas());
         requestMessage.put("business",busi);
         return requestMessage;
     }
@@ -407,11 +443,23 @@
         busi.put("bId",business.getbId());
         busi.put("serviceCode",business.getServiceCode());
         busi.put("serviceName",business.getServiceName());
-        busi.put("datas",business.getDatas());
+        //busi.put("datas",business.getDatas());
         requestMessage.put("business",busi);
         return requestMessage;
     }
 
+    public static JSONObject getDeleteInstanceTableJson(DataFlow dataFlow,Map business,AppService appService){
+        JSONObject requestMessage = getTransactionBusinessBaseJson(dataFlow,StatusConstant.REQUEST_BUSINESS_TYPE_DELETE);
+        JSONObject busi = null;
+        busi = new JSONObject();
+        busi.put("bId",business.get("b_id"));
+        busi.put("serviceCode",appService.getServiceCode());
+        //busi.put("datas",business.getDatas());
+        requestMessage.put("business",busi);
+        return requestMessage;
+
+    }
+
     /**
      * 鑾峰彇澶辫触娑堟伅鐨勬姤鏂囷紙璁㈠崟澶辫触鍚庨�氱煡涓氬姟绯荤粺锛�
      * @param business

--
Gitblit v1.8.0