Merge remote-tracking branch 'origin/base-modify' into base-modify

ace-gate/src/main/java/com/github/wxiaoqi/security/gate/filter/ResponseRecordFilter.java

@@ -31,7 +31,7 @@ import reactor.core.publisher.Mono;
 import java.util.function.Consumer;
 import java.util.function.Function;
 
-@Component
+//@Component
 @Slf4j
 public class ResponseRecordFilter implements GlobalFilter, Ordered {
 

xx-universal/xx-universal-api/src/main/java/com/xxfc/platform/universal/dto/SmsTemplateDTO.java

@@ -62,6 +62,10 @@ public class SmsTemplateDTO {
     public static final int REFUND_A = 22;
     //违章押金退还
     public static final int REFUND_B = 23;
+    //旅游内部通知（客服）
+    public static final int PAY_H = 24;
+    //取消旅游订单（客服）
+    public static final int CANCEL_F = 25;
 
 
 

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

@@ -58,6 +58,11 @@ public class CCPRestSmsBiz{
     //违章押金退还 23
     public static final String TEMPLATE_ID_FINISH_B = "460773";
 
+    //旅游内部通知（客服）24
+    public static final String TEMPLATE_ID_PAY_H = "461421";
+    //取消旅游订单（客服）25
+    public static final String TEMPLATE_ID_CANCEL_F = "461424";
+
 
 
 
@@ -131,6 +136,12 @@ public class CCPRestSmsBiz{
              case 23 :
                  CCPRestSmsUtils.sendTemplateSMS(phoneNumbers,params,TEMPLATE_ID_FINISH_B);
                  break;
+             case 24 :
+                 CCPRestSmsUtils.sendTemplateSMS(phoneNumbers,params,TEMPLATE_ID_PAY_H);
+                 break;
+             case 25 :
+                 CCPRestSmsUtils.sendTemplateSMS(phoneNumbers,params,TEMPLATE_ID_CANCEL_F);
+                 break;
 
          }