feat:升级订单加钟订单不计算车费

nightFragrance-admin/src/main/resources/application-pro.yml

@@ -14,6 +14,7 @@ ylx:
   # 验证码类型 math 数字计算 char 字符验证
   captchaType: math
 
+  ym: city.baoxianzhanggui.com
 # 开发环境配置
 server:
   # 服务器的HTTP端口，默认为8080
@@ -216,9 +217,9 @@ wx:
   #mch-key: 39C9AIJ1RQKT3I8V16BYZ6LLBI0H30NB
   mch-key: 29138927a706e34282df802feacfc18r
   # 异步回调地址
-  notify-url: https://test.baoxianzhanggui.com/nightFragrance/wx/pay/payNotify
+  notify-url: https://city.baoxianzhanggui.com/nightFragrance/wx/pay/payNotify
   # 异步退款回调地址
-  refund-Notify: https://test.baoxianzhanggui.com/nightFragrance/wx/pay/refundNotify
+  refund-Notify: https://city.baoxianzhanggui.com/nightFragrance/wx/pay/refundNotify
   # 证书地址
   cert-path: /nightFragrance/pay/apiclient_cert.pem
   # 证书秘钥地址
@@ -242,7 +243,7 @@ wechat:
   # 获取code
   get-code-url: https://open.weixin.qq.com/connect/oauth2/authorize
   # 回调地址
-  redirect-url: https://test.baoxianzhanggui.com/nightFragrance/sq/getAccessToken
+  redirect-url: https://city.baoxianzhanggui.com/nightFragrance/sq/getAccessToken
   # 回调地址
   access-token-url: https://api.weixin.qq.com/sns/oauth2/access_token
   # 消息模版ID订单待接单通知
@@ -257,3 +258,4 @@ xss:
   excludes: /system/notice
   # 匹配链接
   urlPatterns: /system/*,/monitor/*,/tool/*
+# ylx456

nightFragrance-admin/src/main/resources/application-test.yml

@@ -14,6 +14,8 @@ ylx:
   # 验证码类型 math 数字计算 char 字符验证
   captchaType: math
 
+  ym: test.baoxianzhanggui.com
+
 # 开发环境配置
 server:
   # 服务器的HTTP端口，默认为8080

nightFragrance-common/src/main/java/com/ylx/common/config/RuoYiConfig.java

@@ -30,6 +30,16 @@ public class RuoYiConfig
     /** 验证码类型 */
     private static String captchaType;
 
+
+
+    private static String ym;
+
+    public String getYm() {
+        return ym;
+    }
+    public void setYm(String ym) {
+        this.ym = ym;
+    }
     public String getName()
     {
         return name;

nightFragrance-massage/src/main/java/com/ylx/massage/utils/WeChatUtil.java

@@ -70,7 +70,7 @@ public class WeChatUtil {
                     .append(wxPayProperties.getMpAppId())
                     .append("&redirect_uri=")
                     .append(URLEncoder.encode(wxPayProperties.getRedirectUrl(), "UTF-8"))
-//                    .append(URLEncoder.encode("https://test.baoxianzhanggui.com/fragrance/#/pages/my/wxLogin", "UTF-8"))
+//                    .append(URLEncoder.encode("https://city.baoxianzhanggui.com/fragrance/#/pages/my/wxLogin", "UTF-8"))
                     .append("&response_type=code&scope=snsapi_userinfo&state=")
                     .append("STATE")
                     .append("#wechat_redirect");
@@ -308,7 +308,7 @@ public class WeChatUtil {
 
         String url = " https://api.weixin.qq.com/cgi-bin/menu/create?access_token=" + token;
 
-        String param = "{\"button\":[{\"type\":\"view\",\"name\":\"立即下单\",\"url\":\"https://test.baoxianzhanggui.com/fragrance/\"},{\"type\":\"view\",\"name\":\"查看技师\",\"url\":\"https://test.baoxianzhanggui.com/fragrance/#/pages/identify/identify\"},{\"name\":\"更多\",\"sub_button\":[{\"type\":\"view\",\"name\":\"技师招募\",\"url\":\"https://test.baoxianzhanggui.com/fragrance/#/pages/join/first_join\"},{\"type\":\"view\",\"name\":\"招商合作\",\"url\":\"https://test.baoxianzhanggui.com/fragrance/#/pages/join/teamwork\"},{\"type\":\"view\",\"name\":\"投诉举报\",\"url\":\"https://test.baoxianzhanggui.com/fragrance/#/pages/join/feedback\"},{\"type\":\"view\",\"name\":\"了解我们\",\"url\":\"https://test.baoxianzhanggui.com/fragrance/#/pages/join/understand\"}]}]}";
+        String param = "{\"button\":[{\"type\":\"view\",\"name\":\"立即下单\",\"url\":\"https://city.baoxianzhanggui.com/fragrance/\"},{\"type\":\"view\",\"name\":\"查看技师\",\"url\":\"https://city.baoxianzhanggui.com/fragrance/#/pages/identify/identify\"},{\"name\":\"更多\",\"sub_button\":[{\"type\":\"view\",\"name\":\"技师招募\",\"url\":\"https://city.baoxianzhanggui.com/fragrance/#/pages/join/first_join\"},{\"type\":\"view\",\"name\":\"招商合作\",\"url\":\"https://city.baoxianzhanggui.com/fragrance/#/pages/join/teamwork\"},{\"type\":\"view\",\"name\":\"投诉举报\",\"url\":\"https://city.baoxianzhanggui.com/fragrance/#/pages/join/feedback\"},{\"type\":\"view\",\"name\":\"了解我们\",\"url\":\"https://city.baoxianzhanggui.com/fragrance/#/pages/join/understand\"}]}]}";
         String rs = HttpUtil.post(url, param);
         Map<?, ?> map = JSONObject.parseObject(rs, Map.class);
 
@@ -332,7 +332,7 @@ public class WeChatUtil {
         cn.hutool.json.JSONObject param1 = JSONUtil.createObj();
         param1.put("touser", openid);
         param1.put("template_id", templateId);
-        param1.put("url", "https://test.baoxianzhanggui.com/fragrance/");
+        param1.put("url", "https://city.baoxianzhanggui.com/fragrance/");
         param1.put("data", data);
         String result = HttpUtil.post(url, param1.toString());