add

src/main/java/com/zfire/jiasm/syncdata/service/OrderService.java

@@ -26,6 +26,4 @@ public interface OrderService extends IService<OrderBase> {
     // 平台工单地理位置转成商户工单地理位置 无依平台为准
     void tpPositionTosh(ItfTblAzAssignLcLsUpload lcls);
 
-    void getOrderDetailRec(ItfTblAzAssignLcLsDownload item, OrderBase orderBase, List<ItfGreeToFaDownloadTaskList> its);
-
 }

src/main/java/com/zfire/jiasm/syncdata/service/impl/AddInstallBusinessImpl.java

@@ -244,79 +244,17 @@ public class AddInstallBusinessImpl implements AddInstallBusiness {
 
         //网点转换还原
         publicService.revertFun(orderBase, item);
-        // 接口生成工单
-        if (createInstallOrder(item, orderProducts,orderBase, orderWorker,orderInstall, flag)){
-            orderEndPro(item, oa, oids, odfs, synReqIds, synReqFkMxIds, synReqYfYyIds, faGreeSms, orderAppeal, its, orderBase, oiolList, fyqd, getpjSynReqId);
-        }
-    }
-
-
-    public void orderEndPro(ItfTblAzAssignLcLsDownload item, List<OrderReAppointment> oa,
-                            List<OrderInstallDetail> oids, List<OrderDetailFile> odfs,
-                            List<Long> synReqIds, List<Long> synReqFkMxIds, List<Long> synReqYfYyIds,
-                            List<FaGreeSms> faGreeSms, List<OrderAppeal> orderAppeal,
-                            List<ItfGreeToFaDownloadTaskList> its, OrderBase orderBase,
-                            List<OrderInstallOperatingLog> oiolList, List<ItfTblAzAssignFeeDownload> fyqd,
-                            List<Long> getpjSynReqId) throws Exception {
-        try{
-            // 向工单子表下载任务表插入数据
-            downInformation(item);
-
-            // 采集数据下载
-            orderService.getOrderDetailRec(item, orderBase, its);
-
-            // 安装工单数据落本地表
-            addOrderDataApi(item.getSynReqId(), synReqIds, synReqFkMxIds, synReqYfYyIds, fyqd, getpjSynReqId,
-                    faGreeSms, orderAppeal, its, odfs, oiolList, oids, oa);
-        } catch (Exception ex) {
-            // 抛异常目的数据回滚
-            String msg="工单接口后数据处理失败交给修改处理";
-            throw new Exception(msg);
-        }
 
+        createInstallOrder(item, orderProducts, oiolList, odfs, synReqIds, synReqFkMxIds,
+                synReqYfYyIds, faGreeSms,  orderAppeal,
+                 its, orderBase, orderWorker, fyqd,
+                orderInstall, getpjSynReqId, flag, oids, oa);
 
     }
 
 
