Merge remote-tracking branch 'origin/develop' into develop

# Conflicts:
#	mall-server-sync-api/src/main/java/com/gree/mall/manager/logic/SyncOrderInfoLogic.java
#	mall-server-sync-api/src/main/java/com/gree/mall/manager/logic/material/base/NormChargeLogic.java
#	mall-server-sync-api/src/main/java/com/gree/mall/manager/schedule/SyncSchedule.java
#	mall-server-sync-api/src/main/java/com/gree/mall/manager/utils/http/HttpUtils.java
#	mall-server-sync-api/src/main/resources/bootstrap-dev.properties
#	mall-server-sync-api/src/main/resources/bootstrap-prd.properties
#	mall-server-sync-api/src/main/resources/bootstrap-test.properties
#	mall-server-sync-api/src/main/resources/bootstrap.properties
#	mall-server-sync-api/src/main/resources/mapper/CommonMapper.xml
#	mall-server-sync-api/src/main/resources/spy.properties
#	mall-server-sync-api/src/main/resources/template/辅材收费标准模板（物料收费）.xlsx

mall-server-api/src/main/java/com/gree/mall/manager/logic/SyncOrderInfoLogic.java

@@ -309,232 +309,234 @@ public class SyncOrderInfoLogic {
     @Transactional(rollbackFor = Exception.class)
     public void syncDetail() {
 
+        while (true) {
 
-        List<ItfGreeSynDownloadRec> itfGreeSynDownloadRecs = itfGreeSynDownloadRecService.lambdaQuery()
-                .in(ItfGreeSynDownloadRec::getGreeStatSynStatus, 0,99)
-                .last("limit 50")
-                .orderByAsc(ItfGreeSynDownloadRec::getGreeStatSynStatus)
-                .list();
-        if (CollectionUtils.isEmpty(itfGreeSynDownloadRecs))
-            return;
 
+            List<ItfGreeSynDownloadRec> itfGreeSynDownloadRecs = itfGreeSynDownloadRecService.lambdaQuery()
+                    .in(ItfGreeSynDownloadRec::getGreeStatSynStatus, 0, 99)
+                    .last("limit 20")
+                    .orderByAsc(ItfGreeSynDownloadRec::getGreeStatSynStatus)
+                    .list();
+            if (CollectionUtils.isEmpty(itfGreeSynDownloadRecs))
+                return;
 
-        try {
 
-            String batch = IdWorker.getIdStr();
+            try {
 
-            String accessToken = this.getAccessTokenV3();
+                String batch = IdWorker.getIdStr();
 
+                String accessToken = this.getAccessTokenV3();
 
-            Map<String, String> params = new HashMap<>();
 
-            Map<String, String> heard = new HashMap<>();
-            heard.put("authorization", "Bearer " + accessToken);
+                Map<String, String> params = new HashMap<>();
 
-            WorkOrderSearchReq workOrderSearchReq = new WorkOrderSearchReq();
+                Map<String, String> heard = new HashMap<>();
+                heard.put("authorization", "Bearer " + accessToken);
 
-            List<String> collect = itfGreeSynDownloadRecs.stream().map(ItfGreeSynDownloadRec::getWorkOrderId).collect(Collectors.toList());
-            List<Long> syncIds = itfGreeSynDownloadRecs.stream().map(ItfGreeSynDownloadRec::getSynReqId).collect(Collectors.toList());
+                WorkOrderSearchReq workOrderSearchReq = new WorkOrderSearchReq();
 
-            itfGreeSynDownloadRecService.lambdaUpdate()
-                    .in(ItfGreeSynDownloadRec::getSynReqId, syncIds)
-                    .set(ItfGreeSynDownloadRec::getGreeStatSynStatus, 1)
-                    .set(ItfGreeSynDownloadRec::getDownloadBatchNo, batch)
-                    .set(ItfGreeSynDownloadRec::getGreeStatSynTime, new Date())
-                    .update();
+                List<String> collect = itfGreeSynDownloadRecs.stream().map(ItfGreeSynDownloadRec::getWorkOrderId).collect(Collectors.toList());
+                List<Long> syncIds = itfGreeSynDownloadRecs.stream().map(ItfGreeSynDownloadRec::getSynReqId).collect(Collectors.toList());
 
-            workOrderSearchReq.setWorkOrderIds(collect);
+                itfGreeSynDownloadRecService.lambdaUpdate()
+                        .in(ItfGreeSynDownloadRec::getSynReqId, syncIds)
+                        .set(ItfGreeSynDownloadRec::getGreeStatSynStatus, 1)
+                        .set(ItfGreeSynDownloadRec::getDownloadBatchNo, batch)
+                        .set(ItfGreeSynDownloadRec::getGreeStatSynTime, new Date())
+                        .update();
 
-            String json = JSONUtil.toJsonStr(workOrderSearchReq);
+                workOrderSearchReq.setWorkOrderIds(collect);
 
+                String json = JSONUtil.toJsonStr(workOrderSearchReq);
 
 
-            String body = HttpUtils.requestPostBody(greeUrl + Constant.gree.POST_WORKER_ORDER_DETAIL, json, heard);
+                String body = HttpUtils.requestPostBody(greeUrl + Constant.gree.POST_WORKER_ORDER_DETAIL, json, heard);
 
-            Map<String, Object> bodyMap = JSON.parseObject(body);
-            String s = bodyMap.get("data").toString();
+                Map<String, Object> bodyMap = JSON.parseObject(body);
+                String s = bodyMap.get("data").toString();
 
 
-            log.info("工单同步详情返回："+s);
+                log.info("工单同步详情返回：" + s);
 
 
-            JSONArray jsonArray = JSONUtil.parseArray(s);
+                JSONArray jsonArray = JSONUtil.parseArray(s);
 
-            List<WorkOrderRelationBean> itfGreeSynDownloadRecBeans = JSONUtil.toList(jsonArray, WorkOrderRelationBean.class);
+                List<WorkOrderRelationBean> itfGreeSynDownloadRecBeans = JSONUtil.toList(jsonArray, WorkOrderRelationBean.class);
 
 
-            List<ItfTblWorkOrderFeedback> feedbackRespList = new ArrayList<>();
-            List<ItfTblCollectionCharge> collectionChargeList = new ArrayList<>();
-            List<ItfTblCollectionChargeDetail> collectionChargeDetails = new ArrayList<>();
-            List<ItfTblOldProductOrderDetail> tblOldProductOrderDetailList = new ArrayList<>();
-            List<ItfTblWorkOrderAddComplain> tblWorkOrderAddComplainList = new ArrayList<>();
-            List<ItfTblWorkOrderAppoint> tblWorkOrderAppointList = new ArrayList<>();
-            List<ItfTblWorkOrderCancel> tblWorkOrderCancelList = new ArrayList<>();
-            List<ItfTblWorkOrderComplainFeedback> tblWorkOrderComplainFeedbackList = new ArrayList<>();
-            List<ItfTblWorkOrderComplain> tblWorkOrderComplainList = new ArrayList<>();
-            List<ItfTblWorkOrderCompleteInfo> tblWorkOrderCompleteInfoList = new ArrayList<>();
-            List<ItfTblWorkOrderConsult> tblWorkOrderConsultList = new ArrayList<>();
-            List<ItfTblWorkOrderDetailBarcode> tblWorkOrderDetailBarcodeList = new ArrayList<>();
-            List<ItfTblWorkOrderDetailRelocation> tblWorkOrderDetailRelocationList = new ArrayList<>();
-            List<ItfTblWorkOrderDispatchOutlets> tblWorkOrderDispatchOutletsList = new ArrayList<>();
-            List<ItfTblWorkOrderEngineer> tblWorkOrderEngineerList = new ArrayList<>();
-            List<ItfTblWorkOrderEvaluation> tblWorkOrderEvaluationList = new ArrayList<>();
-            List<ItfTblWorkOrderExt> tblWorkOrderExtList = new ArrayList<>();
-            List<ItfTblWorkOrderIndicators> tblWorkOrderIndicatorsList = new ArrayList<>();
-            List<ItfTblWorkOrderSign> tblWorkOrderSignList = new ArrayList<>();
-            List<ItfTblWorkOrderTag> tblWorkOrderTagList = new ArrayList<>();
-            List<ItfTblWorkOrderCharge> workOrderChargeList = new ArrayList<>();
-            List<ItfTblWorkOrderCollectionComplain> workOrderCollectionComplainList = new ArrayList<>();
+                List<ItfTblWorkOrderFeedback> feedbackRespList = new ArrayList<>();
+                List<ItfTblCollectionCharge> collectionChargeList = new ArrayList<>();
+                List<ItfTblCollectionChargeDetail> collectionChargeDetails = new ArrayList<>();
+                List<ItfTblOldProductOrderDetail> tblOldProductOrderDetailList = new ArrayList<>();
+                List<ItfTblWorkOrderAddComplain> tblWorkOrderAddComplainList = new ArrayList<>();
+                List<ItfTblWorkOrderAppoint> tblWorkOrderAppointList = new ArrayList<>();
+                List<ItfTblWorkOrderCancel> tblWorkOrderCancelList = new ArrayList<>();
+                List<ItfTblWorkOrderComplainFeedback> tblWorkOrderComplainFeedbackList = new ArrayList<>();
+                List<ItfTblWorkOrderComplain> tblWorkOrderComplainList = new ArrayList<>();
+                List<ItfTblWorkOrderCompleteInfo> tblWorkOrderCompleteInfoList = new ArrayList<>();
+                List<ItfTblWorkOrderConsult> tblWorkOrderConsultList = new ArrayList<>();
+                List<ItfTblWorkOrderDetailBarcode> tblWorkOrderDetailBarcodeList = new ArrayList<>();
+                List<ItfTblWorkOrderDetailRelocation> tblWorkOrderDetailRelocationList = new ArrayList<>();
+                List<ItfTblWorkOrderDispatchOutlets> tblWorkOrderDispatchOutletsList = new ArrayList<>();
+                List<ItfTblWorkOrderEngineer> tblWorkOrderEngineerList = new ArrayList<>();
+                List<ItfTblWorkOrderEvaluation> tblWorkOrderEvaluationList = new ArrayList<>();
+                List<ItfTblWorkOrderExt> tblWorkOrderExtList = new ArrayList<>();
+                List<ItfTblWorkOrderIndicators> tblWorkOrderIndicatorsList = new ArrayList<>();
+                List<ItfTblWorkOrderSign> tblWorkOrderSignList = new ArrayList<>();
+                List<ItfTblWorkOrderTag> tblWorkOrderTagList = new ArrayList<>();
+                List<ItfTblWorkOrderCharge> workOrderChargeList = new ArrayList<>();
+                List<ItfTblWorkOrderCollectionComplain> workOrderCollectionComplainList = new ArrayList<>();
 
-            List<ItfTblWorkOrderDispatchEngineer> tblWorkOrderDispatchEngineerList = new ArrayList<>();
-            List<ItfTblWorkOrderStatus> tblWorkOrderStatusList = new ArrayList<>();
+                List<ItfTblWorkOrderDispatchEngineer> tblWorkOrderDispatchEngineerList = new ArrayList<>();
+                List<ItfTblWorkOrderStatus> tblWorkOrderStatusList = new ArrayList<>();
 
-            List<ItfTblWorkOrderCollection> workOrderCollectionList = new ArrayList<>();
-            List<ItfTblCollectionRepair> collectionRepairList = new ArrayList<>();
-            List<ItfTblCollectionRepairPart> collectionRepairPartList = new ArrayList<>();
-            List<ItfTblCollectionRepairProject> collectionRepairProjectList = new ArrayList<>();
-            List<ItfTblCollectionRepairSymptomReason> collectionRepairSymptomReasonList = new ArrayList<>();
-            List<ItfTblWorkOrderDetail> tblWorkOrderDetailList = new ArrayList<>();
+                List<ItfTblWorkOrderCollection> workOrderCollectionList = new ArrayList<>();
+                List<ItfTblCollectionRepair> collectionRepairList = new ArrayList<>();
+                List<ItfTblCollectionRepairPart> collectionRepairPartList = new ArrayList<>();
+                List<ItfTblCollectionRepairProject> collectionRepairProjectList = new ArrayList<>();
+                List<ItfTblCollectionRepairSymptomReason> collectionRepairSymptomReasonList = new ArrayList<>();
+                List<ItfTblWorkOrderDetail> tblWorkOrderDetailList = new ArrayList<>();
 
-            List<ItfTblWorkOrder> itfTblWorkOrders = new ArrayList<>();
+                List<ItfTblWorkOrder> itfTblWorkOrders = new ArrayList<>();
 
 
-            for (WorkOrderRelationBean itfGreeSynDownloadRecBean : itfGreeSynDownloadRecBeans) {
+                for (WorkOrderRelationBean itfGreeSynDownloadRecBean : itfGreeSynDownloadRecBeans) {
 
-                List<ItfGreeSynDownloadRec> itfGreeSynDownloadRecList = itfGreeSynDownloadRecs.stream()
-                        .filter(item -> item.getWorkOrderId().equals(itfGreeSynDownloadRecBean.getId())).collect(Collectors.toList());
+                    List<ItfGreeSynDownloadRec> itfGreeSynDownloadRecList = itfGreeSynDownloadRecs.stream()
+                            .filter(item -> item.getWorkOrderId().equals(itfGreeSynDownloadRecBean.getId())).collect(Collectors.toList());
 
-                itfGreeSynDownloadRecBean.setDownloadBatchNo(batch);
+                    itfGreeSynDownloadRecBean.setDownloadBatchNo(batch);
 
-                tblWorkOrderDetailList.addAll(itfGreeSynDownloadRecBean.getTblWorkOrderDetailList());
+                    tblWorkOrderDetailList.addAll(itfGreeSynDownloadRecBean.getTblWorkOrderDetailList());
 
 
-                feedbackRespList.addAll(itfGreeSynDownloadRecBean.getFeedbackRespList());
+                    feedbackRespList.addAll(itfGreeSynDownloadRecBean.getFeedbackRespList());
 
-                for (ItfTblCollectionChargeBean itfTblCollectionChargeBean : itfGreeSynDownloadRecBean.getCollectionChargeList()) {
-                    ItfTblCollectionCharge itfTblCollectionCharge = BeanUtil.toBean(itfTblCollectionChargeBean, ItfTblCollectionCharge.class);
-                    collectionChargeList.add(itfTblCollectionCharge);
-                    collectionChargeDetails.addAll(itfTblCollectionChargeBean.getCollectionChargeDetails());
-                }
+                    for (ItfTblCollectionChargeBean itfTblCollectionChargeBean : itfGreeSynDownloadRecBean.getCollectionChargeList()) {
+                        ItfTblCollectionCharge itfTblCollectionCharge = BeanUtil.toBean(itfTblCollectionChargeBean, ItfTblCollectionCharge.class);
+                        collectionChargeList.add(itfTblCollectionCharge);
+                        collectionChargeDetails.addAll(itfTblCollectionChargeBean.getCollectionChargeDetails());
+                    }
 
-                tblOldProductOrderDetailList.addAll(itfGreeSynDownloadRecBean.getTblOldProductOrderDetailList());
-
-                tblWorkOrderAddComplainList.addAll(itfGreeSynDownloadRecBean.getTblWorkOrderAddComplainList());
-
-                tblWorkOrderAppointList.addAll(itfGreeSynDownloadRecBean.getTblWorkOrderAppointList());
-                tblWorkOrderCancelList.addAll(itfGreeSynDownloadRecBean.getTblWorkOrderCancelList());
-                tblWorkOrderComplainFeedbackList.addAll(itfGreeSynDownloadRecBean.getTblWorkOrderComplainFeedbackList());
-                tblWorkOrderComplainList.addAll(itfGreeSynDownloadRecBean.getTblWorkOrderComplainList());
-                tblWorkOrderCompleteInfoList.addAll(itfGreeSynDownloadRecBean.getTblWorkOrderCompleteInfoList());
-                tblWorkOrderConsultList.addAll(itfGreeSynDownloadRecBean.getTblWorkOrderConsultList());
-                tblWorkOrderDetailBarcodeList.addAll(itfGreeSynDownloadRecBean.getTblWorkOrderDetailBarcodeList());
-                tblWorkOrderDetailRelocationList.addAll(itfGreeSynDownloadRecBean.getTblWorkOrderDetailRelocationList());
-                tblWorkOrderDispatchOutletsList.addAll(itfGreeSynDownloadRecBean.getTblWorkOrderDispatchOutletsList());
-                tblWorkOrderEngineerList.addAll(itfGreeSynDownloadRecBean.getTblWorkOrderEngineerList());
-                tblWorkOrderEvaluationList.addAll(itfGreeSynDownloadRecBean.getTblWorkOrderEvaluationList());
-                tblWorkOrderExtList.addAll(itfGreeSynDownloadRecBean.getTblWorkOrderExtList());
-                tblWorkOrderIndicatorsList.addAll(itfGreeSynDownloadRecBean.getTblWorkOrderIndicatorsList());
-                tblWorkOrderSignList.addAll(itfGreeSynDownloadRecBean.getTblWorkOrderSignList());
-                tblWorkOrderTagList.addAll(itfGreeSynDownloadRecBean.getTblWorkOrderTagList());
-                workOrderCollectionComplainList.addAll(itfGreeSynDownloadRecBean.getWorkOrderCollectionComplainList());
-                workOrderChargeList.addAll(itfGreeSynDownloadRecBean.getWorkOrderChargeList());
-
-
-                for (ItfTblWorkOrderCollection0Bean itfTblWorkOrderCollectionBean : itfGreeSynDownloadRecBean.getWorkOrderCollectionList()) {
-
-                    ItfTblWorkOrderCollection itfTblWorkOrderCollection = BeanUtil.toBean(itfTblWorkOrderCollectionBean, ItfTblWorkOrderCollection.class);
-                    workOrderCollectionList.add(itfTblWorkOrderCollectionBean);
-
-                    collectionRepairList.addAll(itfTblWorkOrderCollectionBean.getCollectionRepairList());
-                    collectionRepairPartList.addAll(itfTblWorkOrderCollectionBean.getCollectionRepairPartList());
-                    collectionRepairProjectList.addAll(itfTblWorkOrderCollectionBean.getCollectionRepairProjectList());
-                    collectionRepairSymptomReasonList.addAll(itfTblWorkOrderCollectionBean.getCollectionRepairSymptomReasonList());
-                }
-                tblWorkOrderDispatchEngineerList.addAll(itfGreeSynDownloadRecBean.getTblWorkOrderDispatchEngineerList());
-                tblWorkOrderStatusList.addAll(itfGreeSynDownloadRecBean.getTblWorkOrderStatusList());
+                    tblOldProductOrderDetailList.addAll(itfGreeSynDownloadRecBean.getTblOldProductOrderDetailList());
 
-                ItfTblWorkOrder itfTblWorkOrder = BeanUtil.toBean(itfGreeSynDownloadRecBean, ItfTblWorkOrder.class);
-                itfTblWorkOrders.add(itfTblWorkOrder);
+                    tblWorkOrderAddComplainList.addAll(itfGreeSynDownloadRecBean.getTblWorkOrderAddComplainList());
 
-            }
+                    tblWorkOrderAppointList.addAll(itfGreeSynDownloadRecBean.getTblWorkOrderAppointList());
+                    tblWorkOrderCancelList.addAll(itfGreeSynDownloadRecBean.getTblWorkOrderCancelList());
+                    tblWorkOrderComplainFeedbackList.addAll(itfGreeSynDownloadRecBean.getTblWorkOrderComplainFeedbackList());
+                    tblWorkOrderComplainList.addAll(itfGreeSynDownloadRecBean.getTblWorkOrderComplainList());
+                    tblWorkOrderCompleteInfoList.addAll(itfGreeSynDownloadRecBean.getTblWorkOrderCompleteInfoList());
+                    tblWorkOrderConsultList.addAll(itfGreeSynDownloadRecBean.getTblWorkOrderConsultList());
+                    tblWorkOrderDetailBarcodeList.addAll(itfGreeSynDownloadRecBean.getTblWorkOrderDetailBarcodeList());
+                    tblWorkOrderDetailRelocationList.addAll(itfGreeSynDownloadRecBean.getTblWorkOrderDetailRelocationList());
+                    tblWorkOrderDispatchOutletsList.addAll(itfGreeSynDownloadRecBean.getTblWorkOrderDispatchOutletsList());
+                    tblWorkOrderEngineerList.addAll(itfGreeSynDownloadRecBean.getTblWorkOrderEngineerList());
+                    tblWorkOrderEvaluationList.addAll(itfGreeSynDownloadRecBean.getTblWorkOrderEvaluationList());
+                    tblWorkOrderExtList.addAll(itfGreeSynDownloadRecBean.getTblWorkOrderExtList());
+                    tblWorkOrderIndicatorsList.addAll(itfGreeSynDownloadRecBean.getTblWorkOrderIndicatorsList());
+                    tblWorkOrderSignList.addAll(itfGreeSynDownloadRecBean.getTblWorkOrderSignList());
+                    tblWorkOrderTagList.addAll(itfGreeSynDownloadRecBean.getTblWorkOrderTagList());
+                    workOrderCollectionComplainList.addAll(itfGreeSynDownloadRecBean.getWorkOrderCollectionComplainList());
+                    workOrderChargeList.addAll(itfGreeSynDownloadRecBean.getWorkOrderChargeList());
+
+
+                    for (ItfTblWorkOrderCollection0Bean itfTblWorkOrderCollectionBean : itfGreeSynDownloadRecBean.getWorkOrderCollectionList()) {
+
+                        ItfTblWorkOrderCollection itfTblWorkOrderCollection = BeanUtil.toBean(itfTblWorkOrderCollectionBean, ItfTblWorkOrderCollection.class);
+                        workOrderCollectionList.add(itfTblWorkOrderCollectionBean);
 
-            feedbackRespList.stream().forEach(item -> item.setDownloadBatchNo(batch));
-            itfTblWorkOrderFeedbackService.saveBatch(feedbackRespList);
-
-            tblWorkOrderDetailList.stream().forEach(item -> item.setDownloadBatchNo(batch));
-            itfTblWorkOrderDetailService.saveBatch(tblWorkOrderDetailList);
-
-            collectionChargeList.stream().forEach(item -> item.setDownloadBatchNo(batch));
-            itfTblCollectionChargeService.saveBatch(collectionChargeList);
-            collectionChargeDetails.stream().forEach(item -> item.setDownloadBatchNo(batch));
-            itfTblCollectionChargeDetailService.saveBatch(collectionChargeDetails);
-            tblOldProductOrderDetailList.stream().forEach(item -> item.setDownloadBatchNo(batch));
-            itfTblOldProductOrderDetailService.saveBatch(tblOldProductOrderDetailList);
-            tblWorkOrderAddComplainList.stream().forEach(item -> item.setDownloadBatchNo(batch));
-            itfTblWorkOrderAddComplainService.saveBatch(tblWorkOrderAddComplainList);
-            tblWorkOrderAppointList.stream().forEach(item -> item.setDownloadBatchNo(batch));
-            itfTblWorkOrderAppointService.saveBatch(tblWorkOrderAppointList);
-            tblWorkOrderCancelList.stream().forEach(item -> item.setDownloadBatchNo(batch));
-            itfTblWorkOrderCancelService.saveBatch(tblWorkOrderCancelList);
-            tblWorkOrderComplainList.stream().forEach(item -> item.setDownloadBatchNo(batch));
-            itfTblWorkOrderComplainService.saveBatch(tblWorkOrderComplainList);
-            tblWorkOrderComplainFeedbackList.stream().forEach(item -> item.setDownloadBatchNo(batch));
-            itfTblWorkOrderComplainFeedbackService.saveBatch(tblWorkOrderComplainFeedbackList);
-            tblWorkOrderCompleteInfoList.stream().forEach(item -> item.setDownloadBatchNo(batch));
-            itfTblWorkOrderCompleteInfoService.saveBatch(tblWorkOrderCompleteInfoList);
-            tblWorkOrderConsultList.stream().forEach(item -> item.setDownloadBatchNo(batch));
-            itfTblWorkOrderConsultService.saveBatch(tblWorkOrderConsultList);
-            tblWorkOrderDetailBarcodeList.stream().forEach(item -> item.setDownloadBatchNo(batch));
-            itfTblWorkOrderDetailBarcodeService.saveBatch(tblWorkOrderDetailBarcodeList);
-            tblWorkOrderDetailRelocationList.stream().forEach(item -> item.setDownloadBatchNo(batch));
-            itfTblWorkOrderDetailRelocationService.saveBatch(tblWorkOrderDetailRelocationList);
-            tblWorkOrderDispatchOutletsList.stream().forEach(item -> item.setDownloadBatchNo(batch));
-            itfTblWorkOrderDispatchOutletsService.saveBatch(tblWorkOrderDispatchOutletsList);
-            tblWorkOrderEngineerList.stream().forEach(item -> item.setDownloadBatchNo(batch));
-            itfTblWorkOrderEngineerService.saveBatch(tblWorkOrderEngineerList);
-            tblWorkOrderEvaluationList.stream().forEach(item -> item.setDownloadBatchNo(batch));
-            itfTblWorkOrderEvaluationService.saveBatch(tblWorkOrderEvaluationList);
-            tblWorkOrderExtList.stream().forEach(item -> item.setDownloadBatchNo(batch));
-            itfTblWorkOrderExtService.saveBatch(tblWorkOrderExtList);
-            tblWorkOrderIndicatorsList.stream().forEach(item -> item.setDownloadBatchNo(batch));
-            itfTblWorkOrderIndicatorsService.saveBatch(tblWorkOrderIndicatorsList);
-            tblWorkOrderSignList.stream().forEach(item -> item.setDownloadBatchNo(batch));
-            itfTblWorkOrderSignService.saveBatch(tblWorkOrderSignList);
-            tblWorkOrderTagList.stream().forEach(item -> item.setDownloadBatchNo(batch));
-            itfTblWorkOrderTagService.saveBatch(tblWorkOrderTagList);
-            workOrderChargeList.stream().forEach(item -> item.setDownloadBatchNo(batch));
-            itfTblWorkOrderChargeService.saveBatch(workOrderChargeList);
-            workOrderCollectionComplainList.stream().forEach(item -> item.setDownloadBatchNo(batch));
-            itfTblWorkOrderCollectionComplainService.saveBatch(workOrderCollectionComplainList);
-            tblWorkOrderDispatchEngineerList.stream().forEach(item -> item.setDownloadBatchNo(batch));
-            itfTblWorkOrderDispatchEngineerService.saveBatch(tblWorkOrderDispatchEngineerList);
-            tblWorkOrderStatusList.stream().forEach(item -> item.setDownloadBatchNo(batch));
-            itfTblWorkOrderStatusService.saveBatch(tblWorkOrderStatusList);
-            workOrderCollectionList.stream().forEach(item -> item.setDownloadBatchNo(batch));
-            itfTblWorkOrderCollectionService.saveBatch(workOrderCollectionList);
-            collectionRepairList.stream().forEach(item -> item.setDownloadBatchNo(batch));
-            itfTblCollectionRepairService.saveBatch(collectionRepairList);
-            collectionRepairPartList.stream().forEach(item -> item.setDownloadBatchNo(batch));
-            itfTblCollectionRepairPartService.saveBatch(collectionRepairPartList);
-            collectionRepairProjectList.stream().forEach(item -> item.setDownloadBatchNo(batch));
-            itfTblCollectionRepairProjectService.saveBatch(collectionRepairProjectList);
-            collectionRepairSymptomReasonList.stream().forEach(item -> item.setDownloadBatchNo(batch));
-            itfTblCollectionRepairSymptomReasonService.saveBatch(collectionRepairSymptomReasonList);
-
-
-            itfTblWorkOrderService.saveBatch(itfTblWorkOrders);
-
-
-        } catch (Exception e) {
-            List<Long> syncIds = itfGreeSynDownloadRecs.stream().map(ItfGreeSynDownloadRec::getSynReqId).collect(Collectors.toList());
-
-            itfGreeSynDownloadRecService.lambdaUpdate()
-                    .in(ItfGreeSynDownloadRec::getSynReqId, syncIds)
-                    .set(ItfGreeSynDownloadRec::getGreeStatSynErrMsg, e.getMessage())
-                    .set(ItfGreeSynDownloadRec::getGreeStatSynTime, new Date())
-                    .set(ItfGreeSynDownloadRec::getGreeStatSynStatus, 99).update();
+                        collectionRepairList.addAll(itfTblWorkOrderCollectionBean.getCollectionRepairList());
+                        collectionRepairPartList.addAll(itfTblWorkOrderCollectionBean.getCollectionRepairPartList());
+                        collectionRepairProjectList.addAll(itfTblWorkOrderCollectionBean.getCollectionRepairProjectList());
+                        collectionRepairSymptomReasonList.addAll(itfTblWorkOrderCollectionBean.getCollectionRepairSymptomReasonList());
+                    }
+                    tblWorkOrderDispatchEngineerList.addAll(itfGreeSynDownloadRecBean.getTblWorkOrderDispatchEngineerList());
+                    tblWorkOrderStatusList.addAll(itfGreeSynDownloadRecBean.getTblWorkOrderStatusList());
 
+                    ItfTblWorkOrder itfTblWorkOrder = BeanUtil.toBean(itfGreeSynDownloadRecBean, ItfTblWorkOrder.class);
+                    itfTblWorkOrders.add(itfTblWorkOrder);
 
+                }
+
+                feedbackRespList.stream().forEach(item -> item.setDownloadBatchNo(batch));
+                itfTblWorkOrderFeedbackService.saveBatch(feedbackRespList);
+
+                tblWorkOrderDetailList.stream().forEach(item -> item.setDownloadBatchNo(batch));
+                itfTblWorkOrderDetailService.saveBatch(tblWorkOrderDetailList);
+
+                collectionChargeList.stream().forEach(item -> item.setDownloadBatchNo(batch));
+                itfTblCollectionChargeService.saveBatch(collectionChargeList);
+                collectionChargeDetails.stream().forEach(item -> item.setDownloadBatchNo(batch));
+                itfTblCollectionChargeDetailService.saveBatch(collectionChargeDetails);
+                tblOldProductOrderDetailList.stream().forEach(item -> item.setDownloadBatchNo(batch));
+                itfTblOldProductOrderDetailService.saveBatch(tblOldProductOrderDetailList);
+                tblWorkOrderAddComplainList.stream().forEach(item -> item.setDownloadBatchNo(batch));
+                itfTblWorkOrderAddComplainService.saveBatch(tblWorkOrderAddComplainList);
+                tblWorkOrderAppointList.stream().forEach(item -> item.setDownloadBatchNo(batch));
+                itfTblWorkOrderAppointService.saveBatch(tblWorkOrderAppointList);
+                tblWorkOrderCancelList.stream().forEach(item -> item.setDownloadBatchNo(batch));
+                itfTblWorkOrderCancelService.saveBatch(tblWorkOrderCancelList);
+                tblWorkOrderComplainList.stream().forEach(item -> item.setDownloadBatchNo(batch));
+                itfTblWorkOrderComplainService.saveBatch(tblWorkOrderComplainList);
+                tblWorkOrderComplainFeedbackList.stream().forEach(item -> item.setDownloadBatchNo(batch));
+                itfTblWorkOrderComplainFeedbackService.saveBatch(tblWorkOrderComplainFeedbackList);
+                tblWorkOrderCompleteInfoList.stream().forEach(item -> item.setDownloadBatchNo(batch));
+                itfTblWorkOrderCompleteInfoService.saveBatch(tblWorkOrderCompleteInfoList);
+                tblWorkOrderConsultList.stream().forEach(item -> item.setDownloadBatchNo(batch));
+                itfTblWorkOrderConsultService.saveBatch(tblWorkOrderConsultList);
+                tblWorkOrderDetailBarcodeList.stream().forEach(item -> item.setDownloadBatchNo(batch));
+                itfTblWorkOrderDetailBarcodeService.saveBatch(tblWorkOrderDetailBarcodeList);
+                tblWorkOrderDetailRelocationList.stream().forEach(item -> item.setDownloadBatchNo(batch));
+                itfTblWorkOrderDetailRelocationService.saveBatch(tblWorkOrderDetailRelocationList);
+                tblWorkOrderDispatchOutletsList.stream().forEach(item -> item.setDownloadBatchNo(batch));
+                itfTblWorkOrderDispatchOutletsService.saveBatch(tblWorkOrderDispatchOutletsList);
+                tblWorkOrderEngineerList.stream().forEach(item -> item.setDownloadBatchNo(batch));
+                itfTblWorkOrderEngineerService.saveBatch(tblWorkOrderEngineerList);
+                tblWorkOrderEvaluationList.stream().forEach(item -> item.setDownloadBatchNo(batch));
+                itfTblWorkOrderEvaluationService.saveBatch(tblWorkOrderEvaluationList);
+                tblWorkOrderExtList.stream().forEach(item -> item.setDownloadBatchNo(batch));
+                itfTblWorkOrderExtService.saveBatch(tblWorkOrderExtList);
+                tblWorkOrderIndicatorsList.stream().forEach(item -> item.setDownloadBatchNo(batch));
+                itfTblWorkOrderIndicatorsService.saveBatch(tblWorkOrderIndicatorsList);
+                tblWorkOrderSignList.stream().forEach(item -> item.setDownloadBatchNo(batch));
+                itfTblWorkOrderSignService.saveBatch(tblWorkOrderSignList);
+                tblWorkOrderTagList.stream().forEach(item -> item.setDownloadBatchNo(batch));
+                itfTblWorkOrderTagService.saveBatch(tblWorkOrderTagList);
+                workOrderChargeList.stream().forEach(item -> item.setDownloadBatchNo(batch));
+                itfTblWorkOrderChargeService.saveBatch(workOrderChargeList);
+                workOrderCollectionComplainList.stream().forEach(item -> item.setDownloadBatchNo(batch));
+                itfTblWorkOrderCollectionComplainService.saveBatch(workOrderCollectionComplainList);
+                tblWorkOrderDispatchEngineerList.stream().forEach(item -> item.setDownloadBatchNo(batch));
+                itfTblWorkOrderDispatchEngineerService.saveBatch(tblWorkOrderDispatchEngineerList);
+                tblWorkOrderStatusList.stream().forEach(item -> item.setDownloadBatchNo(batch));
+                itfTblWorkOrderStatusService.saveBatch(tblWorkOrderStatusList);
+                workOrderCollectionList.stream().forEach(item -> item.setDownloadBatchNo(batch));
+                itfTblWorkOrderCollectionService.saveBatch(workOrderCollectionList);
+                collectionRepairList.stream().forEach(item -> item.setDownloadBatchNo(batch));
+                itfTblCollectionRepairService.saveBatch(collectionRepairList);
+                collectionRepairPartList.stream().forEach(item -> item.setDownloadBatchNo(batch));
+                itfTblCollectionRepairPartService.saveBatch(collectionRepairPartList);
+                collectionRepairProjectList.stream().forEach(item -> item.setDownloadBatchNo(batch));
+                itfTblCollectionRepairProjectService.saveBatch(collectionRepairProjectList);
+                collectionRepairSymptomReasonList.stream().forEach(item -> item.setDownloadBatchNo(batch));
+                itfTblCollectionRepairSymptomReasonService.saveBatch(collectionRepairSymptomReasonList);
+
+
+                itfTblWorkOrderService.saveBatch(itfTblWorkOrders);
+
+
+            } catch (Exception e) {
+                List<Long> syncIds = itfGreeSynDownloadRecs.stream().map(ItfGreeSynDownloadRec::getSynReqId).collect(Collectors.toList());
+
+                itfGreeSynDownloadRecService.lambdaUpdate()
+                        .in(ItfGreeSynDownloadRec::getSynReqId, syncIds)
+                        .set(ItfGreeSynDownloadRec::getGreeStatSynErrMsg, e.getMessage())
+                        .set(ItfGreeSynDownloadRec::getGreeStatSynTime, new Date())
+                        .set(ItfGreeSynDownloadRec::getGreeStatSynStatus, 99).update();
+
+
+            }
         }
 
     }

mall-server-sync-api/mvnw

@@ -0,0 +1,310 @@
+#!/bin/sh
+# ----------------------------------------------------------------------------
+# Licensed to the Apache Software Foundation (ASF) under one
+# or more contributor license agreements.  See the NOTICE file
+# distributed with this work for additional information
+# regarding copyright ownership.  The ASF licenses this file
+# to you under the Apache License, Version 2.0 (the
+# "License"); you may not use this file except in compliance
+# with the License.  You may obtain a copy of the License at
+#
+#    https://www.apache.org/licenses/LICENSE-2.0
+#
+# Unless required by applicable law or agreed to in writing,
+# software distributed under the License is distributed on an
+# "AS IS" BASIS, WITHOUT WARRANTIES OR CONDITIONS OF ANY
+# KIND, either express or implied.  See the License for the
+# specific language governing permissions and limitations
+# under the License.
+# ----------------------------------------------------------------------------
+
+# ----------------------------------------------------------------------------
+# Maven Start Up Batch script
+#
+# Required ENV vars:
+# ------------------
+#   JAVA_HOME - location of a JDK home dir
+#
+# Optional ENV vars
+# -----------------
+#   M2_HOME - location of maven2's installed home dir
+#   MAVEN_OPTS - parameters passed to the Java VM when running Maven
+#     e.g. to debug Maven itself, use
+#       set MAVEN_OPTS=-Xdebug -Xrunjdwp:transport=dt_socket,server=y,suspend=y,address=8000
+#   MAVEN_SKIP_RC - flag to disable loading of mavenrc files
+# ----------------------------------------------------------------------------
+
+if [ -z "$MAVEN_SKIP_RC" ] ; then
+
+  if [ -f /etc/mavenrc ] ; then
+    . /etc/mavenrc
+  fi
+
+  if [ -f "$HOME/.mavenrc" ] ; then
+    . "$HOME/.mavenrc"
+  fi
+
+fi
+
+# OS specific support.  $var _must_ be set to either true or false.
+cygwin=false;
+darwin=false;
+mingw=false
+case "`uname`" in
+  CYGWIN*) cygwin=true ;;
+  MINGW*) mingw=true;;
+  Darwin*) darwin=true
+    # Use /usr/libexec/java_home if available, otherwise fall back to /Library/Java/Home
+    # See https://developer.apple.com/library/mac/qa/qa1170/_index.html
+    if [ -z "$JAVA_HOME" ]; then
+      if [ -x "/usr/libexec/java_home" ]; then
+        export JAVA_HOME="`/usr/libexec/java_home`"
+      else
+        export JAVA_HOME="/Library/Java/Home"
+      fi
+    fi
+    ;;
+esac
+
+if [ -z "$JAVA_HOME" ] ; then
+  if [ -r /etc/gentoo-release ] ; then
+    JAVA_HOME=`java-config --jre-home`
+  fi
+fi
+
+if [ -z "$M2_HOME" ] ; then
+  ## resolve links - $0 may be a link to maven's home
+  PRG="$0"
+
+  # need this for relative symlinks
+  while [ -h "$PRG" ] ; do
+    ls=`ls -ld "$PRG"`
+    link=`expr "$ls" : '.*-> \(.*\)$'`
+    if expr "$link" : '/.*' > /dev/null; then
+      PRG="$link"
+    else
+      PRG="`dirname "$PRG"`/$link"
+    fi
+  done
+
+  saveddir=`pwd`
+
+  M2_HOME=`dirname "$PRG"`/..
+
+  # make it fully qualified
+  M2_HOME=`cd "$M2_HOME" && pwd`
+
+  cd "$saveddir"
+  # echo Using m2 at $M2_HOME
+fi
+
+# For Cygwin, ensure paths are in UNIX format before anything is touched
+if $cygwin ; then
+  [ -n "$M2_HOME" ] &&
+    M2_HOME=`cygpath --unix "$M2_HOME"`
+  [ -n "$JAVA_HOME" ] &&
+    JAVA_HOME=`cygpath --unix "$JAVA_HOME"`
+  [ -n "$CLASSPATH" ] &&
+    CLASSPATH=`cygpath --path --unix "$CLASSPATH"`
+fi
+
+# For Mingw, ensure paths are in UNIX format before anything is touched
+if $mingw ; then
+  [ -n "$M2_HOME" ] &&
+    M2_HOME="`(cd "$M2_HOME"; pwd)`"
+  [ -n "$JAVA_HOME" ] &&
+    JAVA_HOME="`(cd "$JAVA_HOME"; pwd)`"
+fi
+
+if [ -z "$JAVA_HOME" ]; then
+  javaExecutable="`which javac`"
+  if [ -n "$javaExecutable" ] && ! [ "`expr \"$javaExecutable\" : '\([^ ]*\)'`" = "no" ]; then
+    # readlink(1) is not available as standard on Solaris 10.
+    readLink=`which readlink`
+    if [ ! `expr "$readLink" : '\([^ ]*\)'` = "no" ]; then
+      if $darwin ; then
+        javaHome="`dirname \"$javaExecutable\"`"
+        javaExecutable="`cd \"$javaHome\" && pwd -P`/javac"
+      else
+        javaExecutable="`readlink -f \"$javaExecutable\"`"
+      fi
+      javaHome="`dirname \"$javaExecutable\"`"
+      javaHome=`expr "$javaHome" : '\(.*\)/bin'`
+      JAVA_HOME="$javaHome"
+      export JAVA_HOME
+    fi
+  fi
+fi
+
+if [ -z "$JAVACMD" ] ; then
+  if [ -n "$JAVA_HOME"  ] ; then
+    if [ -x "$JAVA_HOME/jre/sh/java" ] ; then
+      # IBM's JDK on AIX uses strange locations for the executables
+      JAVACMD="$JAVA_HOME/jre/sh/java"
+    else
+      JAVACMD="$JAVA_HOME/bin/java"
+    fi
+  else
+    JAVACMD="`which java`"
+  fi
+fi
+
+if [ ! -x "$JAVACMD" ] ; then
+  echo "Error: JAVA_HOME is not defined correctly." >&2
+  echo "  We cannot execute $JAVACMD" >&2
+  exit 1
+fi
+
+if [ -z "$JAVA_HOME" ] ; then
+  echo "Warning: JAVA_HOME environment variable is not set."
+fi
+
+CLASSWORLDS_LAUNCHER=org.codehaus.plexus.classworlds.launcher.Launcher
+
+# traverses directory structure from process work directory to filesystem root
+# first directory with .mvn subdirectory is considered project base directory
+find_maven_basedir() {
+
+  if [ -z "$1" ]
+  then
+    echo "Path not specified to find_maven_basedir"
+    return 1
+  fi
+
+  basedir="$1"
+  wdir="$1"
+  while [ "$wdir" != '/' ] ; do
+    if [ -d "$wdir"/.mvn ] ; then
+      basedir=$wdir
+      break
+    fi
+    # workaround for JBEAP-8937 (on Solaris 10/Sparc)
+    if [ -d "${wdir}" ]; then
+      wdir=`cd "$wdir/.."; pwd`
+    fi
+    # end of workaround
+  done
+  echo "${basedir}"
+}
+
+# concatenates all lines of a file
+concat_lines() {
+  if [ -f "$1" ]; then
+    echo "$(tr -s '\n' ' ' < "$1")"
+  fi
+}
+
+BASE_DIR=`find_maven_basedir "$(pwd)"`
+if [ -z "$BASE_DIR" ]; then
+  exit 1;
+fi
+
+##########################################################################################
+# Extension to allow automatically downloading the maven-wrapper.jar from Maven-central
+# This allows using the maven wrapper in projects that prohibit checking in binary data.
+##########################################################################################
+if [ -r "$BASE_DIR/.mvn/wrapper/maven-wrapper.jar" ]; then
+    if [ "$MVNW_VERBOSE" = true ]; then
+      echo "Found .mvn/wrapper/maven-wrapper.jar"
+    fi
+else
+    if [ "$MVNW_VERBOSE" = true ]; then
+      echo "Couldn't find .mvn/wrapper/maven-wrapper.jar, downloading it ..."
+    fi
+    if [ -n "$MVNW_REPOURL" ]; then
+      jarUrl="$MVNW_REPOURL/io/takari/maven-wrapper/0.5.6/maven-wrapper-0.5.6.jar"
+    else
+      jarUrl="https://repo.maven.apache.org/maven2/io/takari/maven-wrapper/0.5.6/maven-wrapper-0.5.6.jar"
+    fi
+    while IFS="=" read key value; do
+      case "$key" in (wrapperUrl) jarUrl="$value"; break ;;
+      esac
+    done < "$BASE_DIR/.mvn/wrapper/maven-wrapper.properties"
+    if [ "$MVNW_VERBOSE" = true ]; then
+      echo "Downloading from: $jarUrl"
+    fi
+    wrapperJarPath="$BASE_DIR/.mvn/wrapper/maven-wrapper.jar"
+    if $cygwin; then
+      wrapperJarPath=`cygpath --path --windows "$wrapperJarPath"`
+    fi
+
+    if command -v wget > /dev/null; then
+        if [ "$MVNW_VERBOSE" = true ]; then
+          echo "Found wget ... using wget"
+        fi
+        if [ -z "$MVNW_USERNAME" ] || [ -z "$MVNW_PASSWORD" ]; then
+            wget "$jarUrl" -O "$wrapperJarPath"
+        else
+            wget --http-user=$MVNW_USERNAME --http-password=$MVNW_PASSWORD "$jarUrl" -O "$wrapperJarPath"
+        fi
+    elif command -v curl > /dev/null; then
+        if [ "$MVNW_VERBOSE" = true ]; then
+          echo "Found curl ... using curl"
+        fi
+        if [ -z "$MVNW_USERNAME" ] || [ -z "$MVNW_PASSWORD" ]; then
+            curl -o "$wrapperJarPath" "$jarUrl" -f
+        else
+            curl --user $MVNW_USERNAME:$MVNW_PASSWORD -o "$wrapperJarPath" "$jarUrl" -f
+        fi
+
+    else
+        if [ "$MVNW_VERBOSE" = true ]; then
+          echo "Falling back to using Java to download"
+        fi
+        javaClass="$BASE_DIR/.mvn/wrapper/MavenWrapperDownloader.java"
+        # For Cygwin, switch paths to Windows format before running javac
+        if $cygwin; then
+          javaClass=`cygpath --path --windows "$javaClass"`
+        fi
+        if [ -e "$javaClass" ]; then
+            if [ ! -e "$BASE_DIR/.mvn/wrapper/MavenWrapperDownloader.class" ]; then
+                if [ "$MVNW_VERBOSE" = true ]; then
+                  echo " - Compiling MavenWrapperDownloader.java ..."
+                fi
+                # Compiling the Java class
+                ("$JAVA_HOME/bin/javac" "$javaClass")
+            fi
+            if [ -e "$BASE_DIR/.mvn/wrapper/MavenWrapperDownloader.class" ]; then
+                # Running the downloader
+                if [ "$MVNW_VERBOSE" = true ]; then
+                  echo " - Running MavenWrapperDownloader.java ..."
+                fi
+                ("$JAVA_HOME/bin/java" -cp .mvn/wrapper MavenWrapperDownloader "$MAVEN_PROJECTBASEDIR")
+            fi
+        fi
+    fi
+fi
+##########################################################################################
+# End of extension
+##########################################################################################
+
+export MAVEN_PROJECTBASEDIR=${MAVEN_BASEDIR:-"$BASE_DIR"}
+if [ "$MVNW_VERBOSE" = true ]; then
+  echo $MAVEN_PROJECTBASEDIR
+fi
+MAVEN_OPTS="$(concat_lines "$MAVEN_PROJECTBASEDIR/.mvn/jvm.config") $MAVEN_OPTS"
+
+# For Cygwin, switch paths to Windows format before running java
+if $cygwin; then
+  [ -n "$M2_HOME" ] &&
+    M2_HOME=`cygpath --path --windows "$M2_HOME"`
+  [ -n "$JAVA_HOME" ] &&
+    JAVA_HOME=`cygpath --path --windows "$JAVA_HOME"`
+  [ -n "$CLASSPATH" ] &&
+    CLASSPATH=`cygpath --path --windows "$CLASSPATH"`
+  [ -n "$MAVEN_PROJECTBASEDIR" ] &&
+    MAVEN_PROJECTBASEDIR=`cygpath --path --windows "$MAVEN_PROJECTBASEDIR"`
+fi
+
+# Provide a "standardized" way to retrieve the CLI args that will
+# work with both Windows and non-Windows executions.
+MAVEN_CMD_LINE_ARGS="$MAVEN_CONFIG $@"
+export MAVEN_CMD_LINE_ARGS
+
+WRAPPER_LAUNCHER=org.apache.maven.wrapper.MavenWrapperMain
+
+exec "$JAVACMD" \
+  $MAVEN_OPTS \
+  -classpath "$MAVEN_PROJECTBASEDIR/.mvn/wrapper/maven-wrapper.jar" \
+  "-Dmaven.home=${M2_HOME}" "-Dmaven.multiModuleProjectDirectory=${MAVEN_PROJECTBASEDIR}" \
+  ${WRAPPER_LAUNCHER} $MAVEN_CONFIG "$@"

