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

mall-server-api/pom.xml

@@ -200,6 +200,22 @@
             <scope>compile</scope>
         </dependency>
 
+        <!--es -->
+        <dependency>
+            <groupId>org.springframework.boot</groupId>
+            <artifactId>spring-boot-starter-data-elasticsearch</artifactId>
+            <exclusions>
+                <exclusion>
+                    <artifactId>HdrHistogram</artifactId>
+                    <groupId>org.hdrhistogram</groupId>
+                </exclusion>
+                <exclusion>
+                    <artifactId>httpclient</artifactId>
+                    <groupId>org.apache.httpcomponents</groupId>
+                </exclusion>
+            </exclusions>
+        </dependency>
+
         <dependency>
             <groupId>com.alibaba</groupId>
             <artifactId>easyexcel</artifactId>

mall-server-api/src/main/java/com/gree/mall/manager/enums/workorder/OrderBaseStatusEnum.java

@@ -32,15 +32,17 @@ public enum OrderBaseStatusEnum implements BaseEnum {
     CJ("CJ","创建"),
     YPD("YPD","预派单"),
     DXSPD("DXSPD","待销司派单"),
-    DZBPG("DZBPG","等总部派单"),
+    DZBPG("DZBPG","待总部派单"),
     DSM("DSM","待上门"),
     DWDSPGP("DWDSPGP","待一级网点审批改派"),
     DXSSPGP("DXSSPGP","待销司审批改派"),
     DTJXSSPGP("DTJXSSPGP","待同级销司审批改派"),
-    DZBSPGP("DZBSPGP","等总部审批改派"),
+    DZBSPGP("DZBSPGP","待总部审批改派"),
+    DWDPD("DWDPD","待网点派单"),
     DFZXPD("DFZXPD","待分中心派单"),
     DFZXSPGP("DFZXSPGP","待分中心审批改派"),
     GCSZT("GCSZT","工程师在途"),
+    YZP("YZP","已转派"),
     BFWG("BFWG","部分完工"),
     FWZT("FWZT","服务暂停"),
     WDBH("WDBH","网点驳回"),

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

@@ -1182,7 +1182,8 @@ public class OrderBaseLogic {
     }
 
     public Region getRegion(String province,String city,String area,String street){
-        Region one = regionService.lambdaQuery().eq(Region::getProvinceName, province).eq(Region::getCityName, city).eq(Region::getAreaName, area).eq(Region::getName, street).one();
+        Region one = regionService.lambdaQuery()
+                .like(Region::getProvinceName, province).eq(Region::getCityName, city).eq(Region::getAreaName, area).eq(Region::getName, street).one();
         return one;
     }
 

mall-server-api/src/main/resources/bootstrap-dev.properties

@@ -94,4 +94,11 @@ inf.token.appSecret=3e7iee31ub94rvvesp7266kwske7fple
 #分销商城appid
 share.mall.appid=wx21d155e8a449d9b1
 
+#elasticsearch
+spring.elasticsearch.uris=http://116.62.158.92:9200
+spring.elasticsearch.username=elastic
+spring.elasticsearch.password=zfire2022@
+spring.elasticsearch.connection-timeout=5s
+spring.elasticsearch.socket-timeout=30s
+
 

mall-server-api/src/main/resources/bootstrap-test.properties

@@ -77,4 +77,11 @@ inf.token.appid=zfire-jsm-sxb
 inf.token.appSecret=3e7iee31ub94rvvesp7266kwske7fple
 
 #分销商城appid
-share.mall.appid=wx21d155e8a449d9b1
+share.mall.appid=wx21d155e8a449d9b1
+
+#elasticsearch
+spring.elasticsearch.uris=http://116.62.158.92:9200
+spring.elasticsearch.username=elastic
+spring.elasticsearch.password=zfire2022@
+spring.elasticsearch.connection-timeout=5s
+spring.elasticsearch.socket-timeout=30s