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

mall-server-api/src/main/java/com/gree/mall/manager/controller/workerorder/OrderBaseController.java

@@ -418,7 +418,7 @@ public class OrderBaseController {
 
     @PostMapping("/dow")
     @ApiOperation(value = "4.0总部下载")
-    public ResponseHelper dow(@ApiParam(value = "工单号id", required = true) @RequestParam String orderBaseId
+    public ResponseHelper dow(@ApiParam(value = "工单号id", required = true) @RequestParam List<String> orderBaseId
     ){
         orderBaseLogic.dow(orderBaseId);
         return ResponseHelper.success();

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

@@ -363,7 +363,8 @@ public class AppraiseRelaLogic {
         }
         if (isAdd) {
             bean.insert();
-            orderBaseLogic.dow(orderBase.getId());
+            List<String> orderbaseIds = new ArrayList<>();
+            orderBaseLogic.dow(orderbaseIds);
         } else {
             bean.updateById();
         }

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

@@ -1,6 +1,7 @@
 package com.gree.mall.manager.logic.workorder;
 
 import cn.hutool.core.bean.BeanUtil;
+import cn.hutool.core.collection.CollectionUtil;
 import com.baomidou.mybatisplus.core.metadata.IPage;
 import com.baomidou.mybatisplus.core.toolkit.CollectionUtils;
 import com.baomidou.mybatisplus.extension.plugins.pagination.Page;
@@ -110,6 +111,10 @@ public class ChangeOrderLogic {
 
     @Transactional(rollbackFor = Exception.class)
     public void changeAppointmentTime(String id, String appointmentTime, String appointmentEndTime, String remark, String imgSrc) {
+        PgOrderBase pgOrderBase = pgOrderBaseService.getById(id);
+        if (!StringUtils.equalsAny(pgOrderBase.getOrderStatus(),"YWG","GCSZX","WDWG","YWGO","YJS","LRCD","YQX","FWZT","YCGB","FWQX","FL")){
+            return;
+        }
         pgOrderBaseService.lambdaUpdate()
                 .eq(PgOrderBase::getId, id)
                 .set(!StringUtils.isEmpty(remark), PgOrderBase::getChangeRemark, remark)
@@ -142,15 +147,27 @@ public class ChangeOrderLogic {
     }
 
     @Transactional(rollbackFor = Exception.class)
-    public void changeWorker(List<String> ids, List<String> workerIds, String websitId) {
+    public void changeWorker(List<String> orderIds, List<String> workerIds, String websitId) {
 
-        ids = ids.stream().distinct().collect(Collectors.toList());
+        orderIds = orderIds.stream().distinct().collect(Collectors.toList());
         workerIds = workerIds.stream().distinct().collect(Collectors.toList());
         //循环师傅获得网点派工数据
         AdminWebsit adminWebsit = adminWebsitService.getById(websitId);
 
         List<PgOrderWorker> pgOrderWorkers = new ArrayList<>();
 
+        List<String> ids = new ArrayList<>();
+        for (String id : orderIds) {
+            PgOrderBase pgOrderBase = pgOrderBaseService.getById(id);
+
+            if (!StringUtils.equalsAny(pgOrderBase.getOrderStatus(),"YWG","GCSZX","WDWG","YWGO","YJS","LRCD","YQX","FWZT","YCGB","FWQX","FL")){
+                continue;
+            }
+            ids.add(id);
+        }
+
+        if (CollectionUtil.isEmpty(ids))
+            return;
 
         boolean isDa = true;
 

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

@@ -1880,18 +1880,21 @@ public class OrderBaseLogic {
         pgOrderBase.updateById();
     }
 
-    public void dow(String orderBaseId) {
-        PgOrderBase pgOrderBase = pgOrderBaseService.getById(orderBaseId);
+    public void dow(List<String> orderBaseIds) {
+        for (String orderBaseId : orderBaseIds) {
+
+            PgOrderBase pgOrderBase = pgOrderBaseService.getById(orderBaseId);
 
 
-        ItfGreeSynDownloadRec itfGreeSynDownloadRec = new ItfGreeSynDownloadRec();
-        itfGreeSynDownloadRec.setSynReqTime(new Date());
-        itfGreeSynDownloadRec.setGreeStatSynStatus(0);
-        itfGreeSynDownloadRec.setSalesWebsitNumber(pgOrderBase.getSalesWebsitNumber());
+            ItfGreeSynDownloadRec itfGreeSynDownloadRec = new ItfGreeSynDownloadRec();
+            itfGreeSynDownloadRec.setSynReqTime(new Date());
+            itfGreeSynDownloadRec.setGreeStatSynStatus(0);
+            itfGreeSynDownloadRec.setSalesWebsitNumber(pgOrderBase.getSalesWebsitNumber());
 
-        itfGreeSynDownloadRec.setWorkOrderId(pgOrderBase.getId());
-        itfGreeSynDownloadRec.setUpdatedTimestamp(new Date());
-        itfGreeSynDownloadRec.insert();
+            itfGreeSynDownloadRec.setWorkOrderId(pgOrderBase.getId());
+            itfGreeSynDownloadRec.setUpdatedTimestamp(new Date());
+            itfGreeSynDownloadRec.insert();
+        }
     }