add

pom.xml

@@ -19,23 +19,6 @@
     </properties>
 
     <dependencies>
-        <!--<dependency>
-            <groupId>com.github.binarywang</groupId>
-            <artifactId>wx-java-pay-spring-boot-starter</artifactId>
-            <version>4.1.0</version>
-        </dependency>
-
-        <dependency>
-            <groupId>com.gree.manager</groupId>
-            <artifactId>jiasm_api</artifactId>
-            <version>0.0.1-SNAPSHOT</version>
-            <exclusions>
-                <exclusion>
-                    <groupId>*</groupId>
-                    <artifactId>*</artifactId>
-                </exclusion>
-            </exclusions>
-        </dependency>-->
         <dependency>
             <groupId>com.alibaba.cloud</groupId>
             <artifactId>spring-cloud-starter-alibaba-nacos-discovery</artifactId>
@@ -64,9 +47,7 @@
         <dependency>
             <groupId>org.springframework.integration</groupId>
             <artifactId>spring-integration-redis</artifactId>
-<!--            <version>RELEASE</version>-->
         </dependency>
-
         <dependency>
             <groupId>org.springframework.boot</groupId>
             <artifactId>spring-boot-devtools</artifactId>

src/main/java/com/zfire/jiasm/syncdata/api/OrderAddBeanDTO.java

@@ -6,6 +6,7 @@ import com.zfire.jiasm.syncdata.plus.entity.OrderProduct;
 import lombok.Data;
 import org.hibernate.validator.constraints.Length;
 
+import java.util.ArrayList;
 import java.util.Date;
 import java.util.List;
 