-    private Boolean createInstallOrder(ItfTblAzAssignLcLsDownload item, List<OrderProduct> orderProducts,
-                                   OrderBase orderBase, OrderWorker orderWorker,
-                                    OrderInstall orderInstall,Boolean flag) throws Exception {
-        // 创建工单
-        OrderAddBeanDTO createOrder = new OrderAddBeanDTO();
-        // 工单机型
-        List<OrderProduct> orderProductList = new ArrayList<>();
-        // 工单辅材表
-        List<OrderMaterial> orderMaterialList = new ArrayList<>();
-        // 工单清洗项目
-        List<OrderCleanItem> orderCleanItems = new ArrayList<>();
 
-        // 工单主表、机型、辅材、清洗、预约改约记录、师傅、创建日志、生成采集数据不要
-        getOrderApi(orderProducts, orderBase, orderWorker, orderInstall, createOrder,
-                orderProductList, orderMaterialList, orderCleanItems, flag);
-        log.info("创建安装工单接口 request:{}", JSONObject.toJSONString(createOrder));
-        ResponseHelper respone = jiasmApi.orderAdd(createOrder);
-        log.info("创建安装工单接口 respone:{}", JSONObject.toJSONString(respone));
-        if (respone.getCode()==200){
-            if (flag){
-                SyncCreateOrder sco = new SyncCreateOrder();
-                sco.setId(publicService.getUUID());
-                sco.setOrderBaseId(orderBase.getId());
-                sco.setPgidOrPgguid(item.getPgguid());
-                sco.setOrderJson(JSONObject.toJSONString(createOrder));
-                sco.setCreateTime(new Date());
-                syncCreateOrderService.save(sco);
-            }
-            return Boolean.TRUE;
-        } else {
-            String msg = publicService.getErrormessage(respone);
-            log.info(msg);
-            // 抛异常目的是把前期的数据修改回滚
-            throw new Exception(msg);
-        }
-    }
-
-
-    private void createInstallOrderBak(ItfTblAzAssignLcLsDownload item, List<OrderProduct> orderProducts,
+    private void createInstallOrder(ItfTblAzAssignLcLsDownload item, List<OrderProduct> orderProducts,
                                     List<OrderInstallOperatingLog> oiolList,
                                     List<OrderDetailFile> odfs, List<Long> synReqIds, List<Long> synReqFkMxIds,
                                     List<Long> synReqYfYyIds, List<FaGreeSms> faGreeSms, List<OrderAppeal> orderAppeal,
@@ -460,6 +398,8 @@ public class AddInstallBusinessImpl implements AddInstallBusiness {
         List<OrderDetailFile> odfs = new ArrayList<>();
         OrderBase oldr = new OrderBase();
 
+        // 向工单子表下载任务表插入数据
+        downInformation(item);
 
         // 提取本地订单
         OrderBase old = orderBaseService.lambdaQuery()
@@ -528,42 +468,16 @@ public class AddInstallBusinessImpl implements AddInstallBusiness {
         // 网点转换还原
         revertFun(oldr, item, upInfo);
 
-        if (upInstallOrder(flag, orderProductsUpdate,upInfo, own,orderInstall, order, orderProductList, orderMaterialList, orderCleanItems)){
-
-            endUpInstallOrder(item, synReqYfYyIds, addoalists, mxsynreqids, synreqids, addoiolList, getpjSynReqId, addoalist, faGreeSms, orderAppeal, its, odfs, upInfo, fyqd);
-        }
-    }
-
-    private void endUpInstallOrder(ItfTblAzAssignLcLsDownload item, List<Long> synReqYfYyIds, List<OrderReAppointment> addoalists, List<ItfTblAzAssignMxDownload> mxsynreqids, List<ItfTblAzAssignFkmxDownload> synreqids, List<OrderInstallOperatingLog> addoiolList, List<Long> getpjSynReqId, List<OrderAppraise> addoalist, List<FaGreeSms> faGreeSms, List<OrderAppeal> orderAppeal, List<ItfGreeToFaDownloadTaskList> its, List<OrderDetailFile> odfs, OrderBase upInfo, List<ItfTblAzAssignFeeDownload> fyqd) throws Exception {
-        try{
-            // 向工单子表下载任务表插入数据
-            downInformation(item);
-
-            // 采集数据下载
-            orderService.getOrderDetailRec(item, upInfo, its);
-
-            // 安装工单数据修改落本地表
-            addOrUpdateOrderDataApi(item, mxsynreqids, synreqids, addoiolList,
-                    fyqd, synReqYfYyIds, getpjSynReqId,
-                    addoalist, faGreeSms, orderAppeal, its, odfs, addoalists);
-        } catch (Exception ex) {
-            // 抛异常目的数据回滚
-            String msg="工单接口后数据处理失败";
-            throw new Exception(msg);
-        }
-    }
-
-    private Boolean upInstallOrder(Boolean flag, List<OrderProduct> orderProductsUpdate,OrderBase upInfo, OrderWorker own,
-                                   OrderInstall orderInstall, OrderAddBeanDTO order,
-                                   List<OrderProduct> orderProductList, List<OrderMaterial> orderMaterialList,
-                                   List<OrderCleanItem> orderCleanItems) throws Exception {
         // 工单主表、机型、辅材、清洗、预约改约记录、师傅、创建日志、生成采集数据不要
-        getOrderApi(orderProductsUpdate, upInfo, own, orderInstall, order, orderProductList, orderMaterialList, orderCleanItems, flag);
+        getOrderApi(orderProductsUpdate, upInfo, own, orderInstall, order, orderProductList, orderMaterialList, orderCleanItems,flag);
         log.info("修改安装工单接口 request:{}", JSONObject.toJSONString(order));
         ResponseHelper respone = jiasmApi.orderAdd(order);
         log.info("修改安装工单接口 respone:{}", JSONObject.toJSONString(respone));
         if (respone.getCode()==200){
-            return Boolean.TRUE;
+            // 安装工单数据修改落本地表
+            addOrUpdateOrderDataApi(item, mxsynreqids, synreqids,addoiolList,
+                    fyqd, synReqYfYyIds, getpjSynReqId,
+                    addoalist, faGreeSms,orderAppeal, its,odfs, addoalists);
         } else {
             String msg = publicService.getErrormessage(respone);
             log.info(msg);
@@ -2702,7 +2616,7 @@ public class AddInstallBusinessImpl implements AddInstallBusiness {
             OrderProduct op = getOrderProduct(orderBase, orderProducts, sysDictRefDLMap, sysDictRefXLMap, sysDictRefXiLieMap, mx);
             // 生成采集明细数据+附件数据
             // 总数量一条条插入，内外机数量不再拆分
-            // extracted(orderBase, oids, odfs, insertnum, outid, mx, op);
+            extracted(orderBase, oids, odfs, insertnum, outid, mx, op);
         }
     }
 

src/main/java/com/zfire/jiasm/syncdata/service/impl/OrderServiceImpl.java

@@ -254,12 +254,11 @@ public class OrderServiceImpl extends ServiceImpl<OrderBaseMapper, OrderBase> im
         // 接收派工网点与所属区域有差异时 以接收网点为准 本身就是按网点来的，这里无需处理
 
         // 99999999 待验证要不要处理 todo
-        // 采集数据下载 移动外面处理
-        // getOrderDetailRec(item, orderBase, its);
+        // 采集数据下载
+        getOrderDetailRec(item, orderBase, its);
     }
 
-    @Override
-    public void getOrderDetailRec(ItfTblAzAssignLcLsDownload item, OrderBase orderBase, List<ItfGreeToFaDownloadTaskList> its) {
+    private void getOrderDetailRec(ItfTblAzAssignLcLsDownload item, OrderBase orderBase, List<ItfGreeToFaDownloadTaskList> its) {
         if (orderBase.getOrderStatus().equals(OrderStatusEnum.INSTALL_STATUS_A1304.getCode()) ||
                 orderBase.getOrderStatus().equals(OrderStatusEnum.INSTALL_STATUS_A1309.getCode())){
             // 提取本地订单
@@ -458,7 +457,6 @@ public class OrderServiceImpl extends ServiceImpl<OrderBaseMapper, OrderBase> im
         orderBase.setLastOperatorWebsit(websitFWS.getWebsitId());
         orderBase.setSysWebsitNumber(websitFWS.getBrandSysWebsitNumber());
 
-        // 生成采集数据下载数据 2201
         extractedApi(item, orderBase, its);
     }