Merge remote-tracking branch 'origin/dev/one' into dev/one

diagbotman-service/src/main/resources/mapper/ProductOrderMapper.xml

@@ -73,10 +73,12 @@
     </select>
 
     <select id="waitExamOrderCou" resultType="int">
-    	SELECT
-			count(DISTINCT a.num)
-		from diag_product_order a join diag_order_details b on a.num=b.order_num
-		where b.audit_status=2
+    	SELECT 
+			count(1) 
+		FROM diag_product_order a join
+		(SELECT DISTINCT order_num
+		from diag_order_details where is_deleted='N' and audit_status=2) b on a.num=b.order_num
+		where a.is_deleted='N'
     </select>
 
     <select id="selectAllProductOrder" resultMap="BaseResultWrapper">

docker-compose.yml

@@ -30,7 +30,7 @@ services:
   uaa-service:
     image: 192.168.2.236:5000/diagbotcloud/uaa-service:0.0.1-SNAPSHOT
     depends_on:
-      - config1
+#      - config1
       - eureka1
     volumes:
     - "/etc/localtime:/etc/localtime:ro"
@@ -42,7 +42,7 @@ services:
   user-service:
     image: 192.168.2.236:5000/diagbotcloud/user-service:0.0.1-SNAPSHOT
     depends_on:
-      - config1
+#      - config1
       - eureka1
     volumes:
     - "/etc/localtime:/etc/localtime:ro"
@@ -54,7 +54,7 @@ services:
   diagbotman-service:
     image: 192.168.2.236:5000/diagbotcloud/diagbotman-service:0.0.1-SNAPSHOT
     depends_on:
-      - config1
+#      - config1
       - eureka1
     volumes:
     - "/etc/localtime:/etc/localtime:ro"
@@ -66,7 +66,7 @@ services:
   log-service:
     image: 192.168.2.236:5000/diagbotcloud/log-service:0.0.1-SNAPSHOT
     depends_on:
-      - config1
+#      - config1
       - eureka1
     volumes:
     - "/etc/localtime:/etc/localtime:ro"
@@ -78,7 +78,7 @@ services:
   monitor-service:
     image: 192.168.2.236:5000/diagbotcloud/monitor-service:0.0.1-SNAPSHOT
     depends_on:
-      - config1
+#      - config1
       - eureka1
 #      - user-service
 #      - log-service
@@ -94,7 +94,7 @@ services:
   admin-service:
     image: 192.168.2.236:5000/diagbotcloud/admin-service:0.0.1-SNAPSHOT
     depends_on:
-      - config1
+#      - config1
       - eureka1
     volumes:
     - "/etc/localtime:/etc/localtime:ro"
@@ -107,8 +107,8 @@ services:
     restart: always
   gateway-service:
     image: 192.168.2.236:5000/diagbotcloud/gateway-service:0.0.1-SNAPSHOT
-    depends_on:
-      - config1
+#    depends_on:
+#      - config1
 #      - user-service
 #      - log-service
     volumes: