需求

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

@@ -639,9 +639,10 @@ public class BigLogic {
                 BoolQueryBuilder queryBuilder = QueryBuilders.boolQuery();
 
                 if (org.apache.commons.collections4.CollectionUtils.isNotEmpty(adminUser.getAdminWebsitIds())) {
-                    List<QueryBuilder> should = queryBuilder.should();
-                    should.add(QueryBuilders.termsQuery("create_websit_id", adminUser.getAdminWebsitIds()));
-                    should.add(QueryBuilders.termsQuery("websit_id", adminUser.getAdminWebsitIds()));
+                    queryBuilder.must(
+                            QueryBuilders.boolQuery().should(QueryBuilders.termsQuery("create_websit_id", adminUser.getAdminWebsitIds()))
+                                    .should(QueryBuilders.termsQuery("websit_id", adminUser.getAdminWebsitIds()))
+                    );
                 }
 
                 DateTime startDay = DateUtil.beginOfDay(DateUtil.offsetDay(new Date(), -1 * i));

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

@@ -268,7 +268,7 @@ public class UnicomLogic {
             if(ring != null && ringingTime != null) {
                 callRecord.setRingTimestamp((int)DateUtil.betweenMs(ring,ringingTime));
             }
-            String ossUrl = ossUtil.getAccessUrl()+filepath;
+            String ossUrl = ossUtil.getAccessUrl2()+filepath;
             callRecord.setFileUrl(ossUrl);
             if(callRecord.getCallTimestamp() > 0){
                 callRecord.setStatus("回访成功");

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

@@ -112,7 +112,7 @@ 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")){
+        if (StringUtils.equalsAny(pgOrderBase.getOrderStatus(),"YWG","GCSZX","WDWG","YWGO","YJS","LRCD","YQX","FWZT","YCGB","FWQX","FL")){
             return;
         }
         pgOrderBaseService.lambdaUpdate()
@@ -160,7 +160,7 @@ public class ChangeOrderLogic {
         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")){
+            if (StringUtils.equalsAny(pgOrderBase.getOrderStatus(),"YWG","GCSZX","WDWG","YWGO","YJS","LRCD","YQX","FWZT","YCGB","FWQX","FL")){
                 continue;
             }
             ids.add(id);

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

@@ -199,9 +199,10 @@ public class OrderBaseCountLogic {
             BoolQueryBuilder queryBuilder = QueryBuilders.boolQuery();
 
             if (org.apache.commons.collections4.CollectionUtils.isNotEmpty(adminUser.getAdminWebsitIds())) {
-                List<QueryBuilder> should = queryBuilder.should();
-                should.add(QueryBuilders.termsQuery("create_websit_id", adminUser.getAdminWebsitIds()));
-                should.add(QueryBuilders.termsQuery("websit_id", adminUser.getAdminWebsitIds()));
+                queryBuilder.must(
+                        QueryBuilders.boolQuery().should(QueryBuilders.termsQuery("create_websit_id", adminUser.getAdminWebsitIds()))
+                                .should(QueryBuilders.termsQuery("websit_id", adminUser.getAdminWebsitIds()))
+                );
             }
 
 /*            Long qtsm = pgOrderBaseList.stream().filter(item -> item.getAppointmentTime() != null && item.getAppointmentTime().before(DateUtil.endOfDay(DateUtil.offsetDay(new Date(), (day)))) &&
@@ -249,9 +250,10 @@ public class OrderBaseCountLogic {
                 BoolQueryBuilder queryBuilder = QueryBuilders.boolQuery();
 
                 if (CollectionUtils.isNotEmpty(adminUser.getAdminWebsitIds())) {
-                    List<QueryBuilder> should = queryBuilder.should();
-                    should.add(QueryBuilders.termsQuery("create_websit_id", adminUser.getAdminWebsitIds()));
-                    should.add(QueryBuilders.termsQuery("websit_id", adminUser.getAdminWebsitIds()));
+                    queryBuilder.must(
+                            QueryBuilders.boolQuery().should(QueryBuilders.termsQuery("create_websit_id", adminUser.getAdminWebsitIds()))
+                                    .should(QueryBuilders.termsQuery("websit_id", adminUser.getAdminWebsitIds()))
+                    );
                 }
 
                 //工单类型

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

@@ -332,6 +332,13 @@ public class OrderBaseEsLogic {
             queryBuilder.must(QueryBuilders.termsQuery("order_small_type_text",orderSmallTypeText));
 
 
+        if (startTime != null)
+            queryBuilder.must(QueryBuilders.rangeQuery("create_time")
+                .gte(startTime)
+                .lte(endTime)
+        );
+
+
         //待预约
         NativeSearchQuery searchQuery = new NativeSearchQueryBuilder()
                 .withQuery(queryBuilder)

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

@@ -36,6 +36,7 @@ import com.gree.mall.manager.logic.common.WxPubNoticeLogic;
 import com.gree.mall.manager.plus.entity.*;
 import com.gree.mall.manager.plus.service.*;
 import com.gree.mall.manager.utils.CommonUtils;
+import com.gree.mall.manager.utils.StringUtil;
 import com.gree.mall.manager.zfire.bean.ZfireParamBean;
 import com.gree.mall.manager.zfire.util.FieldUtils;
 import lombok.RequiredArgsConstructor;
@@ -271,11 +272,22 @@ public class OrderBaseLogic {
         BoolQueryBuilder queryBuilder = QueryBuilders.boolQuery();
 
         if (CollectionUtils.isNotEmpty(adminUser.getAdminWebsitIds())) {
-            List<QueryBuilder> should = queryBuilder.should();
-            should.add(QueryBuilders.termsQuery("create_websit_id", adminUser.getAdminWebsitIds()));
-            should.add(QueryBuilders.termsQuery("websit_id", adminUser.getAdminWebsitIds()));
+            queryBuilder.must(
+                    QueryBuilders.boolQuery().should(QueryBuilders.termsQuery("create_websit_id", adminUser.getAdminWebsitIds()))
+                            .should(QueryBuilders.termsQuery("websit_id", adminUser.getAdminWebsitIds()))
+            );
         }
 
+        if (!StringUtil.isEmpty(orderSmallTypeText))
+            queryBuilder.must(QueryBuilders.termsQuery("order_small_type_text",orderSmallTypeText));
+
+
+        if (startTime != null)
+            queryBuilder.must(QueryBuilders.rangeQuery("create_time")
+                    .gte(startTime)
+                    .lte(endTime)
+            );
+
         List<String> orderBaseId = new ArrayList<>();
 
         HashMap<String, Object> DZF = new HashMap<>();
@@ -2152,10 +2164,15 @@ public class OrderBaseLogic {
         }
         if (adminWebsit == null) {
 
+            GoodsCategory goodsCategory = goodsCategoryService.lambdaQuery()
+                    .eq(GoodsCategory::getCategoryNumber, orderAddBeanDTO.getOrderProducts().get(0).getMainId())
+                    .last("limit 1")
+                    .one();
+
             WebsitDispatch websitDispatch = websitDispatchService.lambdaQuery()
                     .eq(WebsitDispatch::getStreetCode, pgOrderBase.getStreetId())
                     .eq(WebsitDispatch::getSaleTypeId, pgOrderBase.getSaleType())
-                    .eq(WebsitDispatch::getCategoryId, orderAddBeanDTO.getOrderProducts().get(0).getMainId())
+                    .eq(WebsitDispatch::getCategoryId, goodsCategory.getCategoryId())
                     .eq(WebsitDispatch::getOrderSmallId, orderAddBeanDTO.getOrderSmallType())
                     .last("limit 1").one();