mall-server-sync-api/src/main/java/com/gree/mall/manager/logic/SyncOrderInfoLogic.java

@@ -211,19 +211,18 @@ public class SyncOrderInfoLogic {
             Map<String, String> heard = new HashMap<>();
             heard.put("authorization", "Bearer " + accessToken);
 
-            log.info(greeUrl + Constant.gree.GET_UPDATE_ORDERS + "/" + itfGreeSynRule.getSalesWebsitNumber() + "/" + time+",参数"+params.toString()+",token"+heard);
             String body = HttpUtils.requestGet(greeUrl + Constant.gree.GET_UPDATE_ORDERS + "/" + itfGreeSynRule.getSalesWebsitNumber() + "/" + time, params, heard);
 
-            log.info(itfGreeSynRule.getSalesWebsitNumber()+"时间为："+time+"【工单同步数据内容】:" + body);
             Map<String, Object> bodyMap = JSON.parseObject(body);
 
+            log.info(itfGreeSynRule.getSalesWebsitNumber() + "时间为：" + time + "【工单同步数据内容】:" + bodyMap.toString());
+
             String s = bodyMap.get("data").toString();
 
 
             JSONArray jsonArray = JSONUtil.parseArray(s);
 
 
-
             itfGreeSynRule.setLastSynUpdTime(new Date());
 
             itfGreeSynRule.updateById();
@@ -258,8 +257,8 @@ public class SyncOrderInfoLogic {
             itfGreeSynDownloadRecService.lambdaUpdate().in(ItfGreeSynDownloadRec::getWorkOrderId,
                     itfGreeSynDownloadRecs.stream().map(ItfGreeSynDownloadRec::getWorkOrderId)
                             .collect(Collectors.toList()))
-                    .eq(ItfGreeSynDownloadRec::getGreeStatSynStatus,0)
-                    .set(ItfGreeSynDownloadRec::getGreeStatSynStatus,9)
+                    .eq(ItfGreeSynDownloadRec::getGreeStatSynStatus, 0)
+                    .set(ItfGreeSynDownloadRec::getGreeStatSynStatus, 9)
                     .update();
 
             itfGreeSynDownloadRecService.saveBatch(itfGreeSynDownloadRecs);
@@ -306,235 +305,301 @@ public class SyncOrderInfoLogic {
     }
 
 
-    @Transactional(rollbackFor = Exception.class)
-    public void syncDetail() {
+    public synchronized void syncDetail() {
 
+        while (true) {
 
-        List<ItfGreeSynDownloadRec> itfGreeSynDownloadRecs = itfGreeSynDownloadRecService.lambdaQuery()
-                .in(ItfGreeSynDownloadRec::getGreeStatSynStatus, 0,99)
-                .last("limit 50")
-                .orderByAsc(ItfGreeSynDownloadRec::getGreeStatSynStatus)
-                .list();
-        if (CollectionUtils.isEmpty(itfGreeSynDownloadRecs))
-            return;
 
+            List<ItfGreeSynDownloadRec> itfGreeSynDownloadRecs = itfGreeSynDownloadRecService.lambdaQuery()
+                    .in(ItfGreeSynDownloadRec::getGreeStatSynStatus, 0, 99)
+                    .last("limit 20")
+                    .orderByAsc(ItfGreeSynDownloadRec::getGreeStatSynStatus)
+                    .list();
+            if (CollectionUtils.isEmpty(itfGreeSynDownloadRecs))
+                return;
 
-        try {
 
-            String batch = IdWorker.getIdStr();
+            try {
 
-            String accessToken = this.getAccessTokenV3();
+                String batch = IdWorker.getIdStr();
 
+                String accessToken = this.getAccessTokenV3();
 
-            Map<String, String> params = new HashMap<>();
 
-            Map<String, String> heard = new HashMap<>();
-            heard.put("authorization", "Bearer " + accessToken);
+                Map<String, String> params = new HashMap<>();
 
-            WorkOrderSearchReq workOrderSearchReq = new WorkOrderSearchReq();
+                Map<String, String> heard = new HashMap<>();
+                heard.put("authorization", "Bearer " + accessToken);
 
-            List<String> collect = itfGreeSynDownloadRecs.stream().map(ItfGreeSynDownloadRec::getWorkOrderId).collect(Collectors.toList());
-            List<Long> syncIds = itfGreeSynDownloadRecs.stream().map(ItfGreeSynDownloadRec::getSynReqId).collect(Collectors.toList());
+                WorkOrderSearchReq workOrderSearchReq = new WorkOrderSearchReq();
 
-            itfGreeSynDownloadRecService.lambdaUpdate()
-                    .in(ItfGreeSynDownloadRec::getSynReqId, syncIds)
-                    .set(ItfGreeSynDownloadRec::getGreeStatSynStatus, 1)
-                    .set(ItfGreeSynDownloadRec::getDownloadBatchNo, batch)
-                    .set(ItfGreeSynDownloadRec::getGreeStatSynTime, new Date())
-                    .update();
+                List<String> collect = itfGreeSynDownloadRecs.stream().map(ItfGreeSynDownloadRec::getWorkOrderId).collect(Collectors.toList());
+                List<Long> syncIds = itfGreeSynDownloadRecs.stream().map(ItfGreeSynDownloadRec::getSynReqId).collect(Collectors.toList());
 
-            workOrderSearchReq.setWorkOrderIds(collect);
+                itfGreeSynDownloadRecService.lambdaUpdate()
+                        .in(ItfGreeSynDownloadRec::getSynReqId, syncIds)
+                        .set(ItfGreeSynDownloadRec::getGreeStatSynStatus, 1)
+                        .set(ItfGreeSynDownloadRec::getDownloadBatchNo, batch)
+                        .set(ItfGreeSynDownloadRec::getGreeStatSynTime, new Date())
+                        .update();
 
-            String json = JSONUtil.toJsonStr(workOrderSearchReq);
+                workOrderSearchReq.setWorkOrderIds(collect);
 
+                String json = JSONUtil.toJsonStr(workOrderSearchReq);
 
 
-            String body = HttpUtils.requestPostBody(greeUrl + Constant.gree.POST_WORKER_ORDER_DETAIL, json, heard);
+                String body = HttpUtils.requestPostBody(greeUrl + Constant.gree.POST_WORKER_ORDER_DETAIL, json, heard);
 
-            Map<String, Object> bodyMap = JSON.parseObject(body);
-            String s = bodyMap.get("data").toString();
+                Map<String, Object> bodyMap = JSON.parseObject(body);
+                String s = bodyMap.get("data").toString();
 
 
-            log.info("工单同步详情返回："+s);
+                log.info("工单同步详情返回：" + s);
 
 
-            JSONArray jsonArray = JSONUtil.parseArray(s);
+                JSONArray jsonArray = JSONUtil.parseArray(s);
 
-            List<WorkOrderRelationBean> itfGreeSynDownloadRecBeans = JSONUtil.toList(jsonArray, WorkOrderRelationBean.class);
+                List<WorkOrderRelationBean> itfGreeSynDownloadRecBeans = JSONUtil.toList(jsonArray, WorkOrderRelationBean.class);
 
 
-            List<ItfTblWorkOrderFeedback> feedbackRespList = new ArrayList<>();
-            List<ItfTblCollectionCharge> collectionChargeList = new ArrayList<>();
-            List<ItfTblCollectionChargeDetail> collectionChargeDetails = new ArrayList<>();
-            List<ItfTblOldProductOrderDetail> tblOldProductOrderDetailList = new ArrayList<>();
-            List<ItfTblWorkOrderAddComplain> tblWorkOrderAddComplainList = new ArrayList<>();
-            List<ItfTblWorkOrderAppoint> tblWorkOrderAppointList = new ArrayList<>();
-            List<ItfTblWorkOrderCancel> tblWorkOrderCancelList = new ArrayList<>();
-            List<ItfTblWorkOrderComplainFeedback> tblWorkOrderComplainFeedbackList = new ArrayList<>();
-            List<ItfTblWorkOrderComplain> tblWorkOrderComplainList = new ArrayList<>();
-            List<ItfTblWorkOrderCompleteInfo> tblWorkOrderCompleteInfoList = new ArrayList<>();
-            List<ItfTblWorkOrderConsult> tblWorkOrderConsultList = new ArrayList<>();
-            List<ItfTblWorkOrderDetailBarcode> tblWorkOrderDetailBarcodeList = new ArrayList<>();
-            List<ItfTblWorkOrderDetailRelocation> tblWorkOrderDetailRelocationList = new ArrayList<>();
-            List<ItfTblWorkOrderDispatchOutlets> tblWorkOrderDispatchOutletsList = new ArrayList<>();
-            List<ItfTblWorkOrderEngineer> tblWorkOrderEngineerList = new ArrayList<>();
-            List<ItfTblWorkOrderEvaluation> tblWorkOrderEvaluationList = new ArrayList<>();
-            List<ItfTblWorkOrderExt> tblWorkOrderExtList = new ArrayList<>();
-            List<ItfTblWorkOrderIndicators> tblWorkOrderIndicatorsList = new ArrayList<>();
-            List<ItfTblWorkOrderSign> tblWorkOrderSignList = new ArrayList<>();
-            List<ItfTblWorkOrderTag> tblWorkOrderTagList = new ArrayList<>();
-            List<ItfTblWorkOrderCharge> workOrderChargeList = new ArrayList<>();
-            List<ItfTblWorkOrderCollectionComplain> workOrderCollectionComplainList = new ArrayList<>();
+                List<ItfTblWorkOrderFeedback> feedbackRespList = new ArrayList<>();
+                List<ItfTblCollectionCharge> collectionChargeList = new ArrayList<>();
+                List<ItfTblCollectionChargeDetail> collectionChargeDetails = new ArrayList<>();
+                List<ItfTblOldProductOrderDetail> tblOldProductOrderDetailList = new ArrayList<>();
+                List<ItfTblWorkOrderAddComplain> tblWorkOrderAddComplainList = new ArrayList<>();
+                List<ItfTblWorkOrderAppoint> tblWorkOrderAppointList = new ArrayList<>();
+                List<ItfTblWorkOrderCancel> tblWorkOrderCancelList = new ArrayList<>();
+                List<ItfTblWorkOrderComplainFeedback> tblWorkOrderComplainFeedbackList = new ArrayList<>();
+                List<ItfTblWorkOrderComplain> tblWorkOrderComplainList = new ArrayList<>();
+                List<ItfTblWorkOrderCompleteInfo> tblWorkOrderCompleteInfoList = new ArrayList<>();
+                List<ItfTblWorkOrderConsult> tblWorkOrderConsultList = new ArrayList<>();
+                List<ItfTblWorkOrderDetailBarcode> tblWorkOrderDetailBarcodeList = new ArrayList<>();
+                List<ItfTblWorkOrderDetailRelocation> tblWorkOrderDetailRelocationList = new ArrayList<>();
+                List<ItfTblWorkOrderDispatchOutlets> tblWorkOrderDispatchOutletsList = new ArrayList<>();
+                List<ItfTblWorkOrderEngineer> tblWorkOrderEngineerList = new ArrayList<>();
+                List<ItfTblWorkOrderEvaluation> tblWorkOrderEvaluationList = new ArrayList<>();
+                List<ItfTblWorkOrderExt> tblWorkOrderExtList = new ArrayList<>();
+                List<ItfTblWorkOrderIndicators> tblWorkOrderIndicatorsList = new ArrayList<>();
+                List<ItfTblWorkOrderSign> tblWorkOrderSignList = new ArrayList<>();
+                List<ItfTblWorkOrderTag> tblWorkOrderTagList = new ArrayList<>();
+                List<ItfTblWorkOrderCharge> workOrderChargeList = new ArrayList<>();
+                List<ItfTblWorkOrderCollectionComplain> workOrderCollectionComplainList = new ArrayList<>();
 
-            List<ItfTblWorkOrderDispatchEngineer> tblWorkOrderDispatchEngineerList = new ArrayList<>();
-            List<ItfTblWorkOrderStatus> tblWorkOrderStatusList = new ArrayList<>();
+                List<ItfTblWorkOrderDispatchEngineer> tblWorkOrderDispatchEngineerList = new ArrayList<>();
+                List<ItfTblWorkOrderStatus> tblWorkOrderStatusList = new ArrayList<>();
 
-            List<ItfTblWorkOrderCollection> workOrderCollectionList = new ArrayList<>();
-            List<ItfTblCollectionRepair> collectionRepairList = new ArrayList<>();
-            List<ItfTblCollectionRepairPart> collectionRepairPartList = new ArrayList<>();
-            List<ItfTblCollectionRepairProject> collectionRepairProjectList = new ArrayList<>();
-            List<ItfTblCollectionRepairSymptomReason> collectionRepairSymptomReasonList = new ArrayList<>();
-            List<ItfTblWorkOrderDetail> tblWorkOrderDetailList = new ArrayList<>();
+                List<ItfTblWorkOrderCollection> workOrderCollectionList = new ArrayList<>();
+                List<ItfTblCollectionRepair> collectionRepairList = new ArrayList<>();
+                List<ItfTblCollectionRepairPart> collectionRepairPartList = new ArrayList<>();
+                List<ItfTblCollectionRepairProject> collectionRepairProjectList = new ArrayList<>();
+                List<ItfTblCollectionRepairSymptomReason> collectionRepairSymptomReasonList = new ArrayList<>();
+                List<ItfTblWorkOrderDetail> tblWorkOrderDetailList = new ArrayList<>();
 
-            List<ItfTblWorkOrder> itfTblWorkOrders = new ArrayList<>();
+                List<ItfTblWorkOrder> itfTblWorkOrders = new ArrayList<>();
 
 
-            for (WorkOrderRelationBean itfGreeSynDownloadRecBean : itfGreeSynDownloadRecBeans) {
+                for (WorkOrderRelationBean itfGreeSynDownloadRecBean : itfGreeSynDownloadRecBeans) {
 
-                List<ItfGreeSynDownloadRec> itfGreeSynDownloadRecList = itfGreeSynDownloadRecs.stream()
-                        .filter(item -> item.getWorkOrderId().equals(itfGreeSynDownloadRecBean.getId())).collect(Collectors.toList());
+                    List<ItfGreeSynDownloadRec> itfGreeSynDownloadRecList = itfGreeSynDownloadRecs.stream()
+                            .filter(item -> item.getWorkOrderId().equals(itfGreeSynDownloadRecBean.getId())).collect(Collectors.toList());
 
-                itfGreeSynDownloadRecBean.setDownloadBatchNo(batch);
+                    itfGreeSynDownloadRecBean.setDownloadBatchNo(batch);
 
-                tblWorkOrderDetailList.addAll(itfGreeSynDownloadRecBean.getTblWorkOrderDetailList());
+                    tblWorkOrderDetailList.addAll(itfGreeSynDownloadRecBean.getTblWorkOrderDetailList());
 
 
-                feedbackRespList.addAll(itfGreeSynDownloadRecBean.getFeedbackRespList());
+                    feedbackRespList.addAll(itfGreeSynDownloadRecBean.getFeedbackRespList());
 
-                for (ItfTblCollectionChargeBean itfTblCollectionChargeBean : itfGreeSynDownloadRecBean.getCollectionChargeList()) {
-                    ItfTblCollectionCharge itfTblCollectionCharge = BeanUtil.toBean(itfTblCollectionChargeBean, ItfTblCollectionCharge.class);
-                    collectionChargeList.add(itfTblCollectionCharge);
-                    collectionChargeDetails.addAll(itfTblCollectionChargeBean.getCollectionChargeDetails());
-                }
+                    for (ItfTblCollectionChargeBean itfTblCollectionChargeBean : itfGreeSynDownloadRecBean.getCollectionChargeList()) {
+                        ItfTblCollectionCharge itfTblCollectionCharge = BeanUtil.toBean(itfTblCollectionChargeBean, ItfTblCollectionCharge.class);
+                        collectionChargeList.add(itfTblCollectionCharge);
+                        collectionChargeDetails.addAll(itfTblCollectionChargeBean.getCollectionChargeDetails());
+                    }
+
+                    tblOldProductOrderDetailList.addAll(itfGreeSynDownloadRecBean.getTblOldProductOrderDetailList());
 
-                tblOldProductOrderDetailList.addAll(itfGreeSynDownloadRecBean.getTblOldProductOrderDetailList());
+                    tblWorkOrderAddComplainList.addAll(itfGreeSynDownloadRecBean.getTblWorkOrderAddComplainList());
 
-                tblWorkOrderAddComplainList.addAll(itfGreeSynDownloadRecBean.getTblWorkOrderAddComplainList());
+                    tblWorkOrderAppointList.addAll(itfGreeSynDownloadRecBean.getTblWorkOrderAppointList());
+                    tblWorkOrderCancelList.addAll(itfGreeSynDownloadRecBean.getTblWorkOrderCancelList());
+                    tblWorkOrderComplainFeedbackList.addAll(itfGreeSynDownloadRecBean.getTblWorkOrderComplainFeedbackList());
+                    tblWorkOrderComplainList.addAll(itfGreeSynDownloadRecBean.getTblWorkOrderComplainList());
+                    tblWorkOrderCompleteInfoList.addAll(itfGreeSynDownloadRecBean.getTblWorkOrderCompleteInfoList());
+                    tblWorkOrderConsultList.addAll(itfGreeSynDownloadRecBean.getTblWorkOrderConsultList());
+                    tblWorkOrderDetailBarcodeList.addAll(itfGreeSynDownloadRecBean.getTblWorkOrderDetailBarcodeList());
+                    tblWorkOrderDetailRelocationList.addAll(itfGreeSynDownloadRecBean.getTblWorkOrderDetailRelocationList());
+                    tblWorkOrderDispatchOutletsList.addAll(itfGreeSynDownloadRecBean.getTblWorkOrderDispatchOutletsList());
+                    tblWorkOrderEngineerList.addAll(itfGreeSynDownloadRecBean.getTblWorkOrderEngineerList());
+                    tblWorkOrderEvaluationList.addAll(itfGreeSynDownloadRecBean.getTblWorkOrderEvaluationList());
+                    tblWorkOrderExtList.addAll(itfGreeSynDownloadRecBean.getTblWorkOrderExtList());
+                    tblWorkOrderIndicatorsList.addAll(itfGreeSynDownloadRecBean.getTblWorkOrderIndicatorsList());
+                    tblWorkOrderSignList.addAll(itfGreeSynDownloadRecBean.getTblWorkOrderSignList());
+                    tblWorkOrderTagList.addAll(itfGreeSynDownloadRecBean.getTblWorkOrderTagList());
+                    workOrderCollectionComplainList.addAll(itfGreeSynDownloadRecBean.getWorkOrderCollectionComplainList());
+                    workOrderChargeList.addAll(itfGreeSynDownloadRecBean.getWorkOrderChargeList());
 
-                tblWorkOrderAppointList.addAll(itfGreeSynDownloadRecBean.getTblWorkOrderAppointList());
-                tblWorkOrderCancelList.addAll(itfGreeSynDownloadRecBean.getTblWorkOrderCancelList());
-                tblWorkOrderComplainFeedbackList.addAll(itfGreeSynDownloadRecBean.getTblWorkOrderComplainFeedbackList());
-                tblWorkOrderComplainList.addAll(itfGreeSynDownloadRecBean.getTblWorkOrderComplainList());
-                tblWorkOrderCompleteInfoList.addAll(itfGreeSynDownloadRecBean.getTblWorkOrderCompleteInfoList());
-                tblWorkOrderConsultList.addAll(itfGreeSynDownloadRecBean.getTblWorkOrderConsultList());
-                tblWorkOrderDetailBarcodeList.addAll(itfGreeSynDownloadRecBean.getTblWorkOrderDetailBarcodeList());
-                tblWorkOrderDetailRelocationList.addAll(itfGreeSynDownloadRecBean.getTblWorkOrderDetailRelocationList());
-                tblWorkOrderDispatchOutletsList.addAll(itfGreeSynDownloadRecBean.getTblWorkOrderDispatchOutletsList());
-                tblWorkOrderEngineerList.addAll(itfGreeSynDownloadRecBean.getTblWorkOrderEngineerList());
-                tblWorkOrderEvaluationList.addAll(itfGreeSynDownloadRecBean.getTblWorkOrderEvaluationList());
-                tblWorkOrderExtList.addAll(itfGreeSynDownloadRecBean.getTblWorkOrderExtList());
-                tblWorkOrderIndicatorsList.addAll(itfGreeSynDownloadRecBean.getTblWorkOrderIndicatorsList());
-                tblWorkOrderSignList.addAll(itfGreeSynDownloadRecBean.getTblWorkOrderSignList());
-                tblWorkOrderTagList.addAll(itfGreeSynDownloadRecBean.getTblWorkOrderTagList());
-                workOrderCollectionComplainList.addAll(itfGreeSynDownloadRecBean.getWorkOrderCollectionComplainList());
-                workOrderChargeList.addAll(itfGreeSynDownloadRecBean.getWorkOrderChargeList());
 
+                    for (ItfTblWorkOrderCollection0Bean itfTblWorkOrderCollectionBean : itfGreeSynDownloadRecBean.getWorkOrderCollectionList()) {
 
-                for (ItfTblWorkOrderCollection0Bean itfTblWorkOrderCollectionBean : itfGreeSynDownloadRecBean.getWorkOrderCollectionList()) {
+                        ItfTblWorkOrderCollection itfTblWorkOrderCollection = BeanUtil.toBean(itfTblWorkOrderCollectionBean, ItfTblWorkOrderCollection.class);
+                        workOrderCollectionList.add(itfTblWorkOrderCollectionBean);
 
-                    ItfTblWorkOrderCollection itfTblWorkOrderCollection = BeanUtil.toBean(itfTblWorkOrderCollectionBean, ItfTblWorkOrderCollection.class);
-                    workOrderCollectionList.add(itfTblWorkOrderCollectionBean);
+                        collectionRepairList.addAll(itfTblWorkOrderCollectionBean.getCollectionRepairList());
+                        collectionRepairPartList.addAll(itfTblWorkOrderCollectionBean.getCollectionRepairPartList());
+                        collectionRepairProjectList.addAll(itfTblWorkOrderCollectionBean.getCollectionRepairProjectList());
+                        collectionRepairSymptomReasonList.addAll(itfTblWorkOrderCollectionBean.getCollectionRepairSymptomReasonList());
+                    }
+                    tblWorkOrderDispatchEngineerList.addAll(itfGreeSynDownloadRecBean.getTblWorkOrderDispatchEngineerList());
+                    tblWorkOrderStatusList.addAll(itfGreeSynDownloadRecBean.getTblWorkOrderStatusList());
+
+                    ItfTblWorkOrder itfTblWorkOrder = BeanUtil.toBean(itfGreeSynDownloadRecBean, ItfTblWorkOrder.class);
+                    itfTblWorkOrders.add(itfTblWorkOrder);
 
-                    collectionRepairList.addAll(itfTblWorkOrderCollectionBean.getCollectionRepairList());
-                    collectionRepairPartList.addAll(itfTblWorkOrderCollectionBean.getCollectionRepairPartList());
-                    collectionRepairProjectList.addAll(itfTblWorkOrderCollectionBean.getCollectionRepairProjectList());
-                    collectionRepairSymptomReasonList.addAll(itfTblWorkOrderCollectionBean.getCollectionRepairSymptomReasonList());
                 }
-                tblWorkOrderDispatchEngineerList.addAll(itfGreeSynDownloadRecBean.getTblWorkOrderDispatchEngineerList());
-                tblWorkOrderStatusList.addAll(itfGreeSynDownloadRecBean.getTblWorkOrderStatusList());
 
-                ItfTblWorkOrder itfTblWorkOrder = BeanUtil.toBean(itfGreeSynDownloadRecBean, ItfTblWorkOrder.class);
-                itfTblWorkOrders.add(itfTblWorkOrder);
+                if (!CollectionUtils.isEmpty(feedbackRespList)) {
+                    feedbackRespList.stream().forEach(item -> item.setDownloadBatchNo(batch));
+                    itfTblWorkOrderFeedbackService.saveBatch(feedbackRespList);
+                }
 
-            }
+                if (!CollectionUtils.isEmpty(tblWorkOrderDetailList)) {
+                    tblWorkOrderDetailList.stream().forEach(item -> item.setDownloadBatchNo(batch));
+                    itfTblWorkOrderDetailService.saveBatch(tblWorkOrderDetailList);
+                }
+
+                if (!CollectionUtils.isEmpty(collectionChargeList)) {
+                    collectionChargeList.stream().forEach(item -> item.setDownloadBatchNo(batch));
+                    itfTblCollectionChargeService.saveBatch(collectionChargeList);
+                }
+                if (!CollectionUtils.isEmpty(collectionChargeDetails)) {
+                    collectionChargeDetails.stream().forEach(item -> item.setDownloadBatchNo(batch));
+                    itfTblCollectionChargeDetailService.saveBatch(collectionChargeDetails);
+                }
+
+                if (!CollectionUtils.isEmpty(tblOldProductOrderDetailList)) {
+                    tblOldProductOrderDetailList.stream().forEach(item -> item.setDownloadBatchNo(batch));
+                    itfTblOldProductOrderDetailService.saveBatch(tblOldProductOrderDetailList);
+                }
+                if (!CollectionUtils.isEmpty(tblWorkOrderAddComplainList)) {
+                    tblWorkOrderAddComplainList.stream().forEach(item -> item.setDownloadBatchNo(batch));
+                    itfTblWorkOrderAddComplainService.saveBatch(tblWorkOrderAddComplainList);
+                }
+                if (!CollectionUtils.isEmpty(tblWorkOrderAppointList)) {
+                    tblWorkOrderAppointList.stream().forEach(item -> item.setDownloadBatchNo(batch));
+                    itfTblWorkOrderAppointService.saveBatch(tblWorkOrderAppointList);
+                }
+                if (!CollectionUtils.isEmpty(tblWorkOrderCancelList)) {
+                    tblWorkOrderCancelList.stream().forEach(item -> item.setDownloadBatchNo(batch));
+                    itfTblWorkOrderCancelService.saveBatch(tblWorkOrderCancelList);
+                }
+                if (!CollectionUtils.isEmpty(tblWorkOrderComplainList)) {
+                    tblWorkOrderComplainList.stream().forEach(item -> item.setDownloadBatchNo(batch));
+                    itfTblWorkOrderComplainService.saveBatch(tblWorkOrderComplainList);
+                }
+                if (!CollectionUtils.isEmpty(tblWorkOrderComplainFeedbackList)) {
+                    tblWorkOrderComplainFeedbackList.stream().forEach(item -> item.setDownloadBatchNo(batch));
+                    itfTblWorkOrderComplainFeedbackService.saveBatch(tblWorkOrderComplainFeedbackList);
+                }
+                if (!CollectionUtils.isEmpty(tblWorkOrderCompleteInfoList)) {
+                    tblWorkOrderCompleteInfoList.stream().forEach(item -> item.setDownloadBatchNo(batch));
+                    itfTblWorkOrderCompleteInfoService.saveBatch(tblWorkOrderCompleteInfoList);
+                }
+                if (!CollectionUtils.isEmpty(tblWorkOrderConsultList)) {
+                    tblWorkOrderConsultList.stream().forEach(item -> item.setDownloadBatchNo(batch));
+                    itfTblWorkOrderConsultService.saveBatch(tblWorkOrderConsultList);
+                }
+                if (!CollectionUtils.isEmpty(tblWorkOrderDetailBarcodeList)) {
+                    tblWorkOrderDetailBarcodeList.stream().forEach(item -> item.setDownloadBatchNo(batch));
+                    itfTblWorkOrderDetailBarcodeService.saveBatch(tblWorkOrderDetailBarcodeList);
+                }
+                if (!CollectionUtils.isEmpty(tblWorkOrderDetailRelocationList)) {
+                    tblWorkOrderDetailRelocationList.stream().forEach(item -> item.setDownloadBatchNo(batch));
+                    itfTblWorkOrderDetailRelocationService.saveBatch(tblWorkOrderDetailRelocationList);
+                }
+                if (!CollectionUtils.isEmpty(tblWorkOrderDispatchOutletsList)) {
+                    tblWorkOrderDispatchOutletsList.stream().forEach(item -> item.setDownloadBatchNo(batch));
+                    itfTblWorkOrderDispatchOutletsService.saveBatch(tblWorkOrderDispatchOutletsList);
+                }
+                if (!CollectionUtils.isEmpty(tblWorkOrderEngineerList)) {
+                    tblWorkOrderEngineerList.stream().forEach(item -> item.setDownloadBatchNo(batch));
+                    itfTblWorkOrderEngineerService.saveBatch(tblWorkOrderEngineerList);
+                }
+                if (!CollectionUtils.isEmpty(tblWorkOrderEvaluationList)) {
+                    tblWorkOrderEvaluationList.stream().forEach(item -> item.setDownloadBatchNo(batch));
+                    itfTblWorkOrderEvaluationService.saveBatch(tblWorkOrderEvaluationList);
+                }
+                if (!CollectionUtils.isEmpty(tblWorkOrderExtList)) {
+                    tblWorkOrderExtList.stream().forEach(item -> item.setDownloadBatchNo(batch));
+                    itfTblWorkOrderExtService.saveBatch(tblWorkOrderExtList);
+                }
+                if (!CollectionUtils.isEmpty(tblWorkOrderIndicatorsList)) {
+                    tblWorkOrderIndicatorsList.stream().forEach(item -> item.setDownloadBatchNo(batch));
+                    itfTblWorkOrderIndicatorsService.saveBatch(tblWorkOrderIndicatorsList);
+                }
+                if (!CollectionUtils.isEmpty(tblWorkOrderSignList)) {
+                    tblWorkOrderSignList.stream().forEach(item -> item.setDownloadBatchNo(batch));
+                    itfTblWorkOrderSignService.saveBatch(tblWorkOrderSignList);
+                }
+                if (!CollectionUtils.isEmpty(tblWorkOrderTagList)) {
+                    tblWorkOrderTagList.stream().forEach(item -> item.setDownloadBatchNo(batch));
+                    itfTblWorkOrderTagService.saveBatch(tblWorkOrderTagList);
+                }
+                if (!CollectionUtils.isEmpty(workOrderChargeList)) {
+                    workOrderChargeList.stream().forEach(item -> item.setDownloadBatchNo(batch));
+                    itfTblWorkOrderChargeService.saveBatch(workOrderChargeList);
+                }
+                if (!CollectionUtils.isEmpty(workOrderCollectionComplainList)) {
+                    workOrderCollectionComplainList.stream().forEach(item -> item.setDownloadBatchNo(batch));
+                    itfTblWorkOrderCollectionComplainService.saveBatch(workOrderCollectionComplainList);
+                }
+                if (!CollectionUtils.isEmpty(tblWorkOrderDispatchEngineerList)) {
+                    tblWorkOrderDispatchEngineerList.stream().forEach(item -> item.setDownloadBatchNo(batch));
+                    itfTblWorkOrderDispatchEngineerService.saveBatch(tblWorkOrderDispatchEngineerList);
+                }
+                if (!CollectionUtils.isEmpty(tblWorkOrderStatusList)) {
+                    tblWorkOrderStatusList.stream().forEach(item -> item.setDownloadBatchNo(batch));
+                    itfTblWorkOrderStatusService.saveBatch(tblWorkOrderStatusList);
+                }
+                if (!CollectionUtils.isEmpty(workOrderCollectionList)) {
+                    workOrderCollectionList.stream().forEach(item -> item.setDownloadBatchNo(batch));
+                    itfTblWorkOrderCollectionService.saveBatch(workOrderCollectionList);
+                }
+                if (!CollectionUtils.isEmpty(collectionRepairList)) {
+                    collectionRepairList.stream().forEach(item -> item.setDownloadBatchNo(batch));
+                    itfTblCollectionRepairService.saveBatch(collectionRepairList);
+                }
+                if (!CollectionUtils.isEmpty(collectionRepairPartList)) {
+                    collectionRepairPartList.stream().forEach(item -> item.setDownloadBatchNo(batch));
+                    itfTblCollectionRepairPartService.saveBatch(collectionRepairPartList);
+                }
+                if (!CollectionUtils.isEmpty(collectionRepairProjectList)) {
+                    collectionRepairProjectList.stream().forEach(item -> item.setDownloadBatchNo(batch));
+                    itfTblCollectionRepairProjectService.saveBatch(collectionRepairProjectList);
+                }
+                if (!CollectionUtils.isEmpty(collectionRepairSymptomReasonList)) {
+                    collectionRepairSymptomReasonList.stream().forEach(item -> item.setDownloadBatchNo(batch));
+                    itfTblCollectionRepairSymptomReasonService.saveBatch(collectionRepairSymptomReasonList);
+                }
 
-            feedbackRespList.stream().forEach(item -> item.setDownloadBatchNo(batch));
-            itfTblWorkOrderFeedbackService.saveBatch(feedbackRespList);
-
-            tblWorkOrderDetailList.stream().forEach(item -> item.setDownloadBatchNo(batch));
-            itfTblWorkOrderDetailService.saveBatch(tblWorkOrderDetailList);
-
-            collectionChargeList.stream().forEach(item -> item.setDownloadBatchNo(batch));
-            itfTblCollectionChargeService.saveBatch(collectionChargeList);
-            collectionChargeDetails.stream().forEach(item -> item.setDownloadBatchNo(batch));
-            itfTblCollectionChargeDetailService.saveBatch(collectionChargeDetails);
-            tblOldProductOrderDetailList.stream().forEach(item -> item.setDownloadBatchNo(batch));
-            itfTblOldProductOrderDetailService.saveBatch(tblOldProductOrderDetailList);
-            tblWorkOrderAddComplainList.stream().forEach(item -> item.setDownloadBatchNo(batch));
-            itfTblWorkOrderAddComplainService.saveBatch(tblWorkOrderAddComplainList);
-            tblWorkOrderAppointList.stream().forEach(item -> item.setDownloadBatchNo(batch));
-            itfTblWorkOrderAppointService.saveBatch(tblWorkOrderAppointList);
-            tblWorkOrderCancelList.stream().forEach(item -> item.setDownloadBatchNo(batch));
-            itfTblWorkOrderCancelService.saveBatch(tblWorkOrderCancelList);
-            tblWorkOrderComplainList.stream().forEach(item -> item.setDownloadBatchNo(batch));
-            itfTblWorkOrderComplainService.saveBatch(tblWorkOrderComplainList);
-            tblWorkOrderComplainFeedbackList.stream().forEach(item -> item.setDownloadBatchNo(batch));
-            itfTblWorkOrderComplainFeedbackService.saveBatch(tblWorkOrderComplainFeedbackList);
-            tblWorkOrderCompleteInfoList.stream().forEach(item -> item.setDownloadBatchNo(batch));
-            itfTblWorkOrderCompleteInfoService.saveBatch(tblWorkOrderCompleteInfoList);
-            tblWorkOrderConsultList.stream().forEach(item -> item.setDownloadBatchNo(batch));
-            itfTblWorkOrderConsultService.saveBatch(tblWorkOrderConsultList);
-            tblWorkOrderDetailBarcodeList.stream().forEach(item -> item.setDownloadBatchNo(batch));
-            itfTblWorkOrderDetailBarcodeService.saveBatch(tblWorkOrderDetailBarcodeList);
-            tblWorkOrderDetailRelocationList.stream().forEach(item -> item.setDownloadBatchNo(batch));
-            itfTblWorkOrderDetailRelocationService.saveBatch(tblWorkOrderDetailRelocationList);
-            tblWorkOrderDispatchOutletsList.stream().forEach(item -> item.setDownloadBatchNo(batch));
-            itfTblWorkOrderDispatchOutletsService.saveBatch(tblWorkOrderDispatchOutletsList);
-            tblWorkOrderEngineerList.stream().forEach(item -> item.setDownloadBatchNo(batch));
-            itfTblWorkOrderEngineerService.saveBatch(tblWorkOrderEngineerList);
-            tblWorkOrderEvaluationList.stream().forEach(item -> item.setDownloadBatchNo(batch));
-            itfTblWorkOrderEvaluationService.saveBatch(tblWorkOrderEvaluationList);
-            tblWorkOrderExtList.stream().forEach(item -> item.setDownloadBatchNo(batch));
-            itfTblWorkOrderExtService.saveBatch(tblWorkOrderExtList);
-            tblWorkOrderIndicatorsList.stream().forEach(item -> item.setDownloadBatchNo(batch));
-            itfTblWorkOrderIndicatorsService.saveBatch(tblWorkOrderIndicatorsList);
-            tblWorkOrderSignList.stream().forEach(item -> item.setDownloadBatchNo(batch));
-            itfTblWorkOrderSignService.saveBatch(tblWorkOrderSignList);
-            tblWorkOrderTagList.stream().forEach(item -> item.setDownloadBatchNo(batch));
-            itfTblWorkOrderTagService.saveBatch(tblWorkOrderTagList);
-            workOrderChargeList.stream().forEach(item -> item.setDownloadBatchNo(batch));
-            itfTblWorkOrderChargeService.saveBatch(workOrderChargeList);
-            workOrderCollectionComplainList.stream().forEach(item -> item.setDownloadBatchNo(batch));
-            itfTblWorkOrderCollectionComplainService.saveBatch(workOrderCollectionComplainList);
-            tblWorkOrderDispatchEngineerList.stream().forEach(item -> item.setDownloadBatchNo(batch));
-            itfTblWorkOrderDispatchEngineerService.saveBatch(tblWorkOrderDispatchEngineerList);
-            tblWorkOrderStatusList.stream().forEach(item -> item.setDownloadBatchNo(batch));
-            itfTblWorkOrderStatusService.saveBatch(tblWorkOrderStatusList);
-            workOrderCollectionList.stream().forEach(item -> item.setDownloadBatchNo(batch));
-            itfTblWorkOrderCollectionService.saveBatch(workOrderCollectionList);
-            collectionRepairList.stream().forEach(item -> item.setDownloadBatchNo(batch));
-            itfTblCollectionRepairService.saveBatch(collectionRepairList);
-            collectionRepairPartList.stream().forEach(item -> item.setDownloadBatchNo(batch));
-            itfTblCollectionRepairPartService.saveBatch(collectionRepairPartList);
-            collectionRepairProjectList.stream().forEach(item -> item.setDownloadBatchNo(batch));
-            itfTblCollectionRepairProjectService.saveBatch(collectionRepairProjectList);
-            collectionRepairSymptomReasonList.stream().forEach(item -> item.setDownloadBatchNo(batch));
-            itfTblCollectionRepairSymptomReasonService.saveBatch(collectionRepairSymptomReasonList);
-
-
-            itfTblWorkOrderService.saveBatch(itfTblWorkOrders);
-
-
-        } catch (Exception e) {
-            List<Long> syncIds = itfGreeSynDownloadRecs.stream().map(ItfGreeSynDownloadRec::getSynReqId).collect(Collectors.toList());
-
-            itfGreeSynDownloadRecService.lambdaUpdate()
-                    .in(ItfGreeSynDownloadRec::getSynReqId, syncIds)
-                    .set(ItfGreeSynDownloadRec::getGreeStatSynErrMsg, e.getMessage())
-                    .set(ItfGreeSynDownloadRec::getGreeStatSynTime, new Date())
-                    .set(ItfGreeSynDownloadRec::getGreeStatSynStatus, 99).update();
+                if (!CollectionUtils.isEmpty(itfTblWorkOrders)) {
+                    itfTblWorkOrders.stream().forEach(item -> item.setDownloadBatchNo(batch));
+                    itfTblWorkOrderService.saveBatch(itfTblWorkOrders);
+                }
+
+
+            } catch (Exception e) {
+                List<Long> syncIds = itfGreeSynDownloadRecs.stream().map(ItfGreeSynDownloadRec::getSynReqId).collect(Collectors.toList());
 
+                log.error("工单同步错误" + e.getMessage());
 
+                itfGreeSynDownloadRecService.lambdaUpdate()
+                        .in(ItfGreeSynDownloadRec::getSynReqId, syncIds)
+                        .set(ItfGreeSynDownloadRec::getGreeStatSynErrMsg, e.getMessage())
+                        .set(ItfGreeSynDownloadRec::getGreeStatSynTime, new Date())
+                        .set(ItfGreeSynDownloadRec::getGreeStatSynStatus, 99).update();
+
+
+            }
         }
 
     }
@@ -557,19 +622,19 @@ public class SyncOrderInfoLogic {
                 workerOrderSyncBean.setInDownloadBatchNo(itfTblWorkOrder.getDownloadBatchNo());
                 WorkerOrderSyncBean workerOrderSyncBean1 = syncMapper.orderExecute(workerOrderSyncBean);
 
-                if (!workerOrderSyncBean1.getOutSynStatus()){
+                if (!workerOrderSyncBean1.getOutSynStatus()) {
 
-                    log.info("工单同步返回内容："+workerOrderSyncBean1.toString());
-                    itfTblWorkOrder.setSynTimes(itfTblWorkOrder.getSynTimes()+1);
+                    log.info("工单同步返回内容：" + workerOrderSyncBean1.toString());
+                    itfTblWorkOrder.setSynTimes(itfTblWorkOrder.getSynTimes() + 1);
                     itfTblWorkOrder.setSynErrMsg(workerOrderSyncBean1.getOutSynErrMsg());
                     itfTblWorkOrder.updateById();
                 }
-            }catch (Exception e){
-                itfTblWorkOrder.setSynTimes(itfTblWorkOrder.getSynTimes()+1);
+            } catch (Exception e) {
+                itfTblWorkOrder.setSynTimes(itfTblWorkOrder.getSynTimes() + 1);
                 itfTblWorkOrder.setSynErrMsg(e.getMessage());
                 itfTblWorkOrder.updateById();
 
-                log.info("工单同步返回日志错误内容："+itfTblWorkOrder.getDownloadBatchNo()+e);
+                log.info("工单同步返回日志错误内容：" + itfTblWorkOrder.getDownloadBatchNo() + e);
             }
 
 

mall-server-sync-api/src/main/java/com/gree/mall/manager/logic/material/base/NormChargeLogic.java

@@ -21,6 +21,7 @@ import com.gree.mall.manager.plus.entity.WebsitNormRela;
 import com.gree.mall.manager.plus.service.SysDictCompanyService;
 import com.gree.mall.manager.plus.service.WebsitNormChargeService;
 import com.gree.mall.manager.plus.service.WebsitNormRelaService;
+import com.gree.mall.manager.utils.CommonUtils;
 import com.gree.mall.manager.utils.excel.ExcelUtils;
 import com.gree.mall.manager.zfire.bean.ZfireParamBean;
 import com.gree.mall.manager.zfire.util.FieldUtils;
@@ -248,6 +249,7 @@ public class NormChargeLogic {
 
         for (int i = 0; i < objects.size(); i++) {
             List<Object> row = (List<Object>) objects.get(i);
+            CommonUtils.initList2(row, 7);
             if (row.size() < 6) {
                 row.add(null);
                 row.add(null);
@@ -267,7 +269,7 @@ public class NormChargeLogic {
                 throw new RemoteServiceException("第" + (i+1) + "行, 小类不能为空");
             }
             if (Objects.isNull(row.get(2))) {
-                throw new RemoteServiceException("第" + (i+1) + "行, 辅材名称不能为空");
+                throw new RemoteServiceException("第" + (i+1) + "行, 收费名称不能为空");
             }
             if (Objects.isNull(row.get(3))) {
                 throw new RemoteServiceException("第" + (i+1) + "行, 单位不能为空");
@@ -275,15 +277,15 @@ public class NormChargeLogic {
             if (Objects.isNull(row.get(4))) {
                 throw new RemoteServiceException("第" + (i+1) + "行, 收费标准不能为空");
             }
-            if (Objects.isNull(row.get(5))) {
-                throw new RemoteServiceException("第" + (i+1) + "行, 自有库存师傅分账金额不能为空");
-            }
+//            if (Objects.isNull(row.get(5))) {
+//                throw new RemoteServiceException("第" + (i+1) + "行, 自有库存师傅分账金额不能为空");
+//            }
 //            if (Objects.isNull(row.get(6))) {
 //                throw new RemoteServiceException("第" + (i+1) + "行, 外购辅材师傅分账金额不能为空");
 //            }
-            if (Objects.isNull(row.get(6))) {
-                throw new RemoteServiceException("第" + (i+1) + "行, 师傅手工费用不能为空");
-            }
+//            if (Objects.isNull(row.get(6))) {
+//                throw new RemoteServiceException("第" + (i+1) + "行, 师傅手工费用不能为空");
+//            }
 
             String parentCategoryStr = (String) row.get(0);
             String categoryStr = (String) row.get(1);

mall-server-sync-api/src/main/java/com/gree/mall/manager/schedule/SyncSchedule.java

@@ -15,7 +15,7 @@ import java.io.IOException;
 /**
  * 定时购买保险
  */
-@ConditionalOnProperty(name = "schedule.enable", havingValue = "true", matchIfMissing = true)
+//@ConditionalOnProperty(name = "schedule.enable", havingValue = "true", matchIfMissing = true)
 @Component
 public class SyncSchedule {
 

mall-server-sync-api/src/main/java/com/gree/mall/manager/utils/http/HttpUtils.java

@@ -60,8 +60,6 @@ public class HttpUtils {
             Response response = okHttpClient.newCall(req).execute();
 
 
-            logger.info("response返回"+response.toString());
-
             //判断请求是否成功
             if (response.isSuccessful()) {
                 String s = response.body().string();
@@ -72,7 +70,6 @@ public class HttpUtils {
 
             e.printStackTrace();
 
-            logger.info(e.toString());
 
             logger.error(e.toString());
 

mall-server-sync-api/src/main/resources/bootstrap-dev.properties

@@ -1,17 +1,17 @@
 sys.url=https://jiasm.zfire.top
-#支付回调地址
+#鏀�粯鍥炶皟鍦板潃
 wechat.payment.notifyUrl=${sys.url}/zfdminiapp/pay/payCall
-#退款回调地址
+#閫€娆惧洖璋冨湴鍧€
 wechat.payment.refundNotifyUrl=${sys.url}/zfdminiapp/pay/refundCall
-#物流回调
+#鐗╂祦鍥炶皟
 express.callback=${sys.url}/${server.servlet.context-path}/common/express/callback
 
-#定时器
+#瀹氭椂鍣�
 schedule.enable=false
-#分销商城商品接口
+#鍒嗛攢鍟嗗煄鍟嗗搧鎺ュ彛
 gjmall.goods.url=http://121.43.111.127:10003/goods/outside/list
 
-##SQL执行分析，该插件有性能损耗，不建议生产环境使用
+##SQL鎵ц�鍒嗘瀽锛岃�鎻掍欢鏈夋€ц兘鎹熻€楋紝涓嶅缓璁�敓浜х幆澧冧娇鐢�
 spring.datasource.druid.db-type=mysql
 spring.datasource.type=com.alibaba.druid.pool.DruidDataSource
 spring.datasource.driver-class-name=com.mysql.cj.jdbc.Driver
@@ -29,25 +29,25 @@ spring.datasource.druid.connection-init-sqls=set names utf8mb4
 spring.datasource.druid.initial-size=5
 spring.datasource.druid.minIdle=5
 spring.datasource.druid.maxActive=20
-### 配置获取连接等待超时的时间，单位是毫秒
+### 閰嶇疆鑾峰彇杩炴帴绛夊緟瓒呮椂鐨勬椂闂达紝鍗曚綅鏄��绉�
 spring.datasource.druid.maxWait=60000
-### 配置间隔多久才进行一次检测，检测需要关闭的空闲连接，单位是毫秒
+### 閰嶇疆闂撮殧澶氫箙鎵嶈繘琛屼竴娆℃�娴嬶紝妫€娴嬮渶瑕佸叧闂�殑绌洪棽杩炴帴锛屽崟浣嶆槸姣��
 spring.datasource.druid.timeBetweenEvictionRunsMillis=60000
-### 配置一个连接在池中最小生存的时间，单位是毫秒
+### 閰嶇疆涓€涓�繛鎺ュ湪姹犱腑鏈€灏忕敓瀛樼殑鏃堕棿锛屽崟浣嶆槸姣��
 spring.datasource.druid.minEvictableIdleTimeMillis=300000
 spring.datasource.druid.validationQuery=SELECT 1 FROM DUAL
 spring.datasource.druid.testWhileIdle=true
 spring.datasource.druid.testOnBorrow=false
 spring.datasource.druid.testOnReturn=false
-### 打开PSCache，并且指定每个连接上PSCache的大小
+### 鎵撳紑PSCache锛屽苟涓旀寚瀹氭瘡涓�繛鎺ヤ笂PSCache鐨勫ぇ灏�
 spring.datasource.druid.poolPreparedStatements=true
 spring.datasource.druid.maxPoolPreparedStatementPerConnectionSize=20
-### 配置监控统计拦截的filters，去掉后监控界面sql无法统计，'wall'用于防火墙
+### 閰嶇疆鐩戞帶缁熻�鎷︽埅鐨刦ilters锛屽幓鎺夊悗鐩戞帶鐣岄潰sql鏃犳硶缁熻�锛�'wall'鐢ㄤ簬闃茬伀澧�
 spring.datasource.druid.filters=stat,wall
 
-### 通过connectProperties属性来打开mergeSql功能；慢SQL记录
+### 閫氳繃connectProperties灞炴€ф潵鎵撳紑mergeSql鍔熻兘锛涙參SQL璁板綍
 spring.datasource.druid.connectionProperties=druid.stat.mergeSql=true;druid.stat.slowSqlMillis=5000
-# 合并多个DruidDataSource的监控数据
+# 鍚堝苟澶氫釜DruidDataSource鐨勭洃鎺ф暟鎹�
 #spring.datasource.useGlobalDataSourceStat=true
 
 
@@ -55,10 +55,10 @@ spring.datasource.druid.connectionProperties=druid.stat.mergeSql=true;druid.stat
 mybatis-plus.configuration.log-impl=org.apache.ibatis.logging.stdout.StdOutImpl
 
 
-#####################redis 单机版 start################
+#####################redis 鍗曟満鐗� start################
 spring.redis.port=6388
 spring.redis.host=121.43.111.127
-#redis密码
+#redis瀵嗙爜
 spring.redis.password=private123@^
 spring.redis.lettuce.pool.max-active=300
 spring.redis.lettuce.pool.max-wait=1000ms
@@ -67,7 +67,7 @@ spring.redis.lettuce.pool.min-idle=0
 spring.redis.timeout=100000ms
 
 
-####################阿里云配置######################
+####################闃块噷浜戦厤缃�######################
 #ali.access.key.id=LTAI5tQjvbfM1MD11aEEU9YG
 #ali.access.key.secert=mvs3mjxYZcGfNSBuoRxgt1Pvq2OmBH
 #ali.oss.bucket.name=train-2023
@@ -80,18 +80,18 @@ ali.oss.type.pic=uploadfile/
 ali.sms.msg.code=SMS_284585310
 ali.cdn.url=
 
-#微信公众域名
+#寰�俊鍏�紬鍩熷悕
 wechat.mp.url=https://jiasm.zfire.top/gejiangh5/
 
-#通联支付回调地址
+#閫氳仈鏀�粯鍥炶皟鍦板潃
 allIn.payment.notifyUrl=${sys.url}/zfdminiapp/pay/allinpay/callback
 
-#内部接口
+#鍐呴儴鎺ュ彛
 inf.url=http://121.43.111.127:11111
 inf.token.appid=zfire-jsm-sxb
 inf.token.appSecret=3e7iee31ub94rvvesp7266kwske7fple
 
-#分销商城appid
+#鍒嗛攢鍟嗗煄appid
 share.mall.appid=wx21d155e8a449d9b1
 
 #elasticsearch
@@ -104,13 +104,13 @@ spring.elasticsearch.rest.read-timeout=30s
 #cmc bank request setting
 cmc.bank.url=http://cdctest.cmburl.cn:80/cdcserver/api/v2
 
-#联通云呼配置
+#鑱旈€氫簯鍛奸厤缃�
 unicome.yunh.baseurl=https://a5.7x24cc.com
 unicome.yunh.account=N000000015221
 unicome.yunh.secret=fe443fc0264411ec80212baafe602ea7
 unicome.yunh.appid=69jpgmwqxyhtcsor
 
-#法大大
+#娉曞ぇ澶�
 fadada.app.id=401793
 fadada.app.secret=eB8mlIWs7ayFihEzWbNfMjrL
 fadada.app.v=2.0
@@ -134,14 +134,16 @@ gree.url=https://sms.gree.com/api/sso/sms-server-order-external
 gree.four.url=https://sms.gree.com/api/sso/sms-server-order-external
 
 
-#总部3.0接口地址
+#鎬婚儴3.0鎺ュ彛鍦板潃
 gree.V3.url=https://api-sms.gree.com
 gree.V3.gettoken=https://sms.gree.com/api/pub/nts-foundation-flycloud-user/api/v1/openid-connect/token
+gree.client.id=guangfoserver
+gree.V3.client.secert=3b23c33b-106d-4837-b506-7779335247d9
 gree.V3.api.url=${gree.V3.url}/api/sso/autoapp-default-server-greeshmobile/api/yunpaigong/accessories
 gree.check.barcode=${gree.V3.url}/api/sso/autoapp-default-server-installaccounts/api/ext/azwgmx/checkBarcode
 gree.repair.settle.get=${gree.V3.url}/api/sso/autoapp-default-server-greerepairaccounts/api/JsBzController/xsGetJsbzByJxxmh
 gree.repair.settle.do=${gree.V3.url}/api/sso/autoapp-default-server-greerepairaccounts/api/repairsettlement/gzBatchSettlement
-#总部接口地址
+#鎬婚儴鎺ュ彛鍦板潃
 gree.api.url=${gree.V3.url}/api/sso/autoapp-default-server-guangzhou/api/outapp/default/general
 gree.web.url=${gree.V3.url}/api/sso/autoapp-default-server-guangzhou
 gree.grant_type=client_credentials

mall-server-sync-api/src/main/resources/bootstrap-prd.properties

@@ -1,24 +1,24 @@
 sys.url=https://fw.greeapps.com
-#?????????
+#支锟斤拷锟截碉拷锟斤拷址
 wechat.payment.notifyUrl=${sys.url}/zfdminiapp/pay/payCall
-#????????
+#锟剿匡拷氐锟斤拷锟街�
 wechat.payment.refundNotifyUrl=${sys.url}/zfdminiapp/pay/refundCall
-#???????
+#锟斤拷锟斤拷锟截碉拷
 express.callback=${sys.url}/${server.servlet.context-path}/common/express/callback
 
-#定时器
+#瀹氭椂鍣�
 schedule.enable=true
-#分销商城商品接口
+#鍒嗛攢鍟嗗煄鍟嗗搧鎺ュ彛
 gjmall.goods.url=https://gjmall.zfire.top/api/goods/outside/list
 
-##SQL??з??????ò?????????????????????????????
+##SQL执锟叫凤拷锟斤拷锟斤拷锟矫诧拷锟斤拷锟斤拷锟斤拷锟斤拷锟侥ｏ拷锟斤拷锟斤拷锟斤拷锟斤拷锟斤拷锟斤拷锟斤拷使锟斤拷
 spring.datasource.druid.db-type=mysql
 spring.datasource.type=com.alibaba.druid.pool.DruidDataSource
 spring.datasource.driver-class-name=com.mysql.cj.jdbc.Driver
-#????
+#锟斤拷锟斤拷
 #spring.datasource.url=jdbc:mysql://rm-bp1gsex17k87vu0np.mysql.rds.aliyuncs.com:3306/sxb-mall?verifyServerCertificate=false&useSSL=false&requireSSL=false&useUnicode=true&characterEncoding=UTF-8&characterSetResults=utf8&serverTimezone=Asia/Shanghai
 
-#????
+#锟斤拷锟斤拷
 spring.datasource.url=jdbc:mysql://rm-wz9yahzr80gze34ab35930.mysql.rds.aliyuncs.com:3306/gf2024?verifyServerCertificate=false&useSSL=false&requireSSL=false&useUnicode=true&characterEncoding=UTF-8&characterSetResults=utf8&serverTimezone=Asia/Shanghai
 
 spring.datasource.username=gFgreeJsm_gd2024_system
@@ -27,32 +27,32 @@ spring.datasource.druid.connection-init-sqls=set names utf8mb4
 spring.datasource.druid.initial-size=5
 spring.datasource.druid.minIdle=5
 spring.datasource.druid.maxActive=20
-### ??????????????????????λ?????
+### 锟斤拷锟矫伙拷取锟斤拷锟接等达拷锟斤拷时锟斤拷时锟戒，锟斤拷位锟角猴拷锟斤拷
 spring.datasource.druid.maxWait=60000
-### ???ü????ò??????μ??????????????????????λ?????
+### 锟斤拷锟矫硷拷锟斤拷锟矫才斤拷锟斤拷一锟轿硷拷猓�拷锟斤拷锟斤拷要锟截闭的匡拷锟斤拷锟斤拷锟接ｏ拷锟斤拷位锟角猴拷锟斤拷
 spring.datasource.druid.timeBetweenEvictionRunsMillis=60000
-### ??????????????????С??????????λ?????
+### 锟斤拷锟斤拷一锟斤拷锟斤拷锟斤拷锟节筹拷锟斤拷锟斤拷小锟斤拷锟斤拷锟绞憋拷洌�拷锟轿伙拷呛锟斤拷锟�
 spring.datasource.druid.minEvictableIdleTimeMillis=300000
 spring.datasource.druid.validationQuery=SELECT 1 FROM DUAL
 spring.datasource.druid.testWhileIdle=true
 spring.datasource.druid.testOnBorrow=false
 spring.datasource.druid.testOnReturn=false
-### ??PSCache??????????????????PSCache???С
+### 锟斤拷PSCache锟斤拷锟斤拷锟斤拷指锟斤拷每锟斤拷锟斤拷锟斤拷锟斤拷PSCache锟侥达拷小
 spring.datasource.druid.poolPreparedStatements=true
 spring.datasource.druid.maxPoolPreparedStatementPerConnectionSize=20
-### ???ü??????????filters????????????sql???????'wall'????????
+### 锟斤拷锟矫硷拷锟酵筹拷锟斤拷锟斤拷氐锟絝ilters锟斤拷去锟斤拷锟斤拷锟截斤拷锟斤拷sql锟睫凤拷统锟狡ｏ拷'wall'锟斤拷锟节凤拷锟斤拷墙
 spring.datasource.druid.filters=stat,wall
 
-### ???connectProperties????????mergeSql???????SQL???
+### 通锟斤拷connectProperties锟斤拷锟斤拷锟斤拷锟斤拷mergeSql锟斤拷锟杰ｏ拷锟斤拷SQL锟斤拷录
 spring.datasource.druid.connectionProperties=druid.stat.mergeSql=true;druid.stat.slowSqlMillis=5000
-# ??????DruidDataSource????????
+# 锟较诧拷锟斤拷锟紻ruidDataSource锟侥硷拷锟斤拷锟斤拷锟�
 #spring.datasource.useGlobalDataSourceStat=true
 
-#####################redis ?????? start################
+#####################redis 锟斤拷锟斤拷锟斤拷 start################
 spring.redis.port=6379
 spring.redis.host=r-wz9o4cl6xe2cu0fux6.redis.rds.aliyuncs.com
 spring.redis.database=5
-#redis????
+#redis锟斤拷锟斤拷
 spring.redis.password=Rl6xe2e4lbtbq
 spring.redis.lettuce.pool.max-active=300
 spring.redis.lettuce.pool.max-wait=1000ms
@@ -60,7 +60,7 @@ spring.redis.lettuce.pool.max-idle=100
 spring.redis.lettuce.pool.min-idle=0
 spring.redis.timeout=100000ms
 
-####################??????????######################
+####################锟斤拷锟斤拷锟斤拷锟斤拷锟斤拷######################
 ali.access.key.id=LTAI5tGCLsqbXGgtgArvCX7t
 ali.access.key.secert=EK0mN35vqozFcRhI3KCZXOnP1VCLNp
 ali.oss.bucket.name=zfire-jsm-h
@@ -70,24 +70,24 @@ ali.oss.type.pic=uploadfile/
 ali.sms.msg.code=SMS_212320165
 ali.cdn.url=
 
-#微信公众域名
+#寰�俊鍏�紬鍩熷悕
 wechat.mp.url=https://fw.greeapps.com/
 
-#通联支付回调地址
+#閫氳仈鏀�粯鍥炶皟鍦板潃
 allIn.payment.notifyUrl=${sys.url}/zfdminiapp/pay/allinpay/callback
 
-#内部接口
+#鍐呴儴鎺ュ彛
 inf.url=https://gjmall.zfire.top/interface
 inf.token.appid=material
 inf.token.appSecret=kaksladjaklsdjlasjdlasjdlaskijwsmk
 
-#分销商城appid
+#鍒嗛攢鍟嗗煄appid
 share.mall.appid=wx21d155e8a449d9b1
 
 #cmc bank request setting
 cmc.bank.url=https://cdc.cmbchina.com/cdcserver/api/v2
 
-#elasticsearch,支持集群
+#elasticsearch,鏀�寔闆嗙兢
 spring.elasticsearch.rest.uris=http://es-cn-i7m27kcyd002c3v8f.elasticsearch.aliyuncs.com:9200
 spring.elasticsearch.rest.username=elastic
 spring.elasticsearch.rest.password=zongjUzongjU2021_
@@ -97,13 +97,13 @@ spring.elasticsearch.rest.read-timeout=30s
 
 management.health.elasticsearch.enabled=false
 
-#联通云呼配置
+#鑱旈€氫簯鍛奸厤缃�
 unicome.yunh.baseurl=https://a5.7x24cc.com
 unicome.yunh.account=N000000014414
 unicome.yunh.secret=c33fe780-fd69-11ea-8033-ff87e22c5f18
 unicome.yunh.appid=a6s2zu00twewmi
 
-#法大大
+#娉曞ぇ澶�
 fadada.app.id=001238
 fadada.app.secret=nPOYjMCj5kCHX7oTtUV07hdL
 fadada.app.v=2.0
@@ -127,7 +127,7 @@ gree.url=https://sms.gree.com/api/sso/sms-server-order-external
 gree.four.url=https://sms.gree.com/api/sso/sms-server-order-external
 
 
-#总部3.0接口地址
+#鎬婚儴3.0鎺ュ彛鍦板潃
 gree.V3.url=https://api-sms.gree.com
 gree.V3.gettoken=https://sms.gree.com/api/pub/nts-foundation-flycloud-user/api/v1/openid-connect/token
 gree.client.id=guangfoserver
@@ -136,7 +136,7 @@ gree.V3.api.url=${gree.V3.url}/api/sso/autoapp-default-server-greeshmobile/api/y
 gree.check.barcode=${gree.V3.url}/api/sso/autoapp-default-server-installaccounts/api/ext/azwgmx/checkBarcode
 gree.repair.settle.get=${gree.V3.url}/api/sso/autoapp-default-server-greerepairaccounts/api/JsBzController/xsGetJsbzByJxxmh
 gree.repair.settle.do=${gree.V3.url}/api/sso/autoapp-default-server-greerepairaccounts/api/repairsettlement/gzBatchSettlement
-#总部接口地址
+#鎬婚儴鎺ュ彛鍦板潃
 gree.api.url=${gree.V3.url}/api/sso/autoapp-default-server-guangzhou/api/outapp/default/general
 gree.web.url=${gree.V3.url}/api/sso/autoapp-default-server-guangzhou
 gree.grant_type=client_credentials

mall-server-sync-api/src/main/resources/bootstrap-test.properties

@@ -1,17 +1,17 @@
 sys.url=https://jiasm.zfire.top
-#支付回调地址
+#鏀�粯鍥炶皟鍦板潃
 wechat.payment.notifyUrl=${sys.url}/zfdminiapp/pay/payCall
-#退款回调地址
+#閫€娆惧洖璋冨湴鍧€
 wechat.payment.refundNotifyUrl=${sys.url}/zfdminiapp/pay/refundCall
-#物流回调
+#鐗╂祦鍥炶皟
 express.callback=${sys.url}/${server.servlet.context-path}/common/express/callback
 
-#定时器
+#瀹氭椂鍣�
 schedule.enable=true
-#分销商城商品接口
+#鍒嗛攢鍟嗗煄鍟嗗搧鎺ュ彛
 gjmall.goods.url=http://121.43.111.127:10003/goods/outside/list
 
-##SQL执行分析，该插件有性能损耗，不建议生产环境使用
+##SQL鎵ц�鍒嗘瀽锛岃�鎻掍欢鏈夋€ц兘鎹熻€楋紝涓嶅缓璁�敓浜х幆澧冧娇鐢�
 spring.datasource.druid.db-type=mysql
 spring.datasource.type=com.alibaba.druid.pool.DruidDataSource
 spring.datasource.driver-class-name=com.mysql.cj.jdbc.Driver
@@ -22,32 +22,32 @@ spring.datasource.druid.connection-init-sqls=set names utf8mb4
 spring.datasource.druid.initial-size=5
 spring.datasource.druid.minIdle=5
 spring.datasource.druid.maxActive=20
-### 配置获取连接等待超时的时间，单位是毫秒
+### 閰嶇疆鑾峰彇杩炴帴绛夊緟瓒呮椂鐨勬椂闂达紝鍗曚綅鏄��绉�
 spring.datasource.druid.maxWait=60000
-### 配置间隔多久才进行一次检测，检测需要关闭的空闲连接，单位是毫秒
+### 閰嶇疆闂撮殧澶氫箙鎵嶈繘琛屼竴娆℃�娴嬶紝妫€娴嬮渶瑕佸叧闂�殑绌洪棽杩炴帴锛屽崟浣嶆槸姣��
 spring.datasource.druid.timeBetweenEvictionRunsMillis=60000
-### 配置一个连接在池中最小生存的时间，单位是毫秒
+### 閰嶇疆涓€涓�繛鎺ュ湪姹犱腑鏈€灏忕敓瀛樼殑鏃堕棿锛屽崟浣嶆槸姣��
 spring.datasource.druid.minEvictableIdleTimeMillis=300000
 spring.datasource.druid.validationQuery=SELECT 1 FROM DUAL
 spring.datasource.druid.testWhileIdle=true
 spring.datasource.druid.testOnBorrow=false
 spring.datasource.druid.testOnReturn=false
-### 打开PSCache，并且指定每个连接上PSCache的大小
+### 鎵撳紑PSCache锛屽苟涓旀寚瀹氭瘡涓�繛鎺ヤ笂PSCache鐨勫ぇ灏�
 spring.datasource.druid.poolPreparedStatements=true
 spring.datasource.druid.maxPoolPreparedStatementPerConnectionSize=20
-### 配置监控统计拦截的filters，去掉后监控界面sql无法统计，'wall'用于防火墙
+### 閰嶇疆鐩戞帶缁熻�鎷︽埅鐨刦ilters锛屽幓鎺夊悗鐩戞帶鐣岄潰sql鏃犳硶缁熻�锛�'wall'鐢ㄤ簬闃茬伀澧�
 spring.datasource.druid.filters=stat,wall
 
-### 通过connectProperties属性来打开mergeSql功能；慢SQL记录
+### 閫氳繃connectProperties灞炴€ф潵鎵撳紑mergeSql鍔熻兘锛涙參SQL璁板綍
 spring.datasource.druid.connectionProperties=druid.stat.mergeSql=true;druid.stat.slowSqlMillis=5000
-# 合并多个DruidDataSource的监控数据
+# 鍚堝苟澶氫釜DruidDataSource鐨勭洃鎺ф暟鎹�
 #spring.datasource.useGlobalDataSourceStat=true
 
 
-#####################redis 单机版 start################
+#####################redis 鍗曟満鐗� start################
 spring.redis.port=6388
 spring.redis.host=121.43.111.127
-#redis密码
+#redis瀵嗙爜
 spring.redis.password=private123@^
 spring.redis.lettuce.pool.max-active=300
 spring.redis.lettuce.pool.max-wait=1000ms
@@ -55,7 +55,7 @@ spring.redis.lettuce.pool.max-idle=100
 spring.redis.lettuce.pool.min-idle=0
 spring.redis.timeout=100000ms
 
-####################阿里云配置######################
+####################闃块噷浜戦厤缃�######################
 ali.access.key.id=LTAI5tDHiEGKuwzNhW2gLPyc
 ali.access.key.secert=NVXSx3Gj7fHv6unGwWgalJh49uMZOI
 ali.oss.bucket.name=zf-mall-test
@@ -65,18 +65,18 @@ ali.oss.type.pic=uploadfile/
 ali.sms.msg.code=SMS_284585310
 ali.cdn.url=
 
-#微信公众域名
+#寰�俊鍏�紬鍩熷悕
 wechat.mp.url=https://jiasm.zfire.top/jsm-sxbh5/
 
-#通联支付回调地址
+#閫氳仈鏀�粯鍥炶皟鍦板潃
 allIn.payment.notifyUrl=${sys.url}/zfdminiapp/pay/allinpay/callback
 
-#内部接口
+#鍐呴儴鎺ュ彛
 inf.url=http://121.43.111.127:11111
 inf.token.appid=zfire-jsm-sxb
 inf.token.appSecret=3e7iee31ub94rvvesp7266kwske7fple
 
-#分销商城appid
+#鍒嗛攢鍟嗗煄appid
 share.mall.appid=wx21d155e8a449d9b1
 
 #elasticsearch
@@ -93,14 +93,14 @@ cmc.bank.privKey=NBtl7WnuUtA2v5FaebEkU0/Jj1IodLGT6lQqwkzmd2E=
 cmc.bank.sm4key=VuAzSWQhsoNqzn0K
 cmc.bank.uid=B000012532
 
-#联通云呼配置
+#鑱旈€氫簯鍛奸厤缃�
 unicome.yunh.baseurl=https://a5.7x24cc.com
 unicome.yunh.account=N000000015221
 unicome.yunh.secret=fe443fc0264411ec80212baafe602ea7
 unicome.yunh.appid=69jpgmwqxyhtcsor
 
 
-#法大大
+#娉曞ぇ澶�
 fadada.app.id=401793
 fadada.app.secret=eB8mlIWs7ayFihEzWbNfMjrL
 fadada.app.v=2.0
@@ -117,22 +117,22 @@ fadada.websit.auth.verified-way=3
 fadada.websit.auth.notify.url=${sys.url}/${server.servlet.context-path}/fdd/notify/websit/auth
 fadada.websit.sign.notify.url=${sys.url}/${server.servlet.context-path}/fdd/notify/websit/batch/sign
 fadada.websit.person.auth.notify.url=${sys.url}/${server.servlet.context-path}/fdd/notify/websit/person
-gree.url=https://api.sms-test.gree.com/api/sso/sms-server-order-external
+gree.url=https://sms.gree.com/api/sso/sms-server-order-external
 
 
-gree.four.url=https://api.sms-test.gree.com/api/sso/sms-server-order-external
+gree.four.url=https://sms.gree.com/api/sso/sms-server-order-external
 
 
-#总部3.0接口地址
+#鎬婚儴3.0鎺ュ彛鍦板潃
 gree.V3.url=https://api-sms.gree.com
-gree.V3.gettoken=httpa://api.sms-test.gree.com/api/pub/nts-foundation-flycloud-user/api/v1/openid-connect/token
+gree.V3.gettoken=https://sms.gree.com/api/pub/nts-foundation-flycloud-user/api/v1/openid-connect/token
 gree.client.id=guangfoserver
-gree.V3.client.secert=f81f5ac8-ad24-4212-9b2d-9cc78f982562
+gree.V3.client.secert=3b23c33b-106d-4837-b506-7779335247d9
 gree.V3.api.url=${gree.V3.url}/api/sso/autoapp-default-server-greeshmobile/api/yunpaigong/accessories
 gree.check.barcode=${gree.V3.url}/api/sso/autoapp-default-server-installaccounts/api/ext/azwgmx/checkBarcode
 gree.repair.settle.get=${gree.V3.url}/api/sso/autoapp-default-server-greerepairaccounts/api/JsBzController/xsGetJsbzByJxxmh
 gree.repair.settle.do=${gree.V3.url}/api/sso/autoapp-default-server-greerepairaccounts/api/repairsettlement/gzBatchSettlement
-#总部接口地址
+#鎬婚儴鎺ュ彛鍦板潃
 gree.api.url=${gree.V3.url}/api/sso/autoapp-default-server-guangzhou/api/outapp/default/general
 gree.web.url=${gree.V3.url}/api/sso/autoapp-default-server-guangzhou
 gree.grant_type=client_credentials

mall-server-sync-api/src/main/resources/bootstrap.properties

@@ -10,22 +10,22 @@ spring.main.allow-bean-definition-overriding=true
 goods.share.limit.percent=0.4
 #wechat.keyPath=classpath:/static/apiclient_cert.p12
 
-#????????
+#锟斤拷锟斤拷锟斤拷锟斤拷
 server.port =23003
 server.servlet.context-path=/zfdapi
 spring.servlet.multipart.max-file-size=40MB
 spring.servlet.multipart.max-request-size=40MB
-#??????web???????????
+#锟角凤拷直锟斤拷web锟剿达拷印锟斤拷锟斤拷锟斤拷息
 spring.devtools.add-properties=true
-#echache????
+#echache锟斤拷锟斤拷
 spring.cache.type=ehcache
 spring.cache.ehcache.config=classpath:ehcache.xml
 
 mybatis-plus.typeEnumsPackage=com.gree.mall.manager.enums
 
-### log4j????
+### log4j锟斤拷锟斤拷
 logging.config=classpath:logback.xml
-#undertow_web????????
+#undertow_web锟斤拷锟斤拷锟斤拷锟斤拷
 server.undertow.accesslog.dir=${user.dir}/logs/access
 server.undertow.accesslog.enabled=true
 server.undertow.accesslog.pattern=%h %l %u %t "%r" %s %b %D
@@ -36,11 +36,11 @@ server.undertow.max-http-post-size=40960000
 #swagger-login-account
 #spring.security.user.name=admin
 #spring.security.user.password=gree2021
-#mybatis-plus????
+#mybatis-plus锟斤拷锟斤拷
 mybatis-plus.mapper-locations=classpath*:mapper/*.xml,classpath*:mapper/**/*Mapper.xml
-#????????  0:"?????ID????", 1:"???????ID",2:"???Ψ?ID (????????Ψ?ID)", 3:"???Ψ?ID UUID";
+#锟斤拷锟斤拷锟斤拷锟斤拷  0:"锟斤拷锟捷匡拷ID锟斤拷锟斤拷", 1:"锟矫伙拷锟斤拷锟斤拷ID",2:"全锟斤拷唯一ID (锟斤拷锟斤拷锟斤拷锟斤拷唯一ID)", 3:"全锟斤拷唯一ID UUID";
 mybatis-plus.global-config.db-config.id-type=id_worker_str
-#jackson??????
+#jackson锟斤拷锟绞憋拷锟�
 spring.jackson.date-format=yyyy-MM-dd HH:mm:ss
 spring.jackson.time-zone=GMT+8
 spring.jackson.timeZone=GMT+08:00

mall-server-sync-api/src/main/resources/mapper/CommonMapper.xml

@@ -879,6 +879,12 @@
         ${ex.selected}
         FROM settle_expense a
         ${ex.query}
+        <if test='adminWebsitIds != null and adminWebsitIds.size > 0' >
+            AND a.websit_id  in
+            <foreach collection="adminWebsitIds" open="(" close=")" item="item" separator=",">
+                #{item}
+            </foreach>
+        </if>
         <if test="ex.orderBy == null or ex.orderBy ==''">
             ORDER BY a.create_time DESC
         </if>
@@ -893,6 +899,12 @@
         <if test="workerId != null">
             AND (a.worker_name1 = #{workerId} OR a.worker_name2 = #{workerId})
         </if>
+        <if test="ex.adminWebsitIds != null and ex.adminWebsitIds.size > 0">
+            AND a.websit_id IN
+            <foreach item="item" index="index" collection="ex.adminWebsitIds" open="(" separator="," close=")">
+                #{item}
+            </foreach>
+        </if>
         <if test="ex.orderBy == null or ex.orderBy ==''">
             ORDER BY a.create_time DESC
         </if>

mall-server-sync-api/src/main/resources/spy.properties

@@ -1,21 +1,21 @@
 module.log=com.p6spy.engine.logging.P6LogFactory,com.p6spy.engine.outage.P6OutageFactory
-# 自定义日志打印
+# 鑷�畾涔夋棩蹇楁墦鍗�
 logMessageFormat=com.baomidou.mybatisplus.extension.p6spy.P6SpyLogger
-#日志输出到控制台
+#鏃ュ織杈撳嚭鍒版帶鍒跺彴
 appender=com.baomidou.mybatisplus.extension.p6spy.StdoutLogger
-# 使用日志系统记录 sql
+# 浣跨敤鏃ュ織绯荤粺璁板綍 sql
 #appender=com.p6spy.engine.spy.appender.Slf4JLogger
-# 设置 p6spy driver 代理
+# 璁剧疆 p6spy driver 浠ｇ悊
 deregisterdrivers=true
-# 取消JDBC URL前缀
+# 鍙栨秷JDBC URL鍓嶇紑
 useprefix=true
-# 配置记录 Log 例外,可去掉的结果集有error,info,batch,debug,statement,commit,rollback,result,resultset.
+# 閰嶇疆璁板綍 Log 渚嬪�,鍙�幓鎺夌殑缁撴灉闆嗘湁error,info,batch,debug,statement,commit,rollback,result,resultset.
 excludecategories=info,debug,result,batch,resultset
-# 日期格式
+# 鏃ユ湡鏍煎紡
 dateformat=yyyy-MM-dd HH:mm:ss
-# 实际驱动可多个
+# 瀹為檯椹卞姩鍙��涓�
 #driverlist=org.h2.Driver
-# 是否开启慢SQL记录
+# 鏄�惁寮€鍚�參SQL璁板綍
 outagedetection=true
-# 慢SQL记录标准 2 秒
+# 鎱�QL璁板綍鏍囧噯 2 绉�
 outagedetectioninterval=2