短信发送

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

@@ -16,6 +16,14 @@ public class SmsTemplateDTO {
     public static final int RENT_MEMENT = 2;
     public static final int TOUR = 3;
     public static final int MEMENT = 4;
+    //租/还车公司相同（订单支付后立即发送给相关负责人）
+    public static final int TAAKE_CAR = 5;
+    //租/还车公司不同（发给租车公司负责人，订单支付后发送）
+    public static final int DIFFERENT_TAAKE_CAR = 6;
+    // 租/还车公司不同（发给还车公司负责人，订单出车后发））(相同不发)
+    public static final int ALSO_CAR = 7;
+    //取消订单
+    public static final int CANCEL = 8;
 
     //类型:1-租车订单通知(普通用户),2-租车订单短信(会员权益),3-旅游订单短信,4-加入会员通知
     private Integer type;

xx-universal/xx-universal-server/pom.xml

@@ -78,12 +78,6 @@
             <version>2.0-SNAPSHOT</version>
             <scope>compile</scope>
         </dependency>
-        <dependency>
-            <groupId>com.github.wxiaoqi</groupId>
-            <artifactId>ace-admin-api</artifactId>
-            <version>2.0-SNAPSHOT</version>
-            <scope>compile</scope>
-        </dependency>
         <dependency>
             <groupId>com.alipay.sdk</groupId>
             <artifactId>alipay-sdk-java</artifactId>

xx-vehicle/xx-vehicle-api/src/main/java/com/xxfc/platform/vehicle/entity/BranchCompany.java

@@ -105,4 +105,18 @@ public class BranchCompany {
     private Integer zoneId;
 
     private String phone;
+
+    /**
+     * 租车客服电话
+     */
+    @Column(name = "vehice_service_phone")
+    @ApiModelProperty("租车客服电话")
+    private Integer vehiceServicePhone;
+    /**
+     * 旅游客服电话
+     */
+    @Column(name = "tour_service_phone")
+    @ApiModelProperty("旅游客服电话")
+    private Integer tourServicePhone;
+
 }
\ No newline at end of file