需求

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

@@ -127,7 +127,7 @@ public class OrderBaseLogic {
 
         List<String> orderBaseId = new ArrayList<>();
 
-        if (zfireParamBean.getIsWait() != null && zfireParamBean.getIsWait()){
+        if (zfireParamBean.getIsWait() != null && zfireParamBean.getIsWait()) {
             List<String> collect = workerOrderService.lambdaQuery()
                     .eq(WorkerOrder::getPayStatus, "WAIT")
                     .ne(WorkerOrder::getWorkerOrderId, "").select(WorkerOrder::getWorkerOrderId)
@@ -147,7 +147,7 @@ public class OrderBaseLogic {
         zfireParamBean.setAdminWebsitIds(zfireParamBean.getAdminWebsitIds());
 
         IPage<OrderBaseVO> page = commonMapper.orderBaseList(new Page(zfireParamBean.getPageNum(), zfireParamBean.getPageSize()),
-                zfireParamBean, adminUser.getType(),adminUser.getType().equals(1)?adminUser.getCompanyWechatId():null,orderBaseId);
+                zfireParamBean, adminUser.getType(), adminUser.getType().equals(1) ? adminUser.getCompanyWechatId() : null, orderBaseId);
 
         //服务单标识
         if (zfireParamBean.getPageSize() != -1 && page.getTotal() > 0) {
@@ -258,10 +258,10 @@ public class OrderBaseLogic {
      *
      * @return
      */
-    public List<Map<String, Object>> countStatus(String startTime,String endTime,String orderSmallType, String orderSmallTypeText) {
+    public List<Map<String, Object>> countStatus(String startTime, String endTime, String orderSmallType, String orderSmallTypeText) {
         AdminUserCom adminUser = commonLogic.getAdminUser();
         List<Map<String, Object>> maps = orderBaseCMapper.countOrderStatus(adminUser.getCompanyWechatId(), adminUser.getAdminWebsitIds(),
-                adminUser.getType(), orderSmallType, orderSmallTypeText,startTime,endTime);
+                adminUser.getType(), orderSmallType, orderSmallTypeText, startTime, endTime);
 
         BoolQueryBuilder queryBuilder = QueryBuilders.boolQuery();
 
@@ -286,18 +286,19 @@ public class OrderBaseLogic {
                     .withQuery(queryBuilder)
                     .withPageable(PageRequest.of(1, 1))
                     .addAggregation(this.getAggs(AggregationBuilders.filter("DZF", QueryBuilders.boolQuery()
-                            .must(QueryBuilders.termsQuery("id",orderBaseId))
+                            .must(QueryBuilders.termsQuery("id", orderBaseId))
                     )))
                     .build();
             SearchHits responseDZF = elasticsearchRestTemplate.search(searchQueryDZF, OrderBaseEs.class);
-            DZF.put("total",this.getWorkerOrderCountResult(responseDZF.getAggregations(),"DZF"));
-            DZF.put("orderStatus","DZF");
+            DZF.put("total", this.getWorkerOrderCountResult(responseDZF.getAggregations(), "DZF"));
+            DZF.put("orderStatus", "DZF");
 
             maps.add(DZF);
 
         }
         return maps;
     }
+
     public AbstractAggregationBuilder<?> getAggs(FilterAggregationBuilder filter) {
         return filter.subAggregation(AggregationBuilders.sum("total_mac_sum").field("total_num"))
                 .subAggregation(AggregationBuilders.terms("order_type_group").field("order_type")
@@ -354,8 +355,8 @@ public class OrderBaseLogic {
         orderBase.setIsQd(orderAddBeanDTO.getIsQd());
         orderBase.setIsQdNotice(true);
         orderBase.setId(orderBaseId);
-        orderBase.setIsImportExcel(orderBase.getIsImportExcel() != null?old.getIsImportExcel():false);
-        orderBase.setIsMeet(orderBase.getIsImportExcel()?orderAddBeanDTO.getIsMeet():true);
+        orderBase.setIsImportExcel(orderBase.getIsImportExcel() != null ? old.getIsImportExcel() : false);
+        orderBase.setIsMeet(orderBase.getIsImportExcel() ? orderAddBeanDTO.getIsMeet() : true);
 
 
         //是否变更了师傅
@@ -411,7 +412,7 @@ public class OrderBaseLogic {
         orderBase.insertOrUpdate();
 
 
-        orderFlagLogic.saveOrderFlag(Lists.newArrayList(orderBase.getId()),OrderFlagEnum.ORDER);
+        orderFlagLogic.saveOrderFlag(Lists.newArrayList(orderBase.getId()), OrderFlagEnum.ORDER);
 
         //日志记录
         if (addFlag) {
@@ -1400,7 +1401,7 @@ public class OrderBaseLogic {
         orderLogLogic.addLog(pgOrderBase.getId(), "创建工单", "创建工单-家盛茂商城api", websitName);
         //派工网点
         if (StringUtils.isNotBlank(pgOrderBase.getWebsitId())) {
-            orderLogLogic.addLog(pgOrderBase.getId(), "指派网点", "派工给网点【" +(pgOrderBase.getWebsitId())+ pgOrderBase.getWebsitName() + "】", websitName);
+            orderLogLogic.addLog(pgOrderBase.getId(), "指派网点", "派工给网点【" + (pgOrderBase.getWebsitId()) + pgOrderBase.getWebsitName() + "】", websitName);
         }
         //派工给师傅
         if (StringUtils.isNotBlank(pgOrderBase.getWorkerId())) {
@@ -1418,9 +1419,10 @@ public class OrderBaseLogic {
             String format1 = sdf3.format(pgOrderBase.getAppointmentEndTime());
 
             String s2 = StringUtils.isNotBlank(pgOrderBase.getAppointmentRemark()) ? "备注:" + pgOrderBase.getAppointmentRemark() : "";
-            orderLogLogic.addLog(pgOrderBase.getId(), "用户预约", "预约时间:" + sdf.format(pgOrderBase.getAppointmentTime())+" "+format+"-"+format1 + " "  + "," + s2, websitName);
+            orderLogLogic.addLog(pgOrderBase.getId(), "用户预约", "预约时间:" + sdf.format(pgOrderBase.getAppointmentTime()) + " " + format + "-" + format1 + " " + "," + s2, websitName);
         }
     }
+
     /**
      * 生成过程反馈
      *
@@ -1432,7 +1434,7 @@ public class OrderBaseLogic {
         orderLogLogic.addLog(pgOrderBase.getId(), "创建工单", "创建工单-自建工单", websitName);
         //派工网点
         if (StringUtils.isNotBlank(pgOrderBase.getWebsitId())) {
-            orderLogLogic.addLog(pgOrderBase.getId(), "指派网点", "派工给网点【" +(pgOrderBase.getWebsitId())+ pgOrderBase.getWebsitName() + "】", websitName);
+            orderLogLogic.addLog(pgOrderBase.getId(), "指派网点", "派工给网点【" + (pgOrderBase.getWebsitId()) + pgOrderBase.getWebsitName() + "】", websitName);
         }
         //派工给师傅
         if (StringUtils.isNotBlank(pgOrderBase.getWorkerId())) {
@@ -1450,13 +1452,13 @@ public class OrderBaseLogic {
             String format1 = sdf3.format(pgOrderBase.getAppointmentEndTime());
 
             String s2 = StringUtils.isNotBlank(pgOrderBase.getAppointmentRemark()) ? "备注:" + pgOrderBase.getAppointmentRemark() : "";
-            orderLogLogic.addLog(pgOrderBase.getId(), "用户预约", "预约时间:" + sdf.format(pgOrderBase.getAppointmentTime())+" "+format+"-"+format1 + " "  + "," + s2, websitName);
+            orderLogLogic.addLog(pgOrderBase.getId(), "用户预约", "预约时间:" + sdf.format(pgOrderBase.getAppointmentTime()) + " " + format + "-" + format1 + " " + "," + s2, websitName);
         }
     }
 
     public Region getRegion(String province, String city, String area, String street) {
         Region one = regionService.lambdaQuery()
-                .like(Region::getProvinceName,province).eq(Region::getCityName,city).eq(Region::getAreaName,area).eq(Region::getName,street).last("limit 1").one();
+                .like(Region::getProvinceName, province).eq(Region::getCityName, city).eq(Region::getAreaName, area).eq(Region::getName, street).last("limit 1").one();
         return one;
     }
 
@@ -1877,7 +1879,6 @@ public class OrderBaseLogic {
         PgOrderBase pgOrderBase = pgOrderBaseService.getById(orderBaseId);
 
 
-
         ItfGreeSynDownloadRec itfGreeSynDownloadRec = new ItfGreeSynDownloadRec();
         itfGreeSynDownloadRec.setSynReqTime(new Date());
         itfGreeSynDownloadRec.setGreeStatSynStatus(0);
@@ -1921,8 +1922,8 @@ public class OrderBaseLogic {
         orderBase.setIsQd(orderAddBeanDTO.getIsQd());
         orderBase.setIsQdNotice(true);
         orderBase.setId(orderBaseId);
-        orderBase.setIsImportExcel(orderBase.getIsImportExcel() != null?old.getIsImportExcel():false);
-        orderBase.setIsMeet(orderBase.getIsImportExcel()?orderAddBeanDTO.getIsMeet():true);
+        orderBase.setIsImportExcel(orderBase.getIsImportExcel() != null ? old.getIsImportExcel() : false);
+        orderBase.setIsMeet(orderBase.getIsImportExcel() ? orderAddBeanDTO.getIsMeet() : true);
 
 
         //是否变更了师傅
@@ -1978,7 +1979,7 @@ public class OrderBaseLogic {
         orderBase.insertOrUpdate();
 
 
-        orderFlagLogic.saveOrderFlag(Lists.newArrayList(orderBase.getId()),OrderFlagEnum.ORDER);
+        orderFlagLogic.saveOrderFlag(Lists.newArrayList(orderBase.getId()), OrderFlagEnum.ORDER);
 
         //日志记录
         if (addFlag) {
@@ -2137,48 +2138,48 @@ public class OrderBaseLogic {
         OrderBaseStatusEnum orderBaseStatusEnum = OrderBaseStatusEnum.DSHPG;
         AdminWebsit adminWebsit = null;
         //网点
+
         if (StringUtils.isNotBlank(orderAddBeanDTO.getWebsitId())) {
             adminWebsit = adminWebsitService.getById(orderAddBeanDTO.getWebsitId());
+        }
+        if (adminWebsit == null) {
 
+            WebsitDispatch websitDispatch = websitDispatchService.lambdaQuery()
+                    .eq(WebsitDispatch::getStreetCode, pgOrderBase.getStreetId())
+                    .eq(WebsitDispatch::getSaleTypeId, pgOrderBase.getSaleType())
+                    .eq(WebsitDispatch::getCategoryId, orderAddBeanDTO.getOrderProducts().get(0).getMainId())
+                    .eq(WebsitDispatch::getOrderSmallId, pgOrderBase.getOrderSmallType())
+                    .last("limit 1").one();
 
-            if (adminWebsit == null) {
-
-                WebsitDispatch websitDispatch = websitDispatchService.lambdaQuery()
-                        .eq(WebsitDispatch::getStreetCode, pgOrderBase.getStreetId())
-                        .eq(WebsitDispatch::getSaleTypeId, pgOrderBase.getSaleType())
-                        .eq(WebsitDispatch::getCategoryId, orderAddBeanDTO.getOrderProducts().get(0).getMainId())
-                        .eq(WebsitDispatch::getOrderSmallId, pgOrderBase.getOrderSmallType())
-                        .last("limit 1").one();
-
-                if (websitDispatch != null) {
-
-                    adminWebsit = adminWebsitService.getById(websitDispatch.getWebsitId());
-                }
+            if (websitDispatch != null) {
 
+                adminWebsit = adminWebsitService.getById(websitDispatch.getWebsitId());
             }
-            if (adminWebsit == null) {
+
+        }
+        if (adminWebsit == null) {
+            orderBaseStatusEnum = OrderBaseStatusEnum.DSHPG;
+        } else {
+            if (adminWebsit.getType().equals(AdminWebsitTypeEnum.B.getKey())) {
                 orderBaseStatusEnum = OrderBaseStatusEnum.DSHPG;
-            }else {
-                if (adminWebsit.getType().equals(AdminWebsitTypeEnum.B.getKey())) {
-                    orderBaseStatusEnum = OrderBaseStatusEnum.DSHPG;
-                }
-                if (adminWebsit.getType().equals(AdminWebsitTypeEnum.C.getKey())
-                        && (orderBaseStatusEnum == OrderBaseStatusEnum.DSHPG || orderBaseStatusEnum == OrderBaseStatusEnum.DWDPG || orderBaseStatusEnum == OrderBaseStatusEnum.DQD)) {
-                    orderBaseStatusEnum = OrderBaseStatusEnum.DWDPG;
-                    if (pgOrderBase.getIsQd() != null && pgOrderBase.getIsQd()) {
-                        orderBaseStatusEnum = OrderBaseStatusEnum.DQD;
-                    }
-                }
-                pgOrderBase.setWebsitId(adminWebsit.getWebsitId());
-                pgOrderBase.setWebsitName(adminWebsit.getName());
-                pgOrderBase.setWebsitPhone(adminWebsit.getWebsitPhone());
-                //只记录第一次
-                if (pgOrderBase.getDispatchWebsitTime() == null) {
-                    pgOrderBase.setDispatchWebsitTime(new Date());
+            }
+            if (adminWebsit.getType().equals(AdminWebsitTypeEnum.C.getKey())
+                    && (orderBaseStatusEnum == OrderBaseStatusEnum.DSHPG || orderBaseStatusEnum == OrderBaseStatusEnum.DWDPG || orderBaseStatusEnum == OrderBaseStatusEnum.DQD)) {
+                orderBaseStatusEnum = OrderBaseStatusEnum.DWDPG;
+                if (pgOrderBase.getIsQd() != null && pgOrderBase.getIsQd()) {
+                    orderBaseStatusEnum = OrderBaseStatusEnum.DQD;
                 }
             }
-
+            pgOrderBase.setWebsitId(adminWebsit.getWebsitId());
+            pgOrderBase.setWebsitName(adminWebsit.getName());
+            pgOrderBase.setWebsitPhone(adminWebsit.getWebsitPhone());
+            //只记录第一次
+            if (pgOrderBase.getDispatchWebsitTime() == null) {
+                pgOrderBase.setDispatchWebsitTime(new Date());
+            }
         }
+
+
         //师傅
         String workerIdsStr = "";
         if (CollectionUtils.isNotEmpty(orderAddBeanDTO.getOrderWorkers())) {
@@ -2271,10 +2272,10 @@ public class OrderBaseLogic {
 
         PgOrderBase pgOrderBase = pgOrderBaseService.getById(orderBaseId);
         if (pgOrderBase == null) {
-           return;
+            return;
         }
         if (OrderBaseStatusEnum.isOver().contains(pgOrderBase.getOrderStatus())) {
-           return;
+            return;
         }
         pgOrderBase.setOrderStatus(OrderBaseStatusEnum.YQX.getKey());
         pgOrderBase.setOrderStatusText(OrderBaseStatusEnum.YQX.getRemark());