@@ -116,11 +117,11 @@ public class OrderAddBeanDTO {
     // 特殊要求-信息员标签（传中文名）
     private List<String> labels2;
     // 特殊要求-业务员等级id
-    private List<String> messengerLevelIds;
+    private List<String> messengerLevelIds = new ArrayList<>();
     // 派工方式 A=自动派工 B=手动派工
     private String dispatchFlag;
     // 工程师，第一个为大工
-    private List<String> workerIds;
+    private List<String> workerIds = new ArrayList<>();
     // 支架
     private String bracket;
     // 加长管
@@ -150,7 +151,7 @@ public class OrderAddBeanDTO {
     // 电商标识
     private String shopFlag;
     // 产品信息/故障信息
-    private List<OrderProduct> orderProductList;
+    private List<OrderProduct> orderProductList = new ArrayList<>();
 
     // 工程单号-销售类型为工程机必填
     private String enginNo;
@@ -163,13 +164,13 @@ public class OrderAddBeanDTO {
     // 工程机的工程师确认的辅材提供方
     private String enginMaterialSupply2;
     // 辅材信息
-    private List<OrderMaterial> orderMaterialList;
+    private List<OrderMaterial> orderMaterialList = new ArrayList<>();
     // 关联(看位工单,铺管工单)工单号
     private String relaOrderBaseId;
     // 预计到货时间
     private Date expectArrivalTime;
     // 清洗项目
-    private List<OrderCleanItem> orderCleanItems;
+    private List<OrderCleanItem> orderCleanItems = new ArrayList<>();
     // 是否现场收费YES/NO
     private IsEnum isOnsiteCharges;
     // 是否可离线操作，通过相册的图片提交采集 YES/NO

src/main/java/com/zfire/jiasm/syncdata/download/order/InstallBusiness.java

@@ -44,9 +44,9 @@ public class InstallBusiness {
     // 3：工单落入本地表
     @Scheduled(fixedDelayString = "${installin}")
     public void inputOrderInstall() {
-        /*if (1 == 1) {
+        if (1 == 1) {
             return;
-        }*/
+        }
 
         SimpleDateFormat sdf = new SimpleDateFormat("yyyy-MM-dd HH:mm:ss");
         List<ItfTblAzAssignLcLsDownload> lcls = new ArrayList<>();

src/main/java/com/zfire/jiasm/syncdata/download/order/InstallBusinessApi.java

@@ -1,18 +1,29 @@
 package com.zfire.jiasm.syncdata.download.order;
 
-import com.alibaba.fastjson.JSONObject;
-import com.zfire.jiasm.syncdata.api.OrderAddBeanDTO;
+import com.baomidou.mybatisplus.core.toolkit.IdWorker;
+import com.zfire.jiasm.syncdata.base.BaseService;
+import com.zfire.jiasm.syncdata.constant.DictTypeEnum;
 import com.zfire.jiasm.syncdata.constant.JiasmApi;
-import com.zfire.jiasm.syncdata.plus.entity.OrderBase;
+import com.zfire.jiasm.syncdata.plus.entity.*;
+import com.zfire.jiasm.syncdata.plus.service.ItfTblAzAssignLcLsDownloadService;
 import com.zfire.jiasm.syncdata.plus.service.OrderBaseService;
-import com.zfire.jiasm.syncdata.utils.MyBeanUtils;
-import com.zfire.jiasm.syncdata.utils.ResponseHelper;
+import com.zfire.jiasm.syncdata.plus.service.SysDictRefService;
+import com.zfire.jiasm.syncdata.service.AddInstallBusiness;
 import lombok.extern.slf4j.Slf4j;
 import org.springframework.beans.factory.annotation.Autowired;
 import org.springframework.beans.factory.annotation.Qualifier;
 import org.springframework.scheduling.annotation.Scheduled;
 import org.springframework.stereotype.Component;
 
+import javax.annotation.Resource;
+import java.text.SimpleDateFormat;
+import java.util.*;
+import java.util.stream.Collectors;
+
+/** 接口方式生成工单
+ * 格力品牌安装工单下载后落本地数据表
+ *    落业务表 - 修改下载主表处理结果
+ */
 @Slf4j
 @Component
 public class InstallBusinessApi {
@@ -22,26 +33,141 @@ public class InstallBusinessApi {
     private JiasmApi jiasmApi;
     @Autowired
     OrderBaseService orderBaseService;
+    @Resource
+    ItfTblAzAssignLcLsDownloadService itfTblAzAssignLcLsDownloadService;
+    @Resource
+    BaseService baseService;
+    @Resource
+    AddInstallBusiness addInstallBusiness;
+    @Resource
+    SysDictRefService sysDictRefService;
 
     // 3：工单落入本地表
     @Scheduled(fixedDelayString = "${installin}")
     public void inputOrderInstall() {
-        /*if (1 == 1) {
+        if (1 == 1) {
+            return;
+        }
+        SimpleDateFormat sdf = new SimpleDateFormat("yyyy-MM-dd HH:mm:ss");
+        List<ItfTblAzAssignLcLsDownload> lcls = new ArrayList<>();
+        List<String> lclslist = new ArrayList<>();
+        List<OrderBase> orderBasesRecs = new ArrayList<>();
+        List<String> orderBaselist = new ArrayList<>();
+        Map<String, List<SysDictRef>> sysDictRefDLMap = new HashMap<>();
+        Map<String, List<SysDictRef>> sysDictRefXLMap = new HashMap<>();
+        Map<String, List<SysDictRef>> sysDictRefXiLieMap = new HashMap<>();
+
+        // 提取品牌信息
+        Brand brand = baseService.getBrand();
+        if (brand == null) {
+            return;
+        }
+        // 提取品牌商对应的大类信息
+        sysDictRefDLMap = getStringListMap(brand);
+        // 提取品牌商对应的小类信息
+        sysDictRefXLMap = getListMap(brand);
+        // 提取品牌商对应的系列信息
+        sysDictRefXiLieMap = getMap(brand);
+
+        // 提取待落本地表的数据
+        lcls = itfTblAzAssignLcLsDownloadService.lambdaQuery()
+                .eq(ItfTblAzAssignLcLsDownload::getSynStatus,0)
+                .orderByAsc(ItfTblAzAssignLcLsDownload::getSynReqId)
+                .list();
+
+        if (lcls.size()<1){
+            log.info("暂无待处理的安装工单: \uF0B7{}",sdf.format(new Date()));
             return;
         }
-        */
-        OrderAddBeanDTO order = new OrderAddBeanDTO();
-
-        OrderBase obs = orderBaseService.lambdaQuery().eq(OrderBase::getId,"331671357990808080386").one();
-        MyBeanUtils.copyProperties(obs,order);
-        order.setSaleNo("00002305788851");
-        order.setVip("1");
-        try {
-            ResponseHelper respone = jiasmApi.orderAdd(order);
-            log.info("respone:{}", JSONObject.toJSONString(respone));
-        }catch (Exception e){
-            log.error("worker order error:",e);
+
+        log.info("安装工单落本地表开始处理: \uF0B7{}",sdf.format(new Date()));
+
+        lclslist = lcls.stream().map(ItfTblAzAssignLcLsDownload::getPgguid).collect(Collectors.toList());
+        // 提取已有的订单数据
+        orderBasesRecs = orderBaseService.lambdaQuery()
+                .select(OrderBase::getPgguid)
+                .in(OrderBase::getPgguid,lclslist).list();
+        orderBaselist = orderBasesRecs.stream().map(OrderBase::getPgguid).collect(Collectors.toList());
+
+        // 按任务号download_task_no，按单来处理
+        for (ItfTblAzAssignLcLsDownload item: lcls) {
+            try{
+                // 向工单子表下载任务表插入数据
+                downInformation(item);
+
+                if (orderBaselist.contains(item.getPgguid())){
+                    // 修改 TL_SynDataFrom_tbl_az_assign_lc_ls_batch
+                    addInstallBusiness.orderUpdateApi(sysDictRefDLMap, sysDictRefXLMap, sysDictRefXiLieMap, brand, item);
+                } else {
+                    // 新增 TL_SynDataFrom_tbl_az_assign_lc_ls_batch
+                    if (addInstallBusiness.orderAddApi(sysDictRefDLMap, sysDictRefXLMap, sysDictRefXiLieMap, brand, item)){
+                        orderBaselist.add(item.getPgguid());
+                    }
+                }
+            } catch (Exception ex) {
+                ex.printStackTrace();
+                log.info("安装工单创建失败 销售单号-派工单号：【" + item.getXsdh() + "-"+ item.getPgid()+"】");
+                String msg = "接口生成安装工单失败： ";
+                if (ex.getMessage()!=null){
+                    msg = msg + ex.getMessage();
+                }
+                item.setSynErrMsg(msg);
+                if (msg.length()>1020){
+                    item.setSynErrMsg(msg.substring(0,1020));
+                }
+                item.setSynTime(new Date());
+                itfTblAzAssignLcLsDownloadService.updateById(item);
+            }
         }
 
+        log.info("安装工单落本地表完成: \uF0B7{}",sdf.format(new Date()));
+    }
+
+
+    private Map<String, List<SysDictRef>> getListMap(Brand brand) {
+        List<SysDictRef> sysDictxlRef;
+        Map<String, List<SysDictRef>> sysDictRefXLMap;
+        sysDictxlRef =  sysDictRefService.lambdaQuery()
+                .select(SysDictRef::getDictCode,SysDictRef::getDictValue,SysDictRef::getRefDictCode)
+                .eq(SysDictRef::getBrandId, brand.getBrandId())
+                .eq(SysDictRef::getDictType, DictTypeEnum.DICT_TYPE_SMALL_TYPE.getCode())
+                .list();
+        sysDictRefXLMap = sysDictxlRef.stream().
+                collect(Collectors.groupingBy(SysDictRef::getRefDictCode));
+        return sysDictRefXLMap;
+    }
+
+    private Map<String, List<SysDictRef>> getStringListMap(Brand brand) {
+        List<SysDictRef> sysDictRef;
+        Map<String, List<SysDictRef>> sysDictRefDLMap;
+        sysDictRef =  sysDictRefService.lambdaQuery()
+                .select(SysDictRef::getDictCode,SysDictRef::getDictValue,SysDictRef::getRefDictCode)
+                .eq(SysDictRef::getBrandId, brand.getBrandId())
+                .eq(SysDictRef::getDictType, DictTypeEnum.DICT_TYPE_MAIN_TYPE.getCode())
+                .list();
+        sysDictRefDLMap = sysDictRef.stream().
+                collect(Collectors.groupingBy(SysDictRef::getRefDictCode));
+        return sysDictRefDLMap;
+    }
+
+    private void downInformation(ItfTblAzAssignLcLsDownload item) {
+        ItfGreeToFaDownloadTaskList tl = new ItfGreeToFaDownloadTaskList();
+        tl.setDownloadTaskNo(IdWorker.getIdStr());
+        tl.setDownloadKeyValue(item.getPgguid());
+        tl.setDownloadTaskType(2206);
+        tl.setDownloadStatus(0);
+        tl.insert();
+    }
+    private Map<String, List<SysDictRef>> getMap(Brand brand) {
+        List<SysDictRef> sysDictxilieRef;
+        Map<String, List<SysDictRef>> sysDictRefXiLieMap;
+        sysDictxilieRef =  sysDictRefService.lambdaQuery()
+                .select(SysDictRef::getDictCode,SysDictRef::getDictValue,SysDictRef::getRefDictCode)
+                .eq(SysDictRef::getBrandId, brand.getBrandId())
+                .eq(SysDictRef::getDictType, DictTypeEnum.DICT_TYPE_SERIES.getCode())
+                .list();
+        sysDictRefXiLieMap = sysDictxilieRef.stream().
+                collect(Collectors.groupingBy(SysDictRef::getRefDictCode));
+        return sysDictRefXiLieMap;
     }
 }

src/main/java/com/zfire/jiasm/syncdata/download/order/RepairBusiness.java

@@ -1,30 +1,24 @@
 package com.zfire.jiasm.syncdata.download.order;
 
-import com.baomidou.mybatisplus.core.conditions.query.QueryWrapper;
-import com.baomidou.mybatisplus.core.toolkit.IdWorker;
-import com.baomidou.mybatisplus.core.toolkit.StringUtils;
 import com.zfire.jiasm.syncdata.base.BaseService;
-import com.zfire.jiasm.syncdata.constant.DictTypeEnum;
-import com.zfire.jiasm.syncdata.constant.GDOrderStatusEnum;
-import com.zfire.jiasm.syncdata.constant.OrderTypeEnum;
-import com.zfire.jiasm.syncdata.dao.mapper.*;
-import com.zfire.jiasm.syncdata.parameter.OrderPar;
-import com.zfire.jiasm.syncdata.parameter.ReAppointment;
-import com.zfire.jiasm.syncdata.plus.entity.*;
-import com.zfire.jiasm.syncdata.plus.service.*;
-import com.zfire.jiasm.syncdata.response.WebsitFWS;
-import com.zfire.jiasm.syncdata.service.OrderService;
+import com.zfire.jiasm.syncdata.plus.entity.Brand;
+import com.zfire.jiasm.syncdata.plus.entity.ItfTblAssignDownload;
+import com.zfire.jiasm.syncdata.plus.entity.OrderBase;
+import com.zfire.jiasm.syncdata.plus.entity.SysDictRef;
+import com.zfire.jiasm.syncdata.plus.service.ItfTblAssignDownloadService;
+import com.zfire.jiasm.syncdata.plus.service.OrderBaseService;
+import com.zfire.jiasm.syncdata.service.AddRepairBusiness;
 import com.zfire.jiasm.syncdata.service.PublicService;
 import lombok.extern.slf4j.Slf4j;
-import org.apache.commons.collections4.CollectionUtils;
-import org.jetbrains.annotations.NotNull;
 import org.springframework.scheduling.annotation.Scheduled;
 import org.springframework.stereotype.Component;
-import org.springframework.transaction.annotation.Transactional;
 
 import javax.annotation.Resource;
 import java.text.SimpleDateFormat;
-import java.util.*;
+import java.util.ArrayList;
+import java.util.Date;
+import java.util.List;
+import java.util.Map;
 import java.util.stream.Collectors;
 
 /**
@@ -34,61 +28,16 @@ import java.util.stream.Collectors;
 @Slf4j
 @Component
 public class RepairBusiness {
-
-    @Resource
-    RepairBusiness repairBusiness;
     @Resource
     ItfTblAssignDownloadService itfTblAssignDownloadService;
     @Resource
-    RepairDownloadMapper repairDownloadMapper;
-    @Resource
     BaseService baseService;
     @Resource
     OrderBaseService orderBaseService;
     @Resource
-    OrderService orderService;
-    @Resource
-    OrderApplyDispatchService orderApplyDispatchService;
-    @Resource
-    AssignDownloadMapper assignDownloadMapper;
-    @Resource
-    ItfTblAssignMxDownloadService itfTblAssignMxDownloadService;
-    @Resource
-    RepairMxDownloadMapper repairMxDownloadMapper;
-    @Resource
     PublicService publicService;
     @Resource
-    OrderProductService orderProductService;
-    @Resource
-    ItfTblAssignFkmxDownloadService itfTblAssignFkmxDownloadService;
-    @Resource
-    OrderRepairOperatingLogService orderRepairOperatingLogService;
-    @Resource
-    ItfTblAssignSatisfactionDownloadService itfTblAssignSatisfactionDownloadService;
-    @Resource
-    OrderAppraiseService orderAppraiseService;
-    @Resource
-    AppraiseMapper appraiseMapper;
-    @Resource
-    AssignSatisfactionDownloadMapper assignSatisfactionDownloadMapper;
-    @Resource
-    FaGreeSmsService faGreeSmsService;
-    @Resource
-    ItfTblAssignXzydDownloadService itfTblAssignXzydDownloadService;
-    @Resource
-    OrderInformationService orderInformationService;
-    @Resource
-    ItfTblAssignAppointmentDownloadService itfTblAssignAppointmentDownloadService;
-    @Resource
-    OrderRepairDetailService orderRepairDetailService;
-    @Resource
-    OrderRepairService orderRepairService;
-    @Resource
-    RepairLogMapper repairLogMapper;
-    @Resource
-    GDOrderBaseMapper gdOrderBaseMapper;
-    @Resource
-    OrderAppealService orderAppealService;
+    AddRepairBusiness addRepairBusiness;
 
 
 
@@ -149,11 +98,11 @@ public class RepairBusiness {
             try{
                 if (orderBaselist.contains(String.valueOf(item.getPgid()))){
                     // 修改
-                    repairBusiness.updateOrder(brand, sysDictRefDLMap, sysDictRefXLMap, sysDictRefXiLieMap, item,
+                    addRepairBusiness.updateOrder(brand, sysDictRefDLMap, sysDictRefXLMap, sysDictRefXiLieMap, item,
                             sysDictRefDLMapXq, sysDictRefXLMapXq);
                 } else {
                     // 新增 TL_SynDataFrom_tbl_assign_batch
-                    repairBusiness.addOrder(brand, item, sysDictRefDLMap, sysDictRefXLMap, sysDictRefXiLieMap,
+                    addRepairBusiness.addOrder(brand, item, sysDictRefDLMap, sysDictRefXLMap, sysDictRefXiLieMap,
                             sysDictRefDLMapXq, sysDictRefXLMapXq);
                     orderBaselist.add(String.valueOf(item.getPgid()));
 
@@ -163,1412 +112,7 @@ public class RepairBusiness {
                 log.info("维修工单落本地表失败 销售单号-派工单号：【" + item.getXsdh() + "-"+ item.getPgid()+"】");
             }
         }
-
         log.info("维修工单落本地表处理完成: \uF0B7{}",sdf.format(new Date()));
     }
 
-    @Transactional(rollbackFor = Exception.class)
-    public void updateOrder(Brand brand, Map<String, List<SysDictRef>> sysDictRefDLMap,
-                            Map<String, List<SysDictRef>> sysDictRefXLMap,
-                            Map<String, List<SysDictRef>> sysDictRefXiLieMap,
-                            ItfTblAssignDownload item,
-                            Map<String, List<SysDictRef>> sysDictRefDLMapXq,
-                            Map<String, List<SysDictRef>> sysDictRefXLMapXq) {
-        List<ItfTblAssignXzydDownload> yds = itfTblAssignXzydDownloadService.lambdaQuery()
-                .eq(ItfTblAssignXzydDownload::getDownloadTaskNo, item.getDownloadTaskNo()).list();
-
-        // TL_SynDataFrom_tbl_assign_batch
-        // TL_SynDataFrom_tbl_assign 主单的 syn_req_id
-        // 处理维修工单主表数据
-        modifyOrderBase(brand, sysDictRefDLMap, item);
-
-        OrderBase order = orderBaseService.lambdaQuery()
-                .eq(OrderBase::getPgid, item.getPgid())
-                .eq(OrderBase::getOrderType, OrderTypeEnum.ORDER_TYPE_REPAIR.getCode()).one();
-
-        // 工单师傅信息更新
-        upOrderWorker(order);
-        // 工单扩展信息更新
-        getOrderInstall(item, order,sysDictRefDLMapXq, sysDictRefXLMapXq);
-        // 维修单明细表更新 TL_SynDataFrom_tbl_assign_mx
-        generateMxUpdate(brand, item, order, sysDictRefDLMap, sysDictRefXLMap, sysDictRefXiLieMap);
-        // 处理维修单过程反馈(只新增不修改)  放入操作日志表 TL_SynDataFrom_tbl_assign_fkmx
-        generateFkmxUpdate(item, order);
-        // 处理用户评价数据 TL_SynDataFrom_tbl_assign_satisfaction
-        generateSstisfaction(item, sysDictRefDLMap, order);
-        // 阅读要求数据处理 TL_SynDataFrom_tbl_assign_xzyd
-        generateXzydUpdate(yds, order);
-        // 用户预约改约数据处理 TL_SynDataFrom_tbl_assign_appointment
-        generateAppointmentUpdate(item, order);
-    }
-
-    private void upOrderWorker(OrderBase order) {
-        if (StringUtils.isEmpty(order.getWorkerName())){
-            // 清理师傅表
-            publicService.deleteWorker(order.getId());
-        } else {
-            // 提取现有的师傅信息
-            List<OrderWorker> ows = publicService.getWorker(order.getWorkerId(), order.getId());
-            // 看是工单师傅是否在内，如不在内说明重新指派了师傅
-            Boolean flag = Boolean.FALSE;
-            for (OrderWorker ow :ows){
-                if (ow.getWorkerId().equals(order.getWorkerId())){
-                    flag = Boolean.TRUE;
-                }
-            }
-            if (!flag){
-                // 清理师傅表，重新生新新师傅数据
-                if (ows !=null && ows.size()>0){
-                    publicService.deleteWorker(order.getId());
-                }
-                publicService.getOrderWorker(order);
-            }
-        }
-    }
-
-    private void modifyOrderBase(Brand brand, Map<String, List<SysDictRef>> sysDictRefDLMap, ItfTblAssignDownload item) {
-        String orderStatus="";
-        Integer cjDowFlag=0;
-        // TL_SynDataFrom_tbl_assign_batch
-        // TL_SynDataFrom_tbl_assign 主单的 syn_req_id
-        // 提取基础表数据
-        OrderBase oldOrder = orderBaseService.lambdaQuery()
-                .eq(OrderBase::getPgid, item.getPgid())
-                .eq(OrderBase::getOrderType, OrderTypeEnum.ORDER_TYPE_REPAIR.getCode()).one();
-        orderStatus = oldOrder.getOrderStatus();
-        cjDowFlag = oldOrder.getOutCjDownloadFlag();
-        // 批量关闭的工单 同步下载无需再修改
-        if (oldOrder.getOrderStatus().equals(GDOrderStatusEnum.REPAIR_STATUS_G13.getCode())){
-            upItfTblAssignDownload(item.getSynReqId(),99,"last_modified_by = CLIENT__autoapp 本地已作废/关闭,忽略下载处理");
-            return;
-        }
-        // 基础表数据同步 总部的修改时间必须晚于本地系统时间才可以修改
-        if (item.getLastModifiedDate().compareTo(oldOrder.getUpdateTime())>0){
-            upOrderBase(brand, item, oldOrder.getId(), oldOrder);
-            oldOrder = orderBaseService.lambdaQuery()
-                    .eq(OrderBase::getPgid, item.getPgid())
-                    .eq(OrderBase::getOrderType, OrderTypeEnum.ORDER_TYPE_REPAIR.getCode()).one();
-        }
-        // 网点信息更新
-        updateWebsit(sysDictRefDLMap, item, oldOrder);
-        // 用户期望上门时间信息更新
-        updateYhqwsmsj(item, oldOrder);
-        // 状态信息更新
-        upOrderStatus(brand, item, oldOrder);
-        // 更新 工单机型
-        upOrderProduct(oldOrder);
-        // 更新 维修数据采集表
-        upOrderRepairDetail(oldOrder);
-        // 生成改派申请数据
-        if (oldOrder.getOrderStatus().equals("B5")){
-            generateDispatch(oldOrder);
-        }
-        // 修改工单改派申请表
-        upOrderApplyDispatch(item, orderStatus, oldOrder);
-
-        // 增加判断是否有未处理的待改派，如果广佛有待改派但总部工单不是待改派，直接更新改派标志
-        // 无删除标识，暂不处理
-
-        // 增加处理采集数据下载 41,102
-        if ((oldOrder.getOrderStatus().equals(GDOrderStatusEnum.REPAIR_STATUS_G8.getCode()) ||
-                oldOrder.getOrderStatus().equals(GDOrderStatusEnum.REPAIR_STATUS_G14.getCode())) && cjDowFlag ==0){
-            List<OrderRepairDetail> ords = orderRepairDetailService.lambdaQuery()
-                    .eq(OrderRepairDetail::getOrderBaseId,oldOrder.getId())
-                    .ne(OrderRepairDetail::getStatus,0).list();
-            // 已存在状态为"已采集"的记录暂时忽略下载
-            if (!(ords !=null && ords.size()>0)){
-                // 清除待采集数据
-                delOrderRepairDetail(oldOrder);
-                // 向表内写数据，另起任务下载数据
-                // 这里向itf_gree_to_fa_download_task_list表的任务类型写入6601 并不会下载，这里无需处理
-                // 修改基础表已采集下载标识
-                OrderBase up = new OrderBase();
-                up.setId(oldOrder.getId());
-                up.setOutCjDownloadFlag(1);
-                orderBaseService.updateById(up);
-            }
-        }
-
-        // 如果是家用的工单，且工单状态是待中心派工或待网点派工时，写入派嘉讯茂
-        // 写入操作日志
-        addOperatingLog(sysDictRefDLMap, item, oldOrder);
-
-        // 修改同步状态
-        upItfTblAssignDownloadStatus(item, oldOrder);
-    }
-
-    private void addOperatingLog(Map<String, List<SysDictRef>> sysDictRefDLMap, ItfTblAssignDownload item, OrderBase oldOrder) {
-        if (oldOrder.getOrderStatus().equals(GDOrderStatusEnum.REPAIR_STATUS_G2.getCode()) ||
-                oldOrder.getOrderStatus().equals(GDOrderStatusEnum.REPAIR_STATUS_G3.getCode()) ||
-                oldOrder.getOrderStatus().equals(GDOrderStatusEnum.REPAIR_STATUS_G4.getCode())){
-            // 大类存在，且相同 非商用
-            if (StringUtils.isNotEmpty(oldOrder.getMainId()) && StringUtils.isNotEmpty(String.valueOf(item.getSpid())) &&
-                    !oldOrder.getMainId().equals(item.getSpid()) &&
-                    (!item.getSpid().equals(DictTypeEnum.DICT_TYPE_SY_102.getCode())) &&
-                    (!item.getSpid().equals(DictTypeEnum.DICT_TYPE_SY_109.getCode())) ){
-                List<OrderRepairOperatingLog> orlog = orderRepairOperatingLogService.lambdaQuery()
-                        .eq(OrderRepairOperatingLog::getOrderBaseId, oldOrder.getId())
-                        .eq(OrderRepairOperatingLog::getType,"指派服务商").list();
-                if (CollectionUtils.isEmpty(orlog)){
-                    OrderPar request = new OrderPar();
-                    request.setOrderNo(oldOrder.getId());
-                    OrderRepairOperatingLog orolog = repairLogMapper.getUpdatetime(request);
-                    if (orolog == null){
-                        orolog = repairLogMapper.getUpdatetimeT(request);
-                    }
-                    // 存在处理
-                    if (orolog != null){
-                        OrderPar orderPar = new OrderPar();
-                        orderPar.setOrderNo(oldOrder.getId());
-                        OrderRepairOperatingLog addlog = gdOrderBaseMapper.getOrderBaseLog(orderPar);
-                        orderRepairOperatingLogService.save(addlog);
-                    }
-                    //
-                    if ((!("S9219801".equals(item.getWxwdno())) && !("S9219807".equals(item.getWxwdno()))) &&
-                            (!("S9219801".equals(item.getXjwdno())) && !("S9219807".equals(item.getXjwdno())))){
-                        OrderPar orderPar = new OrderPar();
-                        orderPar.setOrderNo(oldOrder.getId());
-                        OrderRepairOperatingLog addlog = gdOrderBaseMapper.getOrderBaseLogT(orderPar);
-                        orderRepairOperatingLogService.save(addlog);
-                    }
-                }
-            }
-        }
-    }
-
-    private void delOrderRepairDetail(OrderBase oldOrder) {
-        QueryWrapper dWrapper = new QueryWrapper<OrderRepairDetail>()
-                .eq("order_base_id", oldOrder.getId())
-                .eq("status",0);
-        orderRepairDetailService.remove(dWrapper);
-    }
-
-    private void upOrderApplyDispatch(ItfTblAssignDownload item, String orderStatus, OrderBase oldOrder) {
-        // 原 本地维修单表状态为5 待审批  同步过来的工单状态不是待审批时
-        // 修改工单改派申请 自动审核  新增时条件不成立的
-        if (orderStatus.equals(GDOrderStatusEnum.REPAIR_STATUS_G5.getCode()) && !item.getStat().equals(5L)){
-            OrderApplyDispatch oad = new OrderApplyDispatch();
-            oad.setExamineId("system");
-            oad.setExamineName("接口自动审核");
-            oad.setExamineStatus("OK");
-            oad.setExamineTime(new Date());
-            QueryWrapper upWrapper = new QueryWrapper<OrderApplyDispatch>()
-                    .eq("order_base_id", oldOrder.getId())
-                    .eq("examine_status","WAIT");
-            orderApplyDispatchService.update(oad,upWrapper);
-        }
-    }
-
-    private void upOrderRepairDetail(OrderBase oldOrder) {
-        OrderRepairDetail ord = new OrderRepairDetail();
-        ord.setInstallWebsitId(oldOrder.getWebsitId());
-        ord.setInstallWebsitName(oldOrder.getWebsitName());
-        QueryWrapper upWrapper = new QueryWrapper<OrderRepairDetail>()
-                .eq("order_base_id", oldOrder.getId());
-        orderRepairDetailService.update(ord,upWrapper);
-    }
-
-    private void upOrderProduct(OrderBase oldOrder) {
-        OrderProduct op = new OrderProduct();
-        op.setServiceWebsit(oldOrder.getWebsitId());
-        op.setServiceWebsitMobile(publicService.getSHWDPhone(oldOrder.getWebsitId()));
-        QueryWrapper upWrapper = new QueryWrapper<OrderProduct>()
-                .eq("order_base_id", oldOrder.getId());
-        orderProductService.update(op,upWrapper);
-    }
-
-    private void upOrderStatus(Brand brand, ItfTblAssignDownload item, OrderBase oldOrder) {
-        // 查看是否可更新
-        Boolean allowUpdate = getaBoolean(item, oldOrder);
-        if (allowUpdate){
-            // 这里差 派工状态
-            OrderPar orderPar = new OrderPar();
-            orderPar.setSynReqId(item.getSynReqId());
-            orderPar.setBrandId(brand.getBrandId());
-            OrderBase order = repairDownloadMapper.getOrderBaseStatus(orderPar);
-            order.setId(oldOrder.getId());
-            orderBaseService.updateById(order);
-
-            oldOrder = orderBaseService.lambdaQuery()
-                    .eq(OrderBase::getPgid, item.getPgid())
-                    .eq(OrderBase::getOrderType, OrderTypeEnum.ORDER_TYPE_REPAIR.getCode()).one();
-        }
-    }
-
-    @NotNull
-    private Boolean getaBoolean(ItfTblAssignDownload item, OrderBase oldOrder) {
-        Boolean allowUpdate = Boolean.TRUE;
-
-        if (oldOrder.getOrderStatus().equals(GDOrderStatusEnum.INSTALL_STATUS_G9.getCode())){
-            allowUpdate = Boolean.FALSE;
-        }
-        if (oldOrder.getOrderStatus().equals(GDOrderStatusEnum.REPAIR_STATUS_G7.getCode()) &&
-                (item.getStat().equals(4L) || item.getStat().equals(18L))){
-            allowUpdate = Boolean.FALSE;
-        }
-        if (!oldOrder.getOrderStatus().equals(GDOrderStatusEnum.INSTALL_STATUS_G1_1.getCode()) &&
-                !oldOrder.getOrderStatus().equals(GDOrderStatusEnum.INSTALL_STATUS_G2_0.getCode()) &&
-                !oldOrder.getOrderStatus().equals(GDOrderStatusEnum.INSTALL_STATUS_G3.getCode()) &&
-                !oldOrder.getOrderStatus().equals(GDOrderStatusEnum.INSTALL_STATUS_G4_0.getCode()) &&
-                !oldOrder.getOrderStatus().equals(GDOrderStatusEnum.INSTALL_STATUS_G5.getCode()) &&
-                !oldOrder.getOrderStatus().equals(GDOrderStatusEnum.INSTALL_STATUS_G6.getCode()) &&
-                !oldOrder.getOrderStatus().equals(GDOrderStatusEnum.INSTALL_STATUS_G7.getCode()) &&
-                item.getStat()<=4L){
-            allowUpdate = Boolean.TRUE;
-        }
-        if (item.getStat().equals(2L) && (!oldOrder.getOrderStatus().equals(GDOrderStatusEnum.INSTALL_STATUS_G1_1.getCode()) &&
-                !oldOrder.getOrderStatus().equals(GDOrderStatusEnum.INSTALL_STATUS_G2_0.getCode()) &&
-                !oldOrder.getOrderStatus().equals(GDOrderStatusEnum.INSTALL_STATUS_G3.getCode()))){
-            allowUpdate = Boolean.FALSE;
-        }
-        if (item.getStat().equals(2L) && (oldOrder.getOrderStatus().equals(GDOrderStatusEnum.INSTALL_STATUS_G5.getCode()) ||
-                oldOrder.getOrderStatus().equals(GDOrderStatusEnum.REPAIR_STATUS_G11.getCode()))){
-            allowUpdate = Boolean.TRUE;
-        }
-        return allowUpdate;
-    }
-
-    private void updateYhqwsmsj(ItfTblAssignDownload item, OrderBase oldOrder) {
-        // 如何判断工单已预约 首次预约人信息不为空即为已预约
-        if (StringUtils.isEmpty(oldOrder.getFirstAppointmentId())){
-            OrderBase upOrder = new OrderBase();
-            upOrder.setId(oldOrder.getId());
-            upOrder.setExpectStartTime(item.getYhqwsmsj());
-            upOrder.setExpectEndTime(item.getQwsmjssj());
-            orderBaseService.updateById(upOrder);
-        }
-    }
-
-    private void updateWebsit(Map<String, List<SysDictRef>> sysDictRefDLMap, ItfTblAssignDownload item, OrderBase oldOrder) {
-        // 看网点更新的条件
-        Boolean flag = getaBoolean(sysDictRefDLMap, item, oldOrder);
-        // 更新网点信息
-        if (flag){
-            // 字段赋值
-            getOrderBase(item, oldOrder);
-            orderBaseService.updateById(oldOrder);
-        }
-    }
-
-    @NotNull
-    private void getOrderBase(ItfTblAssignDownload item, OrderBase upOrder) {
-        WebsitFWS websitFWS = new WebsitFWS();
-
-        if (StringUtils.isNotEmpty(item.getXxlb())){
-            upOrder.setInfoType(item.getXxlb());
-        } else {
-            upOrder.setInfoType("");
-        }
-        if (StringUtils.isNotEmpty(String.valueOf(item.getXxlbid()))){
-            upOrder.setInfoTypeId(String.valueOf(item.getXxlbid()));
-        } else {
-            upOrder.setInfoTypeId("101");
-        }
-        // 维修网点
-        String wdno ="";
-        if (StringUtils.isEmpty(item.getWxwdno())){
-            wdno = item.getXjwdno();
-        } else {
-            wdno = item.getWxwdno();
-        }
-        WebsitFWS resultData = publicService.shshwdToptshwd(wdno, upOrder);
-        upOrder.setWebsitId(resultData.getWebsitId());
-        upOrder.setWebsitName(resultData.getWdmc());
-
-
-        if (StringUtils.isNotEmpty(item.getXjwdno())){
-            WebsitFWS res = publicService.shshwdToptshwd(item.getXjwdno(), upOrder);
-            upOrder.setReceWebsitId(res.getWebsitId());
-            upOrder.setReceWebsitName(res.getWdmc());
-        } else {
-            upOrder.setReceWebsitId("");
-            upOrder.setReceWebsitName("");
-        }
-
-        // 结算主体
-        // (wxwdno、xjwdno)维修网点与派下级网点同时为空时  (cjwdno、xswdno)创建网点与销售网点都有值
-        if (StringUtils.isNotEmpty(upOrder.getWebsitId())){
-            websitFWS = publicService.shshwdToptshwd(wdno,upOrder);
-        } else {
-            websitFWS = publicService.shxswdToptxswd(item.getXswdno(),upOrder);
-        }
-        upOrder.setBrandId(websitFWS.getBrandId());
-        upOrder.setBrandName(websitFWS.getBrandName());
-
-    }
-
-    @NotNull
-    private Boolean getaBoolean(Map<String, List<SysDictRef>> sysDictRefDLMap, ItfTblAssignDownload item, OrderBase oldOrder) {
-        Boolean flag = Boolean.FALSE;
-        if ((oldOrder.getOrderStatus().equals(GDOrderStatusEnum.REPAIR_STATUS_G1.getCode()) ||
-                oldOrder.getOrderStatus().equals(GDOrderStatusEnum.REPAIR_STATUS_G2.getCode()) ||
-                oldOrder.getOrderStatus().equals(GDOrderStatusEnum.REPAIR_STATUS_G3.getCode()) ||
-                oldOrder.getOrderStatus().equals(GDOrderStatusEnum.REPAIR_STATUS_G4.getCode()) ||
-                oldOrder.getOrderStatus().equals(GDOrderStatusEnum.REPAIR_STATUS_G5.getCode()) ||
-                oldOrder.getOrderStatus().equals(GDOrderStatusEnum.REPAIR_STATUS_G6.getCode())) ||
-                (oldOrder.getOrderStatus().equals(GDOrderStatusEnum.REPAIR_STATUS_G7.getCode()) &&
-                        !oldOrder.getDispatchStatus().equals("YCJ") &&
-                        !oldOrder.getDispatchStatus().equals("YBWG"))){
-            flag = Boolean.TRUE;
-        }
-        if ((!oldOrder.getOrderStatus().equals(GDOrderStatusEnum.REPAIR_STATUS_G1.getCode()) &&
-                !oldOrder.getOrderStatus().equals(GDOrderStatusEnum.REPAIR_STATUS_G2.getCode()) &&
-                !oldOrder.getOrderStatus().equals(GDOrderStatusEnum.REPAIR_STATUS_G3.getCode())) && item.getStat() == 2){
-            flag = Boolean.FALSE;
-        }
-        // op.setMainId(sysDictRefDLMap.get(String.valueOf(rec.getSpid())).get(0).getDictCode());
-        if (StringUtils.isNotEmpty(oldOrder.getMainId()) && StringUtils.isNotEmpty(String.valueOf(item.getSpid())) &&
-                !oldOrder.getMainId().equals(item.getSpid())){
-            flag = Boolean.TRUE;
-        }
-        return flag;
-    }
-
-    private void upOrderBase(Brand brand, ItfTblAssignDownload item, String id, OrderBase oldOrder) {
-        // 获取维修工单主表要修改的数据
-        OrderBase upOrder = getUpOrderBase(brand, item, id,oldOrder);
-        // 省市区单独处理
-        orderService.shPositionTopt(upOrder);
-        orderBaseService.updateById(upOrder);
-    }
-
-    @NotNull
-    private OrderBase getUpOrderBase(Brand brand, ItfTblAssignDownload item, String id,OrderBase oldOrder) {
-        WebsitFWS websitFWS = new WebsitFWS();
-        OrderPar orderPar = new OrderPar();
-
-        orderPar.setSynReqId(item.getSynReqId());
-        orderPar.setBrandId(brand.getBrandId());
-        OrderBase upOrder = repairDownloadMapper.getUpOrderBase(orderPar);
-        upOrder.setId(id);
-        upOrder.setOutUpdateSynReqId(item.getSynReqId());
-        upOrder.setOutUpdateSynReqTime(new Date());
-
-        // 销售网点处理
-        websitFWS = publicService.shxswdToptxswd(upOrder.getSaleWebsitId(),oldOrder);
-        upOrder.setSaleWebsitId(websitFWS.getWebsitId());
-        upOrder.setSaleWebsitName(websitFWS.getWdmc());
-        // 这里为商户的系统网点编号
-        upOrder.setSaleWebsitSysNumber(websitFWS.getBrandSysWebsitNumber());
-
-        // upOrder.setUpdateTime(new Date());
-        return upOrder;
-    }
-
-    @Transactional(rollbackFor = Exception.class)
-    public void addOrder(Brand brand, ItfTblAssignDownload item,
-                          Map<String, List<SysDictRef>> sysDictRefDLMap,
-                          Map<String, List<SysDictRef>> sysDictRefXLMap,
-                          Map<String, List<SysDictRef>> sysDictRefXiLieMap,
-                         Map<String, List<SysDictRef>> sysDictRefDLMapXq,
-                         Map<String, List<SysDictRef>> sysDictRefXLMapXq) {
-
-        List<ItfTblAssignXzydDownload> yds = itfTblAssignXzydDownloadService.lambdaQuery()
-                .eq(ItfTblAssignXzydDownload::getDownloadTaskNo,item.getDownloadTaskNo()).list();
-
-        // 新增 TL_SynDataFrom_tbl_assign_batch
-        // TL_SynDataFrom_tbl_assign 主单的 syn_req_id
-        // 处理维修工单主表数据
-        OrderBase order = generateOrder(brand, item, yds);
-        // 处理工单师傅
-        publicService.getOrderWorker(order);
-        // 获取工单扩展信息
-        getOrderInstall(item, order, sysDictRefDLMapXq, sysDictRefXLMapXq);
-        // 处理维修单明细表 TL_SynDataFrom_tbl_assign_mx
-        generateMx(brand, item, order, sysDictRefDLMap, sysDictRefXLMap, sysDictRefXiLieMap);
-        // 处理维修单过程反馈表 放入操作日志表 TL_SynDataFrom_tbl_assign_fkmx
-        generateFkmx(item, order);
-        // 处理用户评价数据 TL_SynDataFrom_tbl_assign_satisfaction
-        generateSstisfaction(item, sysDictRefDLMap, order);
-        // 阅读要求数据处理 TL_SynDataFrom_tbl_assign_xzyd
-        generateXzyd(brand, yds, order);
-        // 用户预约改约数据处理 TL_SynDataFrom_tbl_assign_appointment
-        generateAppointment(item, order);
-    }
-
-    private void generateAppointment(ItfTblAssignDownload item, OrderBase order) {
-        OrderBase up = new OrderBase();
-        List<ItfTblAssignAppointmentDownload> us = new ArrayList<>();
-        // 新增工单，直接修改主表预约时间最近一次的数据修改
-        List<ItfTblAssignAppointmentDownload> appoint = itfTblAssignAppointmentDownloadService.lambdaQuery()
-                .eq(ItfTblAssignAppointmentDownload::getDownloadTaskNo, item.getDownloadTaskNo())
-                .orderByAsc(ItfTblAssignAppointmentDownload::getSynReqId).list();
-        for (ItfTblAssignAppointmentDownload a:appoint){
-            up.setId(order.getId());
-            // 这里填写首次预约人信息同时也方便其他地方以此来判断该订单是否已预约
-            up.setFirstAppointmentId(a.getCzren());
-            up.setExpectStartTime(a.getKssj());
-            up.setExpectEndTime(a.getJssj());
-
-            ItfTblAssignAppointmentDownload u = new ItfTblAssignAppointmentDownload();
-            u.setSynReqId(a.getSynReqId());
-            u.setSynStatus(1);
-            u.setSynTime(new Date());
-            us.add(u);
-        }
-        if (appoint !=null && appoint.size()>0){
-            orderBaseService.updateById(up);
-            itfTblAssignAppointmentDownloadService.updateBatchById(us);
-            us.clear();
-        }
-    }
-
-    private void generateAppointmentUpdate(ItfTblAssignDownload item, OrderBase order) {
-        OrderBase up = new OrderBase();
-        List<ItfTblAssignAppointmentDownload> us = new ArrayList<>();
-        // 新增工单，直接修改主表预约时间最近一次的数据修改
-        List<ItfTblAssignAppointmentDownload> appoint = itfTblAssignAppointmentDownloadService.lambdaQuery()
-                .eq(ItfTblAssignAppointmentDownload::getDownloadTaskNo, item.getDownloadTaskNo())
-                .orderByAsc(ItfTblAssignAppointmentDownload::getSynReqId).list();
-        for (ItfTblAssignAppointmentDownload a:appoint){
-            up.setId(order.getId());
-            // 这里填写首次预约人信息同时也方便其他地方以此来判断该订单是否已预约
-            up.setFirstAppointmentId(a.getCzren());
-            up.setExpectStartTime(a.getKssj());
-            up.setExpectEndTime(a.getJssj());
-
-            ItfTblAssignAppointmentDownload u = new ItfTblAssignAppointmentDownload();
-            u.setSynReqId(a.getSynReqId());
-            u.setSynStatus(1);
-            u.setSynTime(new Date());
-            us.add(u);
-        }
-        if (appoint !=null && appoint.size()>0){
-            if (StringUtils.isEmpty(order.getFirstAppointmentId())){
-                orderBaseService.updateById(up);
-            }
-            itfTblAssignAppointmentDownloadService.updateBatchById(us);
-            us.clear();
-        }
-    }
-
-    private void generateXzyd(Brand brand, List<ItfTblAssignXzydDownload> yds, OrderBase order) {
-        List<OrderInformation> oilist = new ArrayList<>();
-        List<ItfTblAssignXzydDownload> ups = new ArrayList<>();
-
-        for (ItfTblAssignXzydDownload yd: yds){
-            // 获取阅读要求数据
-            getAddOrderInfor(order, oilist, yd);
-
-            ItfTblAssignXzydDownload up = new ItfTblAssignXzydDownload();
-            up.setSynReqId(yd.getSynReqId());
-            up.setSynStatus(1);
-            up.setSynTime(new Date());
-            ups.add(up);
-        }
-        if (oilist.size()>0){
-            orderInformationService.saveBatch(oilist);
-            oilist.clear();
-        }
-        if (ups.size()>0){
-            itfTblAssignXzydDownloadService.updateBatchById(ups);
-            ups.clear();
-        }
-    }
-
-    private void generateXzydUpdate(List<ItfTblAssignXzydDownload> yds, OrderBase order) {
-        List<OrderInformation> oilist = new ArrayList<>();
-        List<OrderInformation> oilistUp = new ArrayList<>();
-        List<ItfTblAssignXzydDownload> ups = new ArrayList<>();
-        Map<Long,List<OrderInformation>> oisMap = new HashMap<>();
-        // 提取原有的数据
-        List<OrderInformation> ois = orderInformationService.lambdaQuery()
-                .eq(OrderInformation::getOrderBaseId,order.getId()).list();
-        oisMap = ois.stream().collect(Collectors.groupingBy(OrderInformation::getXzid));
-
-
-        for (ItfTblAssignXzydDownload yd: yds){
-            // 存在修改，不存在新增
-            if (oisMap.containsKey(yd.getXzid())){
-                getUpOrderInfor(oilistUp, yd, order);
-            } else {
-                getAddOrderInfor(order, oilist, yd);
-            }
-
-            ItfTblAssignXzydDownload up = new ItfTblAssignXzydDownload();
-            up.setSynReqId(yd.getSynReqId());
-            up.setSynStatus(1);
-            up.setSynTime(new Date());
-            ups.add(up);
-        }
-        if (oilist.size()>0){
-            orderInformationService.saveBatch(oilist);
-            oilist.clear();
-        }
-        if (oilistUp.size()>0){
-            orderInformationService.updateBatchById(oilistUp);
-            oilistUp.clear();
-        }
-        if (ups.size()>0){
-            itfTblAssignXzydDownloadService.updateBatchById(ups);
-            ups.clear();
-        }
-    }
-
-    private void getUpOrderInfor(List<OrderInformation> oilistUp,
-                                 ItfTblAssignXzydDownload yd, OrderBase order) {
-        OrderInformation up = new OrderInformation();
-
-        OrderInformation old = orderInformationService.lambdaQuery()
-                .eq(OrderInformation::getOrderBaseId,order.getId())
-                .eq(OrderInformation::getXzid,yd.getXzid()).one();
-
-        up.setId(old.getId());
-        up.setXzid(yd.getXzid());
-        up.setAskCategoryId(yd.getXzyqlb());
-        up.setRemark(yd.getXzyq());
-        up.setReadStatus(yd.getYdbz());
-        up.setReadTime(yd.getYdsj());
-        up.setReadName(yd.getYdrmc());
-        WebsitFWS websitFWS = publicService.shshwdToptshwd(yd.getWdno(), order);
-        up.setWebsitId(websitFWS.getWebsitId());
-        up.setWebsitName(websitFWS.getWdmc());
-        oilistUp.add(up);
-    }
-
-    private void getAddOrderInfor(OrderBase order, List<OrderInformation> oilist, ItfTblAssignXzydDownload yd) {
-        OrderInformation add = new OrderInformation();
-        add.setXzid(yd.getXzid());
-        add.setAskCategoryId(yd.getXzyqlb());
-        add.setRemark(yd.getXzyq());
-        add.setOrderBaseId(order.getId());
-        add.setCreateBy(yd.getCreatedBy());
-        add.setCreateTime(yd.getCreatedDate());
-        add.setUpdateBy(yd.getLastModifiedBy());
-        add.setUpdateTime(yd.getLastModifiedDate());
-        add.setReadStatus(yd.getYdbz());
-        add.setReadName(yd.getYdrmc());
-        add.setReadTime(yd.getYdsj());
-        WebsitFWS websitFWS = publicService.shshwdToptshwd(yd.getWdno(), order);
-        add.setWebsitId(websitFWS.getWebsitId());
-        add.setWebsitName(websitFWS.getWdmc());
-        oilist.add(add);
-    }
-
-    private void generateSstisfaction(ItfTblAssignDownload item, Map<String, List<SysDictRef>> sysDictRefDLMap, OrderBase order) {
-        // 提取已同步的数据
-        List<OrderAppraise> oa = new ArrayList<>();
-        List<ItfTblAssignSatisfactionDownload> ups = new ArrayList<>();
-        Map<String,List<OrderAppraise>> oaMap = new HashMap<>();
-        List<OrderAppeal> orderAppeal = new ArrayList<>();
-        int jcaninsert=1;
-        int cpflag=0;
-        // 首评信息用于填写差评中的首评内容
-        String spmessage="";
-        List<OrderAppraise> oanew = new ArrayList<>();
-        List<FaGreeSms> faGreeSms = new ArrayList<>();
-        OrderAppraise zpoa=null;
-        String cpid="";
-
-        // 提取已同步的评价信息
-        oa = orderAppraiseService.lambdaQuery()
-                .eq(OrderAppraise::getOrderBaseId,order.getId()).list();
-        oaMap = oa.stream().collect(Collectors.groupingBy(OrderAppraise::getPid));
-
-        // 提取首评信息
-        OrderAppraise oaOne = orderAppraiseService.lambdaQuery()
-                .eq(OrderAppraise::getOrderBaseId,order.getId())
-                .eq(OrderAppraise::getType,0)
-                .one();
-        if (oaOne !=null){
-            jcaninsert=0;
-            spmessage = oaOne.getAppraiseContent();
-        }
-
-        // 提取差评申诉信息
-        OrderAppeal oldcpss = orderAppealService.lambdaQuery()
-                .eq(OrderAppeal::getOrderBaseId,order.getId()).one();
-
-
-        List<ItfTblAssignSatisfactionDownload> satis = itfTblAssignSatisfactionDownloadService.lambdaQuery()
-                .eq(ItfTblAssignSatisfactionDownload::getDownloadTaskNo, item.getDownloadTaskNo())
-                .orderByAsc(ItfTblAssignSatisfactionDownload::getHfsj)
-                .list();
-
-        for (ItfTblAssignSatisfactionDownload s:satis){
-            // 首评内容
-            if (s.getSxlx()==0){
-                spmessage = s.getPjnr();
-            }
-
-            // 评价已同步，忽略更新
-            if (oaMap.containsKey(s.getId())){
-                upSyncstatus(s.getSynReqId(), 9, "评价已同步，忽略更新");
-                continue;
-            }
-
-            // 只能有一条首评数据 存在首评不再插入 上面判断已生效，这里多一次判断也可
-            if (jcaninsert == 0){
-                if (s.getSxlx()==0){
-                    continue;
-                }
-            }
-
-            // 生成评价实体对像
-            WebsitFWS websitFWS = getWebsitFWS(sysDictRefDLMap, order, oanew, s);
-
-            // 提取追评信息
-            if (zpoa==null){
-                zpoa=oanew.get(oanew.size()-1);
-            } else {
-                if (zpoa.getCreateTime().before(oanew.get(oanew.size()-1).getCreateTime())){
-                    zpoa=oanew.get(oanew.size()-1);
-                }
-            }
-
-            // 生成首次评价后，置标识，不再生成新的
-            if (s.getSxlx()==0){
-                jcaninsert=0;
-            }
-
-            // 差评短信 + 差评申诉 仅一次
-            if (oldcpss==null && cpflag==0) {
-                // 生成差评短信实体对像 faGreeSms  也只发一次
-                addcpsms(order, s, websitFWS, faGreeSms);
-                // 生成差评申诉信息实体对像 只能申诉一次
-                cpflag = getCp(order, orderAppeal,s);
-                if (cpflag==1){
-                    cpid=s.getId();
-                }
-            }
-
-            // 本次产生的差评申诉 补填首次评价内容(存在首评即差评的情况)
-            if (cpflag==1){
-                orderAppeal.get(0).setFirstEvaluate(spmessage);
-                // 可能存在追评 判断不是差评记录
-                if (zpoa!=null && !zpoa.getPid().equals(cpid)){
-                    orderAppeal.get(0).setLastEvaluate(zpoa.getAppraiseContent());
-                }
-            }
-
-            // 之前产生的差评申诉且本次有追评时添加追评信息
-            if (oldcpss!=null && zpoa!=null){
-                oldcpss.setLastEvaluate(zpoa.getAppraiseContent());
-                orderAppeal.clear();
-                orderAppeal.add(oldcpss);
-            }
-
-            s.setSynReqId(s.getSynReqId());
-            s.setSynStatus(1);
-            s.setSynTime(new Date());
-            ups.add(s);
-        }
-
-        // 工单评价表
-        if (oanew.size()>0){
-            orderAppraiseService.saveBatch(oanew);
-            oanew.clear();
-        }
-
-        if (faGreeSms.size()>0){
-            faGreeSmsService.saveBatch(faGreeSms);
-            faGreeSms.clear();
-        }
-
-        if (orderAppeal.size()>0){
-            orderAppealService.saveOrUpdateBatch(orderAppeal);
-            orderAppeal.clear();
-        }
-
-        // 修改同步状态
-        if (ups.size()>0){
-            itfTblAssignSatisfactionDownloadService.updateBatchById(ups);
-            ups.clear();
-        }
-
-    }
-
-    @NotNull
-    private WebsitFWS getWebsitFWS(Map<String, List<SysDictRef>> sysDictRefDLMap, OrderBase order, List<OrderAppraise> oanew, ItfTblAssignSatisfactionDownload s) {
-        WebsitFWS websitFWS;
-        OrderAppraise o = new OrderAppraise();
-        // id为主键，放在pid 中
-        o.setPid(s.getId());
-        o.setPgguid(String.valueOf(s.getPgid()));
-        // 工单号
-        o.setOrderBaseId(order.getId());
-
-        o.setOrderType(order.getOrderType());
-        o.setWebsitId(order.getWebsitId());
-        o.setWebsitName(order.getWebsitName());
-        o.setUserName(order.getUserName());
-        o.setUserPhone(order.getUserMobile());
-        o.setAddress(order.getAddress());
-
-        if (s.getPjly().equals("1")){
-            o.setAppraiseStatus("A");
-        } else if (s.getPjly().equals("2")){
-            o.setAppraiseStatus("B");
-        } else if (s.getPjly().equals("3")){
-            o.setAppraiseStatus("C");
-        } else {
-            o.setAppraiseStatus("X");
-        }
-        o.setAppraiseContent(s.getPjnr());
-        // 回访人id无
-        o.setRvisitNickName(s.getHfren());
-        // 回访人网点信息
-        // 售后网点处理
-        websitFWS = publicService.shshwdToptshwd(s.getHfwdno(), order);
-        if (StringUtils.isEmpty(websitFWS.getWebsitId())){
-            websitFWS = publicService.shxswdToptxswd(s.getHfwdno(), order);
-        }
-        o.setRvisitWebsitId(websitFWS.getWebsitId());
-        o.setRvisitWebsitName(websitFWS.getWdmc());
-
-        o.setRvisitTime(s.getHfsj());
-        o.setNegativeType(s.getBmylx());
-        o.setNegativeRemark(s.getBmybeiz());
-        o.setNegativeTime(s.getBmysj());
-        // 产品大类
-        o.setMainId(sysDictRefDLMap.get(String.valueOf(s.getSplb())).get(0).getDictCode());
-        o.setMainName(sysDictRefDLMap.get(String.valueOf(s.getSplb())).get(0).getDictValue());
-
-        o.setAppointmentType(s.getMydlx());
-        o.setType(s.getSxlx());
-        o.setCreateBy(s.getCreatedBy());
-        o.setCreateTime(new Date());
-        if (s.getCreatedDate()!=null){
-            o.setCreateTime(s.getCreatedDate());
-        }
-        oanew.add(o);
-        return websitFWS;
-    }
-
-    private int getCp(OrderBase orderBase, List<OrderAppeal> orderAppeals, ItfTblAssignSatisfactionDownload s) {
-        if (s.getPjnr().equals("3") || s.getPjnr().indexOf("不满意")>=0){
-            OrderAppeal orderAppeal=new OrderAppeal();
-            orderAppeal.setOrderBaseId(orderBase.getId());
-            orderAppeal.setPgid(orderBase.getPgid());
-            orderAppeal.setWorkerName(orderBase.getWorkerName());
-            orderAppeal.setWorkerId(orderBase.getWorkerId());
-            orderAppeal.setBadEvaluate(s.getPjnr());
-            orderAppeal.setStatus(1);
-            orderAppeal.setCanApply(Boolean.TRUE);
-            orderAppeal.setCreateTime(new Date());
-            orderAppeal.setCreateBy("system");
-            orderAppeals.add(orderAppeal);
-            return 1;
-        }
-        return 0;
-    }
-
-    private void addcpsms(OrderBase order,ItfTblAssignSatisfactionDownload s, WebsitFWS websitFWS,List<FaGreeSms> fsList) {
-        if (s.getPjnr().equals("3") || s.getPjnr().indexOf("不满意")>=0){
-            if (StringUtils.isNotEmpty(s.getHfwdno()) && !s.getHfwdno().equals("99999999") && StringUtils.isNotEmpty(websitFWS.getWdlxdh())){
-                FaGreeSms fs=new FaGreeSms();
-                fs.setSynTaskNo(UUID.randomUUID().toString());
-                fs.setWorkerOrderNo(order.getId());
-                fs.setAzorwx(2);
-                fs.setFjid(String.valueOf(s.getPgid()));
-                fs.setFjwd(s.getHfwdno());
-                Random random = new Random(System.currentTimeMillis());
-                fs.setFsma(String.valueOf(random.nextInt(10000)));
-                fs.setFsnr("您收到一张客户的投诉工单，请及时处理！工单号：" + String.valueOf(order.getPgid()) +
-                        ",服务人员：" + order.getWorkerName());
-                fs.setSjid(websitFWS.getWdlxdh());
-                fs.setYhlb(2);
-                fsList.add(fs);
-            }
-        }
-    }
-
-    private void generateSstisfactionUpdate(ItfTblAssignDownload item, Map<String, List<SysDictRef>> sysDictRefDLMap, OrderBase order) {
-        List<ItfTblAssignSatisfactionDownload> satis = itfTblAssignSatisfactionDownloadService.lambdaQuery()
-                .eq(ItfTblAssignSatisfactionDownload::getDownloadTaskNo, item.getDownloadTaskNo())
-                .orderByAsc(ItfTblAssignSatisfactionDownload::getHfsj)
-                .list();
-
-        for (ItfTblAssignSatisfactionDownload s:satis){
-            // 查看是否已同步
-            ReAppointment request = new ReAppointment();
-            request.setId(s.getId());
-            OrderAppraise old = appraiseMapper.getAppraise(request);
-            if (old!=null){
-                upSyncstatus(s.getSynReqId(), 9, "评价已同步，忽略更新");
-                continue;
-            }
-            // 查看该工单有无较早前下载相同的评价(同一工单，同一主键，同一内容，更早时间)
-            List<ItfTblAssignSatisfactionDownload> rec = itfTblAssignSatisfactionDownloadService.lambdaQuery()
-                    .lt(ItfTblAssignSatisfactionDownload::getSynReqId,s.getSynReqId())
-                    .eq(ItfTblAssignSatisfactionDownload::getPgid,s.getPgid())
-                    .eq(ItfTblAssignSatisfactionDownload::getId,s.getId())
-                    .le(ItfTblAssignSatisfactionDownload::getLastModifiedDate,s.getLastModifiedDate())
-                    .eq(ItfTblAssignSatisfactionDownload::getPjly,s.getPjly()).list();
-            if (rec!=null && rec.size()>0){
-                upSyncstatus(s.getSynReqId(), 9 ,"评价已同步，忽略更新");
-                continue;
-            }
-            // 判断评价是否为中差评,下面处理
-
-            Integer canInsert =1;
-            // 检查fa_order_repair是否有一条sxlx = 0的首评记录
-            if (s.getSxlx().equals(0) && s.getSynStatus().equals(0)){
-                ReAppointment r = new ReAppointment();
-                r.setId(String.valueOf(s.getSynReqId()));
-                ItfTblAssignSatisfactionDownload sa = assignSatisfactionDownloadMapper.getSatisfaction(r);
-                if (sa !=null){
-                    canInsert = 0;
-                }
-            }
-            // 只插入一条sxlx = 0的首评记录
-            if (canInsert.equals(1)){
-                // 增加评价记录
-                WebsitFWS websitFWS = addappraise(order, sysDictRefDLMap, s);
-                // 增加差评短信
-                addcpsms(order, s, websitFWS);
-            }
-
-            // 未评价过工单基础表写入首次评价数据
-            if (order.getAppraiseTime() ==null){
-                upOrderBasePJ(order, s);
-            }
-
-            // 修改同步状态
-            upSatisfactionSynstatus(s);
-        }
-    }
-
-    private void addcpsms(OrderBase order, ItfTblAssignSatisfactionDownload s, WebsitFWS websitFWS) {
-        if (s.getPjnr().equals("3") || s.getPjnr().indexOf("不满意")>=0){
-            if (StringUtils.isNotEmpty(s.getHfwdno()) && !s.getHfwdno().equals("99999999") &&
-                    StringUtils.isNotEmpty(websitFWS.getWdlxdh())){
-                FaGreeSms fs = new FaGreeSms();
-                fs.setSynTaskNo(UUID.randomUUID().toString());
-                fs.setWorkerOrderNo(order.getId());
-                fs.setAzorwx(2);
-                fs.setFjid(String.valueOf(s.getPgid()));
-                fs.setFjwd(s.getHfwdno());
-                Random random = new Random(System.currentTimeMillis());
-                fs.setFsma(String.valueOf(random.nextInt(10000)));
-                fs.setFsnr("您收到一张客户的投诉工单，请及时处理！工单号：" + String.valueOf(s.getPgid()) +
-                        ",服务人员：" + order.getWorkerName());
-                fs.setSjid(websitFWS.getWdlxdh());
-                fs.setYhlb(2);
-                faGreeSmsService.save(fs);
-            }
-        }
-    }
-
-    @NotNull
-    private WebsitFWS addappraise(OrderBase order, Map<String, List<SysDictRef>> sysDictRefDLMap, ItfTblAssignSatisfactionDownload s) {
-        Boolean canAppeal = Boolean.TRUE;
-        Integer appeal = 0;
-        ReAppointment rq = new ReAppointment();
-        WebsitFWS websitFWS = new WebsitFWS();
-
-        if(StringUtils.isNotEmpty(s.getPjnr())){
-            if (s.getPjnr().equals("1") || s.getPjnr().equals("满意")){
-                canAppeal=Boolean.FALSE;
-            }
-        }
-        // 检查上一条记录是否为中差评，如果是则新插入的不需要再申诉
-        if (canAppeal){
-            ReAppointment req = new ReAppointment();
-            req.setId(String.valueOf(s.getPgid()));
-            OrderAppraise id = appraiseMapper.getOldId(req);
-            if (id !=null){
-                appeal = 0;
-            } else {
-                appeal = 1;
-            }
-        }
-
-        rq.setId(String.valueOf(s.getSynReqId()));
-        OrderAppraise add = assignSatisfactionDownloadMapper.getOrderAppraise(rq);
-
-        // rvisit_websit_id 单独处理
-        websitFWS = publicService.shshwdToptshwd(s.getHfwdno(), order);
-        if (StringUtils.isEmpty(websitFWS.getWebsitId())){
-            websitFWS = publicService.shxswdToptxswd(s.getHfwdno(), order);
-        }
-        add.setRvisitWebsitId(websitFWS.getWebsitId());
-        add.setRvisitWebsitName(websitFWS.getWdmc());
-        // splb 商品大类  单独处理
-        add.setMainId(sysDictRefDLMap.get(String.valueOf(s.getSplb())).get(0).getDictCode());
-        // can_appeal 是否可发起申诉   单独处理
-        // add.setCanAppeal(appeal);
-        orderAppraiseService.save(add);
-        return websitFWS;
-    }
-
-    private void upOrderBasePJ(OrderBase order, ItfTblAssignSatisfactionDownload s) {
-        OrderBase upOrder = new OrderBase();
-        upOrder.setId(order.getId());
-        upOrder.setAppraiseTime(s.getCreatedDate());
-        // 原 评价:1=差评,2=中评,3=好评,0=未评价,4=剔除,5=其他
-        if (StringUtils.isEmpty(s.getPjnr())){
-            upOrder.setAppraiseStatus("N");
-        }
-        if (s.getPjnr().equals("1") || s.getPjnr().equals("满意")){
-            upOrder.setAppraiseStatus("A");
-        } else if (s.getPjnr().equals("2") || s.getPjnr().equals("一般")){
-            upOrder.setAppraiseStatus("B");
-        } else if (s.getPjnr().equals("3") || s.getPjnr().equals("不满意") ||
-                s.getPjnr().indexOf("差")>=0 || s.getPjnr().indexOf("不满")>=0){
-            upOrder.setAppraiseStatus("C");
-        } else {
-            upOrder.setAppraiseStatus("O");
-        }
-        orderBaseService.updateById(upOrder);
-    }
-
-    private void upSatisfactionSynstatus(ItfTblAssignSatisfactionDownload s) {
-        ItfTblAssignSatisfactionDownload ups = new ItfTblAssignSatisfactionDownload();
-        ups.setSynReqId(s.getSynReqId());
-        ups.setSynStatus(1);
-        ups.setSynTime(new Date());
-        itfTblAssignSatisfactionDownloadService.updateById(ups);
-    }
-
-    private void upSyncstatus(Long synReqId, Integer synStatus ,
-                              String msg) {
-        ItfTblAssignSatisfactionDownload up = new ItfTblAssignSatisfactionDownload();
-        up.setSynReqId(synReqId);
-        up.setSynStatus(synStatus);
-        up.setSynTime(new Date());
-        up.setSynErrMsg(msg);
-        itfTblAssignSatisfactionDownloadService.updateById(up);
-    }
-
-    private void generateFkmx(ItfTblAssignDownload item, OrderBase order) {
-        List<ItfTblAssignFkmxDownload> fkmxRec = new ArrayList<>();
-        List<OrderRepairOperatingLog> orols = new ArrayList<>();
-        List<ItfTblAssignFkmxDownload> ups = new ArrayList<>();
-
-        fkmxRec = itfTblAssignFkmxDownloadService.lambdaQuery()
-                .eq(ItfTblAssignFkmxDownload::getDownloadTaskNo, item.getDownloadTaskNo())
-                .eq(ItfTblAssignFkmxDownload::getSynStatus,0)
-                .orderByAsc(ItfTblAssignFkmxDownload::getCreatedDate,ItfTblAssignFkmxDownload::getFkid)
-                .list();
-        for (ItfTblAssignFkmxDownload fkmx :fkmxRec){
-            // 获取操作明细数据
-            getoroldata(order, orols, fkmx);
-            ItfTblAssignFkmxDownload u = new ItfTblAssignFkmxDownload();
-            u.setSynReqId(fkmx.getSynReqId());
-            u.setSynStatus(1);
-            u.setSynTime(new Date());
-            ups.add(u);
-        }
-        if (orols.size()>0){
-            orderRepairOperatingLogService.saveBatch(orols);
-            orols.clear();
-            itfTblAssignFkmxDownloadService.updateBatchById(ups);
-            ups.clear();
-        }
-    }
-
-    private void generateFkmxUpdate(ItfTblAssignDownload item, OrderBase order) {
-        List<ItfTblAssignFkmxDownload> fkmxRec = new ArrayList<>();
-        List<OrderRepairOperatingLog> orols = new ArrayList<>();
-        List<ItfTblAssignFkmxDownload> ups = new ArrayList<>();
-        Map<String, List<OrderRepairOperatingLog>> orolMap = new HashMap<>();
-        
-        // 提取已有的，有则更新，无则新增
-        List<OrderRepairOperatingLog> olds = orderRepairOperatingLogService.lambdaQuery()
-                .eq(OrderRepairOperatingLog::getOrderBaseId,order.getId()).list();
-        orolMap = olds.stream().collect(Collectors.groupingBy(OrderRepairOperatingLog::getFkid));
-        
-
-        fkmxRec = itfTblAssignFkmxDownloadService.lambdaQuery()
-                .eq(ItfTblAssignFkmxDownload::getDownloadTaskNo, item.getDownloadTaskNo())
-                .eq(ItfTblAssignFkmxDownload::getSynStatus,0)
-                .orderByAsc(ItfTblAssignFkmxDownload::getCreatedDate,ItfTblAssignFkmxDownload::getFkid)
-                .list();
-        for (ItfTblAssignFkmxDownload fkmx :fkmxRec){
-            // 存在不做更新？过程是这样写的
-            if (!orolMap.containsKey(fkmx.getFkid())){
-                getoroldata(order, orols, fkmx);
-            }
-            
-            ItfTblAssignFkmxDownload u = new ItfTblAssignFkmxDownload();
-            u.setSynReqId(fkmx.getSynReqId());
-            u.setSynStatus(1);
-            u.setSynTime(new Date());
-            ups.add(u);
-        }
-        if (orols.size()>0){
-            orderRepairOperatingLogService.saveBatch(orols);
-            orols.clear();
-            itfTblAssignFkmxDownloadService.updateBatchById(ups);
-            ups.clear();
-        }
-    }
-
-    private void getoroldata(OrderBase order, List<OrderRepairOperatingLog> orols, ItfTblAssignFkmxDownload fkmx) {
-        OrderRepairOperatingLog add = new OrderRepairOperatingLog();
-        WebsitFWS websitFWS = new WebsitFWS();
-        add.setWebsitName(order.getWebsitName());
-        add.setWebsitId(order.getWebsitId());
-        add.setOrderBaseId(order.getId());
-        add.setCustomerName(order.getUserName());
-        add.setCustomerPhone(order.getUserMobile());
-        add.setType(fkmx.getFklb());
-        add.setContent(fkmx.getFknr());
-        add.setFeedback(fkmx.getFkjg());
-        add.setOperator(fkmx.getFkren());
-        add.setOperatorNumber(fkmx.getFkrenmc());
-        websitFWS = publicService.shshwdToptshwd(fkmx.getFkwdno(), order);
-        if (StringUtils.isEmpty(websitFWS.getWebsitId())){
-            websitFWS = publicService.shxswdToptxswd(fkmx.getFkwdno(), order);
-        }
-        add.setOperateWebsit(websitFWS.getWdmc());
-        add.setWebsitPhone(websitFWS.getWdlxdh());
-        add.setWorkerOrderStatus(order.getOrderStatus());// 反馈时的工单状态
-        add.setBeforeOrderStatus(order.getLastOrderStatus());// 操作前工单状态 - 上一流程状态
-        add.setBeforeDispatchStatus(order.getDispatchStatus());// 操作前派工状态
-        add.setOrderStatus("DJS"); // 操作后工单状态
-        // 总部下来的工单统一为待接收状态-派工状态
-        add.setDispatchStatus("DJS"); // 操作后派工状态
-        // 附件地址 todo
-        add.setPgguid(order.getPgguid());
-        add.setFkmxguid(fkmx.getFkmxguid());
-        add.setFkid(String.valueOf(fkmx.getFkid()));
-        add.setPgid(fkmx.getPgid());
-        add.setBrandFileId(fkmx.getScid());
-        add.setBrandFileName(fkmx.getScwj());
-        add.setWjid(fkmx.getWjid());
-        add.setReqSourceNum(fkmx.getQqlyxh());
-        add.setUploadNotifyFlag(0);
-        add.setCreateTime(fkmx.getFksj());
-        add.setUpdateTime(fkmx.getLastModifiedDate());
-        add.setCreateBy(fkmx.getCreatedBy());
-        add.setUpdateBy(fkmx.getLastModifiedBy());
-        orols.add(add);
-    }
-
-    private void getOrderInstall(ItfTblAssignDownload item, OrderBase order, Map<String, List<SysDictRef>> sysDictRefDLMapXq,
-                                 Map<String, List<SysDictRef>> sysDictRefXLMapXq) {
-        // 查看是否存在
-        OrderRepair oldor = orderRepairService.lambdaQuery()
-                .eq(OrderRepair::getOrderBaseId,order.getId()).one();
-
-        OrderRepair or = new OrderRepair();
-        if (oldor !=null){
-            or.setId(oldor.getId());
-        }
-
-        or.setOrderBaseId(order.getId());
-        or.setCxyzm(item.getCxyzm());
-        or.setSffswx(item.getSffswx());
-        or.setChaoshiqe(item.getChaoshiqe());
-        or.setZbby(item.getZbby());
-        or.setZptype(item.getZptype());
-        or.setYhif(item.getYhif());
-        or.setTsdengji(item.getTsdengji());
-        // 需求大类 未找到放原有的值
-        or.setDemandTypeId(String.valueOf(item.getSpid()));
-        or.setDemandTypeName(item.getSpmc());
-
-        if (sysDictRefXLMapXq.containsKey(String.valueOf(item.getSpid()))){
-            or.setDemandTypeId(sysDictRefXLMapXq.get(String.valueOf(item.getSpid())).get(0).getDictCode());
-            or.setDemandTypeName(sysDictRefXLMapXq.get(String.valueOf(item.getSpid())).get(0).getDictValue());
-        }
-
-        // 需求小类
-        or.setDemandSmallTypeId("");
-        or.setDemandSmallTypeName("");
-        if (!item.getXqxiaolei().equals(0L) && sysDictRefXLMapXq.containsKey(item.getXqxiaolei())) {
-            or.setDemandSmallTypeId(sysDictRefXLMapXq.get(item.getXqxiaolei()).get(0).getDictCode());
-            or.setDemandSmallTypeName(sysDictRefXLMapXq.get(item.getXqxiaolei()).get(0).getDictValue());
-        } else {
-
-        }
-        or.setExtendField1(item.getExtjson1());
-        or.setExtendField2(item.getExtjson2());
-        or.setExtendField3(item.getExtjson3());
-        or.setExtendField4(item.getExtjson4());
-        or.setExtendField5(item.getExtjson5());
-        or.setCreateBy(order.getCreateBy());
-        or.setCreateTime(order.getCreateTime());
-        or.setUpdateBy(order.getUpdateBy());
-        or.setUpdateTime(order.getUpdateTime());
-        orderRepairService.saveOrUpdate(or);
-    }
-
-    private void generateMx(Brand brand, ItfTblAssignDownload item, OrderBase order,
-                            Map<String, List<SysDictRef>> sysDictRefDLMap,
-                            Map<String, List<SysDictRef>> sysDictRefXLMap,
-                            Map<String, List<SysDictRef>> sysDictRefXiLieMap) {
-        List<ItfTblAssignMxDownload> mxRec = new ArrayList<>();
-        List<OrderProduct> addmx = new ArrayList<>();
-        List<ItfTblAssignMxDownload> ups = new ArrayList<>();
-        WebsitFWS websitFWS = new WebsitFWS();
-
-
-        // 提取明细表数据
-        mxRec = itfTblAssignMxDownloadService.lambdaQuery()
-                .eq(ItfTblAssignMxDownload::getDownloadTaskNo, item.getDownloadTaskNo())
-                .eq(ItfTblAssignMxDownload::getSynStatus,0)
-                .orderByAsc(ItfTblAssignMxDownload::getSynStatus)
-                .list();
-        for (ItfTblAssignMxDownload rec:mxRec){
-            // 提取维修工单明细数据对象
-            OrderPar mxreq = new OrderPar();
-            mxreq.setSynReqId(Long.valueOf(rec.getSynReqId()));
-            mxreq.setBrandId(brand.getBrandId());
-            OrderProduct op = repairMxDownloadMapper.getMx(mxreq);
-            // 销售单位处理 sale_websit
-            websitFWS = publicService.shxswdToptxswd(op.getSaleWebsit(),order);
-            op.setSaleWebsit(websitFWS.getWebsitId());
-
-            // 服务单位处理 service_websit
-            websitFWS = publicService.shshwdToptshwd(op.getServiceWebsit(),order);
-            op.setServiceWebsit(websitFWS.getWebsitId());
-
-            // 其他部分参数赋值
-            op.setOrderBaseId(order.getId());
-            op.setPgguid(item.getPgguid());
-            op.setMainId(order.getMainId());
-            op.setMainName(order.getMainName());
-
-            if (sysDictRefDLMap.containsKey(rec.getSpid())){
-                op.setMainId(sysDictRefDLMap.get(rec.getSpid()).get(0).getDictCode());
-                op.setMainName(sysDictRefDLMap.get(rec.getSpid()).get(0).getDictValue());
-            }
-
-            op.setSmallId(rec.getXlid());
-            op.setSmallName(rec.getXlmc());
-            if (!rec.getXlid().equals(0L) && sysDictRefXLMap.containsKey(rec.getXlid())){
-                op.setSmallId(sysDictRefXLMap.get(rec.getXlid()).get(0).getDictCode());
-                op.setSmallName(sysDictRefXLMap.get(rec.getXlid()).get(0).getDictValue());
-            }
-
-            if (!rec.getXiid().equals("0") && sysDictRefXiLieMap.containsKey(rec.getXiid())){
-                op.setSeriesId(sysDictRefXiLieMap.get(rec.getXiid()).get(0).getDictCode());
-                op.setSeriesName(sysDictRefXiLieMap.get(rec.getXiid()).get(0).getDictValue());
-            } else {
-                op.setSeriesId(rec.getXiid());
-                op.setSeriesName(rec.getXimc());
-            }
-            addmx.add(op);
-
-            ItfTblAssignMxDownload up = new ItfTblAssignMxDownload();
-            up.setSynReqId(rec.getSynReqId());
-            up.setSynStatus(1);
-            up.setSynReqTime(new Date());
-            ups.add(up);
-        }
-
-        if (addmx.size()>0){
-            orderProductService.saveBatch(addmx);
-            addmx.clear();
-            itfTblAssignMxDownloadService.updateBatchById(ups);
-            ups.clear();
-        }
-    }
-
-    private void generateMxUpdate(Brand brand, ItfTblAssignDownload item, OrderBase order,
-                            Map<String, List<SysDictRef>> sysDictRefDLMap,
-                            Map<String, List<SysDictRef>> sysDictRefXLMap,
-                            Map<String, List<SysDictRef>> sysDictRefXiLieMap) {
-        List<ItfTblAssignMxDownload> mxRec = new ArrayList<>();
-        List<OrderProduct> addmx = new ArrayList<>();
-        List<OrderProduct> upmx = new ArrayList<>();
-        List<ItfTblAssignMxDownload> ups = new ArrayList<>();
-        Map<String, List<OrderProduct>> opsMap = new HashMap<>();
-
-        // 提取现有的数据
-        List<OrderProduct> ops = orderProductService.lambdaQuery()
-                .eq(OrderProduct::getOrderBaseId,order.getId()).list();
-
-        opsMap = ops.stream().collect(Collectors.groupingBy(OrderProduct::getPgmxid));
-
-        // 提取明细表数据
-        mxRec = itfTblAssignMxDownloadService.lambdaQuery()
-                .eq(ItfTblAssignMxDownload::getDownloadTaskNo, item.getDownloadTaskNo())
-                .eq(ItfTblAssignMxDownload::getSynStatus,0)
-                .orderByAsc(ItfTblAssignMxDownload::getSynStatus)
-                .list();
-
-        for (ItfTblAssignMxDownload rec:mxRec){
-            // 提取维修工单明细数据对象
-            OrderPar mxreq = new OrderPar();
-            mxreq.setSynReqId(Long.valueOf(rec.getSynReqId()));
-            mxreq.setBrandId(brand.getBrandId());
-            OrderProduct op = getOrderProduct(item, order, sysDictRefDLMap, sysDictRefXLMap, sysDictRefXiLieMap, rec, mxreq);
-
-            // 存在修改
-            if (opsMap.containsKey(op.getPgmxid())){
-                getupop(upmx, opsMap, op);
-            } else {
-                addmx.add(op);
-            }
-
-            ItfTblAssignMxDownload up = new ItfTblAssignMxDownload();
-            up.setSynReqId(rec.getSynReqId());
-            up.setSynStatus(1);
-            up.setSynReqTime(new Date());
-            ups.add(up);
-        }
-
-        if (addmx.size()>0){
-            orderProductService.saveBatch(addmx);
-            addmx.clear();
-        }
-        if (upmx.size()>0){
-            orderProductService.updateBatchById(upmx);
-            addmx.clear();
-        }
-        if (ups.size()>0){
-            itfTblAssignMxDownloadService.updateBatchById(ups);
-            ups.clear();
-        }
-
-    }
-
-    private void getupop(List<OrderProduct> upmx, Map<String, List<OrderProduct>> opsMap, OrderProduct op) {
-        OrderProduct up = new OrderProduct();
-        up.setId(opsMap.get(op.getPgmxid()).get(0).getId());
-        up.setMainId(op.getMainId());
-        up.setMainName(op.getMainName());
-        up.setSmallId(op.getSmallId());
-        up.setSmallName(op.getSmallName());
-        up.setSeriesId(op.getSeriesId());
-        up.setSeriesName(op.getSeriesName());
-        up.setProductId(op.getProductId());
-        up.setProductName(op.getProductName());
-        up.setUrgency(op.getUrgency());
-        up.setSaleWebsit(op.getSaleWebsit());
-        up.setServiceWebsit(op.getServiceWebsit());
-        up.setSaleWebsitMobile(op.getSaleWebsitMobile());
-        up.setServiceWebsitMobile(op.getServiceWebsitMobile());
-        up.setBuyTime(op.getBuyTime());
-        upmx.add(up);
-    }
-
-    @NotNull
-    private OrderProduct getOrderProduct(ItfTblAssignDownload item, OrderBase order,
-                                         Map<String, List<SysDictRef>> sysDictRefDLMap,
-                                         Map<String, List<SysDictRef>> sysDictRefXLMap,
-                                         Map<String, List<SysDictRef>> sysDictRefXiLieMap,
-                                         ItfTblAssignMxDownload rec, OrderPar mxreq) {
-        WebsitFWS websitFWS = new WebsitFWS();
-        OrderProduct op = repairMxDownloadMapper.getMx(mxreq);
-
-        // 其他部分参数赋值
-        // 销售单位处理 sale_websit
-        websitFWS = publicService.shxswdToptxswd(op.getSaleWebsit(),order);
-        op.setSaleWebsit(websitFWS.getWebsitId());
-        // 服务单位处理 service_websit
-        websitFWS = publicService.shshwdToptshwd(op.getServiceWebsit(),order);
-        op.setServiceWebsit(websitFWS.getWebsitId());
-
-        op.setOrderBaseId(order.getId());
-
-        op.setPgguid(item.getPgguid());
-        op.setMainId(rec.getSpid());
-        op.setMainName(rec.getSpmc());
-        if (sysDictRefDLMap.containsKey(rec.getSpid())){
-            op.setMainId(sysDictRefDLMap.get(rec.getSpid()).get(0).getDictCode());
-            op.setMainName(sysDictRefDLMap.get(rec.getSpid()).get(0).getDictValue());
-        }
-
-        op.setSmallId(rec.getXlid());
-        op.setSmallName(rec.getXlmc());
-        if (!rec.getXlid().equals(0L) && sysDictRefXLMap.containsKey(rec.getXlid())){
-            op.setSmallId(sysDictRefXLMap.get(rec.getXlid()).get(0).getDictCode());
-            op.setSmallName(sysDictRefXLMap.get(rec.getXlid()).get(0).getDictValue());
-        }
-
-        op.setSeriesId(rec.getXiid());
-        op.setSeriesName(rec.getXimc());
-        if (!rec.getXiid().equals("0") && sysDictRefXiLieMap.containsKey(rec.getXiid())){
-            op.setSeriesId(sysDictRefXiLieMap.get(rec.getXiid()).get(0).getDictCode());
-            op.setSeriesName(sysDictRefXiLieMap.get(rec.getXiid()).get(0).getDictValue());
-        }
-
-        return op;
-    }
-
-    private OrderBase generateOrder(Brand brand, ItfTblAssignDownload item, List<ItfTblAssignXzydDownload> yds) {
-        Boolean isChildInfo = Boolean.FALSE;
-
-        if (yds !=null && yds.size()>0){
-            isChildInfo = Boolean.TRUE;
-        }
-
-        OrderBase order = saveOrderBase(brand, item, isChildInfo);
-
-        // 总部维修单为待审批改派时 若本地表无改派数据则生成改派数据
-        if (order.getOrderStatus().equals("B5")){
-            generateDispatch(order);
-        }
-        // 如果是家用的工单，且工单状态是待中心派工或待网点派工时，写入派嘉讯茂  不做
-
-        // 修改同步状态
-        upItfTblAssignDownloadStatus(item, order);
-
-        return order;
-    }
-
-    private OrderBase saveOrderBase(Brand brand, ItfTblAssignDownload item, Boolean isChildInfo) {
-        // 获取维修工单主表数据
-        OrderPar orderPar = new OrderPar();
-        orderPar.setSynReqId(item.getSynReqId());
-        orderPar.setBrandId(brand.getBrandId());
-        OrderBase order = repairDownloadMapper.getOrderBase(orderPar);
-        order.setId("77"+ IdWorker.getIdStr());
-        if (isChildInfo){
-            order.setIsChildInfo("YES");
-        }
-        // 部分属性值重置
-        orderService.setParame(brand, order, item);
-        // 新增
-        orderBaseService.save(order);
-        return order;
-    }
-
-    public void upItfTblAssignDownloadStatus(ItfTblAssignDownload item, OrderBase order){
-        upItfTblAssignDownload(item.getSynReqId(),1,"成功");
-
-        OrderPar prepar = new OrderPar();
-        prepar.setSynReqId(item.getSynReqId());
-        prepar.setPgid(order.getPgid());
-        assignDownloadMapper.updateStatus(prepar);
-    }
-
-    private void upItfTblAssignDownload(Long synReqId, Integer synStatus, String synErrMsg) {
-        ItfTblAssignDownload up = new ItfTblAssignDownload();
-        up.setSynReqId(synReqId);
-        up.setSynStatus(synStatus);
-        up.setSynTime(new Date());
-        up.setSynErrMsg(synErrMsg);
-        itfTblAssignDownloadService.updateById(up);
-    }
-
-    private void generateDispatch(OrderBase order) {
-        SimpleDateFormat sdf = new SimpleDateFormat("yyyy-MM-dd HH:mm:ss");
-
-        List<String> parame = new ArrayList<>();
-        parame.add(order.getWebsitId());
-        parame.add(order.getReceWebsitId());
-        // 改派表中查看是否有待审的数据
-        List<OrderApplyDispatch> rec = orderApplyDispatchService.lambdaQuery()
-                .eq(OrderApplyDispatch::getOrderBaseId, order.getId())
-                .eq(OrderApplyDispatch::getExamineStatus,"WAIT")
-                .in(OrderApplyDispatch::getWebsitId,parame).list();
-        if (rec.size()<1){
-            // 生成改派数据 从维修工单表中读取数据
-            OrderApplyDispatch addn = new OrderApplyDispatch();
-            addn.setOrderBaseId(order.getId());
-            addn.setPgid(order.getPgid());
-            addn.setType("REPAIR");
-            addn.setWebsitId(order.getWebsitId());
-            addn.setWebsitName(order.getWebsitName());
-            addn.setApplyContent("申请改派");
-            addn.setExamineStatus("WAIT");
-            addn.setUserName(order.getUserName());
-            addn.setUserMobile(order.getUserMobile());
-            addn.setReserveTime(order.getAppointmentTime());
-            addn.setReservePeriod(sdf.format(order.getAppointmentTime()));
-            addn.setMainId(Integer.valueOf(order.getMainId()));
-            addn.setMainName(order.getMainName());
-            addn.setCreateTime(order.getCreateTime());
-            addn.setUpdateTime(order.getUpdateTime());
-            orderApplyDispatchService.save(addn);
-        }
-    }
-
-
 }

src/main/java/com/zfire/jiasm/syncdata/download/order/RepairBusinessApi.java

@@ -0,0 +1,128 @@
+package com.zfire.jiasm.syncdata.download.order;
+
+import com.zfire.jiasm.syncdata.base.BaseService;
+import com.zfire.jiasm.syncdata.plus.entity.Brand;
+import com.zfire.jiasm.syncdata.plus.entity.ItfTblAssignDownload;
+import com.zfire.jiasm.syncdata.plus.entity.OrderBase;
+import com.zfire.jiasm.syncdata.plus.entity.SysDictRef;
+import com.zfire.jiasm.syncdata.plus.service.ItfTblAssignDownloadService;
+import com.zfire.jiasm.syncdata.plus.service.OrderBaseService;
+import com.zfire.jiasm.syncdata.service.AddRepairBusiness;
+import com.zfire.jiasm.syncdata.service.PublicService;
+import lombok.extern.slf4j.Slf4j;
+import org.springframework.scheduling.annotation.Scheduled;
+import org.springframework.stereotype.Component;
+
+import javax.annotation.Resource;
+import java.text.SimpleDateFormat;
+import java.util.ArrayList;
+import java.util.Date;
+import java.util.List;
+import java.util.Map;
+import java.util.stream.Collectors;
+
+/** 接口方式生成工单
+ * 格力品牌维修工单下载后落本地数据表
+ *    落业务表 - 修改下载主表处理结果
+ */
+@Slf4j
+@Component
+public class RepairBusinessApi {
+    @Resource
+    ItfTblAssignDownloadService itfTblAssignDownloadService;
+    @Resource
+    BaseService baseService;
+    @Resource
+    OrderBaseService orderBaseService;
+    @Resource
+    PublicService publicService;
+    @Resource
+    AddRepairBusiness addRepairBusiness;
+
+
+
+
+    // 1：工单落入本地表 TL_SynDataFrom_tbl_assign_batch
+    @Scheduled(fixedDelayString = "${repairin}")
+    public void inputOrder() {
+        if (1 == 1) {
+            return;
+        }
+        SimpleDateFormat sdf = new SimpleDateFormat("yyyy-MM-dd HH:mm:ss");
+        List<ItfTblAssignDownload> repairRec = new ArrayList<>();
+        List<Long> pgids = new ArrayList<>();
+        List<OrderBase> orderBasesRecs = new ArrayList<>();
+        List<String> orderBaselist = new ArrayList<>();
+
+        // 提取品牌信息
+        Brand brand = baseService.getBrand();
+        if (brand == null) {
+            return;
+        }
+
+        // 提取品牌商对应的大类信息
+        Map<String, List<SysDictRef>> sysDictRefDLMap = publicService.getStringListMap(brand);
+        // 提取品牌商对应的小类信息
+        Map<String, List<SysDictRef>> sysDictRefXLMap = publicService.getListMap(brand);
+        // 提取品牌商对应的系列信息
+        Map<String, List<SysDictRef>> sysDictRefXiLieMap = publicService.getMap(brand);
+
+        // 提取品牌商对应的需求大类信息
+        Map<String, List<SysDictRef>> sysDictRefDLMapXq = publicService.getStringListMapXq(brand);
+        // 提取品牌商对应的需求小类信息
+        Map<String, List<SysDictRef>> sysDictRefXLMapXq = publicService.getListMapXq(brand);
+
+        // 提取待落本地表的数据
+        repairRec = itfTblAssignDownloadService.lambdaQuery()
+                .eq(ItfTblAssignDownload::getSynStatus,0)
+                .orderByAsc(ItfTblAssignDownload::getSynReqId)
+                .list();
+
+        if (repairRec.size()<1){
+            log.info("暂无待处理的维修工单: \uF0B7{}",sdf.format(new Date()));
+            return;
+        }
+
+        pgids = repairRec.stream().map(ItfTblAssignDownload::getPgid).collect(Collectors.toList());
+
+        // 提取已有的订单数据
+        orderBasesRecs = orderBaseService.lambdaQuery()
+                .select(OrderBase::getPgid)
+                .in(OrderBase::getPgid,pgids).list();
+        orderBaselist = orderBasesRecs.stream().map(OrderBase::getPgid).collect(Collectors.toList());
+
+        log.info("维修工单落本地表开始处理: \uF0B7{}",sdf.format(new Date()));
+
+        // 按任务号download_task_no，按单来处理
+        for (ItfTblAssignDownload item: repairRec){
+            try{
+                if (orderBaselist.contains(String.valueOf(item.getPgid()))){
+                    // 修改
+                    addRepairBusiness.updateOrderApi(brand, sysDictRefDLMap, sysDictRefXLMap, sysDictRefXiLieMap, item,
+                            sysDictRefDLMapXq, sysDictRefXLMapXq);
+                } else {
+                    // 新增 TL_SynDataFrom_tbl_assign_batch
+                    if (addRepairBusiness.addOrderApi(brand, item, sysDictRefDLMap, sysDictRefXLMap, sysDictRefXiLieMap,
+                            sysDictRefDLMapXq, sysDictRefXLMapXq)){
+                        orderBaselist.add(String.valueOf(item.getPgid()));
+                    }
+                }
+            }catch (Exception ex) {
+                ex.printStackTrace();
+                log.info("维修工单创建失败 销售单号-派工单号：【" + item.getXsdh() + "-"+ item.getPgid()+"】");
+                String msg = "接口生成维修工单失败： ";
+                if (ex.getMessage()!=null){
+                    msg = msg + ex.getMessage();
+                }
+                item.setSynErrMsg(msg);
+                if (msg.length()>1020){
+                    item.setSynErrMsg(msg.substring(0,1020));
+                }
+                item.setSynTime(new Date());
+                itfTblAssignDownloadService.updateById(item);
+            }
+        }
+        log.info("维修工单落本地表处理完成: \uF0B7{}",sdf.format(new Date()));
+    }
+
+}

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

@@ -8,10 +8,16 @@ import java.util.List;
 import java.util.Map;
 
 public interface AddInstallBusiness {
-    void orderUpdate(Map<String, List<SysDictRef>> sysDictRefDLMap, Map<String, List<SysDictRef>> sysDictRefXLMap,
-                            Map<String, List<SysDictRef>> sysDictRefXiLieMap, Brand brand, ItfTblAzAssignLcLsDownload item);
-
     void orderAdd(Map<String, List<SysDictRef>> sysDictRefDLMap, Map<String, List<SysDictRef>> sysDictRefXLMap,
                   Map<String, List<SysDictRef>> sysDictRefXiLieMap, Brand brand, ItfTblAzAssignLcLsDownload item);
 
+    Boolean orderAddApi(Map<String, List<SysDictRef>> sysDictRefDLMap, Map<String, List<SysDictRef>> sysDictRefXLMap,
+                  Map<String, List<SysDictRef>> sysDictRefXiLieMap, Brand brand, ItfTblAzAssignLcLsDownload item);
+
+    void orderUpdate(Map<String, List<SysDictRef>> sysDictRefDLMap, Map<String, List<SysDictRef>> sysDictRefXLMap,
+                     Map<String, List<SysDictRef>> sysDictRefXiLieMap, Brand brand, ItfTblAzAssignLcLsDownload item);
+
+    void orderUpdateApi(Map<String, List<SysDictRef>> sysDictRefDLMap, Map<String, List<SysDictRef>> sysDictRefXLMap,
+                     Map<String, List<SysDictRef>> sysDictRefXiLieMap, Brand brand, ItfTblAzAssignLcLsDownload item);
+
     }

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

@@ -0,0 +1,38 @@
+package com.zfire.jiasm.syncdata.service;
+
+import com.zfire.jiasm.syncdata.plus.entity.Brand;
+import com.zfire.jiasm.syncdata.plus.entity.ItfTblAssignDownload;
+import com.zfire.jiasm.syncdata.plus.entity.SysDictRef;
+
+import java.util.List;
+import java.util.Map;
+
+public interface AddRepairBusiness {
+    void addOrder(Brand brand, ItfTblAssignDownload item,
+                  Map<String, List<SysDictRef>> sysDictRefDLMap,
+                  Map<String, List<SysDictRef>> sysDictRefXLMap,
+                  Map<String, List<SysDictRef>> sysDictRefXiLieMap,
+                  Map<String, List<SysDictRef>> sysDictRefDLMapXq,
+                  Map<String, List<SysDictRef>> sysDictRefXLMapXq);
+
+    Boolean addOrderApi(Brand brand, ItfTblAssignDownload item,
+                  Map<String, List<SysDictRef>> sysDictRefDLMap,
+                  Map<String, List<SysDictRef>> sysDictRefXLMap,
+                  Map<String, List<SysDictRef>> sysDictRefXiLieMap,
+                  Map<String, List<SysDictRef>> sysDictRefDLMapXq,
+                  Map<String, List<SysDictRef>> sysDictRefXLMapXq);
+
+    void updateOrder(Brand brand, Map<String, List<SysDictRef>> sysDictRefDLMap,
+                     Map<String, List<SysDictRef>> sysDictRefXLMap,
+                     Map<String, List<SysDictRef>> sysDictRefXiLieMap,
+                     ItfTblAssignDownload item,
+                     Map<String, List<SysDictRef>> sysDictRefDLMapXq,
+                     Map<String, List<SysDictRef>> sysDictRefXLMapXq);
+
+    void updateOrderApi(Brand brand, Map<String, List<SysDictRef>> sysDictRefDLMap,
+                     Map<String, List<SysDictRef>> sysDictRefXLMap,
+                     Map<String, List<SysDictRef>> sysDictRefXiLieMap,
+                     ItfTblAssignDownload item,
+                     Map<String, List<SysDictRef>> sysDictRefDLMapXq,
+                     Map<String, List<SysDictRef>> sysDictRefXLMapXq);
+}

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

@@ -14,9 +14,12 @@ import java.util.List;
 public interface OrderService extends IService<OrderBase> {
 
     void setPar(ItfTblAzAssignLcLsDownload item, OrderBase orderBase, List<OrderApplyDispatch> oads,List<ItfGreeToFaDownloadTaskList> its);
+    void setParApi(ItfTblAzAssignLcLsDownload item, OrderBase orderBase, List<OrderApplyDispatch> oads,List<ItfGreeToFaDownloadTaskList> its);
     void setParUp(ItfTblAzAssignLcLsDownload item, OrderBase orderBase, List<OrderApplyDispatch> oads, List<ItfGreeToFaDownloadTaskList> its);
+    void setParUpApi(ItfTblAzAssignLcLsDownload item, OrderBase orderBase, List<OrderApplyDispatch> oads, List<ItfGreeToFaDownloadTaskList> its);
 
     void setParame(Brand brand, OrderBase orderBase, ItfTblAssignDownload item);
+    void setParameUpdate(Brand brand, OrderBase orderBase, ItfTblAssignDownload item);
 
     // 商户工单地理位置转成平台工单地理位置 依商户的为准
     void shPositionTopt(OrderBase orderBase);

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

@@ -13,6 +13,8 @@ import java.util.Map;
 public interface PublicService {
     // 创建工单师傅数据
     OrderWorker getOrderWorker(OrderBase orderBase);
+    // 创建工单师傅数据
+    OrderWorker getOrderWorkerApi(OrderBase orderBase,OrderWorker orderWorker);
     // 获取工单师傅数据
     List<OrderWorker> getWorker(String workerId,String orderBaseId);
     // 移除工单师傅数据

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

@@ -1,13 +1,13 @@
 package com.zfire.jiasm.syncdata.service.impl;
 
+import com.alibaba.fastjson.JSONObject;
 import com.baomidou.mybatisplus.core.toolkit.IdWorker;
 import com.baomidou.mybatisplus.core.toolkit.StringUtils;
-import com.zfire.jiasm.syncdata.base.BaseService;
+import com.zfire.jiasm.syncdata.api.OrderAddBeanDTO;
 import com.zfire.jiasm.syncdata.constant.*;
 import com.zfire.jiasm.syncdata.dao.mapper.AZGDFYQDDownloadMapper;
 import com.zfire.jiasm.syncdata.dao.mapper.AZGDFkMxDownloadMapper;
 import com.zfire.jiasm.syncdata.dao.mapper.AZGDLcLsDownloadMapper;
-import com.zfire.jiasm.syncdata.download.order.InstallBusiness;
 import com.zfire.jiasm.syncdata.parameter.OrderPar;
 import com.zfire.jiasm.syncdata.plus.entity.*;
 import com.zfire.jiasm.syncdata.plus.service.*;
@@ -15,9 +15,14 @@ import com.zfire.jiasm.syncdata.response.WebsitFWS;
 import com.zfire.jiasm.syncdata.service.AddInstallBusiness;
 import com.zfire.jiasm.syncdata.service.OrderService;
 import com.zfire.jiasm.syncdata.service.PublicService;
+import com.zfire.jiasm.syncdata.utils.MyBeanUtils;
+import com.zfire.jiasm.syncdata.utils.ResponseHelper;
+import lombok.extern.slf4j.Slf4j;
 import org.apache.commons.collections4.CollectionUtils;
 import org.jetbrains.annotations.NotNull;
 import org.springframework.beans.BeanUtils;
+import org.springframework.beans.factory.annotation.Autowired;
+import org.springframework.beans.factory.annotation.Qualifier;
 import org.springframework.stereotype.Service;
 import org.springframework.transaction.annotation.Transactional;
 
@@ -25,6 +30,7 @@ import javax.annotation.Resource;
 import java.util.*;
 import java.util.stream.Collectors;
 
+@Slf4j
 @Service
 public class AddInstallBusinessImpl implements AddInstallBusiness {
     @Resource
@@ -75,8 +81,199 @@ public class AddInstallBusinessImpl implements AddInstallBusiness {
     OrderInstallDetailService orderInstallDetailService;
     @Resource
     OrderDetailFileService orderDetailFileService;
+    @Qualifier("com.zfire.jiasm.syncdata.constant.JiasmApi")
+    @Autowired
+    private JiasmApi jiasmApi;
 
 
+    @Override
+    @Transactional(rollbackFor = Exception.class)
+    public void orderAdd(Map<String, List<SysDictRef>> sysDictRefDLMap, Map<String, List<SysDictRef>> sysDictRefXLMap,
+                         Map<String, List<SysDictRef>> sysDictRefXiLieMap, Brand brand, ItfTblAzAssignLcLsDownload item) {
+        List<OrderReAppointment> oa = new ArrayList<>();
+        List<OrderAppraise> oanew = new ArrayList<>();
+        List<OrderProduct> orderProducts = new ArrayList<>();
+        List<OrderInstallDetail> oids = new ArrayList<>();
+        List<OrderDetailFile> odfs = new ArrayList<>();
+        List<ItfTblAzAssignFkmxDownload> fkmxs = new ArrayList<>();
+        List<Long> synReqIds = new ArrayList<>();
+        List<Long> synReqFkMxIds = new ArrayList<>();
+        List<Long> synReqYfYyIds = new ArrayList<>();
+        List<FaGreeSms> faGreeSms = new ArrayList<>();
+        List<OrderAppeal> orderAppeal = new ArrayList<>();
+        List<ItfGreeToFaDownloadTaskList> its = new ArrayList<>();
+        List<OrderApplyDispatch> oads = new ArrayList<>();
+
+
+        List<ItfTblAzAssignMxDownload> orderMx = itfTblAzAssignMxDownloadService.lambdaQuery()
+                .eq(ItfTblAzAssignMxDownload::getDownloadTaskNo, item.getDownloadTaskNo())
+                .eq(ItfTblAzAssignMxDownload::getSynStatus,0)
+                .orderByAsc(ItfTblAzAssignMxDownload::getSynReqId)
+                .list();
+        synReqIds = orderMx.stream().map(ItfTblAzAssignMxDownload::getSynReqId).collect(Collectors.toList());
+
+        fkmxs = itfTblAzAssignFkmxDownloadService.lambdaQuery()
+                .eq(ItfTblAzAssignFkmxDownload::getDownloadTaskNo, item.getDownloadTaskNo())
+                .eq(ItfTblAzAssignFkmxDownload::getSynStatus,0)
+                .orderByAsc(ItfTblAzAssignFkmxDownload::getCreatedDate)
+                .list();
+        synReqFkMxIds = fkmxs.stream().map(ItfTblAzAssignFkmxDownload::getSynReqId).collect(Collectors.toList());
+
+        // 分销商城订单 这里不再判断
+        /*if (item.getShopno().equals("88888888")){
+            ItfFxInstallReq itfFxInstallReq=itfFxInstallReqService.lambdaQuery()
+                    .eq(ItfFxInstallReq::getPgguid,item.getPgguid()).one();
+            if (itfFxInstallReq==null){
+                synItfTblAzAssignLcLsDownload(item.getSynReqId(), 99, "分销商城订单生成失败(itf_fx_install_req pgguid="+item.getPgguid());
+                return;
+            }
+        }*/
+
+        // 获取安装工单主表
+        OrderBase orderBase = getAddOrderBase(item, brand,oads,its);
+
+        // 以旧换新数据下载同步表
+        getOldForNewProduct(item, orderBase,its);
+
+        // 获取工单师傅信息
+        OrderWorker orderWorker = getOrderWorker(orderBase);
+        // 获取工单机型 + 生成采集明细数据+附件数据
+        getOrderProduct(orderBase, orderProducts, sysDictRefDLMap, sysDictRefXLMap, sysDictRefXiLieMap, orderMx,oids,odfs);
+        // 获取工单操作明细- 操作日志表
+        List<OrderInstallOperatingLog> oiolList = getOrderInstallOperatingLogs(fkmxs, orderBase,item);
+        // 获取安装费用清单 - 对应扩展表
+        List<ItfTblAzAssignFeeDownload> fyqd = itfTblAzAssignFeeDownloadService.lambdaQuery()
+                .eq(ItfTblAzAssignFeeDownload::getDownloadTaskNo, item.getDownloadTaskNo())
+                .eq(ItfTblAzAssignFeeDownload::getSynStatus,0)
+                .orderByDesc(ItfTblAzAssignFeeDownload::getSynReqId)
+                .list();
+        // 获取工单扩展信息  - 费用清单是不能放在扩展表的，这里有误 从订单表取才可以
+        OrderInstall orderInstall = getOrderInstall(orderBase, item, fyqd);
+        // 获取用户预约改约信息
+        List<ItfTblAzAssignAppointmentDownload> appointments = itfTblAzAssignAppointmentDownloadService.lambdaQuery()
+                .eq(ItfTblAzAssignAppointmentDownload::getDownloadTaskNo, item.getDownloadTaskNo())
+                .eq(ItfTblAzAssignAppointmentDownload::getSynStatus,0)
+                .orderByAsc(ItfTblAzAssignAppointmentDownload::getSynReqId)
+                .list();
+        synReqYfYyIds = appointments.stream().map(ItfTblAzAssignAppointmentDownload::getSynReqId).collect(Collectors.toList());
+        getOrderAppointment(orderBase, oa, appointments);
+
+        // 获取用户客户评价信息
+        List<Long> getpjSynReqId = new ArrayList<>();
+        getOrderAppraise(orderBase, sysDictRefDLMap, oanew, item.getDownloadTaskNo(), getpjSynReqId,faGreeSms,orderAppeal);
+
+        // 安装工单数据落本地表
+        addOrderData(orderBase, orderWorker, orderInstall, orderProducts, oiolList, oa, oanew,
+                item.getSynReqId(), synReqIds, synReqFkMxIds, synReqYfYyIds, fyqd, getpjSynReqId,
+                faGreeSms,orderAppeal, its, oads, oids, odfs);
+    }
+
+    @Override
+    @Transactional(rollbackFor = Exception.class)
+    public Boolean orderAddApi(Map<String, List<SysDictRef>> sysDictRefDLMap, Map<String, List<SysDictRef>> sysDictRefXLMap,
+                         Map<String, List<SysDictRef>> sysDictRefXiLieMap, Brand brand, ItfTblAzAssignLcLsDownload item) {
+        List<OrderReAppointment> oa = new ArrayList<>();
+        List<OrderAppraise> oanew = new ArrayList<>();
+        List<OrderProduct> orderProducts = new ArrayList<>();
+        List<OrderInstallDetail> oids = new ArrayList<>();
+        List<OrderDetailFile> odfs = new ArrayList<>();
+        List<ItfTblAzAssignFkmxDownload> fkmxs = new ArrayList<>();
+        List<Long> synReqIds = new ArrayList<>();
+        List<Long> synReqFkMxIds = new ArrayList<>();
+        List<Long> synReqYfYyIds = new ArrayList<>();
+        List<FaGreeSms> faGreeSms = new ArrayList<>();
+        List<OrderAppeal> orderAppeal = new ArrayList<>();
+        List<ItfGreeToFaDownloadTaskList> its = new ArrayList<>();
+        List<OrderApplyDispatch> oads = new ArrayList<>();
+
+
+        // 工单机型
+        List<ItfTblAzAssignMxDownload> orderMx = itfTblAzAssignMxDownloadService.lambdaQuery()
+                .eq(ItfTblAzAssignMxDownload::getDownloadTaskNo, item.getDownloadTaskNo())
+                .eq(ItfTblAzAssignMxDownload::getSynStatus,0)
+                .orderByAsc(ItfTblAzAssignMxDownload::getSynReqId)
+                .list();
+        synReqIds = orderMx.stream().map(ItfTblAzAssignMxDownload::getSynReqId).collect(Collectors.toList());
+
+        fkmxs = itfTblAzAssignFkmxDownloadService.lambdaQuery()
+                .eq(ItfTblAzAssignFkmxDownload::getDownloadTaskNo, item.getDownloadTaskNo())
+                .eq(ItfTblAzAssignFkmxDownload::getSynStatus,0)
+                .orderByAsc(ItfTblAzAssignFkmxDownload::getCreatedDate)
+                .list();
+        synReqFkMxIds = fkmxs.stream().map(ItfTblAzAssignFkmxDownload::getSynReqId).collect(Collectors.toList());
+
+        // 获取安装工单主表
+        // 同时生成改派申请数据、采集预下载数据
+        OrderBase orderBase = getAddOrderBaseApi(item, brand,oads,its);
+
+        // 以旧换新数据下载同步表
+        getOldForNewProduct(item, orderBase,its);
+
+        // 获取工单师傅信息
+        OrderWorker orderWorker = getOrderWorker(orderBase);
+        // 获取工单机型 + 生成采集明细数据+附件数据
+        getOrderProduct(orderBase, orderProducts, sysDictRefDLMap, sysDictRefXLMap, sysDictRefXiLieMap, orderMx,oids,odfs);
+
+        // 获取安装费用清单 - 对应扩展表
+        List<ItfTblAzAssignFeeDownload> fyqd = itfTblAzAssignFeeDownloadService.lambdaQuery()
+                .eq(ItfTblAzAssignFeeDownload::getDownloadTaskNo, item.getDownloadTaskNo())
+                .eq(ItfTblAzAssignFeeDownload::getSynStatus,0)
+                .orderByDesc(ItfTblAzAssignFeeDownload::getSynReqId)
+                .list();
+        // 获取工单扩展信息  - 费用清单是不能放在扩展表的，这里有误 从订单表取才可以
+        OrderInstall orderInstall = getOrderInstall(orderBase, item, fyqd);
+        // 获取用户预约改约信息
+        List<ItfTblAzAssignAppointmentDownload> appointments = itfTblAzAssignAppointmentDownloadService.lambdaQuery()
+                .eq(ItfTblAzAssignAppointmentDownload::getDownloadTaskNo, item.getDownloadTaskNo())
+                .eq(ItfTblAzAssignAppointmentDownload::getSynStatus,0)
+                .orderByAsc(ItfTblAzAssignAppointmentDownload::getSynReqId)
+                .list();
+        synReqYfYyIds = appointments.stream().map(ItfTblAzAssignAppointmentDownload::getSynReqId).collect(Collectors.toList());
+        getOrderAppointment(orderBase, oa, appointments);
+
+        // 获取用户客户评价信息
+        List<Long> getpjSynReqId = new ArrayList<>();
+        getOrderAppraise(orderBase, sysDictRefDLMap, oanew, item.getDownloadTaskNo(), getpjSynReqId,faGreeSms,orderAppeal);
+
+        // 生成工单
+        return createInstallOrder(item, oanew, orderProducts, odfs, synReqIds, synReqFkMxIds, synReqYfYyIds, faGreeSms, orderAppeal, its, oads, orderBase, orderWorker, fyqd, orderInstall, getpjSynReqId);
+    }
+
+    @NotNull
+    private Boolean createInstallOrder(ItfTblAzAssignLcLsDownload item, List<OrderAppraise> oanew, List<OrderProduct> orderProducts, List<OrderDetailFile> odfs, List<Long> synReqIds, List<Long> synReqFkMxIds, List<Long> synReqYfYyIds, List<FaGreeSms> faGreeSms, List<OrderAppeal> orderAppeal, List<ItfGreeToFaDownloadTaskList> its, List<OrderApplyDispatch> oads, OrderBase orderBase, OrderWorker orderWorker, List<ItfTblAzAssignFeeDownload> fyqd, OrderInstall orderInstall, List<Long> getpjSynReqId) {
+        // 创建工单
+        OrderAddBeanDTO order = new OrderAddBeanDTO();
+        // 工单机型
+        List<OrderProduct> orderProductList = new ArrayList<>();
+        // 工单辅材表
+        List<OrderMaterial> orderMaterialList = new ArrayList<>();
+        // 工单清洗项目
+        List<OrderCleanItem> orderCleanItems = new ArrayList<>();
+
+        // 工单主表、机型、辅材、清洗、预约改约记录、师傅、创建日志、生成采集数据不要
+        getOrderApi(orderProducts, orderBase, orderWorker, orderInstall, order, orderProductList, orderMaterialList, orderCleanItems);
+        log.info("request:{}", JSONObject.toJSONString(order));
+        ResponseHelper respone = jiasmApi.orderAdd(order);
+        log.info("respone:{}", JSONObject.toJSONString(respone));
+        if (respone.getCode()==200){
+            // 安装工单数据落本地表
+            addOrderDataApi(oanew, item.getSynReqId(), synReqIds, synReqFkMxIds, synReqYfYyIds, fyqd, getpjSynReqId,
+                    faGreeSms, orderAppeal, its, oads, odfs);
+            return Boolean.TRUE;
+        } else {
+            String msg ="接口生成安装工单失败: ";
+            if (respone.getMessage()!=null){
+                msg=msg+respone.getMessage();
+            }
+            log.info(msg);
+            item.setSynErrMsg(msg);
+            if (msg.length()>1020){
+                item.setSynErrMsg(msg.substring(0,1020));
+            }
+            itfTblAzAssignLcLsDownloadService.updateById(item);
+            return Boolean.FALSE;
+        }
+    }
 
     @Override
     @Transactional(rollbackFor = Exception.class)
@@ -110,7 +307,7 @@ public class AddInstallBusinessImpl implements AddInstallBusiness {
         newLCLS.setDispatchStatus(old.getDispatchStatus());
 
         // 获取工单主表要同步的数据  upInfo 为null
-        OrderBase upInfo = getOrderBaseUp(old, item, newLCLS, brand);
+        OrderBase upInfo = getOrderBaseUp(old, item, newLCLS);
 
         // 以旧换新数据下载同步表
         getOldForNewProductt(item, newLCLS,its,old);
@@ -156,89 +353,276 @@ public class AddInstallBusinessImpl implements AddInstallBusiness {
 
     @Override
     @Transactional(rollbackFor = Exception.class)
-    public void orderAdd(Map<String, List<SysDictRef>> sysDictRefDLMap, Map<String, List<SysDictRef>> sysDictRefXLMap,
-                         Map<String, List<SysDictRef>> sysDictRefXiLieMap, Brand brand, ItfTblAzAssignLcLsDownload item) {
-        List<OrderReAppointment> oa = new ArrayList<>();
-        List<OrderAppraise> oanew = new ArrayList<>();
-        List<OrderProduct> orderProducts = new ArrayList<>();
-        List<OrderInstallDetail> oids = new ArrayList<>();
-        List<OrderDetailFile> odfs = new ArrayList<>();
-        List<ItfTblAzAssignFkmxDownload> fkmxs = new ArrayList<>();
-        List<Long> synReqIds = new ArrayList<>();
-        List<Long> synReqFkMxIds = new ArrayList<>();
+    public void orderUpdateApi(Map<String, List<SysDictRef>> sysDictRefDLMap, Map<String, List<SysDictRef>> sysDictRefXLMap,
+                               Map<String, List<SysDictRef>> sysDictRefXiLieMap, Brand brand, ItfTblAzAssignLcLsDownload item) {
         List<Long> synReqYfYyIds = new ArrayList<>();
+        List<OrderReAppointment> addoalists = new ArrayList<>();
+        List<ItfTblAzAssignMxDownload> mxsynreqids = new ArrayList<>();
+        List<ItfTblAzAssignFkmxDownload> synreqids = new ArrayList<>();
+        List<OrderProduct> orderProductsUpdate = new ArrayList<>();
+        List<OrderInstallOperatingLog> addoiolList = new ArrayList<>();
+        List<Long> getpjSynReqId = new ArrayList<>();
+        List<OrderAppraise> addoalist = new ArrayList<>();
         List<FaGreeSms> faGreeSms = new ArrayList<>();
         List<OrderAppeal> orderAppeal = new ArrayList<>();
         List<ItfGreeToFaDownloadTaskList> its = new ArrayList<>();
         List<OrderApplyDispatch> oads = new ArrayList<>();
+        List<OrderInstallDetail> oids = new ArrayList<>();
+        List<String> delOrderProduct = new ArrayList<>();
+        List<String> delOrderInstallDetail = new ArrayList<>();
+        List<OrderDetailFile> odfs = new ArrayList<>();
 
+        // 提取本地订单
+        OrderBase old = orderBaseService.lambdaQuery()
+                .eq(OrderBase::getPgguid, item.getPgguid()).one();
 
-        List<ItfTblAzAssignMxDownload> orderMx = itfTblAzAssignMxDownloadService.lambdaQuery()
-                .eq(ItfTblAzAssignMxDownload::getDownloadTaskNo, item.getDownloadTaskNo())
-                .eq(ItfTblAzAssignMxDownload::getSynStatus,0)
-                .orderByAsc(ItfTblAzAssignMxDownload::getSynReqId)
-                .list();
-        synReqIds = orderMx.stream().map(ItfTblAzAssignMxDownload::getSynReqId).collect(Collectors.toList());
+        // 获取安装工单主表
+        OrderBase newLCLS = getAddOrderBaseUpApi(item, brand,oads, its);
+        // 这里一定不能少 已生成了工单号，不能再次生成
+        newLCLS.setId(old.getId());
+        newLCLS.setDispatchStatus(old.getDispatchStatus());
 
-        fkmxs = itfTblAzAssignFkmxDownloadService.lambdaQuery()
-                .eq(ItfTblAzAssignFkmxDownload::getDownloadTaskNo, item.getDownloadTaskNo())
-                .eq(ItfTblAzAssignFkmxDownload::getSynStatus,0)
-                .orderByAsc(ItfTblAzAssignFkmxDownload::getCreatedDate)
-                .list();
-        synReqFkMxIds = fkmxs.stream().map(ItfTblAzAssignFkmxDownload::getSynReqId).collect(Collectors.toList());
+        // 获取工单主表要同步的数据  upInfo 为null
+        OrderBase upInfo = getOrderBaseUp(old, item, newLCLS);
 
-        // 分销商城订单 这里不再判断
-        /*if (item.getShopno().equals("88888888")){
-            ItfFxInstallReq itfFxInstallReq=itfFxInstallReqService.lambdaQuery()
-                    .eq(ItfFxInstallReq::getPgguid,item.getPgguid()).one();
-            if (itfFxInstallReq==null){
-                synItfTblAzAssignLcLsDownload(item.getSynReqId(), 99, "分销商城订单生成失败(itf_fx_install_req pgguid="+item.getPgguid());
-                return;
-            }
-        }*/
+        // 以旧换新数据下载同步表
+        getOldForNewProductt(item, newLCLS,its,old);
 
-        // 获取安装工单主表
-        OrderBase orderBase = getAddOrderBase(item, brand,oads,its);
+        // 获取工单师傅信息来自于工单主表数据只有修改的情况
+        OrderWorker own =getOrderWorkerUpdate(old.getId(), upInfo, newLCLS);
 
-        // 以旧换新数据下载同步表
-        getOldForNewProduct(item, orderBase,its);
+        // 获取产品明细要同步的数据 -只存在修改，减少与增加的情况不存在
+        getOrderProductsUpdate(sysDictRefDLMap, sysDictRefXLMap, sysDictRefXiLieMap, old, newLCLS,
+                item.getDownloadTaskNo(),mxsynreqids,orderProductsUpdate,oids,delOrderInstallDetail,odfs,delOrderProduct);
 
-        // 获取工单师傅信息
-        OrderWorker orderWorker = getOrderWorker(orderBase);
-        // 获取工单机型 + 生成采集明细数据+附件数据
-        getOrderProduct(orderBase, orderProducts, sysDictRefDLMap, sysDictRefXLMap, sysDictRefXiLieMap, orderMx,oids,odfs);
-        // 获取工单操作明细- 操作日志表
-        List<OrderInstallOperatingLog> oiolList = getOrderInstallOperatingLogs(fkmxs, orderBase,item);
-        // 获取安装费用清单 - 对应扩展表
+        // 获取操作明细同步数据，即反馈明细
+        addoiolList = getOrderInstallOperatingLogsadd(item, old, newLCLS, synreqids);
+
+        // 费用清单 放扩展表
+        // 提取已同步的数据
+        OrderInstall oldOrderInstall = orderInstallService.lambdaQuery()
+                .eq(OrderInstall::getOrderBaseId,old.getId()).one();
+        // 获取安装费用清单
         List<ItfTblAzAssignFeeDownload> fyqd = itfTblAzAssignFeeDownloadService.lambdaQuery()
                 .eq(ItfTblAzAssignFeeDownload::getDownloadTaskNo, item.getDownloadTaskNo())
                 .eq(ItfTblAzAssignFeeDownload::getSynStatus,0)
-                .orderByDesc(ItfTblAzAssignFeeDownload::getSynReqId)
                 .list();
-        // 获取工单扩展信息  - 费用清单是不能放在扩展表的，这里有误 从订单表取才可以
-        OrderInstall orderInstall = getOrderInstall(orderBase, item, fyqd);
+        OrderInstall orderInstall = getOrderInstall(newLCLS, item, fyqd);
+        // 已同步的有数据，后期的一定有数据  直接修改
+        if (oldOrderInstall != null && orderInstall!=null){
+            orderInstall.setId(oldOrderInstall.getId());
+            orderInstall.setUpdateBy(newLCLS.getLastOperatorBy());
+            orderInstall.setUpdateTime(newLCLS.getLastOperatorTime());
+        }
+
         // 获取用户预约改约信息
-        List<ItfTblAzAssignAppointmentDownload> appointments = itfTblAzAssignAppointmentDownloadService.lambdaQuery()
-                .eq(ItfTblAzAssignAppointmentDownload::getDownloadTaskNo, item.getDownloadTaskNo())
-                .eq(ItfTblAzAssignAppointmentDownload::getSynStatus,0)
-                .orderByAsc(ItfTblAzAssignAppointmentDownload::getSynReqId)
-                .list();
-        synReqYfYyIds = appointments.stream().map(ItfTblAzAssignAppointmentDownload::getSynReqId).collect(Collectors.toList());
-        getOrderAppointment(orderBase, oa, appointments);
+        synReqYfYyIds = getYfYyLongs(item, old, newLCLS, addoalists);
 
-        // 获取用户客户评价信息
-        List<Long> getpjSynReqId = new ArrayList<>();
-        getOrderAppraise(orderBase, sysDictRefDLMap, oanew, item.getDownloadTaskNo(), getpjSynReqId,faGreeSms,orderAppeal);
+        // 获取评价同步数据
+        addoalist = getOrderAppraises(sysDictRefDLMap, item, newLCLS, getpjSynReqId,faGreeSms, orderAppeal);
 
-        // 安装工单数据落本地表
-        addOrderData(orderBase, orderWorker, orderInstall, orderProducts, oiolList, oa, oanew,
-                item.getSynReqId(), synReqIds, synReqFkMxIds, synReqYfYyIds, fyqd, getpjSynReqId,
-                faGreeSms,orderAppeal, its, oads, oids, odfs);
+
+        // 创建工单
+        OrderAddBeanDTO order = new OrderAddBeanDTO();
+        // 工单机型
+        List<OrderProduct> orderProductList = new ArrayList<>();
+        // 工单辅材表
+        List<OrderMaterial> orderMaterialList = new ArrayList<>();
+        // 工单清洗项目
+        List<OrderCleanItem> orderCleanItems = new ArrayList<>();
+
+        // 工单主表、机型、辅材、清洗、预约改约记录、师傅、创建日志、生成采集数据不要
+        getOrderApi(orderProductsUpdate, upInfo, own, orderInstall, order, orderProductList, orderMaterialList, orderCleanItems);
+        log.info("request:{}", JSONObject.toJSONString(order));
+        ResponseHelper respone = jiasmApi.orderAdd(order);
+        log.info("respone:{}", JSONObject.toJSONString(respone));
+        if (respone.getCode()==200){
+            // 安装工单数据修改落本地表
+            addOrUpdateOrderDataApi(item, mxsynreqids, synreqids,
+                    fyqd, synReqYfYyIds, getpjSynReqId,
+                    addoalist, faGreeSms,orderAppeal, its,oads,odfs);
+        } else {
+            String msg ="接口安装工单修改失败: ";
+            if (respone.getMessage()!=null){
+                msg=msg+respone.getMessage();
+            }
+            log.info(msg);
+            item.setSynErrMsg(msg);
+            if (msg.length()>1020){
+                item.setSynErrMsg(msg.substring(0,1020));
+            }
+            itfTblAzAssignLcLsDownloadService.updateById(item);
+        }
     }
 
+    public void addOrUpdateOrderDataApi(ItfTblAzAssignLcLsDownload item,
+                                     List<ItfTblAzAssignMxDownload> mxsynreqids,
+                                     List<ItfTblAzAssignFkmxDownload> synreqids,
+                                     List<ItfTblAzAssignFeeDownload> fyqd,List<Long> synReqYfYyIds,
+                                     List<Long> getpjSynReqId, List<OrderAppraise> addoalist,
+                                     List<FaGreeSms> faGreeSms,List<OrderAppeal> orderAppeal,List<ItfGreeToFaDownloadTaskList> its,
+                                     List<OrderApplyDispatch> oads,
+                                     List<OrderDetailFile> odfs) {
+        // 同步修改订单基础表
+
+        // lc_ls同步状态改成1 同步成功
+        synItfTblAzAssignLcLsDownload(item.getSynReqId(),1,"成功");
+        // 同步新增或修改师傅信息 own 从工单主表过来，无load表修改
+        // 同步修改产品明细表
+        if (mxsynreqids.size()>0){
+            itfTblAzAssignMxDownloadService.updateBatchById(mxsynreqids);
+            mxsynreqids.clear();
+        }
+        // 同步新增操作日志表
+        if (synreqids.size()>0){
+            itfTblAzAssignFkmxDownloadService.updateBatchById(synreqids);
+            synreqids.clear();
+        }
+
+        // 同步修改安装工单扩展表
+        if (CollectionUtils.isNotEmpty(fyqd)){
+            upItfTblAzAssignFeeDownload(fyqd);
+        }
+
+        // 同步用户预约表
+        if (synReqYfYyIds.size()>0){
+            upItfTblAzAssignAppointment(synReqYfYyIds);
+            synReqYfYyIds.clear();
+        }
 
+        // 同步评价新增的数据
+        if (addoalist.size()>0){
+            orderAppraiseService.saveBatch(addoalist);
+            addoalist.clear();
+        }
 
+        // 预约改约-总部短信发送
+        if (faGreeSms.size()>0){
+            faGreeSmsService.saveBatch(faGreeSms);
+            faGreeSms.clear();
+        }
 
+        // 差评申诉
+        if (orderAppeal.size()>0){
+            orderAppealService.saveOrUpdateBatch(orderAppeal);
+            orderAppeal.clear();
+        }
+
+        // 以旧换新
+        if (its.size()>0){
+            itfGreeToFaDownloadTaskListService.saveBatch(its);
+            its.clear();
+        }
+
+        // 改派申请单
+        if (oads.size()>0){
+            orderApplyDispatchService.saveOrUpdateBatch(oads);
+            oads.clear();
+        }
+
+        // 删除产品机型
+        // 新增采集附件
+        if (odfs.size()>0){
+            orderDetailFileService.saveOrUpdateBatch(odfs);
+            odfs.clear();
+        }
+
+        // 客户评价
+        if (getpjSynReqId.size()>0){
+            upItfTblAzAssignSatisfactionDownload(getpjSynReqId);
+            getpjSynReqId.clear();
+        }
+
+    }
+
+    public void addOrderDataApi(List<OrderAppraise> oanew,
+                                Long synReqId, List<Long> synReqIds,  List<Long> synReqFkMxIds, List<Long> synReqYfYyIds,
+                                List<ItfTblAzAssignFeeDownload> fyqd, List<Long> getpjSynReqId,
+                                List<FaGreeSms> faGreeSms,List<OrderAppeal> orderAppeal,
+                                List<ItfGreeToFaDownloadTaskList> its, List<OrderApplyDispatch> oads,
+                                List<OrderDetailFile> odfs) {
+        // 工单基础表
+        // 工单师傅表
+        // 工单机型表
+        // 采集明细
+        // 采集附件
+        if (odfs.size()>0){
+            orderDetailFileService.saveBatch(odfs);
+            odfs.clear();
+        }
+        if (synReqIds.size()>0){
+            upItfTblAzAssignMxDownload(synReqIds);
+            synReqIds.clear();
+        }
+        // 操作明细表
+        if (synReqFkMxIds.size()>0){
+            upItfTblAzAssignFkmxDownload(synReqFkMxIds);
+            synReqFkMxIds.clear();
+        }
+        // 安装费用清单表
+        if (CollectionUtils.isNotEmpty(fyqd)){
+            upItfTblAzAssignFeeDownload(fyqd);
+        }
+
+        // 用户预约改约信息表
+        if (synReqYfYyIds.size()>0){
+            upItfTblAzAssignAppointment(synReqYfYyIds);
+            synReqYfYyIds.clear();
+        }
+
+        // 工单评价表
+        if (oanew.size()>0){
+            orderAppraiseService.saveBatch(oanew);
+            oanew.clear();
+        }
+        // 差评给网点发短信
+        if (faGreeSms.size()>0){
+            faGreeSmsService.saveBatch(faGreeSms);
+            faGreeSms.clear();
+        }
+        // 生成申诉数据
+        if (orderAppeal.size()>0){
+            orderAppealService.saveOrUpdateBatch(orderAppeal);
+            orderAppeal.clear();
+        }
+        // 以旧换新
+        if (its.size()>0){
+            itfGreeToFaDownloadTaskListService.saveBatch(its);
+            its.clear();
+        }
+        // 客户评价信息
+        if (getpjSynReqId.size()>0){
+            upItfTblAzAssignSatisfactionDownload(getpjSynReqId);
+            getpjSynReqId.clear();
+        }
+        // 改派申请单
+        if (oads.size()>0){
+            orderApplyDispatchService.saveOrUpdateBatch(oads);
+            oads.clear();
+        }
+        // 修改同步状态
+        upItfTblAzAssignLcLsDownload(synReqId);
+    }
+
+    private void getOrderApi(List<OrderProduct> orderProducts, OrderBase orderBase, OrderWorker orderWorker,
+                             OrderInstall orderInstall, OrderAddBeanDTO order, List<OrderProduct> orderProductList, List<OrderMaterial> orderMaterialList, List<OrderCleanItem> orderCleanItems) {
+        if (orderProducts!=null){
+            orderProductList.addAll(orderProducts);
+        }
+        if (orderInstall !=null){
+            MyBeanUtils.copyProperties(orderInstall, order);
+        }
+        // 工单
+        MyBeanUtils.copyProperties(orderBase, order);
+        order.getOrderMaterialList().addAll(orderMaterialList);
+        order.getOrderCleanItems().addAll(orderCleanItems);
+        order.setOperatorFlag(2);
+        if (orderWorker !=null){
+            List<String> workerIds = new ArrayList<>();
+            workerIds.add(orderWorker.getWorkerId());
+            order.getWorkerIds().addAll(workerIds);
+        }
+    }
 
     private void downInformation(ItfTblAzAssignLcLsDownload item) {
         ItfGreeToFaDownloadTaskList tl = new ItfGreeToFaDownloadTaskList();
@@ -300,7 +684,7 @@ public class AddInstallBusinessImpl implements AddInstallBusiness {
         // 同步用户预约表
         if (addoalists.size()>0){
             orderReAppointmentService.saveBatch(addoalists);
-            addoalist.clear();
+            addoalists.clear();
         }
         if (synReqYfYyIds.size()>0){
             upItfTblAzAssignAppointment(synReqYfYyIds);
@@ -932,17 +1316,17 @@ public class AddInstallBusinessImpl implements AddInstallBusiness {
     }
 
     @NotNull
-    private OrderBase getOrderBaseUp(OrderBase old, ItfTblAzAssignLcLsDownload item, OrderBase lclsNew,Brand brand) {
+    private OrderBase getOrderBaseUp(OrderBase old, ItfTblAzAssignLcLsDownload item, OrderBase lclsNew) {
         // 本地订单已关闭 且总部的最后修改时间在本地数据修改时间之前 不可修改
         if (old.getOrderStatus().equals(GDOrderStatusEnum.INSTALL_STATUS_G10.getCode()) &&
-                item.getLastModifiedDate().compareTo(old.getUpdateTime())<0){
+                (old.getUpdateTime()==null || item.getLastModifiedDate().compareTo(old.getUpdateTime())<0)){
             synItfTblAzAssignLcLsDownload(item.getSynReqId(), 99, "本地工单已关闭或作废忽略更新");
             // 这里只是不修改订单主表，其他数据表接着执行
             return null;
         }
 
         // 1.安装工单主表基础信息更新
-        if (item.getLastModifiedDate().compareTo(old.getUpdateTime())>0){
+        if (old.getUpdateTime()==null || item.getLastModifiedDate().compareTo(old.getUpdateTime())>0){
             upBase(old, item, lclsNew);
         }
 
@@ -974,7 +1358,7 @@ public class AddInstallBusinessImpl implements AddInstallBusiness {
 
         // 4:工单状态
         Boolean allowUpdate = getAllowUpdate(old, lclsNew);
-        if (allowUpdate && item.getLastModifiedDate().compareTo(old.getUpdateTime())>0){
+        if (allowUpdate && (old.getUpdateTime()==null || item.getLastModifiedDate().compareTo(old.getUpdateTime())>0)){
             old.setOrderStatus(lclsNew.getOrderStatus());
             old.setOrderStatusTime(lclsNew.getOrderStatusTime());
             old.setLastOrderStatus(lclsNew.getLastOrderStatus());
@@ -1054,14 +1438,14 @@ public class AddInstallBusinessImpl implements AddInstallBusiness {
 
         // 本地订单已关闭 且总部的最后修改时间在本地数据修改时间之前 不可修改
         if (old.getOrderStatus().equals(GDOrderStatusEnum.INSTALL_STATUS_G10.getCode()) &&
-                item.getLastModifiedDate().compareTo(old.getUpdateTime())<0){
+                (old.getUpdateTime()==null || item.getLastModifiedDate().compareTo(old.getUpdateTime())<0)){
             synItfTblAzAssignLcLsDownload(item.getSynReqId(), 99, "本地工单已关闭或作废忽略更新");
             // 这里只是不修改订单主表，其他数据表接着执行
             return null;
         }
 
         // 1.安装工单主表基础信息更新
-        if (item.getLastModifiedDate().compareTo(old.getUpdateTime())>0){
+        if (old.getUpdateTime()==null || item.getLastModifiedDate().compareTo(old.getUpdateTime())>0){
             BeanUtils.copyProperties(newLCLS,upInfo);
             // upInfo = getAddOrderBaseUp(item, brand);
             //  未完成数量 取小
@@ -1099,7 +1483,7 @@ public class AddInstallBusinessImpl implements AddInstallBusiness {
         // 4:工单状态
         Boolean allowUpdate = getAllowUpdate(old, newLCLS);
         // 不可修改退回去
-        if (!(allowUpdate && item.getLastModifiedDate().compareTo(old.getUpdateTime())>0)){
+        if (!(allowUpdate && (old.getUpdateTime()==null || item.getLastModifiedDate().compareTo(old.getUpdateTime())>0))){
             upInfo.setOrderStatus(old.getOrderStatus());
             upInfo.setOrderStatusTime(old.getOrderStatusTime());
             upInfo.setLastOrderStatus(old.getLastOrderStatus());
@@ -1427,6 +1811,8 @@ public class AddInstallBusinessImpl implements AddInstallBusiness {
         upItfTblAzAssignLcLsDownload(synReqId);
     }
 
+
+
     private void upItfTblAzAssignFeeDownload(List<ItfTblAzAssignFeeDownload> fyqd) {
         List<ItfTblAzAssignFeeDownload> adds = new ArrayList<>();
         for (ItfTblAzAssignFeeDownload item:fyqd){
@@ -1998,6 +2384,36 @@ public class AddInstallBusinessImpl implements AddInstallBusiness {
         return orderBase;
     }
 
+    private OrderBase getAddOrderBaseApi(ItfTblAzAssignLcLsDownload item, Brand brand,List<OrderApplyDispatch> oads,
+                                      List<ItfGreeToFaDownloadTaskList> its) {
+        OrderBase orderBase = new OrderBase();
+        OrderPar orderPar = new OrderPar();
+        orderPar.setSynReqId(item.getSynReqId());
+        orderPar.setBrandId(brand.getBrandId());
+
+        // 生成工单基础表 对象
+        orderBase = azGDLcLsDownloadMapper.getOrderBase(orderPar);
+        orderBase.setId("");
+        // 总部下来的工单新增时统一为待接收状态
+        orderBase.setDispatchStatus("DJS");
+
+        // 1500 挂起工单  先给A13081=非广佛作废
+        if (item.getDqjd().equals(1500L)){
+            orderBase.setOrderStatus("A13081");
+        }
+
+        //  预派工订单标识
+        if (orderBase.getOrderStatus().equals(OrderStatusEnum.INSTALL_STATUS_A1100.getCode()) ||
+                orderBase.getOrderStatus().equals(OrderStatusEnum.INSTALL_STATUS_A1122.getCode()) ||
+                orderBase.getOrderStatus().equals(OrderStatusEnum.INSTALL_STATUS_A1130.getCode()) ){
+            orderBase.setIsReservation(1);
+        }
+        // 重置部分数据
+        orderService.setParApi(item, orderBase,oads,its);
+
+        return orderBase;
+    }
+
     private OrderBase getAddOrderBaseUp(ItfTblAzAssignLcLsDownload item, Brand brand,
                                         List<OrderApplyDispatch> oads, List<ItfGreeToFaDownloadTaskList> its) {
         OrderBase orderBase = new OrderBase();
@@ -2011,4 +2427,18 @@ public class AddInstallBusinessImpl implements AddInstallBusiness {
 
         return orderBase;
     }
+
+    private OrderBase getAddOrderBaseUpApi(ItfTblAzAssignLcLsDownload item, Brand brand,
+                                        List<OrderApplyDispatch> oads, List<ItfGreeToFaDownloadTaskList> its) {
+        OrderBase orderBase = new OrderBase();
+        OrderPar orderPar = new OrderPar();
+        orderPar.setSynReqId(item.getSynReqId());
+        orderPar.setBrandId(brand.getBrandId());
+        // 生成工单基础表 对象
+        orderBase = azGDLcLsDownloadMapper.getOrderBase(orderPar);
+        // 重置部分数据
+        orderService.setParUpApi(item, orderBase,oads,its);
+
+        return orderBase;
+    }
 }

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

@@ -0,0 +1,2446 @@
+package com.zfire.jiasm.syncdata.service.impl;
+
+import com.alibaba.fastjson.JSONObject;
+import com.baomidou.mybatisplus.core.conditions.query.QueryWrapper;
+import com.baomidou.mybatisplus.core.toolkit.IdWorker;
+import com.baomidou.mybatisplus.core.toolkit.StringUtils;
+import com.sun.org.apache.xpath.internal.operations.Bool;
+import com.zfire.jiasm.syncdata.api.OrderAddBeanDTO;
+import com.zfire.jiasm.syncdata.constant.DictTypeEnum;
+import com.zfire.jiasm.syncdata.constant.GDOrderStatusEnum;
+import com.zfire.jiasm.syncdata.constant.JiasmApi;
+import com.zfire.jiasm.syncdata.constant.OrderTypeEnum;
+import com.zfire.jiasm.syncdata.dao.mapper.*;
+import com.zfire.jiasm.syncdata.parameter.OrderPar;
+import com.zfire.jiasm.syncdata.parameter.ReAppointment;
+import com.zfire.jiasm.syncdata.plus.entity.*;
+import com.zfire.jiasm.syncdata.plus.service.*;
+import com.zfire.jiasm.syncdata.response.WebsitFWS;
+import com.zfire.jiasm.syncdata.service.AddRepairBusiness;
+import com.zfire.jiasm.syncdata.service.OrderService;
+import com.zfire.jiasm.syncdata.service.PublicService;
+import com.zfire.jiasm.syncdata.utils.MyBeanUtils;
+import com.zfire.jiasm.syncdata.utils.ResponseHelper;
+import lombok.extern.slf4j.Slf4j;
+import org.apache.commons.collections4.CollectionUtils;
+import org.jetbrains.annotations.NotNull;
+import org.springframework.beans.factory.annotation.Autowired;
+import org.springframework.beans.factory.annotation.Qualifier;
+import org.springframework.stereotype.Service;
+import org.springframework.transaction.annotation.Transactional;
+
+import javax.annotation.Resource;
+import java.text.SimpleDateFormat;
+import java.util.*;
+import java.util.stream.Collectors;
+
+@Slf4j
+@Service
+public class AddRepairBusinessImpl implements AddRepairBusiness {
+    @Resource
+    ItfTblAssignDownloadService itfTblAssignDownloadService;
+    @Resource
+    RepairDownloadMapper repairDownloadMapper;
+    @Resource
+    OrderBaseService orderBaseService;
+    @Resource
+    OrderService orderService;
+    @Resource
+    OrderApplyDispatchService orderApplyDispatchService;
+    @Resource
+    AssignDownloadMapper assignDownloadMapper;
+    @Resource
+    ItfTblAssignMxDownloadService itfTblAssignMxDownloadService;
+    @Resource
+    RepairMxDownloadMapper repairMxDownloadMapper;
+    @Resource
+    PublicService publicService;
+    @Resource
+    OrderProductService orderProductService;
+    @Resource
+    ItfTblAssignFkmxDownloadService itfTblAssignFkmxDownloadService;
+    @Resource
+    OrderRepairOperatingLogService orderRepairOperatingLogService;
+    @Resource
+    ItfTblAssignSatisfactionDownloadService itfTblAssignSatisfactionDownloadService;
+    @Resource
+    OrderAppraiseService orderAppraiseService;
+    @Resource
+    AppraiseMapper appraiseMapper;
+    @Resource
+    AssignSatisfactionDownloadMapper assignSatisfactionDownloadMapper;
+    @Resource
+    FaGreeSmsService faGreeSmsService;
+    @Resource
+    ItfTblAssignXzydDownloadService itfTblAssignXzydDownloadService;
+    @Resource
+    OrderInformationService orderInformationService;
+    @Resource
+    ItfTblAssignAppointmentDownloadService itfTblAssignAppointmentDownloadService;
+    @Resource
+    OrderRepairDetailService orderRepairDetailService;
+    @Resource
+    OrderRepairService orderRepairService;
+    @Resource
+    RepairLogMapper repairLogMapper;
+    @Resource
+    GDOrderBaseMapper gdOrderBaseMapper;
+    @Resource
+    OrderAppealService orderAppealService;
+    @Qualifier("com.zfire.jiasm.syncdata.constant.JiasmApi")
+    @Autowired
+    private JiasmApi jiasmApi;
+
+
+    @Override
+    @Transactional(rollbackFor = Exception.class)
+    public void addOrder(Brand brand, ItfTblAssignDownload item,
+                         Map<String, List<SysDictRef>> sysDictRefDLMap,
+                         Map<String, List<SysDictRef>> sysDictRefXLMap,
+                         Map<String, List<SysDictRef>> sysDictRefXiLieMap,
+                         Map<String, List<SysDictRef>> sysDictRefDLMapXq,
+                         Map<String, List<SysDictRef>> sysDictRefXLMapXq) {
+
+        List<ItfTblAssignXzydDownload> yds = itfTblAssignXzydDownloadService.lambdaQuery()
+                .eq(ItfTblAssignXzydDownload::getDownloadTaskNo,item.getDownloadTaskNo()).list();
+
+        // 新增 TL_SynDataFrom_tbl_assign_batch
+        // TL_SynDataFrom_tbl_assign 主单的 syn_req_id
+        // 处理维修工单主表数据
+        OrderBase order = generateOrder(brand, item, yds);
+        // 处理工单师傅
+        publicService.getOrderWorker(order);
+        // 获取工单扩展信息
+        getOrderInstall(item, order, sysDictRefXLMapXq);
+        // 处理维修单明细表 TL_SynDataFrom_tbl_assign_mx
+        generateMx(brand, item, order, sysDictRefDLMap, sysDictRefXLMap, sysDictRefXiLieMap);
+        // 处理维修单过程反馈表 放入操作日志表 TL_SynDataFrom_tbl_assign_fkmx
+        generateFkmx(item, order);
+        // 处理用户评价数据 TL_SynDataFrom_tbl_assign_satisfaction
+        generateSstisfaction(item, sysDictRefDLMap, order);
+        // 阅读要求数据处理 TL_SynDataFrom_tbl_assign_xzyd
+        generateXzyd(yds, order);
+        // 用户预约改约数据处理 TL_SynDataFrom_tbl_assign_appointment
+        generateAppointment(item, order);
+    }
+
+    @Override
+    @Transactional(rollbackFor = Exception.class)
+    public void updateOrder(Brand brand, Map<String, List<SysDictRef>> sysDictRefDLMap,
+                            Map<String, List<SysDictRef>> sysDictRefXLMap,
+                            Map<String, List<SysDictRef>> sysDictRefXiLieMap,
+                            ItfTblAssignDownload item,
+                            Map<String, List<SysDictRef>> sysDictRefDLMapXq,
+                            Map<String, List<SysDictRef>> sysDictRefXLMapXq) {
+        List<ItfTblAssignXzydDownload> yds = itfTblAssignXzydDownloadService.lambdaQuery()
+                .eq(ItfTblAssignXzydDownload::getDownloadTaskNo, item.getDownloadTaskNo()).list();
+
+        // TL_SynDataFrom_tbl_assign_batch
+        // TL_SynDataFrom_tbl_assign 主单的 syn_req_id
+        // 处理维修工单主表数据
+        modifyOrderBase(brand, sysDictRefDLMap, item);
+
+        OrderBase order = orderBaseService.lambdaQuery()
+                .eq(OrderBase::getPgid, item.getPgid())
+                .eq(OrderBase::getOrderType, OrderTypeEnum.ORDER_TYPE_REPAIR.getCode()).one();
+
+        // 工单师傅信息更新
+        upOrderWorker(order);
+        // 工单扩展信息更新
+        getOrderInstall(item, order,sysDictRefXLMapXq);
+        // 维修单明细表更新 TL_SynDataFrom_tbl_assign_mx
+        generateMxUpdate(brand, item, order, sysDictRefDLMap, sysDictRefXLMap, sysDictRefXiLieMap);
+        // 处理维修单过程反馈(只新增不修改)  放入操作日志表 TL_SynDataFrom_tbl_assign_fkmx
+        generateFkmxUpdate(item, order);
+        // 处理用户评价数据 TL_SynDataFrom_tbl_assign_satisfaction
+        generateSstisfaction(item, sysDictRefDLMap, order);
+        // 阅读要求数据处理 TL_SynDataFrom_tbl_assign_xzyd
+        generateXzydUpdate(yds, order);
+        // 用户预约改约数据处理 TL_SynDataFrom_tbl_assign_appointment
+        generateAppointmentUpdate(item, order);
+    }
+
+    @Override
+    @Transactional(rollbackFor = Exception.class)
+    public Boolean addOrderApi(Brand brand, ItfTblAssignDownload item,
+                         Map<String, List<SysDictRef>> sysDictRefDLMap,
+                         Map<String, List<SysDictRef>> sysDictRefXLMap,
+                         Map<String, List<SysDictRef>> sysDictRefXiLieMap,
+                         Map<String, List<SysDictRef>> sysDictRefDLMapXq,
+                         Map<String, List<SysDictRef>> sysDictRefXLMapXq) {
+        OrderApplyDispatch addn = new OrderApplyDispatch();
+        OrderWorker orderWorker = new OrderWorker();
+        OrderRepair or = new OrderRepair();
+        List<OrderProduct> addmx = new ArrayList<>();
+        List<ItfTblAssignMxDownload> ups = new ArrayList<>();
+        List<ItfTblAssignSatisfactionDownload> pjups = new ArrayList<>();
+        List<OrderAppeal> orderAppeal = new ArrayList<>();
+        List<OrderAppraise> oanew = new ArrayList<>();
+        List<FaGreeSms> faGreeSms = new ArrayList<>();
+        List<OrderInformation> oilist = new ArrayList<>();
+        List<ItfTblAssignXzydDownload> ydups = new ArrayList<>();
+        List<ItfTblAssignFkmxDownload> fkmxups = new ArrayList<>();
+        List<ItfTblAssignAppointmentDownload> us = new ArrayList<>();
+
+        List<ItfTblAssignXzydDownload> yds = itfTblAssignXzydDownloadService.lambdaQuery()
+                .eq(ItfTblAssignXzydDownload::getDownloadTaskNo,item.getDownloadTaskNo()).list();
+
+        // 新增 TL_SynDataFrom_tbl_assign_batch
+        // TL_SynDataFrom_tbl_assign 主单的 syn_req_id
+        // 处理维修工单主表数据
+        OrderBase order = generateOrderApi(brand, item, yds,addn);
+        // 生成工单师傅对像
+        publicService.getOrderWorkerApi(order,orderWorker);
+        // 获取工单扩展信息
+        getOrderInstallApi(item, order, sysDictRefXLMapXq,or);
+        // 处理维修单明细表 TL_SynDataFrom_tbl_assign_mx
+        generateMxApi(brand, item, order, sysDictRefDLMap, sysDictRefXLMap, sysDictRefXiLieMap, addmx, ups);
+        // 处理维修单过程反馈表 放入操作日志表 TL_SynDataFrom_tbl_assign_fkmx
+        generateFkmxApi(item, fkmxups);
+        // 处理用户评价数据 TL_SynDataFrom_tbl_assign_satisfaction
+        generateSstisfactionApi(item, sysDictRefDLMap, order, pjups, orderAppeal, oanew, faGreeSms);
+        // 阅读要求数据处理 TL_SynDataFrom_tbl_assign_xzyd
+        generateXzydApi(yds, order, oilist, ydups);
+        // 用户预约改约数据处理 TL_SynDataFrom_tbl_assign_appointment
+        generateAppointmentApi(item, us);
+
+        // 生成工单
+        return createRepairOrder(item, orderWorker, or, addmx, ups, pjups, orderAppeal, oanew, faGreeSms, oilist, ydups, fkmxups, us, order);
+
+    }
+
+    @Override
+    @Transactional(rollbackFor = Exception.class)
+    public void updateOrderApi(Brand brand, Map<String, List<SysDictRef>> sysDictRefDLMap,
+                            Map<String, List<SysDictRef>> sysDictRefXLMap,
+                            Map<String, List<SysDictRef>> sysDictRefXiLieMap,
+                            ItfTblAssignDownload item,
+                            Map<String, List<SysDictRef>> sysDictRefDLMapXq,
+                            Map<String, List<SysDictRef>> sysDictRefXLMapXq) {
+        Boolean flag = Boolean.FALSE;
+        String orderStatus="";
+        Integer cjDowFlag=0;
+        OrderRepair or = new OrderRepair();
+        List<ItfTblAssignMxDownload> ups = new ArrayList<>();
+        List<ItfTblAssignFkmxDownload> fkmx = new ArrayList<>();
+        List<ItfTblAssignSatisfactionDownload> upsatis = new ArrayList<>();
+        List<OrderAppeal> orderAppeal = new ArrayList<>();
+        List<OrderAppraise> oanew = new ArrayList<>();
+        List<FaGreeSms> faGreeSms = new ArrayList<>();
+
+
+
+        List<ItfTblAssignXzydDownload> yds = itfTblAssignXzydDownloadService.lambdaQuery()
+                .eq(ItfTblAssignXzydDownload::getDownloadTaskNo, item.getDownloadTaskNo()).list();
+
+        OrderBase order = orderBaseService.lambdaQuery()
+                .eq(OrderBase::getPgid, item.getPgid())
+                .eq(OrderBase::getOrderType, OrderTypeEnum.ORDER_TYPE_REPAIR.getCode()).one();
+        orderStatus = order.getOrderStatus();
+        cjDowFlag = order.getOutCjDownloadFlag();
+
+        // TL_SynDataFrom_tbl_assign_batch
+        // TL_SynDataFrom_tbl_assign 主单的 syn_req_id
+        // 处理维修工单主表数据
+        flag = modifyOrderBaseApi(brand, sysDictRefDLMap, item);
+
+        // 工单师傅信息
+        // upOrderWorker(order);
+
+        // 工单扩展信息更新
+        getOrderInstallApi(item, order,sysDictRefXLMapXq,or);
+
+        // 维修单明细表更新 TL_SynDataFrom_tbl_assign_mx
+        generateMxUpdateApi(item, ups);
+
+        // 处理维修单过程反馈(只新增不修改)  放入操作日志表 TL_SynDataFrom_tbl_assign_fkmx
+        generateFkmxUpdateApi(item, fkmx);
+        // 处理用户评价数据 TL_SynDataFrom_tbl_assign_satisfaction
+        generateSstisfactionUpdateApi(item, sysDictRefDLMap, order, upsatis, orderAppeal, oanew, faGreeSms);
+        // 阅读要求数据处理 TL_SynDataFrom_tbl_assign_xzyd
+        generateXzydUpdate(yds, order);
+        // 用户预约改约数据处理 TL_SynDataFrom_tbl_assign_appointment
+        generateAppointmentUpdate(item, order);
+
+
+
+
+
+        if (flag){
+            // 生成改派申请数据
+            if (order.getOrderStatus().equals("B5")){
+                generateDispatch(order);
+            }
+            // 修改工单改派申请表
+            upOrderApplyDispatch(item, orderStatus, order);
+
+            // 增加处理采集数据下载 41,102
+            if ((order.getOrderStatus().equals(GDOrderStatusEnum.REPAIR_STATUS_G8.getCode()) ||
+                    order.getOrderStatus().equals(GDOrderStatusEnum.REPAIR_STATUS_G14.getCode())) && cjDowFlag ==0){
+                List<OrderRepairDetail> ords = orderRepairDetailService.lambdaQuery()
+                        .eq(OrderRepairDetail::getOrderBaseId,order.getId())
+                        .ne(OrderRepairDetail::getStatus,0).list();
+                // 已存在状态为"已采集"的记录暂时忽略下载
+                if (!(ords !=null && ords.size()>0)){
+                    // 清除待采集数据
+                    delOrderRepairDetail(order);
+                    // 向表内写数据，另起任务下载数据
+                    // 这里向itf_gree_to_fa_download_task_list表的任务类型写入6601 并不会下载，这里无需处理
+                    // 修改基础表已采集下载标识
+                    OrderBase up = new OrderBase();
+                    up.setId(order.getId());
+                    up.setOutCjDownloadFlag(1);
+                    orderBaseService.updateById(up);
+                }
+            }
+            // 修改同步状态
+            upItfTblAssignDownloadStatus(item, order);
+        }
+
+        if (ups.size()>0){
+            itfTblAssignMxDownloadService.updateBatchById(ups);
+            ups.clear();
+        }
+
+        if (fkmx.size()>0){
+            itfTblAssignFkmxDownloadService.updateBatchById(fkmx);
+            fkmx.clear();
+        }
+
+        // 工单评价表
+        if (oanew.size()>0){
+            orderAppraiseService.saveBatch(oanew);
+            oanew.clear();
+        }
+
+        if (faGreeSms.size()>0){
+            faGreeSmsService.saveBatch(faGreeSms);
+            faGreeSms.clear();
+        }
+
+        if (orderAppeal.size()>0){
+            orderAppealService.saveOrUpdateBatch(orderAppeal);
+            orderAppeal.clear();
+        }
+
+        // 修改同步状态
+        if (upsatis.size()>0){
+            itfTblAssignSatisfactionDownloadService.updateBatchById(upsatis);
+            upsatis.clear();
+        }
+    }
+
+    @NotNull
+    private Boolean createRepairOrder(ItfTblAssignDownload item, OrderWorker orderWorker, OrderRepair or, List<OrderProduct> addmx, List<ItfTblAssignMxDownload> ups, List<ItfTblAssignSatisfactionDownload> pjups, List<OrderAppeal> orderAppeal, List<OrderAppraise> oanew, List<FaGreeSms> faGreeSms, List<OrderInformation> oilist, List<ItfTblAssignXzydDownload> ydups, List<ItfTblAssignFkmxDownload> fkmxups, List<ItfTblAssignAppointmentDownload> us, OrderBase order) {
+        // 创建工单
+        OrderAddBeanDTO orderApi = new OrderAddBeanDTO();
+        // 工单机型
+        List<OrderProduct> orderProductList = new ArrayList<>();
+        // 工单辅材表
+        List<OrderMaterial> orderMaterialList = new ArrayList<>();
+        // 工单清洗项目
+        List<OrderCleanItem> orderCleanItems = new ArrayList<>();
+
+        // 工单主表、机型、辅材、清洗、预约改约记录、师傅、创建日志、生成采集数据不要
+        getOrderApi(addmx, order, orderWorker, or, orderApi, orderProductList, orderMaterialList, orderCleanItems);
+        log.info("request:{}", JSONObject.toJSONString(order));
+        ResponseHelper respone = jiasmApi.orderAdd(orderApi);
+        log.info("respone:{}", JSONObject.toJSONString(respone));
+        if (respone.getCode()==200){
+            // 同步更新状态
+            synStatus(item, addmx, ups, pjups, orderAppeal, oanew, faGreeSms, oilist, ydups, fkmxups, us, order);
+            return Boolean.TRUE;
+        } else {
+            String msg ="接口生成维修工单失败: ";
+            if (respone.getMessage()!=null){
+                msg=msg+respone.getMessage();
+            }
+            log.info(msg);
+            item.setSynErrMsg(msg);
+            if (msg.length()>1020){
+                item.setSynErrMsg(msg.substring(0,1020));
+            }
+            itfTblAssignDownloadService.updateById(item);
+            return Boolean.FALSE;
+        }
+    }
+
+    private void synStatus(ItfTblAssignDownload item, List<OrderProduct> addmx, List<ItfTblAssignMxDownload> ups, List<ItfTblAssignSatisfactionDownload> pjups, List<OrderAppeal> orderAppeal, List<OrderAppraise> oanew, List<FaGreeSms> faGreeSms, List<OrderInformation> oilist, List<ItfTblAssignXzydDownload> ydups, List<ItfTblAssignFkmxDownload> fkmxups, List<ItfTblAssignAppointmentDownload> us, OrderBase order) {
+        // 修改同步状态
+        upItfTblAssignDownloadStatus(item, order);
+
+        // 处理维修单明细表
+        if (addmx.size()>0){
+            orderProductService.saveBatch(addmx);
+            addmx.clear();
+            itfTblAssignMxDownloadService.updateBatchById(ups);
+            ups.clear();
+        }
+
+        // 过程反馈
+        if (fkmxups.size()>0){
+            itfTblAssignFkmxDownloadService.updateBatchById(fkmxups);
+            fkmxups.clear();
+        }
+
+        // 工单评价表
+        if (oanew.size()>0){
+            orderAppraiseService.saveBatch(oanew);
+            oanew.clear();
+        }
+        // 预约改约-总部短信发送请求
+        if (faGreeSms.size()>0){
+            faGreeSmsService.saveBatch(faGreeSms);
+            faGreeSms.clear();
+        }
+        // 差评申诉
+        if (orderAppeal.size()>0){
+            orderAppealService.saveOrUpdateBatch(orderAppeal);
+            orderAppeal.clear();
+        }
+        // 修改同步状态
+        if (pjups.size()>0){
+            itfTblAssignSatisfactionDownloadService.updateBatchById(pjups);
+            pjups.clear();
+        }
+
+        // 工单子信息阅读要求
+        if (oilist.size()>0){
+            orderInformationService.saveBatch(oilist);
+            oilist.clear();
+        }
+        if (ydups.size()>0){
+            itfTblAssignXzydDownloadService.updateBatchById(ydups);
+            ydups.clear();
+        }
+
+        // 用户预约改约下载记录
+        if (CollectionUtils.isNotEmpty(us)){
+            itfTblAssignAppointmentDownloadService.updateBatchById(us);
+            us.clear();
+        }
+    }
+
+    private void getOrderApi(List<OrderProduct> orderProducts, OrderBase orderBase, OrderWorker orderWorker,
+                             OrderRepair orderInstall, OrderAddBeanDTO order, List<OrderProduct> orderProductList, List<OrderMaterial> orderMaterialList, List<OrderCleanItem> orderCleanItems) {
+        if (orderProducts!=null){
+            orderProductList.addAll(orderProducts);
+        }
+        if (orderInstall !=null){
+            MyBeanUtils.copyProperties(orderInstall, order);
+        }
+        // 工单
+        MyBeanUtils.copyProperties(orderBase, order);
+        order.getOrderMaterialList().addAll(orderMaterialList);
+        order.getOrderCleanItems().addAll(orderCleanItems);
+        order.setOperatorFlag(2);
+        if (orderWorker !=null){
+            List<String> workerIds = new ArrayList<>();
+            workerIds.add(orderWorker.getWorkerId());
+            order.getWorkerIds().addAll(workerIds);
+        }
+    }
+
+
+    private void upOrderWorker(OrderBase order) {
+        if (StringUtils.isEmpty(order.getWorkerName())){
+            // 清理师傅表
+            publicService.deleteWorker(order.getId());
+        } else {
+            // 提取现有的师傅信息
+            List<OrderWorker> ows = publicService.getWorker(order.getWorkerId(), order.getId());
+            // 看是工单师傅是否在内，如不在内说明重新指派了师傅
+            Boolean flag = Boolean.FALSE;
+            for (OrderWorker ow :ows){
+                if (ow.getWorkerId().equals(order.getWorkerId())){
+                    flag = Boolean.TRUE;
+                }
+            }
+            if (!flag){
+                // 清理师傅表，重新生新新师傅数据
+                if (ows !=null && ows.size()>0){
+                    publicService.deleteWorker(order.getId());
+                }
+                publicService.getOrderWorker(order);
+            }
+        }
+    }
+
+
+    private void modifyOrderBase(Brand brand, Map<String, List<SysDictRef>> sysDictRefDLMap, ItfTblAssignDownload item) {
+        String orderStatus="";
+        Integer cjDowFlag=0;
+        // TL_SynDataFrom_tbl_assign_batch
+        // TL_SynDataFrom_tbl_assign 主单的 syn_req_id
+        // 提取基础表数据
+        OrderBase oldOrder = orderBaseService.lambdaQuery()
+                .eq(OrderBase::getPgid, item.getPgid())
+                .eq(OrderBase::getOrderType, OrderTypeEnum.ORDER_TYPE_REPAIR.getCode()).one();
+        orderStatus = oldOrder.getOrderStatus();
+        cjDowFlag = oldOrder.getOutCjDownloadFlag();
+        // 批量关闭的工单 同步下载无需再修改
+        if (oldOrder.getOrderStatus().equals(GDOrderStatusEnum.REPAIR_STATUS_G13.getCode())){
+            upItfTblAssignDownload(item.getSynReqId(),99,"last_modified_by = CLIENT__autoapp 本地已作废/关闭,忽略下载处理");
+            return;
+        }
+        // 基础表数据同步 总部的修改时间必须晚于本地系统时间才可以修改
+        if (oldOrder.getUpdateTime() ==null || item.getLastModifiedDate().compareTo(oldOrder.getUpdateTime())>0){
+            OrderBase upOrder = upOrderBase(brand, item, oldOrder);
+        }
+        // 网点信息更新
+        updateWebsit(sysDictRefDLMap, item, oldOrder);
+        // 用户期望上门时间信息更新
+        updateYhqwsmsj(item, oldOrder);
+        // 状态信息更新
+        upOrderStatus(brand, item, oldOrder);
+        // 更新 工单机型
+        upOrderProduct(oldOrder);
+        // 更新 维修数据采集表
+        upOrderRepairDetail(oldOrder);
+        // 生成改派申请数据
+        if (oldOrder.getOrderStatus().equals("B5")){
+            generateDispatch(oldOrder);
+        }
+        // 修改工单改派申请表
+        upOrderApplyDispatch(item, orderStatus, oldOrder);
+
+        // 增加判断是否有未处理的待改派，如果广佛有待改派但总部工单不是待改派，直接更新改派标志
+        // 无删除标识，暂不处理
+
+        // 增加处理采集数据下载 41,102
+        if ((oldOrder.getOrderStatus().equals(GDOrderStatusEnum.REPAIR_STATUS_G8.getCode()) ||
+                oldOrder.getOrderStatus().equals(GDOrderStatusEnum.REPAIR_STATUS_G14.getCode())) && cjDowFlag ==0){
+            List<OrderRepairDetail> ords = orderRepairDetailService.lambdaQuery()
+                    .eq(OrderRepairDetail::getOrderBaseId,oldOrder.getId())
+                    .ne(OrderRepairDetail::getStatus,0).list();
+            // 已存在状态为"已采集"的记录暂时忽略下载
+            if (!(ords !=null && ords.size()>0)){
+                // 清除待采集数据
+                delOrderRepairDetail(oldOrder);
+                // 向表内写数据，另起任务下载数据
+                // 这里向itf_gree_to_fa_download_task_list表的任务类型写入6601 并不会下载，这里无需处理
+                // 修改基础表已采集下载标识
+                OrderBase up = new OrderBase();
+                up.setId(oldOrder.getId());
+                up.setOutCjDownloadFlag(1);
+                orderBaseService.updateById(up);
+            }
+        }
+
+        // 如果是家用的工单，且工单状态是待中心派工或待网点派工时，写入派嘉讯茂
+        // 写入操作日志
+        addOperatingLog(sysDictRefDLMap, item, oldOrder);
+
+        // 修改同步状态
+        upItfTblAssignDownloadStatus(item, oldOrder);
+    }
+
+    private Boolean modifyOrderBaseApi(Brand brand, Map<String, List<SysDictRef>> sysDictRefDLMap, ItfTblAssignDownload item) {
+        String orderStatus="";
+        Integer cjDowFlag=0;
+        // TL_SynDataFrom_tbl_assign_batch
+        // TL_SynDataFrom_tbl_assign 主单的 syn_req_id
+        // 提取基础表数据
+        OrderBase oldOrder = orderBaseService.lambdaQuery()
+                .eq(OrderBase::getPgid, item.getPgid())
+                .eq(OrderBase::getOrderType, OrderTypeEnum.ORDER_TYPE_REPAIR.getCode()).one();
+        orderStatus = oldOrder.getOrderStatus();
+        cjDowFlag = oldOrder.getOutCjDownloadFlag();
+        // 批量关闭的工单 同步下载无需再修改
+        if (oldOrder.getOrderStatus().equals(GDOrderStatusEnum.REPAIR_STATUS_G13.getCode())){
+            upItfTblAssignDownload(item.getSynReqId(),99,"last_modified_by = CLIENT__autoapp 本地已作废/关闭,忽略下载处理");
+            return Boolean.FALSE;
+        }
+
+        // 基础表数据同步 总部的修改时间必须晚于本地系统时间才可以修改
+        if (oldOrder.getUpdateTime()==null || item.getLastModifiedDate().compareTo(oldOrder.getUpdateTime())>0){
+            OrderBase upOrder = upOrderBaseApi(brand, item, oldOrder);
+            MyBeanUtils.copyProperties(upOrder,oldOrder);
+        }
+        // 网点信息更新
+        updateWebsitApi(sysDictRefDLMap, item, oldOrder);
+        // 用户期望上门时间信息更新
+        updateYhqwsmsjApi(item, oldOrder);
+        // 状态信息更新
+        upOrderStatusApi(brand, item, oldOrder);
+
+        return Boolean.TRUE;
+    }
+
+    private void addOperatingLog(Map<String, List<SysDictRef>> sysDictRefDLMap, ItfTblAssignDownload item, OrderBase oldOrder) {
+        if (oldOrder.getOrderStatus().equals(GDOrderStatusEnum.REPAIR_STATUS_G2.getCode()) ||
+                oldOrder.getOrderStatus().equals(GDOrderStatusEnum.REPAIR_STATUS_G3.getCode()) ||
+                oldOrder.getOrderStatus().equals(GDOrderStatusEnum.REPAIR_STATUS_G4.getCode())){
+            // 大类存在，且相同 非商用
+            if (StringUtils.isNotEmpty(oldOrder.getMainId()) && StringUtils.isNotEmpty(String.valueOf(item.getSpid())) &&
+                    !oldOrder.getMainId().equals(item.getSpid()) &&
+                    (!item.getSpid().equals(DictTypeEnum.DICT_TYPE_SY_102.getCode())) &&
+                    (!item.getSpid().equals(DictTypeEnum.DICT_TYPE_SY_109.getCode())) ){
+                List<OrderRepairOperatingLog> orlog = orderRepairOperatingLogService.lambdaQuery()
+                        .eq(OrderRepairOperatingLog::getOrderBaseId, oldOrder.getId())
+                        .eq(OrderRepairOperatingLog::getType,"指派服务商").list();
+                if (CollectionUtils.isEmpty(orlog)){
+                    OrderPar request = new OrderPar();
+                    request.setOrderNo(oldOrder.getId());
+                    OrderRepairOperatingLog orolog = repairLogMapper.getUpdatetime(request);
+                    if (orolog == null){
+                        orolog = repairLogMapper.getUpdatetimeT(request);
+                    }
+                    // 存在处理
+                    if (orolog != null){
+                        OrderPar orderPar = new OrderPar();
+                        orderPar.setOrderNo(oldOrder.getId());
+                        OrderRepairOperatingLog addlog = gdOrderBaseMapper.getOrderBaseLog(orderPar);
+                        orderRepairOperatingLogService.save(addlog);
+                    }
+                    //
+                    if ((!("S9219801".equals(item.getWxwdno())) && !("S9219807".equals(item.getWxwdno()))) &&
+                            (!("S9219801".equals(item.getXjwdno())) && !("S9219807".equals(item.getXjwdno())))){
+                        OrderPar orderPar = new OrderPar();
+                        orderPar.setOrderNo(oldOrder.getId());
+                        OrderRepairOperatingLog addlog = gdOrderBaseMapper.getOrderBaseLogT(orderPar);
+                        orderRepairOperatingLogService.save(addlog);
+                    }
+                }
+            }
+        }
+    }
+
+    private void delOrderRepairDetail(OrderBase oldOrder) {
+        QueryWrapper dWrapper = new QueryWrapper<OrderRepairDetail>()
+                .eq("order_base_id", oldOrder.getId())
+                .eq("status",0);
+        orderRepairDetailService.remove(dWrapper);
+    }
+
+    private void upOrderApplyDispatch(ItfTblAssignDownload item, String orderStatus, OrderBase oldOrder) {
+        // 原 本地维修单表状态为5 待审批  同步过来的工单状态不是待审批时
+        // 修改工单改派申请 自动审核  新增时条件不成立的
+        if (orderStatus.equals(GDOrderStatusEnum.REPAIR_STATUS_G5.getCode()) && !item.getStat().equals(5L)){
+            OrderApplyDispatch oad = new OrderApplyDispatch();
+            oad.setExamineId("system");
+            oad.setExamineName("接口自动审核");
+            oad.setExamineStatus("OK");
+            oad.setExamineTime(new Date());
+            QueryWrapper upWrapper = new QueryWrapper<OrderApplyDispatch>()
+                    .eq("order_base_id", oldOrder.getId())
+                    .eq("examine_status","WAIT");
+            orderApplyDispatchService.update(oad,upWrapper);
+        }
+    }
+
+    private void upOrderRepairDetail(OrderBase oldOrder) {
+        OrderRepairDetail ord = new OrderRepairDetail();
+        ord.setInstallWebsitId(oldOrder.getWebsitId());
+        ord.setInstallWebsitName(oldOrder.getWebsitName());
+        QueryWrapper upWrapper = new QueryWrapper<OrderRepairDetail>()
+                .eq("order_base_id", oldOrder.getId());
+        orderRepairDetailService.update(ord,upWrapper);
+    }
+
+    private void upOrderProduct(OrderBase oldOrder) {
+        OrderProduct op = new OrderProduct();
+        op.setServiceWebsit(oldOrder.getWebsitId());
+        op.setServiceWebsitMobile(publicService.getSHWDPhone(oldOrder.getWebsitId()));
+        QueryWrapper upWrapper = new QueryWrapper<OrderProduct>()
+                .eq("order_base_id", oldOrder.getId());
+        orderProductService.update(op,upWrapper);
+    }
+
+    private void upOrderStatus(Brand brand, ItfTblAssignDownload item, OrderBase oldOrder) {
+        // 查看是否可更新
+        Boolean allowUpdate = getaBoolean(item, oldOrder);
+        if (allowUpdate){
+            // 这里差 派工状态
+            OrderPar orderPar = new OrderPar();
+            orderPar.setSynReqId(item.getSynReqId());
+            orderPar.setBrandId(brand.getBrandId());
+            OrderBase order = repairDownloadMapper.getOrderBaseStatus(orderPar);
+            order.setId(oldOrder.getId());
+            orderBaseService.updateById(order);
+            MyBeanUtils.copyProperties(order,oldOrder);
+        }
+    }
+
+    private void upOrderStatusApi(Brand brand, ItfTblAssignDownload item, OrderBase oldOrder) {
+        // 查看是否可更新
+        Boolean allowUpdate = getaBoolean(item, oldOrder);
+        if (allowUpdate){
+            // 这里差 派工状态
+            OrderPar orderPar = new OrderPar();
+            orderPar.setSynReqId(item.getSynReqId());
+            orderPar.setBrandId(brand.getBrandId());
+            OrderBase order = repairDownloadMapper.getOrderBaseStatus(orderPar);
+            MyBeanUtils.copyProperties(order,oldOrder);
+        }
+    }
+
+    @NotNull
+    private Boolean getaBoolean(ItfTblAssignDownload item, OrderBase oldOrder) {
+        Boolean allowUpdate = Boolean.TRUE;
+
+        if (oldOrder.getOrderStatus().equals(GDOrderStatusEnum.INSTALL_STATUS_G9.getCode())){
+            allowUpdate = Boolean.FALSE;
+        }
+        if (oldOrder.getOrderStatus().equals(GDOrderStatusEnum.REPAIR_STATUS_G7.getCode()) &&
+                (item.getStat().equals(4L) || item.getStat().equals(18L))){
+            allowUpdate = Boolean.FALSE;
+        }
+        if (!oldOrder.getOrderStatus().equals(GDOrderStatusEnum.INSTALL_STATUS_G1_1.getCode()) &&
+                !oldOrder.getOrderStatus().equals(GDOrderStatusEnum.INSTALL_STATUS_G2_0.getCode()) &&
+                !oldOrder.getOrderStatus().equals(GDOrderStatusEnum.INSTALL_STATUS_G3.getCode()) &&
+                !oldOrder.getOrderStatus().equals(GDOrderStatusEnum.INSTALL_STATUS_G4_0.getCode()) &&
+                !oldOrder.getOrderStatus().equals(GDOrderStatusEnum.INSTALL_STATUS_G5.getCode()) &&
+                !oldOrder.getOrderStatus().equals(GDOrderStatusEnum.INSTALL_STATUS_G6.getCode()) &&
+                !oldOrder.getOrderStatus().equals(GDOrderStatusEnum.INSTALL_STATUS_G7.getCode()) &&
+                item.getStat()<=4L){
+            allowUpdate = Boolean.TRUE;
+        }
+        if (item.getStat().equals(2L) && (!oldOrder.getOrderStatus().equals(GDOrderStatusEnum.INSTALL_STATUS_G1_1.getCode()) &&
+                !oldOrder.getOrderStatus().equals(GDOrderStatusEnum.INSTALL_STATUS_G2_0.getCode()) &&
+                !oldOrder.getOrderStatus().equals(GDOrderStatusEnum.INSTALL_STATUS_G3.getCode()))){
+            allowUpdate = Boolean.FALSE;
+        }
+        if (item.getStat().equals(2L) && (oldOrder.getOrderStatus().equals(GDOrderStatusEnum.INSTALL_STATUS_G5.getCode()) ||
+                oldOrder.getOrderStatus().equals(GDOrderStatusEnum.REPAIR_STATUS_G11.getCode()))){
+            allowUpdate = Boolean.TRUE;
+        }
+        return allowUpdate;
+    }
+
+    private void updateYhqwsmsj(ItfTblAssignDownload item, OrderBase oldOrder) {
+        // 如何判断工单已预约 首次预约人信息不为空即为已预约
+        if (StringUtils.isEmpty(oldOrder.getFirstAppointmentId())){
+            OrderBase upOrder = new OrderBase();
+            upOrder.setId(oldOrder.getId());
+            upOrder.setExpectStartTime(item.getYhqwsmsj());
+            upOrder.setExpectEndTime(item.getQwsmjssj());
+            orderBaseService.updateById(upOrder);
+        }
+    }
+
+    private void updateYhqwsmsjApi(ItfTblAssignDownload item, OrderBase oldOrder) {
+        // 如何判断工单已预约 首次预约人信息不为空即为已预约
+        if (StringUtils.isEmpty(oldOrder.getFirstAppointmentId())){
+            OrderBase upOrder = new OrderBase();
+            upOrder.setId(oldOrder.getId());
+            upOrder.setExpectStartTime(item.getYhqwsmsj());
+            upOrder.setExpectEndTime(item.getQwsmjssj());
+        }
+    }
+
+    private void updateWebsit(Map<String, List<SysDictRef>> sysDictRefDLMap, ItfTblAssignDownload item, OrderBase oldOrder) {
+        // 看网点更新的条件
+        Boolean flag = getaBoolean(sysDictRefDLMap, item, oldOrder);
+        // 更新网点信息
+        if (flag){
+            // 字段赋值
+            getOrderBase(item, oldOrder);
+            orderBaseService.updateById(oldOrder);
+        }
+    }
+
+    private void updateWebsitApi(Map<String, List<SysDictRef>> sysDictRefDLMap, ItfTblAssignDownload item, OrderBase oldOrder) {
+        // 看网点更新的条件
+        Boolean flag = getaBoolean(sysDictRefDLMap, item, oldOrder);
+        // 更新网点信息
+        if (flag){
+            // 字段赋值
+            getOrderBase(item, oldOrder);
+        }
+    }
+
+    @NotNull
+    private void getOrderBase(ItfTblAssignDownload item, OrderBase upOrder) {
+        WebsitFWS websitFWS = new WebsitFWS();
+
+        if (StringUtils.isNotEmpty(item.getXxlb())){
+            upOrder.setInfoType(item.getXxlb());
+        } else {
+            upOrder.setInfoType("");
+        }
+        if (StringUtils.isNotEmpty(String.valueOf(item.getXxlbid()))){
+            upOrder.setInfoTypeId(String.valueOf(item.getXxlbid()));
+        } else {
+            upOrder.setInfoTypeId("101");
+        }
+        // 维修网点
+        String wdno ="";
+        if (StringUtils.isEmpty(item.getWxwdno())){
+            wdno = item.getXjwdno();
+        } else {
+            wdno = item.getWxwdno();
+        }
+        WebsitFWS resultData = publicService.shshwdToptshwd(wdno, upOrder);
+        upOrder.setWebsitId(resultData.getWebsitId());
+        upOrder.setWebsitName(resultData.getWdmc());
+
+
+        if (StringUtils.isNotEmpty(item.getXjwdno())){
+            WebsitFWS res = publicService.shshwdToptshwd(item.getXjwdno(), upOrder);
+            upOrder.setReceWebsitId(res.getWebsitId());
+            upOrder.setReceWebsitName(res.getWdmc());
+        } else {
+            upOrder.setReceWebsitId("");
+            upOrder.setReceWebsitName("");
+        }
+
+        // 结算主体
+        // (wxwdno、xjwdno)维修网点与派下级网点同时为空时  (cjwdno、xswdno)创建网点与销售网点都有值
+        if (StringUtils.isNotEmpty(upOrder.getWebsitId())){
+            websitFWS = publicService.shshwdToptshwd(wdno,upOrder);
+        } else {
+            websitFWS = publicService.shxswdToptxswd(item.getXswdno(),upOrder);
+        }
+        upOrder.setBrandId(websitFWS.getBrandId());
+        upOrder.setBrandName(websitFWS.getBrandName());
+
+    }
+
+    @NotNull
+    private Boolean getaBoolean(Map<String, List<SysDictRef>> sysDictRefDLMap, ItfTblAssignDownload item, OrderBase oldOrder) {
+        Boolean flag = Boolean.FALSE;
+        if ((oldOrder.getOrderStatus().equals(GDOrderStatusEnum.REPAIR_STATUS_G1.getCode()) ||
+                oldOrder.getOrderStatus().equals(GDOrderStatusEnum.REPAIR_STATUS_G2.getCode()) ||
+                oldOrder.getOrderStatus().equals(GDOrderStatusEnum.REPAIR_STATUS_G3.getCode()) ||
+                oldOrder.getOrderStatus().equals(GDOrderStatusEnum.REPAIR_STATUS_G4.getCode()) ||
+                oldOrder.getOrderStatus().equals(GDOrderStatusEnum.REPAIR_STATUS_G5.getCode()) ||
+                oldOrder.getOrderStatus().equals(GDOrderStatusEnum.REPAIR_STATUS_G6.getCode())) ||
+                (oldOrder.getOrderStatus().equals(GDOrderStatusEnum.REPAIR_STATUS_G7.getCode()) &&
+                        !oldOrder.getDispatchStatus().equals("YCJ") &&
+                        !oldOrder.getDispatchStatus().equals("YBWG"))){
+            flag = Boolean.TRUE;
+        }
+        if ((!oldOrder.getOrderStatus().equals(GDOrderStatusEnum.REPAIR_STATUS_G1.getCode()) &&
+                !oldOrder.getOrderStatus().equals(GDOrderStatusEnum.REPAIR_STATUS_G2.getCode()) &&
+                !oldOrder.getOrderStatus().equals(GDOrderStatusEnum.REPAIR_STATUS_G3.getCode())) && item.getStat() == 2){
+            flag = Boolean.FALSE;
+        }
+        // op.setMainId(sysDictRefDLMap.get(String.valueOf(rec.getSpid())).get(0).getDictCode());
+        if (StringUtils.isNotEmpty(oldOrder.getMainId()) && StringUtils.isNotEmpty(String.valueOf(item.getSpid())) &&
+                !oldOrder.getMainId().equals(item.getSpid())){
+            flag = Boolean.TRUE;
+        }
+        return flag;
+    }
+
+    private OrderBase upOrderBase(Brand brand, ItfTblAssignDownload item,OrderBase oldOrder) {
+        // 获取维修工单主表要修改的数据
+        OrderBase upOrder = getUpOrderBase(brand, item, oldOrder);
+        // 省市区单独处理
+        orderService.shPositionTopt(upOrder);
+        MyBeanUtils.copyProperties(upOrder,oldOrder);
+        orderBaseService.updateById(oldOrder);
+        return oldOrder;
+    }
+
+    private OrderBase upOrderBaseApi(Brand brand, ItfTblAssignDownload item, OrderBase oldOrder) {
+        // 获取维修工单主表要修改的数据
+        OrderBase upOrder = getUpOrderBase(brand, item, oldOrder);
+        // 省市区单独处理
+        orderService.shPositionTopt(upOrder);
+        return upOrder;
+    }
+
+    @NotNull
+    private OrderBase getUpOrderBase(Brand brand, ItfTblAssignDownload item, OrderBase oldOrder) {
+        WebsitFWS websitFWS = new WebsitFWS();
+        OrderPar orderPar = new OrderPar();
+
+        orderPar.setSynReqId(item.getSynReqId());
+        orderPar.setBrandId(brand.getBrandId());
+        OrderBase upOrder = repairDownloadMapper.getUpOrderBase(orderPar);
+
+        upOrder.setId(oldOrder.getId());
+        upOrder.setOutUpdateSynReqId(item.getSynReqId());
+        upOrder.setOutUpdateSynReqTime(new Date());
+
+        // 销售网点处理
+        websitFWS = publicService.shxswdToptxswd(upOrder.getSaleWebsitId(),oldOrder);
+        upOrder.setSaleWebsitId(websitFWS.getWebsitId());
+        upOrder.setSaleWebsitName(websitFWS.getWdmc());
+        // 这里为商户的系统网点编号
+        upOrder.setSaleWebsitSysNumber(websitFWS.getBrandSysWebsitNumber());
+
+        // gpsaddress
+        if (StringUtils.isEmpty(upOrder.getGpsAddress()) && StringUtils.isNotEmpty(oldOrder.getGpsAddress())){
+            upOrder.setGpsAddress(oldOrder.getGpsAddress());
+        }
+
+        // upOrder.setUpdateTime(new Date());
+        return upOrder;
+    }
+
+    private void generateAppointment(ItfTblAssignDownload item, OrderBase order) {
+        OrderBase up = new OrderBase();
+        List<ItfTblAssignAppointmentDownload> us = new ArrayList<>();
+        // 新增工单，直接修改主表预约时间最近一次的数据修改
+        List<ItfTblAssignAppointmentDownload> appoint = itfTblAssignAppointmentDownloadService.lambdaQuery()
+                .eq(ItfTblAssignAppointmentDownload::getDownloadTaskNo, item.getDownloadTaskNo())
+                .orderByAsc(ItfTblAssignAppointmentDownload::getSynReqId).list();
+        for (ItfTblAssignAppointmentDownload a:appoint){
+            up.setId(order.getId());
+            // 这里填写首次预约人信息同时也方便其他地方以此来判断该订单是否已预约
+            up.setFirstAppointmentId(a.getCzren());
+            up.setExpectStartTime(a.getKssj());
+            up.setExpectEndTime(a.getJssj());
+
+            ItfTblAssignAppointmentDownload u = new ItfTblAssignAppointmentDownload();
+            u.setSynReqId(a.getSynReqId());
+            u.setSynStatus(1);
+            u.setSynTime(new Date());
+            us.add(u);
+        }
+        if (appoint !=null && appoint.size()>0){
+            orderBaseService.updateById(up);
+            itfTblAssignAppointmentDownloadService.updateBatchById(us);
+            us.clear();
+        }
+    }
+
+    private void generateAppointmentApi(ItfTblAssignDownload item, List<ItfTblAssignAppointmentDownload> us) {
+        // 新增工单，直接修改主表预约时间最近一次的数据修改
+        List<ItfTblAssignAppointmentDownload> appoint = itfTblAssignAppointmentDownloadService.lambdaQuery()
+                .eq(ItfTblAssignAppointmentDownload::getDownloadTaskNo, item.getDownloadTaskNo())
+                .orderByAsc(ItfTblAssignAppointmentDownload::getSynReqId).list();
+        for (ItfTblAssignAppointmentDownload a:appoint){
+            ItfTblAssignAppointmentDownload u = new ItfTblAssignAppointmentDownload();
+            u.setSynReqId(a.getSynReqId());
+            u.setSynStatus(1);
+            u.setSynTime(new Date());
+            us.add(u);
+        }
+    }
+
+    private void generateAppointmentUpdate(ItfTblAssignDownload item, OrderBase order) {
+        OrderBase up = new OrderBase();
+        List<ItfTblAssignAppointmentDownload> us = new ArrayList<>();
+        // 新增工单，直接修改主表预约时间最近一次的数据修改
+        List<ItfTblAssignAppointmentDownload> appoint = itfTblAssignAppointmentDownloadService.lambdaQuery()
+                .eq(ItfTblAssignAppointmentDownload::getDownloadTaskNo, item.getDownloadTaskNo())
+                .orderByAsc(ItfTblAssignAppointmentDownload::getSynReqId).list();
+        for (ItfTblAssignAppointmentDownload a:appoint){
+            up.setId(order.getId());
+            // 这里填写首次预约人信息同时也方便其他地方以此来判断该订单是否已预约
+            up.setFirstAppointmentId(a.getCzren());
+            up.setExpectStartTime(a.getKssj());
+            up.setExpectEndTime(a.getJssj());
+
+            ItfTblAssignAppointmentDownload u = new ItfTblAssignAppointmentDownload();
+            u.setSynReqId(a.getSynReqId());
+            u.setSynStatus(1);
+            u.setSynTime(new Date());
+            us.add(u);
+        }
+        if (appoint !=null && appoint.size()>0){
+            if (StringUtils.isEmpty(order.getFirstAppointmentId())){
+                orderBaseService.updateById(up);
+            }
+            itfTblAssignAppointmentDownloadService.updateBatchById(us);
+            us.clear();
+        }
+    }
+
+    private void generateXzyd(List<ItfTblAssignXzydDownload> yds, OrderBase order) {
+        List<OrderInformation> oilist = new ArrayList<>();
+        List<ItfTblAssignXzydDownload> ups = new ArrayList<>();
+
+        for (ItfTblAssignXzydDownload yd: yds){
+            // 获取阅读要求数据
+            getAddOrderInfor(order, oilist, yd);
+
+            ItfTblAssignXzydDownload up = new ItfTblAssignXzydDownload();
+            up.setSynReqId(yd.getSynReqId());
+            up.setSynStatus(1);
+            up.setSynTime(new Date());
+            ups.add(up);
+        }
+        if (oilist.size()>0){
+            orderInformationService.saveBatch(oilist);
+            oilist.clear();
+        }
+        if (ups.size()>0){
+            itfTblAssignXzydDownloadService.updateBatchById(ups);
+            ups.clear();
+        }
+    }
+
+    private void generateXzydApi(List<ItfTblAssignXzydDownload> yds, OrderBase order,
+                                 List<OrderInformation> oilist,
+                                 List<ItfTblAssignXzydDownload> ydups) {
+        for (ItfTblAssignXzydDownload yd: yds){
+            // 获取阅读要求数据
+            getAddOrderInfor(order, oilist, yd);
+
+            ItfTblAssignXzydDownload up = new ItfTblAssignXzydDownload();
+            up.setSynReqId(yd.getSynReqId());
+            up.setSynStatus(1);
+            up.setSynTime(new Date());
+            ydups.add(up);
+        }
+    }
+
+    private void generateXzydUpdate(List<ItfTblAssignXzydDownload> yds, OrderBase order) {
+        List<OrderInformation> oilist = new ArrayList<>();
+        List<OrderInformation> oilistUp = new ArrayList<>();
+        List<ItfTblAssignXzydDownload> ups = new ArrayList<>();
+        Map<Long,List<OrderInformation>> oisMap = new HashMap<>();
+        // 提取原有的数据
+        List<OrderInformation> ois = orderInformationService.lambdaQuery()
+                .eq(OrderInformation::getOrderBaseId,order.getId()).list();
+        oisMap = ois.stream().collect(Collectors.groupingBy(OrderInformation::getXzid));
+
+
+        for (ItfTblAssignXzydDownload yd: yds){
+            // 存在修改，不存在新增
+            if (oisMap.containsKey(yd.getXzid())){
+                getUpOrderInfor(oilistUp, yd, order);
+            } else {
+                getAddOrderInfor(order, oilist, yd);
+            }
+
+            ItfTblAssignXzydDownload up = new ItfTblAssignXzydDownload();
+            up.setSynReqId(yd.getSynReqId());
+            up.setSynStatus(1);
+            up.setSynTime(new Date());
+            ups.add(up);
+        }
+        if (oilist.size()>0){
+            orderInformationService.saveBatch(oilist);
+            oilist.clear();
+        }
+        if (oilistUp.size()>0){
+            orderInformationService.updateBatchById(oilistUp);
+            oilistUp.clear();
+        }
+        if (ups.size()>0){
+            itfTblAssignXzydDownloadService.updateBatchById(ups);
+            ups.clear();
+        }
+    }
+
+    private void getUpOrderInfor(List<OrderInformation> oilistUp,
+                                 ItfTblAssignXzydDownload yd, OrderBase order) {
+        OrderInformation up = new OrderInformation();
+
+        OrderInformation old = orderInformationService.lambdaQuery()
+                .eq(OrderInformation::getOrderBaseId,order.getId())
+                .eq(OrderInformation::getXzid,yd.getXzid()).one();
+
+        up.setId(old.getId());
+        up.setXzid(yd.getXzid());
+        up.setAskCategoryId(yd.getXzyqlb());
+        up.setRemark(yd.getXzyq());
+        up.setReadStatus(yd.getYdbz());
+        up.setReadTime(yd.getYdsj());
+        up.setReadName(yd.getYdrmc());
+        WebsitFWS websitFWS = publicService.shshwdToptshwd(yd.getWdno(), order);
+        up.setWebsitId(websitFWS.getWebsitId());
+        up.setWebsitName(websitFWS.getWdmc());
+        oilistUp.add(up);
+    }
+
+    private void getAddOrderInfor(OrderBase order, List<OrderInformation> oilist, ItfTblAssignXzydDownload yd) {
+        OrderInformation add = new OrderInformation();
+        add.setXzid(yd.getXzid());
+        add.setAskCategoryId(yd.getXzyqlb());
+        add.setRemark(yd.getXzyq());
+        add.setOrderBaseId(order.getId());
+        add.setCreateBy(yd.getCreatedBy());
+        add.setCreateTime(yd.getCreatedDate());
+        add.setUpdateBy(yd.getLastModifiedBy());
+        add.setUpdateTime(yd.getLastModifiedDate());
+        add.setReadStatus(yd.getYdbz());
+        add.setReadName(yd.getYdrmc());
+        add.setReadTime(yd.getYdsj());
+        WebsitFWS websitFWS = publicService.shshwdToptshwd(yd.getWdno(), order);
+        add.setWebsitId(websitFWS.getWebsitId());
+        add.setWebsitName(websitFWS.getWdmc());
+        oilist.add(add);
+    }
+
+    private void generateSstisfaction(ItfTblAssignDownload item, Map<String, List<SysDictRef>> sysDictRefDLMap, OrderBase order) {
+        // 提取已同步的数据
+        List<OrderAppraise> oa = new ArrayList<>();
+        List<ItfTblAssignSatisfactionDownload> upsatis = new ArrayList<>();
+        Map<String,List<OrderAppraise>> oaMap = new HashMap<>();
+        List<OrderAppeal> orderAppeal = new ArrayList<>();
+        int jcaninsert=1;
+        int cpflag=0;
+        // 首评信息用于填写差评中的首评内容
+        String spmessage="";
+        List<OrderAppraise> oanew = new ArrayList<>();
+        List<FaGreeSms> faGreeSms = new ArrayList<>();
+        OrderAppraise zpoa=null;
+        String cpid="";
+
+        // 提取已同步的评价信息
+        oa = orderAppraiseService.lambdaQuery()
+                .eq(OrderAppraise::getOrderBaseId,order.getId()).list();
+        oaMap = oa.stream().collect(Collectors.groupingBy(OrderAppraise::getPid));
+
+        // 提取首评信息
+        OrderAppraise oaOne = orderAppraiseService.lambdaQuery()
+                .eq(OrderAppraise::getOrderBaseId,order.getId())
+                .eq(OrderAppraise::getType,0)
+                .one();
+        if (oaOne !=null){
+            jcaninsert=0;
+            spmessage = oaOne.getAppraiseContent();
+        }
+
+        // 提取差评申诉信息
+        OrderAppeal oldcpss = orderAppealService.lambdaQuery()
+                .eq(OrderAppeal::getOrderBaseId,order.getId()).one();
+
+
+        List<ItfTblAssignSatisfactionDownload> satis = itfTblAssignSatisfactionDownloadService.lambdaQuery()
+                .eq(ItfTblAssignSatisfactionDownload::getDownloadTaskNo, item.getDownloadTaskNo())
+                .orderByAsc(ItfTblAssignSatisfactionDownload::getHfsj)
+                .list();
+
+        for (ItfTblAssignSatisfactionDownload s:satis){
+            // 首评内容
+            if (s.getSxlx()==0){
+                spmessage = s.getPjnr();
+            }
+
+            // 评价已同步，忽略更新
+            if (oaMap.containsKey(s.getId())){
+                upSyncstatus(s.getSynReqId(), 9, "评价已同步，忽略更新");
+                continue;
+            }
+
+            // 只能有一条首评数据 存在首评不再插入 上面判断已生效，这里多一次判断也可
+            if (jcaninsert == 0){
+                if (s.getSxlx()==0){
+                    continue;
+                }
+            }
+
+            // 生成评价实体对像
+            WebsitFWS websitFWS = getWebsitFWS(sysDictRefDLMap, order, oanew, s);
+
+            // 提取追评信息
+            if (zpoa==null){
+                zpoa=oanew.get(oanew.size()-1);
+            } else {
+                if (zpoa.getCreateTime().before(oanew.get(oanew.size()-1).getCreateTime())){
+                    zpoa=oanew.get(oanew.size()-1);
+                }
+            }
+
+            // 生成首次评价后，置标识，不再生成新的
+            if (s.getSxlx()==0){
+                jcaninsert=0;
+            }
+
+            // 差评短信 + 差评申诉 仅一次
+            if (oldcpss==null && cpflag==0) {
+                // 生成差评短信实体对像 faGreeSms  也只发一次
+                addcpsms(order, s, websitFWS, faGreeSms);
+                // 生成差评申诉信息实体对像 只能申诉一次
+                cpflag = getCp(order, orderAppeal,s);
+                if (cpflag==1){
+                    cpid=s.getId();
+                }
+            }
+
+            // 本次产生的差评申诉 补填首次评价内容(存在首评即差评的情况)
+            if (cpflag==1){
+                orderAppeal.get(0).setFirstEvaluate(spmessage);
+                // 可能存在追评 判断不是差评记录
+                if (zpoa!=null && !zpoa.getPid().equals(cpid)){
+                    orderAppeal.get(0).setLastEvaluate(zpoa.getAppraiseContent());
+                }
+            }
+
+            // 之前产生的差评申诉且本次有追评时添加追评信息
+            if (oldcpss!=null && zpoa!=null){
+                oldcpss.setLastEvaluate(zpoa.getAppraiseContent());
+                orderAppeal.clear();
+                orderAppeal.add(oldcpss);
+            }
+
+            s.setSynReqId(s.getSynReqId());
+            s.setSynStatus(1);
+            s.setSynTime(new Date());
+            upsatis.add(s);
+        }
+
+        // 工单评价表
+        if (oanew.size()>0){
+            orderAppraiseService.saveBatch(oanew);
+            oanew.clear();
+        }
+
+        if (faGreeSms.size()>0){
+            faGreeSmsService.saveBatch(faGreeSms);
+            faGreeSms.clear();
+        }
+
+        if (orderAppeal.size()>0){
+            orderAppealService.saveOrUpdateBatch(orderAppeal);
+            orderAppeal.clear();
+        }
+
+        // 修改同步状态
+        if (upsatis.size()>0){
+            itfTblAssignSatisfactionDownloadService.updateBatchById(upsatis);
+            upsatis.clear();
+        }
+
+    }
+
+    private void generateSstisfactionUpdateApi(ItfTblAssignDownload item, Map<String, List<SysDictRef>> sysDictRefDLMap, OrderBase order,
+                                         List<ItfTblAssignSatisfactionDownload> upsatis,List<OrderAppeal> orderAppeal,
+                                         List<OrderAppraise> oanew,List<FaGreeSms> faGreeSms) {
+        // 提取已同步的数据
+        List<OrderAppraise> oa = new ArrayList<>();
+        Map<String,List<OrderAppraise>> oaMap = new HashMap<>();
+        int jcaninsert=1;
+        int cpflag=0;
+        // 首评信息用于填写差评中的首评内容
+        String spmessage="";
+        OrderAppraise zpoa=null;
+        String cpid="";
+
+        // 提取已同步的评价信息
+        oa = orderAppraiseService.lambdaQuery()
+                .eq(OrderAppraise::getOrderBaseId,order.getId()).list();
+        oaMap = oa.stream().collect(Collectors.groupingBy(OrderAppraise::getPid));
+
+        // 提取首评信息
+        OrderAppraise oaOne = orderAppraiseService.lambdaQuery()
+                .eq(OrderAppraise::getOrderBaseId,order.getId())
+                .eq(OrderAppraise::getType,0)
+                .one();
+        if (oaOne !=null){
+            jcaninsert=0;
+            spmessage = oaOne.getAppraiseContent();
+        }
+
+        // 提取差评申诉信息
+        OrderAppeal oldcpss = orderAppealService.lambdaQuery()
+                .eq(OrderAppeal::getOrderBaseId,order.getId()).one();
+
+
+        List<ItfTblAssignSatisfactionDownload> satis = itfTblAssignSatisfactionDownloadService.lambdaQuery()
+                .eq(ItfTblAssignSatisfactionDownload::getDownloadTaskNo, item.getDownloadTaskNo())
+                .orderByAsc(ItfTblAssignSatisfactionDownload::getHfsj)
+                .list();
+
+        for (ItfTblAssignSatisfactionDownload s:satis){
+            // 首评内容
+            if (s.getSxlx()==0){
+                spmessage = s.getPjnr();
+            }
+
+            // 评价已同步，忽略更新
+            if (oaMap.containsKey(s.getId())){
+                upSyncstatus(s.getSynReqId(), 9, "评价已同步，忽略更新");
+                continue;
+            }
+
+            // 只能有一条首评数据 存在首评不再插入 上面判断已生效，这里多一次判断也可
+            if (jcaninsert == 0){
+                if (s.getSxlx()==0){
+                    continue;
+                }
+            }
+
+            // 生成评价实体对像
+            WebsitFWS websitFWS = getWebsitFWS(sysDictRefDLMap, order, oanew, s);
+
+            // 提取追评信息
+            if (zpoa==null){
+                zpoa=oanew.get(oanew.size()-1);
+            } else {
+                if (zpoa.getCreateTime().before(oanew.get(oanew.size()-1).getCreateTime())){
+                    zpoa=oanew.get(oanew.size()-1);
+                }
+            }
+
+            // 生成首次评价后，置标识，不再生成新的
+            if (s.getSxlx()==0){
+                jcaninsert=0;
+            }
+
+            // 差评短信 + 差评申诉 仅一次
+            if (oldcpss==null && cpflag==0) {
+                // 生成差评短信实体对像 faGreeSms  也只发一次
+                addcpsms(order, s, websitFWS, faGreeSms);
+                // 生成差评申诉信息实体对像 只能申诉一次
+                cpflag = getCp(order, orderAppeal,s);
+                if (cpflag==1){
+                    cpid=s.getId();
+                }
+            }
+
+            // 本次产生的差评申诉 补填首次评价内容(存在首评即差评的情况)
+            if (cpflag==1){
+                orderAppeal.get(0).setFirstEvaluate(spmessage);
+                // 可能存在追评 判断不是差评记录
+                if (zpoa!=null && !zpoa.getPid().equals(cpid)){
+                    orderAppeal.get(0).setLastEvaluate(zpoa.getAppraiseContent());
+                }
+            }
+
+            // 之前产生的差评申诉且本次有追评时添加追评信息
+            if (oldcpss!=null && zpoa!=null){
+                oldcpss.setLastEvaluate(zpoa.getAppraiseContent());
+                orderAppeal.clear();
+                orderAppeal.add(oldcpss);
+            }
+
+            s.setSynReqId(s.getSynReqId());
+            s.setSynStatus(1);
+            s.setSynTime(new Date());
+            upsatis.add(s);
+        }
+
+    }
+
+    private void generateSstisfactionApi(ItfTblAssignDownload item, Map<String, List<SysDictRef>> sysDictRefDLMap, OrderBase order,
+                                      List<ItfTblAssignSatisfactionDownload> ups,
+                                      List<OrderAppeal> orderAppeal,
+                                      List<OrderAppraise> oanew,
+                                      List<FaGreeSms> faGreeSms) {
+        // 提取已同步的数据
+        List<OrderAppraise> oa = new ArrayList<>();
+        Map<String,List<OrderAppraise>> oaMap = new HashMap<>();
+        int jcaninsert=1;
+        int cpflag=0;
+        // 首评信息用于填写差评中的首评内容
+        String spmessage="";
+        OrderAppraise zpoa=null;
+        String cpid="";
+
+        // 提取已同步的评价信息
+        oa = orderAppraiseService.lambdaQuery()
+                .eq(OrderAppraise::getOrderBaseId,order.getId()).list();
+        oaMap = oa.stream().collect(Collectors.groupingBy(OrderAppraise::getPid));
+
+        // 提取首评信息
+        OrderAppraise oaOne = orderAppraiseService.lambdaQuery()
+                .eq(OrderAppraise::getOrderBaseId,order.getId())
+                .eq(OrderAppraise::getType,0)
+                .one();
+        if (oaOne !=null){
+            jcaninsert=0;
+            spmessage = oaOne.getAppraiseContent();
+        }
+
+        // 提取差评申诉信息
+        OrderAppeal oldcpss = orderAppealService.lambdaQuery()
+                .eq(OrderAppeal::getOrderBaseId,order.getId()).one();
+
+
+        List<ItfTblAssignSatisfactionDownload> satis = itfTblAssignSatisfactionDownloadService.lambdaQuery()
+                .eq(ItfTblAssignSatisfactionDownload::getDownloadTaskNo, item.getDownloadTaskNo())
+                .orderByAsc(ItfTblAssignSatisfactionDownload::getHfsj)
+                .list();
+
+        for (ItfTblAssignSatisfactionDownload s:satis){
+            // 首评内容
+            if (s.getSxlx()==0){
+                spmessage = s.getPjnr();
+            }
+
+            // 评价已同步，忽略更新
+            if (oaMap.containsKey(s.getId())){
+                upSyncstatus(s.getSynReqId(), 9, "评价已同步，忽略更新");
+                continue;
+            }
+
+            // 只能有一条首评数据 存在首评不再插入 上面判断已生效，这里多一次判断也可
+            if (jcaninsert == 0){
+                if (s.getSxlx()==0){
+                    continue;
+                }
+            }
+
+            // 生成评价实体对像
+            WebsitFWS websitFWS = getWebsitFWS(sysDictRefDLMap, order, oanew, s);
+
+            // 提取追评信息
+            if (zpoa==null){
+                zpoa=oanew.get(oanew.size()-1);
+            } else {
+                if (zpoa.getCreateTime().before(oanew.get(oanew.size()-1).getCreateTime())){
+                    zpoa=oanew.get(oanew.size()-1);
+                }
+            }
+
+            // 生成首次评价后，置标识，不再生成新的
+            if (s.getSxlx()==0){
+                jcaninsert=0;
+            }
+
+            // 差评短信 + 差评申诉 仅一次
+            if (oldcpss==null && cpflag==0) {
+                // 生成差评短信实体对像 faGreeSms  也只发一次
+                addcpsms(order, s, websitFWS, faGreeSms);
+                // 生成差评申诉信息实体对像 只能申诉一次
+                cpflag = getCp(order, orderAppeal,s);
+                if (cpflag==1){
+                    cpid=s.getId();
+                }
+            }
+
+            // 本次产生的差评申诉 补填首次评价内容(存在首评即差评的情况)
+            if (cpflag==1){
+                orderAppeal.get(0).setFirstEvaluate(spmessage);
+                // 可能存在追评 判断不是差评记录
+                if (zpoa!=null && !zpoa.getPid().equals(cpid)){
+                    orderAppeal.get(0).setLastEvaluate(zpoa.getAppraiseContent());
+                }
+            }
+
+            // 之前产生的差评申诉且本次有追评时添加追评信息
+            if (oldcpss!=null && zpoa!=null){
+                oldcpss.setLastEvaluate(zpoa.getAppraiseContent());
+                orderAppeal.clear();
+                orderAppeal.add(oldcpss);
+            }
+
+            s.setSynReqId(s.getSynReqId());
+            s.setSynStatus(1);
+            s.setSynTime(new Date());
+            ups.add(s);
+        }
+
+    }
+
+
+
+    @NotNull
+    private WebsitFWS getWebsitFWS(Map<String, List<SysDictRef>> sysDictRefDLMap, OrderBase order, List<OrderAppraise> oanew, ItfTblAssignSatisfactionDownload s) {
+        WebsitFWS websitFWS;
+        OrderAppraise o = new OrderAppraise();
+        // id为主键，放在pid 中
+        o.setPid(s.getId());
+        o.setPgguid(String.valueOf(s.getPgid()));
+        // 工单号
+        o.setOrderBaseId(order.getId());
+
+        o.setOrderType(order.getOrderType());
+        o.setWebsitId(order.getWebsitId());
+        o.setWebsitName(order.getWebsitName());
+        o.setUserName(order.getUserName());
+        o.setUserPhone(order.getUserMobile());
+        o.setAddress(order.getAddress());
+
+        if (s.getPjly().equals("1")){
+            o.setAppraiseStatus("A");
+        } else if (s.getPjly().equals("2")){
+            o.setAppraiseStatus("B");
+        } else if (s.getPjly().equals("3")){
+            o.setAppraiseStatus("C");
+        } else {
+            o.setAppraiseStatus("X");
+        }
+        o.setAppraiseContent(s.getPjnr());
+        // 回访人id无
+        o.setRvisitNickName(s.getHfren());
+        // 回访人网点信息
+        // 售后网点处理
+        websitFWS = publicService.shshwdToptshwd(s.getHfwdno(), order);
+        if (StringUtils.isEmpty(websitFWS.getWebsitId())){
+            websitFWS = publicService.shxswdToptxswd(s.getHfwdno(), order);
+        }
+        o.setRvisitWebsitId(websitFWS.getWebsitId());
+        o.setRvisitWebsitName(websitFWS.getWdmc());
+
+        o.setRvisitTime(s.getHfsj());
+        o.setNegativeType(s.getBmylx());
+        o.setNegativeRemark(s.getBmybeiz());
+        o.setNegativeTime(s.getBmysj());
+        // 产品大类
+        o.setMainId(sysDictRefDLMap.get(String.valueOf(s.getSplb())).get(0).getDictCode());
+        o.setMainName(sysDictRefDLMap.get(String.valueOf(s.getSplb())).get(0).getDictValue());
+
+        o.setAppointmentType(s.getMydlx());
+        o.setType(s.getSxlx());
+        o.setCreateBy(s.getCreatedBy());
+        o.setCreateTime(new Date());
+        if (s.getCreatedDate()!=null){
+            o.setCreateTime(s.getCreatedDate());
+        }
+        oanew.add(o);
+        return websitFWS;
+    }
+
+    private int getCp(OrderBase orderBase, List<OrderAppeal> orderAppeals, ItfTblAssignSatisfactionDownload s) {
+        if (s.getPjnr().equals("3") || s.getPjnr().indexOf("不满意")>=0){
+            OrderAppeal orderAppeal=new OrderAppeal();
+            orderAppeal.setOrderBaseId(orderBase.getId());
+            orderAppeal.setPgid(orderBase.getPgid());
+            orderAppeal.setWorkerName(orderBase.getWorkerName());
+            orderAppeal.setWorkerId(orderBase.getWorkerId());
+            orderAppeal.setBadEvaluate(s.getPjnr());
+            orderAppeal.setStatus(1);
+            orderAppeal.setCanApply(Boolean.TRUE);
+            orderAppeal.setCreateTime(new Date());
+            orderAppeal.setCreateBy("system");
+            orderAppeals.add(orderAppeal);
+            return 1;
+        }
+        return 0;
+    }
+
+    private void addcpsms(OrderBase order,ItfTblAssignSatisfactionDownload s, WebsitFWS websitFWS,List<FaGreeSms> fsList) {
+        if (s.getPjnr().equals("3") || s.getPjnr().indexOf("不满意")>=0){
+            if (StringUtils.isNotEmpty(s.getHfwdno()) && !s.getHfwdno().equals("99999999") && StringUtils.isNotEmpty(websitFWS.getWdlxdh())){
+                FaGreeSms fs=new FaGreeSms();
+                fs.setSynTaskNo(UUID.randomUUID().toString());
+                fs.setWorkerOrderNo(order.getId());
+                fs.setAzorwx(2);
+                fs.setFjid(String.valueOf(s.getPgid()));
+                fs.setFjwd(s.getHfwdno());
+                Random random = new Random(System.currentTimeMillis());
+                fs.setFsma(String.valueOf(random.nextInt(10000)));
+                fs.setFsnr("您收到一张客户的投诉工单，请及时处理！工单号：" + String.valueOf(order.getPgid()) +
+                        ",服务人员：" + order.getWorkerName());
+                fs.setSjid(websitFWS.getWdlxdh());
+                fs.setYhlb(2);
+                fsList.add(fs);
+            }
+        }
+    }
+
+    private void generateSstisfactionUpdate(ItfTblAssignDownload item, Map<String, List<SysDictRef>> sysDictRefDLMap, OrderBase order) {
+        List<ItfTblAssignSatisfactionDownload> satis = itfTblAssignSatisfactionDownloadService.lambdaQuery()
+                .eq(ItfTblAssignSatisfactionDownload::getDownloadTaskNo, item.getDownloadTaskNo())
+                .orderByAsc(ItfTblAssignSatisfactionDownload::getHfsj)
+                .list();
+
+        for (ItfTblAssignSatisfactionDownload s:satis){
+            // 查看是否已同步
+            ReAppointment request = new ReAppointment();
+            request.setId(s.getId());
+            OrderAppraise old = appraiseMapper.getAppraise(request);
+            if (old!=null){
+                upSyncstatus(s.getSynReqId(), 9, "评价已同步，忽略更新");
+                continue;
+            }
+            // 查看该工单有无较早前下载相同的评价(同一工单，同一主键，同一内容，更早时间)
+            List<ItfTblAssignSatisfactionDownload> rec = itfTblAssignSatisfactionDownloadService.lambdaQuery()
+                    .lt(ItfTblAssignSatisfactionDownload::getSynReqId,s.getSynReqId())
+                    .eq(ItfTblAssignSatisfactionDownload::getPgid,s.getPgid())
+                    .eq(ItfTblAssignSatisfactionDownload::getId,s.getId())
+                    .le(ItfTblAssignSatisfactionDownload::getLastModifiedDate,s.getLastModifiedDate())
+                    .eq(ItfTblAssignSatisfactionDownload::getPjly,s.getPjly()).list();
+            if (rec!=null && rec.size()>0){
+                upSyncstatus(s.getSynReqId(), 9 ,"评价已同步，忽略更新");
+                continue;
+            }
+            // 判断评价是否为中差评,下面处理
+
+            Integer canInsert =1;
+            // 检查fa_order_repair是否有一条sxlx = 0的首评记录
+            if (s.getSxlx().equals(0) && s.getSynStatus().equals(0)){
+                ReAppointment r = new ReAppointment();
+                r.setId(String.valueOf(s.getSynReqId()));
+                ItfTblAssignSatisfactionDownload sa = assignSatisfactionDownloadMapper.getSatisfaction(r);
+                if (sa !=null){
+                    canInsert = 0;
+                }
+            }
+            // 只插入一条sxlx = 0的首评记录
+            if (canInsert.equals(1)){
+                // 增加评价记录
+                WebsitFWS websitFWS = addappraise(order, sysDictRefDLMap, s);
+                // 增加差评短信
+                addcpsms(order, s, websitFWS);
+            }
+
+            // 未评价过工单基础表写入首次评价数据
+            if (order.getAppraiseTime() ==null){
+                upOrderBasePJ(order, s);
+            }
+
+            // 修改同步状态
+            upSatisfactionSynstatus(s);
+        }
+    }
+
+    private void addcpsms(OrderBase order, ItfTblAssignSatisfactionDownload s, WebsitFWS websitFWS) {
+        if (s.getPjnr().equals("3") || s.getPjnr().indexOf("不满意")>=0){
+            if (StringUtils.isNotEmpty(s.getHfwdno()) && !s.getHfwdno().equals("99999999") &&
+                    StringUtils.isNotEmpty(websitFWS.getWdlxdh())){
+                FaGreeSms fs = new FaGreeSms();
+                fs.setSynTaskNo(UUID.randomUUID().toString());
+                fs.setWorkerOrderNo(order.getId());
+                fs.setAzorwx(2);
+                fs.setFjid(String.valueOf(s.getPgid()));
+                fs.setFjwd(s.getHfwdno());
+                Random random = new Random(System.currentTimeMillis());
+                fs.setFsma(String.valueOf(random.nextInt(10000)));
+                fs.setFsnr("您收到一张客户的投诉工单，请及时处理！工单号：" + String.valueOf(s.getPgid()) +
+                        ",服务人员：" + order.getWorkerName());
+                fs.setSjid(websitFWS.getWdlxdh());
+                fs.setYhlb(2);
+                faGreeSmsService.save(fs);
+            }
+        }
+    }
+
+    @NotNull
+    private WebsitFWS addappraise(OrderBase order, Map<String, List<SysDictRef>> sysDictRefDLMap, ItfTblAssignSatisfactionDownload s) {
+        Boolean canAppeal = Boolean.TRUE;
+        Integer appeal = 0;
+        ReAppointment rq = new ReAppointment();
+        WebsitFWS websitFWS = new WebsitFWS();
+
+        if(StringUtils.isNotEmpty(s.getPjnr())){
+            if (s.getPjnr().equals("1") || s.getPjnr().equals("满意")){
+                canAppeal=Boolean.FALSE;
+            }
+        }
+        // 检查上一条记录是否为中差评，如果是则新插入的不需要再申诉
+        if (canAppeal){
+            ReAppointment req = new ReAppointment();
+            req.setId(String.valueOf(s.getPgid()));
+            OrderAppraise id = appraiseMapper.getOldId(req);
+            if (id !=null){
+                appeal = 0;
+            } else {
+                appeal = 1;
+            }
+        }
+
+        rq.setId(String.valueOf(s.getSynReqId()));
+        OrderAppraise add = assignSatisfactionDownloadMapper.getOrderAppraise(rq);
+
+        // rvisit_websit_id 单独处理
+        websitFWS = publicService.shshwdToptshwd(s.getHfwdno(), order);
+        if (StringUtils.isEmpty(websitFWS.getWebsitId())){
+            websitFWS = publicService.shxswdToptxswd(s.getHfwdno(), order);
+        }
+        add.setRvisitWebsitId(websitFWS.getWebsitId());
+        add.setRvisitWebsitName(websitFWS.getWdmc());
+        // splb 商品大类  单独处理
+        add.setMainId(sysDictRefDLMap.get(String.valueOf(s.getSplb())).get(0).getDictCode());
+        // can_appeal 是否可发起申诉   单独处理
+        // add.setCanAppeal(appeal);
+        orderAppraiseService.save(add);
+        return websitFWS;
+    }
+
+    private void upOrderBasePJ(OrderBase order, ItfTblAssignSatisfactionDownload s) {
+        OrderBase upOrder = new OrderBase();
+        upOrder.setId(order.getId());
+        upOrder.setAppraiseTime(s.getCreatedDate());
+        // 原 评价:1=差评,2=中评,3=好评,0=未评价,4=剔除,5=其他
+        if (StringUtils.isEmpty(s.getPjnr())){
+            upOrder.setAppraiseStatus("N");
+        }
+        if (s.getPjnr().equals("1") || s.getPjnr().equals("满意")){
+            upOrder.setAppraiseStatus("A");
+        } else if (s.getPjnr().equals("2") || s.getPjnr().equals("一般")){
+            upOrder.setAppraiseStatus("B");
+        } else if (s.getPjnr().equals("3") || s.getPjnr().equals("不满意") ||
+                s.getPjnr().indexOf("差")>=0 || s.getPjnr().indexOf("不满")>=0){
+            upOrder.setAppraiseStatus("C");
+        } else {
+            upOrder.setAppraiseStatus("O");
+        }
+        orderBaseService.updateById(upOrder);
+    }
+
+    private void upSatisfactionSynstatus(ItfTblAssignSatisfactionDownload s) {
+        ItfTblAssignSatisfactionDownload ups = new ItfTblAssignSatisfactionDownload();
+        ups.setSynReqId(s.getSynReqId());
+        ups.setSynStatus(1);
+        ups.setSynTime(new Date());
+        itfTblAssignSatisfactionDownloadService.updateById(ups);
+    }
+
+    private void upSyncstatus(Long synReqId, Integer synStatus ,
+                              String msg) {
+        ItfTblAssignSatisfactionDownload up = new ItfTblAssignSatisfactionDownload();
+        up.setSynReqId(synReqId);
+        up.setSynStatus(synStatus);
+        up.setSynTime(new Date());
+        up.setSynErrMsg(msg);
+        itfTblAssignSatisfactionDownloadService.updateById(up);
+    }
+
+    private void generateFkmx(ItfTblAssignDownload item, OrderBase order) {
+        List<ItfTblAssignFkmxDownload> fkmxRec = new ArrayList<>();
+        List<OrderRepairOperatingLog> orols = new ArrayList<>();
+        List<ItfTblAssignFkmxDownload> ups = new ArrayList<>();
+
+        fkmxRec = itfTblAssignFkmxDownloadService.lambdaQuery()
+                .eq(ItfTblAssignFkmxDownload::getDownloadTaskNo, item.getDownloadTaskNo())
+                .eq(ItfTblAssignFkmxDownload::getSynStatus,0)
+                .orderByAsc(ItfTblAssignFkmxDownload::getCreatedDate,ItfTblAssignFkmxDownload::getFkid)
+                .list();
+        for (ItfTblAssignFkmxDownload fkmx :fkmxRec){
+            // 获取操作明细数据
+            getoroldata(order, orols, fkmx);
+            ItfTblAssignFkmxDownload u = new ItfTblAssignFkmxDownload();
+            u.setSynReqId(fkmx.getSynReqId());
+            u.setSynStatus(1);
+            u.setSynTime(new Date());
+            ups.add(u);
+        }
+        if (orols.size()>0){
+            orderRepairOperatingLogService.saveBatch(orols);
+            orols.clear();
+            itfTblAssignFkmxDownloadService.updateBatchById(ups);
+            ups.clear();
+        }
+    }
+
+    private void generateFkmxApi(ItfTblAssignDownload item, List<ItfTblAssignFkmxDownload> fkmxups) {
+        List<ItfTblAssignFkmxDownload> fkmxRec = new ArrayList<>();
+        List<ItfTblAssignFkmxDownload> ups = new ArrayList<>();
+
+        fkmxRec = itfTblAssignFkmxDownloadService.lambdaQuery()
+                .eq(ItfTblAssignFkmxDownload::getDownloadTaskNo, item.getDownloadTaskNo())
+                .eq(ItfTblAssignFkmxDownload::getSynStatus,0)
+                .orderByAsc(ItfTblAssignFkmxDownload::getCreatedDate,ItfTblAssignFkmxDownload::getFkid)
+                .list();
+        for (ItfTblAssignFkmxDownload fkmx :fkmxRec){
+            // 获取操作明细数据
+            // getoroldata(order, orols, fkmx);
+            ItfTblAssignFkmxDownload u = new ItfTblAssignFkmxDownload();
+            u.setSynReqId(fkmx.getSynReqId());
+            u.setSynStatus(1);
+            u.setSynTime(new Date());
+            fkmxups.add(u);
+        }
+    }
+
+    private void generateFkmxUpdate(ItfTblAssignDownload item, OrderBase order) {
+        List<ItfTblAssignFkmxDownload> fkmxRec = new ArrayList<>();
+        List<OrderRepairOperatingLog> orols = new ArrayList<>();
+        List<ItfTblAssignFkmxDownload> ups = new ArrayList<>();
+        Map<String, List<OrderRepairOperatingLog>> orolMap = new HashMap<>();
+
+        // 提取已有的，有则更新，无则新增
+        List<OrderRepairOperatingLog> olds = orderRepairOperatingLogService.lambdaQuery()
+                .eq(OrderRepairOperatingLog::getOrderBaseId,order.getId()).list();
+        orolMap = olds.stream().collect(Collectors.groupingBy(OrderRepairOperatingLog::getFkid));
+
+
+        fkmxRec = itfTblAssignFkmxDownloadService.lambdaQuery()
+                .eq(ItfTblAssignFkmxDownload::getDownloadTaskNo, item.getDownloadTaskNo())
+                .eq(ItfTblAssignFkmxDownload::getSynStatus,0)
+                .orderByAsc(ItfTblAssignFkmxDownload::getCreatedDate,ItfTblAssignFkmxDownload::getFkid)
+                .list();
+        for (ItfTblAssignFkmxDownload fkmx :fkmxRec){
+            // 存在不做更新？过程是这样写的
+            if (!orolMap.containsKey(fkmx.getFkid())){
+                getoroldata(order, orols, fkmx);
+            }
+
+            ItfTblAssignFkmxDownload u = new ItfTblAssignFkmxDownload();
+            u.setSynReqId(fkmx.getSynReqId());
+            u.setSynStatus(1);
+            u.setSynTime(new Date());
+            ups.add(u);
+        }
+        if (orols.size()>0){
+            orderRepairOperatingLogService.saveBatch(orols);
+            orols.clear();
+            itfTblAssignFkmxDownloadService.updateBatchById(ups);
+            ups.clear();
+        }
+    }
+
+    private void generateFkmxUpdateApi(ItfTblAssignDownload item, List<ItfTblAssignFkmxDownload> ups) {
+        List<ItfTblAssignFkmxDownload> fkmxRec = new ArrayList<>();
+
+        fkmxRec = itfTblAssignFkmxDownloadService.lambdaQuery()
+                .eq(ItfTblAssignFkmxDownload::getDownloadTaskNo, item.getDownloadTaskNo())
+                .eq(ItfTblAssignFkmxDownload::getSynStatus,0)
+                .orderByAsc(ItfTblAssignFkmxDownload::getCreatedDate,ItfTblAssignFkmxDownload::getFkid)
+                .list();
+        for (ItfTblAssignFkmxDownload fkmx :fkmxRec){
+            ItfTblAssignFkmxDownload u = new ItfTblAssignFkmxDownload();
+            u.setSynReqId(fkmx.getSynReqId());
+            u.setSynStatus(1);
+            u.setSynTime(new Date());
+            ups.add(u);
+        }
+    }
+
+    private void getoroldata(OrderBase order, List<OrderRepairOperatingLog> orols, ItfTblAssignFkmxDownload fkmx) {
+        OrderRepairOperatingLog add = new OrderRepairOperatingLog();
+        WebsitFWS websitFWS = new WebsitFWS();
+        add.setWebsitName(order.getWebsitName());
+        add.setWebsitId(order.getWebsitId());
+        add.setOrderBaseId(order.getId());
+        add.setCustomerName(order.getUserName());
+        add.setCustomerPhone(order.getUserMobile());
+        add.setType(fkmx.getFklb());
+        add.setContent(fkmx.getFknr());
+        add.setFeedback(fkmx.getFkjg());
+        add.setOperator(fkmx.getFkren());
+        add.setOperatorNumber(fkmx.getFkrenmc());
+        websitFWS = publicService.shshwdToptshwd(fkmx.getFkwdno(), order);
+        if (StringUtils.isEmpty(websitFWS.getWebsitId())){
+            websitFWS = publicService.shxswdToptxswd(fkmx.getFkwdno(), order);
+        }
+        add.setOperateWebsit(websitFWS.getWdmc());
+        add.setWebsitPhone(websitFWS.getWdlxdh());
+        add.setWorkerOrderStatus(order.getOrderStatus());// 反馈时的工单状态
+        add.setBeforeOrderStatus(order.getLastOrderStatus());// 操作前工单状态 - 上一流程状态
+        add.setBeforeDispatchStatus(order.getDispatchStatus());// 操作前派工状态
+        add.setOrderStatus("DJS"); // 操作后工单状态
+        // 总部下来的工单统一为待接收状态-派工状态
+        add.setDispatchStatus("DJS"); // 操作后派工状态
+        // 附件地址 todo
+        add.setPgguid(order.getPgguid());
+        add.setFkmxguid(fkmx.getFkmxguid());
+        add.setFkid(String.valueOf(fkmx.getFkid()));
+        add.setPgid(fkmx.getPgid());
+        add.setBrandFileId(fkmx.getScid());
+        add.setBrandFileName(fkmx.getScwj());
+        add.setWjid(fkmx.getWjid());
+        add.setReqSourceNum(fkmx.getQqlyxh());
+        add.setUploadNotifyFlag(0);
+        add.setCreateTime(fkmx.getFksj());
+        add.setUpdateTime(fkmx.getLastModifiedDate());
+        add.setCreateBy(fkmx.getCreatedBy());
+        add.setUpdateBy(fkmx.getLastModifiedBy());
+        orols.add(add);
+    }
+
+    private void getOrderInstall(ItfTblAssignDownload item, OrderBase order,
+                                 Map<String, List<SysDictRef>> sysDictRefXLMapXq) {
+        OrderRepair or = new OrderRepair();
+
+        // 查看是否存在
+        OrderRepair oldor = orderRepairService.lambdaQuery()
+                .eq(OrderRepair::getOrderBaseId,order.getId()).one();
+
+        if (oldor !=null){
+            or.setId(oldor.getId());
+        }
+        or.setOrderBaseId(order.getId());
+        or.setCxyzm(item.getCxyzm());
+        or.setSffswx(item.getSffswx());
+        or.setChaoshiqe(item.getChaoshiqe());
+        or.setZbby(item.getZbby());
+        or.setZptype(item.getZptype());
+        or.setYhif(item.getYhif());
+        or.setTsdengji(item.getTsdengji());
+        // 需求大类 未找到放原有的值
+        or.setDemandTypeId(String.valueOf(item.getSpid()));
+        or.setDemandTypeName(item.getSpmc());
+
+        if (sysDictRefXLMapXq.containsKey(String.valueOf(item.getSpid()))){
+            or.setDemandTypeId(sysDictRefXLMapXq.get(String.valueOf(item.getSpid())).get(0).getDictCode());
+            or.setDemandTypeName(sysDictRefXLMapXq.get(String.valueOf(item.getSpid())).get(0).getDictValue());
+        }
+
+        // 需求小类
+        or.setDemandSmallTypeId("");
+        or.setDemandSmallTypeName("");
+        if (!item.getXqxiaolei().equals(0L) && sysDictRefXLMapXq.containsKey(item.getXqxiaolei())) {
+            or.setDemandSmallTypeId(sysDictRefXLMapXq.get(item.getXqxiaolei()).get(0).getDictCode());
+            or.setDemandSmallTypeName(sysDictRefXLMapXq.get(item.getXqxiaolei()).get(0).getDictValue());
+        } else {
+
+        }
+        or.setExtendField1(item.getExtjson1());
+        or.setExtendField2(item.getExtjson2());
+        or.setExtendField3(item.getExtjson3());
+        or.setExtendField4(item.getExtjson4());
+        or.setExtendField5(item.getExtjson5());
+        or.setCreateBy(order.getCreateBy());
+        or.setCreateTime(order.getCreateTime());
+        or.setUpdateBy(order.getUpdateBy());
+        or.setUpdateTime(order.getUpdateTime());
+        orderRepairService.saveOrUpdate(or);
+    }
+
+    private void getOrderInstall(ItfTblAssignDownload item, OrderBase order,
+                                 Map<String, List<SysDictRef>> sysDictRefXLMapXq,OrderRepair or) {
+        // 查看是否存在
+        OrderRepair oldor = orderRepairService.lambdaQuery()
+                .eq(OrderRepair::getOrderBaseId,order.getId()).one();
+
+        if (oldor !=null){
+            or.setId(oldor.getId());
+        }
+
+        or.setOrderBaseId(order.getId());
+        or.setCxyzm(item.getCxyzm());
+        or.setSffswx(item.getSffswx());
+        or.setChaoshiqe(item.getChaoshiqe());
+        or.setZbby(item.getZbby());
+        or.setZptype(item.getZptype());
+        or.setYhif(item.getYhif());
+        or.setTsdengji(item.getTsdengji());
+        // 需求大类 未找到放原有的值
+        or.setDemandTypeId(String.valueOf(item.getSpid()));
+        or.setDemandTypeName(item.getSpmc());
+
+        if (sysDictRefXLMapXq.containsKey(String.valueOf(item.getSpid()))){
+            or.setDemandTypeId(sysDictRefXLMapXq.get(String.valueOf(item.getSpid())).get(0).getDictCode());
+            or.setDemandTypeName(sysDictRefXLMapXq.get(String.valueOf(item.getSpid())).get(0).getDictValue());
+        }
+
+        // 需求小类
+        or.setDemandSmallTypeId("");
+        or.setDemandSmallTypeName("");
+        if (!item.getXqxiaolei().equals(0L) && sysDictRefXLMapXq.containsKey(item.getXqxiaolei())) {
+            or.setDemandSmallTypeId(sysDictRefXLMapXq.get(item.getXqxiaolei()).get(0).getDictCode());
+            or.setDemandSmallTypeName(sysDictRefXLMapXq.get(item.getXqxiaolei()).get(0).getDictValue());
+        } else {
+
+        }
+        or.setExtendField1(item.getExtjson1());
+        or.setExtendField2(item.getExtjson2());
+        or.setExtendField3(item.getExtjson3());
+        or.setExtendField4(item.getExtjson4());
+        or.setExtendField5(item.getExtjson5());
+        or.setCreateBy(order.getCreateBy());
+        or.setCreateTime(order.getCreateTime());
+        or.setUpdateBy(order.getUpdateBy());
+        or.setUpdateTime(order.getUpdateTime());
+        orderRepairService.saveOrUpdate(or);
+    }
+
+    private void getOrderInstallApi(ItfTblAssignDownload item, OrderBase order,
+                                 Map<String, List<SysDictRef>> sysDictRefXLMapXq,OrderRepair or) {
+        // 查看是否存在
+        OrderRepair oldor = orderRepairService.lambdaQuery()
+                .eq(OrderRepair::getOrderBaseId,order.getId()).one();
+
+        if (oldor !=null){
+            or.setId(oldor.getId());
+        }
+
+        or.setOrderBaseId(order.getId());
+        or.setCxyzm(item.getCxyzm());
+        or.setSffswx(item.getSffswx());
+        or.setChaoshiqe(item.getChaoshiqe());
+        or.setZbby(item.getZbby());
+        or.setZptype(item.getZptype());
+        or.setYhif(item.getYhif());
+        or.setTsdengji(item.getTsdengji());
+        // 需求大类 未找到放原有的值
+        or.setDemandTypeId(String.valueOf(item.getSpid()));
+        or.setDemandTypeName(item.getSpmc());
+
+        if (sysDictRefXLMapXq.containsKey(String.valueOf(item.getSpid()))){
+            or.setDemandTypeId(sysDictRefXLMapXq.get(String.valueOf(item.getSpid())).get(0).getDictCode());
+            or.setDemandTypeName(sysDictRefXLMapXq.get(String.valueOf(item.getSpid())).get(0).getDictValue());
+        }
+
+        // 需求小类
+        or.setDemandSmallTypeId("");
+        or.setDemandSmallTypeName("");
+        if (!item.getXqxiaolei().equals(0L) && sysDictRefXLMapXq.containsKey(item.getXqxiaolei())) {
+            or.setDemandSmallTypeId(sysDictRefXLMapXq.get(item.getXqxiaolei()).get(0).getDictCode());
+            or.setDemandSmallTypeName(sysDictRefXLMapXq.get(item.getXqxiaolei()).get(0).getDictValue());
+        } else {
+
+        }
+        or.setExtendField1(item.getExtjson1());
+        or.setExtendField2(item.getExtjson2());
+        or.setExtendField3(item.getExtjson3());
+        or.setExtendField4(item.getExtjson4());
+        or.setExtendField5(item.getExtjson5());
+        or.setCreateBy(order.getCreateBy());
+        or.setCreateTime(order.getCreateTime());
+        or.setUpdateBy(order.getUpdateBy());
+        or.setUpdateTime(order.getUpdateTime());
+    }
+
+    private void generateMx(Brand brand, ItfTblAssignDownload item, OrderBase order,
+                            Map<String, List<SysDictRef>> sysDictRefDLMap,
+                            Map<String, List<SysDictRef>> sysDictRefXLMap,
+                            Map<String, List<SysDictRef>> sysDictRefXiLieMap) {
+        List<ItfTblAssignMxDownload> mxRec = new ArrayList<>();
+        List<OrderProduct> addmx = new ArrayList<>();
+        List<ItfTblAssignMxDownload> ups = new ArrayList<>();
+        WebsitFWS websitFWS = new WebsitFWS();
+
+
+        // 提取明细表数据
+        mxRec = itfTblAssignMxDownloadService.lambdaQuery()
+                .eq(ItfTblAssignMxDownload::getDownloadTaskNo, item.getDownloadTaskNo())
+                .eq(ItfTblAssignMxDownload::getSynStatus,0)
+                .orderByAsc(ItfTblAssignMxDownload::getSynStatus)
+                .list();
+        for (ItfTblAssignMxDownload rec:mxRec){
+            // 提取维修工单明细数据对象
+            OrderPar mxreq = new OrderPar();
+            mxreq.setSynReqId(Long.valueOf(rec.getSynReqId()));
+            mxreq.setBrandId(brand.getBrandId());
+            OrderProduct op = repairMxDownloadMapper.getMx(mxreq);
+            // 销售单位处理 sale_websit
+            websitFWS = publicService.shxswdToptxswd(op.getSaleWebsit(),order);
+            op.setSaleWebsit(websitFWS.getWebsitId());
+
+            // 服务单位处理 service_websit
+            websitFWS = publicService.shshwdToptshwd(op.getServiceWebsit(),order);
+            op.setServiceWebsit(websitFWS.getWebsitId());
+
+            // 其他部分参数赋值
+            op.setOrderBaseId(order.getId());
+            op.setPgguid(item.getPgguid());
+            op.setMainId(order.getMainId());
+            op.setMainName(order.getMainName());
+
+            if (sysDictRefDLMap.containsKey(rec.getSpid())){
+                op.setMainId(sysDictRefDLMap.get(rec.getSpid()).get(0).getDictCode());
+                op.setMainName(sysDictRefDLMap.get(rec.getSpid()).get(0).getDictValue());
+            }
+
+            op.setSmallId(rec.getXlid());
+            op.setSmallName(rec.getXlmc());
+            if (!rec.getXlid().equals(0L) && sysDictRefXLMap.containsKey(rec.getXlid())){
+                op.setSmallId(sysDictRefXLMap.get(rec.getXlid()).get(0).getDictCode());
+                op.setSmallName(sysDictRefXLMap.get(rec.getXlid()).get(0).getDictValue());
+            }
+
+            if (!rec.getXiid().equals("0") && sysDictRefXiLieMap.containsKey(rec.getXiid())){
+                op.setSeriesId(sysDictRefXiLieMap.get(rec.getXiid()).get(0).getDictCode());
+                op.setSeriesName(sysDictRefXiLieMap.get(rec.getXiid()).get(0).getDictValue());
+            } else {
+                op.setSeriesId(rec.getXiid());
+                op.setSeriesName(rec.getXimc());
+            }
+            addmx.add(op);
+
+            ItfTblAssignMxDownload up = new ItfTblAssignMxDownload();
+            up.setSynReqId(rec.getSynReqId());
+            up.setSynStatus(1);
+            up.setSynReqTime(new Date());
+            ups.add(up);
+        }
+
+        if (addmx.size()>0){
+            orderProductService.saveBatch(addmx);
+            addmx.clear();
+            itfTblAssignMxDownloadService.updateBatchById(ups);
+            ups.clear();
+        }
+    }
+
+    private void generateMxApi(Brand brand, ItfTblAssignDownload item, OrderBase order,
+                            Map<String, List<SysDictRef>> sysDictRefDLMap,
+                            Map<String, List<SysDictRef>> sysDictRefXLMap,
+                            Map<String, List<SysDictRef>> sysDictRefXiLieMap,
+                               List<OrderProduct> addmx,
+                               List<ItfTblAssignMxDownload> ups) {
+        List<ItfTblAssignMxDownload> mxRec = new ArrayList<>();
+        WebsitFWS websitFWS = new WebsitFWS();
+
+        // 提取明细表数据
+        mxRec = itfTblAssignMxDownloadService.lambdaQuery()
+                .eq(ItfTblAssignMxDownload::getDownloadTaskNo, item.getDownloadTaskNo())
+                .eq(ItfTblAssignMxDownload::getSynStatus,0)
+                .orderByAsc(ItfTblAssignMxDownload::getSynStatus)
+                .list();
+        for (ItfTblAssignMxDownload rec:mxRec){
+            // 提取维修工单明细数据对象
+            OrderPar mxreq = new OrderPar();
+            mxreq.setSynReqId(Long.valueOf(rec.getSynReqId()));
+            mxreq.setBrandId(brand.getBrandId());
+            OrderProduct op = repairMxDownloadMapper.getMx(mxreq);
+            // 销售单位处理 sale_websit
+            websitFWS = publicService.shxswdToptxswd(op.getSaleWebsit(),order);
+            op.setSaleWebsit(websitFWS.getWebsitId());
+
+            // 服务单位处理 service_websit
+            websitFWS = publicService.shshwdToptshwd(op.getServiceWebsit(),order);
+            op.setServiceWebsit(websitFWS.getWebsitId());
+
+            // 其他部分参数赋值
+            op.setOrderBaseId(order.getId());
+            op.setPgguid(item.getPgguid());
+            op.setMainId(order.getMainId());
+            op.setMainName(order.getMainName());
+
+            if (sysDictRefDLMap.containsKey(rec.getSpid())){
+                op.setMainId(sysDictRefDLMap.get(rec.getSpid()).get(0).getDictCode());
+                op.setMainName(sysDictRefDLMap.get(rec.getSpid()).get(0).getDictValue());
+            }
+
+            op.setSmallId(rec.getXlid());
+            op.setSmallName(rec.getXlmc());
+            if (!rec.getXlid().equals(0L) && sysDictRefXLMap.containsKey(rec.getXlid())){
+                op.setSmallId(sysDictRefXLMap.get(rec.getXlid()).get(0).getDictCode());
+                op.setSmallName(sysDictRefXLMap.get(rec.getXlid()).get(0).getDictValue());
+            }
+
+            if (!rec.getXiid().equals("0") && sysDictRefXiLieMap.containsKey(rec.getXiid())){
+                op.setSeriesId(sysDictRefXiLieMap.get(rec.getXiid()).get(0).getDictCode());
+                op.setSeriesName(sysDictRefXiLieMap.get(rec.getXiid()).get(0).getDictValue());
+            } else {
+                op.setSeriesId(rec.getXiid());
+                op.setSeriesName(rec.getXimc());
+            }
+            addmx.add(op);
+
+            ItfTblAssignMxDownload up = new ItfTblAssignMxDownload();
+            up.setSynReqId(rec.getSynReqId());
+            up.setSynStatus(1);
+            up.setSynReqTime(new Date());
+            ups.add(up);
+        }
+    }
+
+    private void generateMxUpdate(Brand brand, ItfTblAssignDownload item, OrderBase order,
+                                  Map<String, List<SysDictRef>> sysDictRefDLMap,
+                                  Map<String, List<SysDictRef>> sysDictRefXLMap,
+                                  Map<String, List<SysDictRef>> sysDictRefXiLieMap) {
+        List<ItfTblAssignMxDownload> mxRec = new ArrayList<>();
+        List<OrderProduct> addmx = new ArrayList<>();
+        List<OrderProduct> upmx = new ArrayList<>();
+        List<ItfTblAssignMxDownload> ups = new ArrayList<>();
+        Map<String, List<OrderProduct>> opsMap = new HashMap<>();
+
+        // 提取现有的数据
+        List<OrderProduct> ops = orderProductService.lambdaQuery()
+                .eq(OrderProduct::getOrderBaseId,order.getId()).list();
+
+        opsMap = ops.stream().collect(Collectors.groupingBy(OrderProduct::getPgmxid));
+
+        // 提取明细表数据
+        mxRec = itfTblAssignMxDownloadService.lambdaQuery()
+                .eq(ItfTblAssignMxDownload::getDownloadTaskNo, item.getDownloadTaskNo())
+                .eq(ItfTblAssignMxDownload::getSynStatus,0)
+                .orderByAsc(ItfTblAssignMxDownload::getSynStatus)
+                .list();
+
+        for (ItfTblAssignMxDownload rec:mxRec){
+            // 提取维修工单明细数据对象
+            OrderPar mxreq = new OrderPar();
+            mxreq.setSynReqId(Long.valueOf(rec.getSynReqId()));
+            mxreq.setBrandId(brand.getBrandId());
+            OrderProduct op = getOrderProduct(item, order, sysDictRefDLMap, sysDictRefXLMap, sysDictRefXiLieMap, rec, mxreq);
+
+            // 存在修改
+            if (opsMap.containsKey(op.getPgmxid())){
+                getupop(upmx, opsMap, op);
+            } else {
+                addmx.add(op);
+            }
+
+            ItfTblAssignMxDownload up = new ItfTblAssignMxDownload();
+            up.setSynReqId(rec.getSynReqId());
+            up.setSynStatus(1);
+            up.setSynReqTime(new Date());
+            ups.add(up);
+        }
+
+        if (addmx.size()>0){
+            orderProductService.saveBatch(addmx);
+            addmx.clear();
+        }
+        if (upmx.size()>0){
+            orderProductService.updateBatchById(upmx);
+            upmx.clear();
+        }
+        if (ups.size()>0){
+            itfTblAssignMxDownloadService.updateBatchById(ups);
+            ups.clear();
+        }
+
+    }
+
+    private void generateMxUpdateApi(ItfTblAssignDownload item,
+                                  List<ItfTblAssignMxDownload> ups) {
+        List<ItfTblAssignMxDownload> mxRec = new ArrayList<>();
+
+        // 提取明细表数据
+        mxRec = itfTblAssignMxDownloadService.lambdaQuery()
+                .eq(ItfTblAssignMxDownload::getDownloadTaskNo, item.getDownloadTaskNo())
+                .eq(ItfTblAssignMxDownload::getSynStatus,0)
+                .orderByAsc(ItfTblAssignMxDownload::getSynStatus)
+                .list();
+
+        for (ItfTblAssignMxDownload rec:mxRec){
+            ItfTblAssignMxDownload up = new ItfTblAssignMxDownload();
+            up.setSynReqId(rec.getSynReqId());
+            up.setSynStatus(1);
+            up.setSynReqTime(new Date());
+            ups.add(up);
+        }
+    }
+
+    private void getupop(List<OrderProduct> upmx, Map<String, List<OrderProduct>> opsMap, OrderProduct op) {
+        OrderProduct up = new OrderProduct();
+        up.setId(opsMap.get(op.getPgmxid()).get(0).getId());
+        up.setMainId(op.getMainId());
+        up.setMainName(op.getMainName());
+        up.setSmallId(op.getSmallId());
+        up.setSmallName(op.getSmallName());
+        up.setSeriesId(op.getSeriesId());
+        up.setSeriesName(op.getSeriesName());
+        up.setProductId(op.getProductId());
+        up.setProductName(op.getProductName());
+        up.setUrgency(op.getUrgency());
+        up.setSaleWebsit(op.getSaleWebsit());
+        up.setServiceWebsit(op.getServiceWebsit());
+        up.setSaleWebsitMobile(op.getSaleWebsitMobile());
+        up.setServiceWebsitMobile(op.getServiceWebsitMobile());
+        up.setBuyTime(op.getBuyTime());
+        upmx.add(up);
+    }
+
+    @NotNull
+    private OrderProduct getOrderProduct(ItfTblAssignDownload item, OrderBase order,
+                                         Map<String, List<SysDictRef>> sysDictRefDLMap,
+                                         Map<String, List<SysDictRef>> sysDictRefXLMap,
+                                         Map<String, List<SysDictRef>> sysDictRefXiLieMap,
+                                         ItfTblAssignMxDownload rec, OrderPar mxreq) {
+        WebsitFWS websitFWS = new WebsitFWS();
+        OrderProduct op = repairMxDownloadMapper.getMx(mxreq);
+
+        // 其他部分参数赋值
+        // 销售单位处理 sale_websit
+        websitFWS = publicService.shxswdToptxswd(op.getSaleWebsit(),order);
+        op.setSaleWebsit(websitFWS.getWebsitId());
+        // 服务单位处理 service_websit
+        websitFWS = publicService.shshwdToptshwd(op.getServiceWebsit(),order);
+        op.setServiceWebsit(websitFWS.getWebsitId());
+
+        op.setOrderBaseId(order.getId());
+
+        op.setPgguid(item.getPgguid());
+        op.setMainId(rec.getSpid());
+        op.setMainName(rec.getSpmc());
+        if (sysDictRefDLMap.containsKey(rec.getSpid())){
+            op.setMainId(sysDictRefDLMap.get(rec.getSpid()).get(0).getDictCode());
+            op.setMainName(sysDictRefDLMap.get(rec.getSpid()).get(0).getDictValue());
+        }
+
+        op.setSmallId(rec.getXlid());
+        op.setSmallName(rec.getXlmc());
+        if (!rec.getXlid().equals(0L) && sysDictRefXLMap.containsKey(rec.getXlid())){
+            op.setSmallId(sysDictRefXLMap.get(rec.getXlid()).get(0).getDictCode());
+            op.setSmallName(sysDictRefXLMap.get(rec.getXlid()).get(0).getDictValue());
+        }
+
+        op.setSeriesId(rec.getXiid());
+        op.setSeriesName(rec.getXimc());
+        if (!rec.getXiid().equals("0") && sysDictRefXiLieMap.containsKey(rec.getXiid())){
+            op.setSeriesId(sysDictRefXiLieMap.get(rec.getXiid()).get(0).getDictCode());
+            op.setSeriesName(sysDictRefXiLieMap.get(rec.getXiid()).get(0).getDictValue());
+        }
+
+        return op;
+    }
+
+    private OrderBase generateOrder(Brand brand, ItfTblAssignDownload item, List<ItfTblAssignXzydDownload> yds) {
+        Boolean isChildInfo = Boolean.FALSE;
+
+        if (yds !=null && yds.size()>0){
+            isChildInfo = Boolean.TRUE;
+        }
+
+        OrderBase order = saveOrderBase(brand, item, isChildInfo);
+
+        // 总部维修单为待审批改派时 若本地表无改派数据则生成改派数据
+        if (order.getOrderStatus().equals("B5")){
+            generateDispatch(order);
+        }
+        // 如果是家用的工单，且工单状态是待中心派工或待网点派工时，写入派嘉讯茂  不做
+
+        // 修改同步状态
+        upItfTblAssignDownloadStatus(item, order);
+
+        return order;
+    }
+
+    private OrderBase generateOrderApi(Brand brand, ItfTblAssignDownload item, List<ItfTblAssignXzydDownload> yds,OrderApplyDispatch addn) {
+        Boolean isChildInfo = Boolean.FALSE;
+
+        if (yds !=null && yds.size()>0){
+            isChildInfo = Boolean.TRUE;
+        }
+
+        OrderBase order = getOrderBaseApi(brand, item, isChildInfo);
+
+        // 总部维修单为待审批改派时 若本地表无改派数据则生成改派数据
+        if (order.getOrderStatus().equals("B5")){
+            generateDispatchApi(order,addn);
+        }
+        // 如果是家用的工单，且工单状态是待中心派工或待网点派工时，写入派嘉讯茂  不做
+
+        return order;
+    }
+
+    private OrderBase generateOrderUpdateApi(Brand brand, ItfTblAssignDownload item, OrderApplyDispatch addn) {
+        OrderBase order = getOrderBaseUpdateApi(brand, item);
+
+        // 总部维修单为待审批改派时 若本地表无改派数据则生成改派数据
+        if (order.getOrderStatus().equals("B5")){
+            generateDispatchApi(order,addn);
+        }
+
+        return order;
+    }
+
+    private OrderBase getOrderBaseApi(Brand brand, ItfTblAssignDownload item, Boolean isChildInfo) {
+        // 获取维修工单主表数据
+        OrderPar orderPar = new OrderPar();
+        orderPar.setSynReqId(item.getSynReqId());
+        orderPar.setBrandId(brand.getBrandId());
+        OrderBase order = repairDownloadMapper.getOrderBase(orderPar);
+        order.setId("");
+        if (isChildInfo){
+            order.setIsChildInfo("YES");
+        }
+        // 部分属性值重置
+        orderService.setParame(brand, order, item);
+        // 新增
+        // orderBaseService.save(order);
+        return order;
+    }
+
+
+    private OrderBase getOrderBaseUpdateApi(Brand brand, ItfTblAssignDownload item) {
+        // 获取维修工单主表数据
+        OrderPar orderPar = new OrderPar();
+        orderPar.setSynReqId(item.getSynReqId());
+        orderPar.setBrandId(brand.getBrandId());
+        OrderBase order = repairDownloadMapper.getOrderBase(orderPar);
+        // 部分属性值重置
+        orderService.setParameUpdate(brand, order, item);
+
+        return order;
+    }
+
+    private OrderBase saveOrderBase(Brand brand, ItfTblAssignDownload item, Boolean isChildInfo) {
+        // 获取维修工单主表数据
+        OrderPar orderPar = new OrderPar();
+        orderPar.setSynReqId(item.getSynReqId());
+        orderPar.setBrandId(brand.getBrandId());
+        OrderBase order = repairDownloadMapper.getOrderBase(orderPar);
+        order.setId("77"+ IdWorker.getIdStr());
+        if (isChildInfo){
+            order.setIsChildInfo("YES");
+        }
+        // 部分属性值重置
+        orderService.setParame(brand, order, item);
+        // 新增
+        orderBaseService.save(order);
+        return order;
+    }
+
+    public void upItfTblAssignDownloadStatus(ItfTblAssignDownload item, OrderBase order){
+        upItfTblAssignDownload(item.getSynReqId(),1,"成功");
+
+        OrderPar prepar = new OrderPar();
+        prepar.setSynReqId(item.getSynReqId());
+        prepar.setPgid(order.getPgid());
+        assignDownloadMapper.updateStatus(prepar);
+    }
+
+    private void upItfTblAssignDownload(Long synReqId, Integer synStatus, String synErrMsg) {
+        ItfTblAssignDownload up = new ItfTblAssignDownload();
+        up.setSynReqId(synReqId);
+        up.setSynStatus(synStatus);
+        up.setSynTime(new Date());
+        up.setSynErrMsg(synErrMsg);
+        itfTblAssignDownloadService.updateById(up);
+    }
+
+    private void generateDispatch(OrderBase order) {
+        SimpleDateFormat sdf = new SimpleDateFormat("yyyy-MM-dd HH:mm:ss");
+
+        List<String> parame = new ArrayList<>();
+        parame.add(order.getWebsitId());
+        parame.add(order.getReceWebsitId());
+        // 改派表中查看是否有待审的数据
+        List<OrderApplyDispatch> rec = orderApplyDispatchService.lambdaQuery()
+                .eq(OrderApplyDispatch::getOrderBaseId, order.getId())
+                .eq(OrderApplyDispatch::getExamineStatus,"WAIT")
+                .in(OrderApplyDispatch::getWebsitId,parame).list();
+        if (rec.size()<1){
+            // 生成改派数据 从维修工单表中读取数据
+            OrderApplyDispatch addn = new OrderApplyDispatch();
+            addn.setOrderBaseId(order.getId());
+            addn.setPgid(order.getPgid());
+            addn.setType("REPAIR");
+            addn.setWebsitId(order.getWebsitId());
+            addn.setWebsitName(order.getWebsitName());
+            addn.setApplyContent("申请改派");
+            addn.setExamineStatus("WAIT");
+            addn.setUserName(order.getUserName());
+            addn.setUserMobile(order.getUserMobile());
+            addn.setReserveTime(order.getAppointmentTime());
+            addn.setReservePeriod(sdf.format(order.getAppointmentTime()));
+            addn.setMainId(Integer.valueOf(order.getMainId()));
+            addn.setMainName(order.getMainName());
+            addn.setCreateTime(order.getCreateTime());
+            addn.setUpdateTime(order.getUpdateTime());
+            orderApplyDispatchService.save(addn);
+        }
+    }
+
+    private void generateDispatchUpdateApi(OrderBase order,OrderApplyDispatch addn) {
+        SimpleDateFormat sdf = new SimpleDateFormat("yyyy-MM-dd HH:mm:ss");
+
+        List<String> parame = new ArrayList<>();
+        parame.add(order.getWebsitId());
+        parame.add(order.getReceWebsitId());
+        // 改派表中查看是否有待审的数据
+        List<OrderApplyDispatch> rec = orderApplyDispatchService.lambdaQuery()
+                .eq(OrderApplyDispatch::getOrderBaseId, order.getId())
+                .eq(OrderApplyDispatch::getExamineStatus,"WAIT")
+                .in(OrderApplyDispatch::getWebsitId,parame).list();
+        if (rec.size()<1){
+            // 生成改派数据 从维修工单表中读取数据
+            addn.setOrderBaseId(order.getId());
+            addn.setPgid(order.getPgid());
+            addn.setType("REPAIR");
+            addn.setWebsitId(order.getWebsitId());
+            addn.setWebsitName(order.getWebsitName());
+            addn.setApplyContent("申请改派");
+            addn.setExamineStatus("WAIT");
+            addn.setUserName(order.getUserName());
+            addn.setUserMobile(order.getUserMobile());
+            addn.setReserveTime(order.getAppointmentTime());
+            addn.setReservePeriod(sdf.format(order.getAppointmentTime()));
+            addn.setMainId(Integer.valueOf(order.getMainId()));
+            addn.setMainName(order.getMainName());
+            addn.setCreateTime(order.getCreateTime());
+            addn.setUpdateTime(order.getUpdateTime());
+        }
+    }
+
+    private void generateDispatchApi(OrderBase order,OrderApplyDispatch addn) {
+        SimpleDateFormat sdf = new SimpleDateFormat("yyyy-MM-dd HH:mm:ss");
+
+        List<String> parame = new ArrayList<>();
+        parame.add(order.getWebsitId());
+        parame.add(order.getReceWebsitId());
+        // 改派表中查看是否有待审的数据
+        List<OrderApplyDispatch> rec = orderApplyDispatchService.lambdaQuery()
+                .eq(OrderApplyDispatch::getOrderBaseId, order.getId())
+                .eq(OrderApplyDispatch::getExamineStatus,"WAIT")
+                .in(OrderApplyDispatch::getWebsitId,parame).list();
+        if (rec.size()<1){
+            // 生成改派数据 从维修工单表中读取数据
+            addn.setOrderBaseId(order.getId());
+            addn.setPgid(order.getPgid());
+            addn.setType("REPAIR");
+            addn.setWebsitId(order.getWebsitId());
+            addn.setWebsitName(order.getWebsitName());
+            addn.setApplyContent("申请改派");
+            addn.setExamineStatus("WAIT");
+            addn.setUserName(order.getUserName());
+            addn.setUserMobile(order.getUserMobile());
+            addn.setReserveTime(order.getAppointmentTime());
+            addn.setReservePeriod(sdf.format(order.getAppointmentTime()));
+            addn.setMainId(Integer.valueOf(order.getMainId()));
+            addn.setMainName(order.getMainName());
+            addn.setCreateTime(order.getCreateTime());
+            addn.setUpdateTime(order.getUpdateTime());
+        }
+    }
+
+}

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

@@ -95,6 +95,62 @@ public class OrderServiceImpl extends ServiceImpl<OrderBaseMapper, OrderBase> im
         extracted(item, orderBase, oads, its);
     }
 
+    @Override
+    public  void setParApi(ItfTblAzAssignLcLsDownload item, OrderBase orderBase,List<OrderApplyDispatch> oads,
+                        List<ItfGreeToFaDownloadTaskList> its){
+        WebsitFWS websitFWS = new WebsitFWS();
+
+        if (StringUtils.isEmpty(orderBase.getGpsAddress())){
+            orderBase.setGpsAddress(publicService.getGpsaddress(orderBase.getLng(),orderBase.getLat()));
+        }
+
+        // 设置网点信息
+        setWebsit(item, orderBase);
+
+        // 判断安装网点编号是否为空或者为公司，如果为空或为公司，就写入接收派工网点
+        if (StringUtils.isEmpty(item.getAzwdno()) ||
+                item.getAzwdno().equals("S9219801") ||
+                item.getAzwdno().equals("S9219807")){
+            if (orderBase.getWebsitId() !=null){
+                orderBase.setWebsitId(orderBase.getReceWebsitId());
+                orderBase.setWebsitName(orderBase.getReceWebsitName());
+            }
+        }
+
+        // 接收派工网点为中心且当前节点是1129或1301，更新为2待分部派工
+        if ((item.getJspgwdno().equals("S9219801") || item.getJspgwdno().equals("S9219807")) &&
+                (orderBase.getOrderStatus().equals(OrderStatusEnum.INSTALL_STATUS_A1129.getCode()) ||
+                        orderBase.getOrderStatus().equals(OrderStatusEnum.INSTALL_STATUS_A1301.getCode()))){
+            orderBase.setOrderStatus(GDOrderStatusEnum.INSTALL_STATUS_G2_0.getCode());
+        }
+        // 分销商城订单需要写日志表这里不再处理
+
+        // 省市区单独处理
+        shPositionTopt(orderBase);
+        // 派工方式，新创建订单时 azren 名称不为空时为手动派工  （dispatch_flag派工方式 A=自动派工 B=手动派工）
+        if (StringUtils.isNotEmpty(orderBase.getDispatchFlag())){
+            orderBase.setDispatchFlag("B");
+        } else {
+            orderBase.setDispatchFlag("A");
+        }
+
+        // create_sys - 创建网点系统  cjwdno
+        // last_operator_websit:最近操作网点 创建单时也是创建网点 可能是销售网点，也可能是售后网点  zjczwd
+        // sys_websit_number 系统网点编号 zjczwd 同上
+        orderBase.setCreateSys(orderBase.getCreateWebsitId());
+
+        // 先从销售网点判断
+        websitFWS = publicService.shxswdToptxswd(item.getXsdwno(),orderBase);
+        if (StringUtils.isEmpty(websitFWS.getWebsitId())){
+            websitFWS = publicService.shshwdToptshwd(item.getXsdwno(),orderBase);
+        }
+        orderBase.setLastOperatorWebsit(websitFWS.getWebsitId());
+        orderBase.setSysWebsitNumber(websitFWS.getBrandSysWebsitNumber());
+
+        // 采集数据下载
+        extractedApi(item, orderBase, oads, its);
+    }
+
     private void setWebsit(ItfTblAzAssignLcLsDownload item, OrderBase orderBase) {
         // 售后网点处理-安装或维修网点
         WebsitFWS websitFWS = null;
@@ -153,6 +209,21 @@ public class OrderServiceImpl extends ServiceImpl<OrderBaseMapper, OrderBase> im
         getOrderDetailRec(item, orderBase, its);
     }
 
+    private void extractedApi(ItfTblAzAssignLcLsDownload item, OrderBase orderBase, List<OrderApplyDispatch> oads,
+                              List<ItfGreeToFaDownloadTaskList> its) {
+        // 修改工单状态
+        setOrderStatus(item, orderBase);
+
+        // 生成改派申请数据
+        getOrderApplyDispatch(orderBase, oads);
+
+        // 接收派工网点与所属区域有差异时 以接收网点为准 本身就是按网点来的，这里无需处理
+
+        // 99999999 待验证要不要处理 todo
+        // 采集数据下载
+        // getOrderDetailRec(item, orderBase, 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())){
@@ -348,6 +419,50 @@ public class OrderServiceImpl extends ServiceImpl<OrderBaseMapper, OrderBase> im
         extracted(item, orderBase, oads, its);
     }
 
+    @Override
+    public void setParUpApi(ItfTblAzAssignLcLsDownload item, OrderBase orderBase,List<OrderApplyDispatch> oads, List<ItfGreeToFaDownloadTaskList> its){
+        WebsitFWS websitFWS = new WebsitFWS();
+
+        if (StringUtils.isEmpty(orderBase.getGpsAddress())){
+            orderBase.setGpsAddress(publicService.getGpsaddress(orderBase.getLng(),orderBase.getLat()));
+        }
+
+        // 师傅信息可能对应不到
+        if (StringUtils.isEmpty(orderBase.getWorkerIdcard())){
+            orderBase.setWorkerId("");
+            orderBase.setWorkerName("");
+            orderBase.setWorkerMobile("");
+            orderBase.setWorkerIdcard("");
+        }
+
+        // 设置网点信息
+        setWebsit(item, orderBase);
+
+        // 省市区单独处理
+        shPositionTopt(orderBase);
+        // 派工方式，新创建订单时 azren 名称不为空时为手动派工  （dispatch_flag派工方式 A=自动派工 B=手动派工）
+        if (StringUtils.isNotEmpty(orderBase.getDispatchFlag())){
+            orderBase.setDispatchFlag("B");
+        } else {
+            orderBase.setDispatchFlag("A");
+        }
+
+        // create_sys - 创建网点系统  cjwdno
+        // last_operator_websit:最近操作网点 创建单时也是创建网点 可能是销售网点，也可能是售后网点  zjczwd
+        // sys_websit_number 系统网点编号 zjczwd 同上
+        orderBase.setCreateSys(orderBase.getCreateWebsitId());
+
+        // 先从销售网点判断
+        websitFWS = publicService.shxswdToptxswd(item.getXsdwno(),orderBase);
+        if (StringUtils.isEmpty(websitFWS.getWebsitId())){
+            websitFWS = publicService.shshwdToptshwd(item.getXsdwno(),orderBase);
+        }
+        orderBase.setLastOperatorWebsit(websitFWS.getWebsitId());
+        orderBase.setSysWebsitNumber(websitFWS.getBrandSysWebsitNumber());
+
+        extractedApi(item, orderBase, oads, its);
+    }
+
 
 
     @Override
@@ -431,6 +546,73 @@ public class OrderServiceImpl extends ServiceImpl<OrderBaseMapper, OrderBase> im
     }
 
     @Override
+    public void setParameUpdate(Brand brand, OrderBase orderBase, ItfTblAssignDownload item) {
+        WebsitFWS websitFWS = new WebsitFWS();
+
+        // gpsaddress
+        if (StringUtils.isEmpty(orderBase.getGpsAddress())){
+            orderBase.setGpsAddress(publicService.getGpsaddress(orderBase.getLng(),orderBase.getLat()));
+        }
+
+        // 结算主体
+        // (wxwdno、xjwdno)维修网点与派下级网点同时为空时  (cjwdno、xswdno)创建网点与销售网点都有值
+        if (StringUtils.isNotEmpty(orderBase.getWebsitId())){
+            websitFWS = publicService.shshwdToptshwd(orderBase.getWebsitId(),orderBase);
+        } else {
+            websitFWS = publicService.shxswdToptxswd(orderBase.getSaleWebsitId(),orderBase);
+        }
+        orderBase.setBrandId(websitFWS.getBrandId());
+        orderBase.setBrandName(websitFWS.getBrandName());
+        orderBase.setGroupCompanyId(websitFWS.getGroupCompanyId());
+        orderBase.setGroupCompanyName(websitFWS.getGroupCompanyName());
+
+        websitFWS = publicService.shshwdToptshwd(orderBase.getWebsitId(),orderBase);
+        orderBase.setWebsitId(websitFWS.getWebsitId());
+        orderBase.setWebsitName(websitFWS.getWdmc());
+
+        // 省市区单独处理
+        shPositionTopt(orderBase);
+
+        // 售后网点处理
+        websitFWS = publicService.shshwdToptshwd(orderBase.getWebsitId(),orderBase);
+        orderBase.setWebsitId(websitFWS.getWebsitId());
+        orderBase.setWebsitName(websitFWS.getWdmc());
+        // 接收派工网点处理
+        websitFWS = publicService.shshwdToptshwd(orderBase.getReceWebsitId(),orderBase);
+        orderBase.setReceWebsitId(websitFWS.getWebsitId());
+        orderBase.setReceWebsitName(websitFWS.getWdmc());
+
+        // 创建网点处理
+        websitFWS = publicService.shshwdToptshwd(orderBase.getCreateWebsitId(),orderBase);
+        orderBase.setCreateWebsitId(websitFWS.getWebsitId());
+        orderBase.setCreateWebsitName(websitFWS.getWdmc());
+
+        // 销售网点处理
+        websitFWS = publicService.shxswdToptxswd(orderBase.getSaleWebsitId(),orderBase);
+        orderBase.setSaleWebsitId(websitFWS.getWebsitId());
+        orderBase.setSaleWebsitName(websitFWS.getWdmc());
+        // 这里为商户的系统网点编号
+        orderBase.setSaleWebsitSysNumber(websitFWS.getBrandSysWebsitNumber());
+
+        // create_sys - 创建网点系统  cjwdno
+        // last_operator_websit:最近操作网点 创建单时也是创建网点 可能是销售网点，也可能是售后网点  zjczwd
+        // sys_websit_number 系统网点编号 zjczwd 同上
+        // 先从销售网点查
+        websitFWS = publicService.shxswdToptxswd(orderBase.getCreateSys(),orderBase);
+        if (StringUtils.isEmpty(websitFWS.getWebsitId())){
+            websitFWS = publicService.shshwdToptshwd(orderBase.getCreateSys(),orderBase);
+        }
+        orderBase.setCreateSys(websitFWS.getWebsitId());
+
+        websitFWS = publicService.shxswdToptxswd(orderBase.getLastOperatorWebsit(),orderBase);
+        if (StringUtils.isEmpty(websitFWS.getWebsitId())){
+            websitFWS = publicService.shshwdToptshwd(orderBase.getLastOperatorWebsit(),orderBase);
+        }
+        orderBase.setLastOperatorWebsit(websitFWS.getWebsitId());
+        orderBase.setSysWebsitNumber(websitFWS.getBrandSysWebsitNumber());
+    }
+
+    @Override
     public void shPositionTopt(OrderBase orderBase) {
         List<BrandLbsRelate> br;
         if (StringUtils.isNotEmpty(orderBase.getStreet())){

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

@@ -81,26 +81,39 @@ public class PublicServiceImpl implements PublicService {
     public OrderWorker getOrderWorker(OrderBase orderBase){
         if (StringUtils.isNotEmpty(orderBase.getWorkerName())){
             OrderWorker orderWorker = new OrderWorker();
-            orderWorker.setOrderBaseId(orderBase.getId());
-            orderWorker.setWorkerId(orderBase.getWorkerId());
-            orderWorker.setWorkerName(orderBase.getWorkerName());
-            orderWorker.setWorkerMobile(orderBase.getWorkerMobile());
-            orderWorker.setWorkerIdcard(orderBase.getWorkerIdcard());
-            orderWorker.setIsMaster(Boolean.TRUE);
-            orderWorker.setBrandPgid(orderBase.getPgid());
-            orderWorker.setPgguid(orderBase.getPgguid());
-            orderWorker.setCreateTime(orderBase.getCreateTime());
-            orderWorker.setCreateBy(orderBase.getCreateBy());
-            orderWorker.setOutWorkerSource(Boolean.FALSE);
-
-            orderWorkerService.save(orderWorker);
+            getWorkerInfo(orderBase, orderWorker);
+            if (orderWorker !=null){
+                orderWorkerService.save(orderWorker);
+                return orderWorker;
+            }
+        }
+        return null;
+    }
 
+    @Override
+    public OrderWorker getOrderWorkerApi(OrderBase orderBase,OrderWorker orderWorker){
+        if (StringUtils.isNotEmpty(orderBase.getWorkerName())){
+            getWorkerInfo(orderBase, orderWorker);
             return orderWorker;
         }
 
         return null;
     }
 
+    private void getWorkerInfo(OrderBase orderBase, OrderWorker orderWorker) {
+        orderWorker.setOrderBaseId(orderBase.getId());
+        orderWorker.setWorkerId(orderBase.getWorkerId());
+        orderWorker.setWorkerName(orderBase.getWorkerName());
+        orderWorker.setWorkerMobile(orderBase.getWorkerMobile());
+        orderWorker.setWorkerIdcard(orderBase.getWorkerIdcard());
+        orderWorker.setIsMaster(Boolean.TRUE);
+        orderWorker.setBrandPgid(orderBase.getPgid());
+        orderWorker.setPgguid(orderBase.getPgguid());
+        orderWorker.setCreateTime(orderBase.getCreateTime());
+        orderWorker.setCreateBy(orderBase.getCreateBy());
+        orderWorker.setOutWorkerSource(Boolean.FALSE);
+    }
+
     @Override
     public List<OrderWorker> getWorker(String workerId,String orderBaseId) {
         List<OrderWorker> ows = orderWorkerService.lambdaQuery()

src/main/resources/bootstrap.properties

@@ -1,4 +1,4 @@
 spring.profiles.active=test
-spring.application.name=jiasm-sync-service
+spring.application.name=jiasm-syncdata
 spring.main.allow-bean-definition-overriding=true
 

src/main/resources/mapper/RepairDownloadMapper.xml

@@ -37,15 +37,14 @@
     </select>
 
     <select id="getUpOrderBase" parameterType="com.zfire.jiasm.syncdata.parameter.OrderPar" resultType="com.zfire.jiasm.syncdata.plus.entity.OrderBase">
-        select a.yhmc as user_name,a.quhao as area_code,
-               case a.yddh when '' then case a.dhhm when '' then '' else a.dhhm end  else a.yddh end as tel_phone,
+        select a.yhmc as user_name,a.quhao as area_code,a.yddh as user_mobile,a.dhhm as tel_phone,
                a.email,a.yddh2 as user_mobile2,
                a.sfen as province,a.cshi as city,a.xian as area,a.xzhen as street,
                a.sfenid as province_id,a.cshiid as city_id,a.xianid as area_id,a.xzhenid as street_id,
                a.dizi as address,a.beiz as remark,IFNULL(a.last_modified_date,a.zjczsj) as update_time,
                case when a.spid=102 then '商用' when a.spid=109 then '商用' else '家用' end as service_flag,
-               b.sfzen as worker_id,b.wxgmc as worker_name,b.yddh as worker_mobile,
-               b.sfzen as worker_idcard,IFNULL(a.yxji,'1') as priority,IFNULL(a.gpsdzxx,'') as gps_address,
+               b.sfzen as worker_id,b.wxgmc as worker_name,b.yddh as worker_mobile,a.last_modified_by as update_by,
+               b.sfzen as worker_idcard,IFNULL(a.yxji,'1') as priority,a.gpsdzxx as gps_address,
                case a.tsdengji when '一级投诉' then 'FIRST'
                                when '二级投诉' then 'SECOND'
                                when '三级投诉' then 'THIRD'