Merge remote-tracking branch 'origin/master'

mall-miniapp-service/src/main/java/com/gree/mall/miniapp/logic/es/EsLogic.java

@@ -39,7 +39,7 @@ public class EsLogic {
 
 
 
-    public  List<CommonListES>  list(List<String> websitNumbers,String workerNumber,String comId){
+    public  List<CommonListES> list(List<String> websitNumbers,String workerNumber,String comId){
         //标题
         BoolQueryBuilder titleQueryBuilder = QueryBuilders.boolQuery().must(QueryBuilders.termQuery("type", "1"));
         if(StringUtils.isNotEmpty(comId)){
@@ -51,7 +51,7 @@ public class EsLogic {
             must.must(QueryBuilders.termQuery("comListId", comId));
         }
         if(StringUtils.isNotEmpty(workerNumber)){
-            must.must(QueryBuilders.termQuery("workerNumber.keyword", workerNumber));
+            must.must(QueryBuilders.termQuery("workerNumber", workerNumber));
         }
 /*        if(CollectionUtils.isNotEmpty(websitNumbers)){
             must.must(QueryBuilders.termsQuery("websitNumber.keyword",websitNumbers));

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

@@ -186,7 +186,7 @@ public class WorkerComListLogic {
      * @param workerNumber
      */
     public List<CommonListES> record(String comListId, String workerNumber) {
-        List<CommonListES> list = esLogic.list(Arrays.asList(workerNumber), workerNumber, comListId);
+        List<CommonListES> list = esLogic.list(null, workerNumber, comListId);
         return list;
     }
 

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

@@ -92,7 +92,7 @@ public class EsLogic {
             must.must(QueryBuilders.matchPhraseQuery("workerNumber", workerNumber));
         }
         if(CollectionUtils.isNotEmpty(websitNumbers)){
-            must.must(QueryBuilders.termsQuery("websitNumber.keyword",websitNumbers));
+            must.filter(QueryBuilders.termsQuery("websitNumber",websitNumbers));
         }
         NativeSearchQuery titleBuild = new NativeSearchQueryBuilder().withQuery(titleQueryBuilder).build();
         NativeSearchQuery dataBuild = new NativeSearchQueryBuilder()

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

@@ -1571,6 +1571,8 @@ public class AgreementLogic {
             for (LeLetter leLetter : list) {
                 leLetter.setExamineFration(leLetter.getFraction());
                 leLetter.setExaminePrice(leLetter.getPrice());
+                leLetter.setStatus(LetterStatusEnum.EXECUTED.getKey());
+
 
                 leLetter.setExamineName("申诉截止时间已到自动批复");
 
@@ -1600,7 +1602,7 @@ public class AgreementLogic {
                     for (LeLetter leLetter : list) {
                         leLetter.setExamineFration(leLetter.getFraction());
                         leLetter.setExaminePrice(leLetter.getPrice());
-
+                        leLetter.setStatus(LetterStatusEnum.EXECUTED.getKey());
                         leLetter.setExamineName("申诉截止时间已到自动批复");
 
                         leLetter.updateById();

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

@@ -100,7 +100,7 @@ public class OrderBaseCountLogic {
                 .addAggregation(this.getAggs(AggregationBuilders.filter("DJS", QueryBuilders.boolQuery()
                         .must(QueryBuilders.boolQuery().should(QueryBuilders.termsQuery("is_meet", false))
                                 .should(QueryBuilders.termsQuery("order_status", "DJD")))
-                        .mustNot(QueryBuilders.termsQuery("order_status", "YQX", "FWQX", "FL", "FWZT", "YCGB"))
+                        .mustNot(QueryBuilders.termsQuery("order_status", "YQX", "FWQX", "FL", "FWZT", "YCGB","YZP"))
                 )))
                 .build();
         SearchHits responseDJS = elasticsearchRestTemplate.search(searchQueryDJS, OrderBaseEs.class);
@@ -139,7 +139,7 @@ public class OrderBaseCountLogic {
                 .withQuery(queryBuilderCount)
                 .withPageable(PageRequest.of(1, 1))
                 .addAggregation(this.getAggs(AggregationBuilders.filter("DYY", QueryBuilders.boolQuery()
-                        .mustNot(QueryBuilders.termsQuery("order_status","YWG","GCSZX","WDWG","YWGO","YQX","FWZT","YCGB",
+                        .mustNot(QueryBuilders.termsQuery("order_status","YWG","GCSZX","WDWG","YWGO","YQX","FWZT","YCGB","YZP",
                                 "FWQX","FL","YJS","LRCD","DSHPG","CJ","YPD","DXSPD","DZBPG","DWDSPGP","DXSSPGP","DTJXSSPGP","DZBSPGP")
                         )
                         .mustNot(QueryBuilders.existsQuery("appointment_time"))