123

ace-common/src/main/resources/properties/systemconfig.properties

@@ -17,10 +17,10 @@ USER_HEADER_URL_DEFAULT=https://xxtest.upyuns.com/image/app/default_%20avatar.pn
 #\u9ED8\u8BA4\u6635\u79F0
 USER_NIKENAME_DEFAULT=XX_
 #\u77ED\u4FE1\u673A
-ACCESSKEYID=LTAInxMDwHQL8yg9
-ACCESSKEYSECRET=OCKDEiwKGjePCZgPeWMEUFGwGbKYLA
-TEMPLATECODE=SMS_170070101
-SIGNNAME=\u6EF4\u623F\u8F66
+ACCESSKEYID=LTAIlXrgxOBAj2Ny
+ACCESSKEYSECRET=zo8OkOCF4iygqOjYYoxRKfVRxDvgTI
+TEMPLATECODE=SMS_166480010
+SIGNNAME=升云
 #\u5FAE\u4FE1\u652F\u4ED8\u914D\u7F6E
 WINXIN_AppID=wx425608b69a34736f
 WINXIN_PARTNER_KEY=xxfcXXDfangche74upyuns3AD4334533

xx-universal/xx-universal-server/src/main/java/com/xxfc/platform/universal/biz/AliYunSmsBiz.java

@@ -11,15 +11,15 @@ import org.springframework.stereotype.Service;
 public class AliYunSmsBiz {
 
     //租车订单通知(普通用户)1
-    public static final String TEMPLATE_ID_ORDER = "SMS_173247815";
+    public static final String TEMPLATE_ID_ORDER = "SMS_205409960";
     //租车订单短信(会员权益)2
-    public static final String TEMPLATE_ID_ORDER_MEMBER = "SMS_173252767";
+    public static final String TEMPLATE_ID_ORDER_MEMBER = "SMS_205430052";
     //旅游订单短信3
-    public static final String TEMPLATE_ID_ORDER_TOUR = "SMS_173247826";
+    public static final String TEMPLATE_ID_ORDER_TOUR = "SMS_205435031";
     //加入会员通知4
-    public static final String TEMPLATE_ID_MEMBER = "SMS_173247829";
+    public static final String TEMPLATE_ID_MEMBER = "SMS_205409966";
     //租/还车公司相同（订单支付后立即发送给相关负责人）5
-    public static final String TEMPLATE_ID_TAAKE_CAR = "SMS_173247836";
+    public static final String TEMPLATE_ID_TAAKE_CAR = "SMS_205409971";
     //租/还车公司不同（发给租车公司负责人，订单支付后发送）6
     public static final String TEMPLATE_ID_DIFFERENT_TAAKE_CAR = "458621";
     // 租/还车公司不同（发给还车公司负责人，订单出车后发））(相同不发)7
@@ -30,16 +30,16 @@ public class AliYunSmsBiz {
 
     //租车（通用）10
     //public static final String TEMPLATE_ID_PAY_A = "460759";
-    public static final String TEMPLATE_ID_PAY_A = "SMS_171112286";
+    public static final String TEMPLATE_ID_PAY_A = "SMS_205409973";
     //租车（使用会员权益）11
     //public static final String TEMPLATE_ID_PAY_B = "460760";
     public static final String TEMPLATE_ID_PAY_B = "SMS_173340577";
     //租车内部通知（客服）12
     //public static final String TEMPLATE_ID_PAY_C = "460763";
-    public static final String TEMPLATE_ID_PAY_C = "SMS_173345572";
+    public static final String TEMPLATE_ID_PAY_C = "SMS_205430069";
     //租车内部通知（出车人）13
     //public static final String TEMPLATE_ID_PAY_D = "460762";
-    public static final String TEMPLATE_ID_PAY_D = "SMS_173340609";
+    public static final String TEMPLATE_ID_PAY_D = "SMS_205399932";
     //租车内部通知（收车人）14
     //public static final String TEMPLATE_ID_PAY_E = "460764";
     public static final String TEMPLATE_ID_PAY_E = "SMS_173345589";

xx-vehicle/xx-vehicle-server/src/main/resources/mapper/VehicleMapper.xml

@@ -1376,10 +1376,10 @@
             <if test="goodStatus != null and goodStatus > 0 and type != null and type > 0 ">
                 <choose>
                     <when test="goodStatus == 1 and type == 1">
-                        and v.`state`= 1 and  v.`subordinate_branch` == v.`park_branch_company_id` and  v.`subordinate_branch` == v.`manage_company_id
+                        and v.`state`= 1 and  v.`subordinate_branch` = v.`park_branch_company_id` and  v.`subordinate_branch` = v.`manage_company_id`
                     </when>
                     <when test="goodStatus == 2 and type == 1">
-                        and v.`state`= 2 and  v.`subordinate_branch` == v.`park_branch_company_id` and  v.`subordinate_branch` == v.`manage_company_id
+                        and v.`state`= 2 and  v.`subordinate_branch` = v.`park_branch_company_id` and  v.`subordinate_branch` = v.`manage_company_id`
                     </when>
                     <when test="goodStatus == 1 and type == 2">
                         and v.`state`= 1