Merge remote-tracking branch 'origin/master'

mall-miniapp-service/src/main/java/com/gree/mall/miniapp/controller/user/UserController.java

@@ -297,7 +297,7 @@ public class UserController {
         CurrentCompanyWechat currentCompanyWechat = commonLogic.getCurrentCompanyWechat();
         WxJsApiSignBean pubJsapiSign = wechatLogic.getPubJsapiSign(currentCompanyWechat.getCompanyWechatId(), url);
 
-        log.info("=====11请求获取公众号jsapi"+url+"返回内容"+pubJsapiSign);
+      //  log.info("=====11请求获取公众号jsapi"+url+"返回内容"+pubJsapiSign);
         return ResponseHelper.success(pubJsapiSign);
     }
 

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

@@ -51,11 +51,11 @@ public class EsLogic {
             must.must(QueryBuilders.termQuery("comListId", comId));
         }
         if(StringUtils.isNotEmpty(workerNumber)){
-            must.must(QueryBuilders.matchPhraseQuery("workerNumber", workerNumber));
+            must.must(QueryBuilders.termQuery("workerNumber", workerNumber));
         }
-        if(CollectionUtils.isNotEmpty(websitNumbers)){
+/*        if(CollectionUtils.isNotEmpty(websitNumbers)){
             must.must(QueryBuilders.termsQuery("websitNumber.keyword",websitNumbers));
-        }
+        }*/
         NativeSearchQuery titleBuild = new NativeSearchQueryBuilder().withQuery(titleQueryBuilder).build();
         NativeSearchQuery dataBuild = new NativeSearchQueryBuilder().withQuery(must).build();
 

mall-miniapp-service/src/main/java/com/gree/mall/miniapp/logic/workorder/OrderBaseLogic.java

@@ -199,8 +199,10 @@ public class OrderBaseLogic {
 
         List<String> websitIds = websitUserService.lambdaQuery().eq(WebsitUser::getUserId, currentCompanyWechat.getUserId()).select(WebsitUser::getWebsitId).list().stream().map(WebsitUser::getWebsitId).collect(Collectors.toList());
         List<String> orderBaseIds = pgOrderWorkerService.lambdaQuery()
-                    .and(item -> item.eq(PgOrderWorker::getWorkerNumber, currentCompanyWechat.getUser().getWorkerNumber()).or()
+                    .and(!StringUtil.isEmpty(currentCompanyWechat.getUser().getWorkerNumber()),
+                            item -> item.eq(PgOrderWorker::getWorkerNumber, currentCompanyWechat.getUser().getWorkerNumber()).or()
                     .eq(PgOrderWorker::getWorkerId,currentCompanyWechat.getUserId()))
+                    .eq(StringUtil.isEmpty(currentCompanyWechat.getUser().getWorkerNumber()),PgOrderWorker::getWorkerId,currentCompanyWechat.getUserId())
                     .list().stream().map(PgOrderWorker::getOrderBaseId).distinct().collect(Collectors.toList());
 
         if(byDay != null){

mall-miniapp-service/src/main/resources/bootstrap-prd.properties

@@ -81,4 +81,14 @@ inf.token.appid=material
 inf.token.appSecret=kaksladjaklsdjlasjdlasjdlaskijwsmk
 
 #分销商城appid
-share.mall.appid=wx21d155e8a449d9b1
+share.mall.appid=wx21d155e8a449d9b1
+
+
+#elasticsearch,支持集群
+spring.elasticsearch.rest.uris=http://es-cn-i7m27kcyd002c3v8f.elasticsearch.aliyuncs.com:9200
+spring.elasticsearch.rest.username=elastic
+spring.elasticsearch.rest.password=zongjUzongjU2021_
+spring.elasticsearch.rest.connection-timeout=5s
+spring.elasticsearch.rest.read-timeout=30s
+spring.data.elasticsearch.client.reactive.max-in-memory-size=500MB
+

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

@@ -144,11 +144,7 @@ public class WorkerManagerLogic {
                 .and(item -> item.eq(!StringUtil.isEmpty(websitUserBean.getWorkerNumber()),PgOrderBase::getWorkerNumber,websitUserBean.getWorkerNumber())
                         .or(!StringUtil.isEmpty(websitUserBean.getWorkerNumber())).like(PgOrderBase::getWorkerIdList,websitUserBean.getUserId()))
                 .eq(PgOrderBase::getWebsitId,websitUserBean.getWebsitId())
-                .notIn(PgOrderBase::getOrderStatus, OrderBaseStatusEnum.YQX.getKey(),OrderBaseStatusEnum.YJS.getKey(),
-                        OrderBaseStatusEnum.YWG.getKey(),OrderBaseStatusEnum.FWQX.getKey(),OrderBaseStatusEnum.YWGO.getKey(),
-                        OrderBaseStatusEnum.YGBGD.getKey(),OrderBaseStatusEnum.FGFZF.getKey(),OrderBaseStatusEnum.YZFGD.getKey(),
-                        OrderBaseStatusEnum.FZXBWG.getKey(),OrderBaseStatusEnum.FBBWG.getKey(),OrderBaseStatusEnum.LSXX.getKey(),
-                        OrderBaseStatusEnum.PLGB.getKey(),OrderBaseStatusEnum.ZCGB.getKey()
+                .notIn(PgOrderBase::getOrderStatus, "YWG","GCSZX","WDWG","YWGO","YJS","LRCD","YQX","FWZT","YCGB","FWQX","FL"
                         ).count() > 0) {
 
             throw new RemoteServiceException("师傅存在未完工工单，请改派后再离职");