update:扫码配置

fs-framework/src/main/java/com/fs/framework/web/service/SysLoginService.java

@@ -59,13 +59,13 @@ public class SysLoginService
     @Autowired
     private WechatLoginService wechatLoginService;
 
-    @Value("${wechat.admin.appid}")
+    @Value("${wechat.admin.appid:#{null}}")
     private String appId;
-    @Value("${wechat.admin.secret}")
+    @Value("${wechat.admin.secret:#{null}}")
     private String secret;
-    @Value("${wechat.admin.redirectUri}")
+    @Value("${wechat.admin.redirectUri:#{null}}")
     private String redirectUri;
-    @Value("${wechat.isNeedScan}")
+    @Value("${wechat.isNeedScan:false}")
     private Boolean isNeedScan;
 
     /**

fs-service/src/main/resources/application-common.yml

@@ -143,12 +143,3 @@ wechat:
   api:
     base-url: https://api.weixin.qq.com
     upload-shipping-info: /wxa/sec/order/upload_shipping_info
-  company:
-    appid: wxd7c1e221622a0ccf
-    secret: 70d3ed4f8eb68cca0cf525b8ce07405d
-    redirectUri: http://rfa96c48.natappfree.cc/callback
-  admin:
-    appid: wxd7c1e221622a0ccf
-    secret: 70d3ed4f8eb68cca0cf525b8ce07405d
-    redirectUri: http://rfa96c48.natappfree.cc/callback
-  isNeedScan: false

fs-service/src/main/resources/application-druid-jnmy-test.yml

@@ -232,5 +232,15 @@ isNewWxMerchant: true
 ipad:
     url: http://localhost:8999/dev-api
     companyId: 13
+#wechat:
+#    company:
+#        appid: wxd7c1e221622a0ccf
+#        secret: 70d3ed4f8eb68cca0cf525b8ce07405d
+#        redirectUri: http://ta6d97ec.natappfree.cc/callback
+#    admin:
+#        appid: wxd7c1e221622a0ccf
+#        secret: 70d3ed4f8eb68cca0cf525b8ce07405d
+#        redirectUri: http://ta6d97ec.natappfree.cc/callback
+#    isNeedScan: true
 
 

fs-service/src/main/resources/application-druid-jnmy.yml

@@ -161,4 +161,15 @@ im:
 #是否为新商户，新商户不走mpOpenId
 isNewWxMerchant: true
 
+wechat:
+    company:
+        appid: wxd7c1e221622a0ccf
+        secret: 70d3ed4f8eb68cca0cf525b8ce07405d
+        redirectUri: https://company.jnmyunl.com/prod-api/callback
+    admin:
+        appid: wxd7c1e221622a0ccf
+        secret: 70d3ed4f8eb68cca0cf525b8ce07405d
+        redirectUri: https://admin.jnmyunl.com/prod-api/callback
+    isNeedScan: false
+
 

fs-service/src/main/resources/mapper/his/FsStoreOrderMapper.xml

@@ -579,7 +579,7 @@ PUBLIC "-//mybatis.org//DTD Mapper 3.0//EN"
             so.store_id in (select store_id from fs_store where delivery_type=2 or delivery_type=1)
             )
             and  (so.extend_order_id is null or  so.extend_order_id like '')
-            and (fuic.doctor_type2_confirm = 1 or fuic.doctor_type2_confirm = null)
+            and (fuic.doctor_type2_confirm = 1 or fuic.doctor_type2_confirm IS null)
         </if>
         <if test="maps.status == 7">
             and so.`status`= 2
@@ -796,7 +796,7 @@ PUBLIC "-//mybatis.org//DTD Mapper 3.0//EN"
                 so.store_id in (select store_id from fs_store where delivery_type=2 or delivery_type=1)
                 )
                 and  (so.extend_order_id is null or  so.extend_order_id like '')
-                and (fuic.doctor_type2_confirm = 1 or fuic.doctor_type2_confirm = null)
+                and (fuic.doctor_type2_confirm = 1 or fuic.doctor_type2_confirm IS null)
             </if>
             <if test="maps.status == 7">
                 and so.`status`= 2