配置爱贝源的回复

watero-rst-service/src/main/java/com/iamberry/rst/util/SmsConfig.java

@@ -29,18 +29,24 @@ public class SmsConfig {
     public static String SEND_NOTICE_INFORM="";
     /**		通知发送滤芯短信2	*/
     public static String SEND_NOTICE_INFORM2="";
+
     /* 发送邮寄信息  -- 美国watero */
     public static String SEND_PRODUCT_SMS_WATERO="";
     /* 发送邮寄信息  -- 上朵 */
     public static String SEND_PRODUCT_SMS_SHANGDUO="";
     /* 发送邮寄信息  -- 优尼雅 */
     public static String SEND_PRODUCT_SMS_YULIA="";
+    /* 发送邮寄信息  -- 爱贝源 */
+    public static String SEND_PRODUCT_SMS_AIBERLE="";
+
     /* 发送问题回复  -- 美国watero */
     public static String SEND_PRODUCT_SEND_WATERO="";
     /* 发送问题回复  -- 上朵 */
     public static String SEND_PRODUCT_SEND_SHANGDUO="";
     /* 发送问题回复  -- 优尼雅 */
     public static String SEND_PRODUCT_SEND_YULIA="";
+    /* 发送问题回复  -- 爱贝源 */
+    public static String SEND_PRODUCT_SEND_AIBERLE="";
 
     /* 发送发货提醒  -- 美国watero */
     public static String RELATION_SEND_WATERO="";
@@ -48,6 +54,8 @@ public class SmsConfig {
     public static String RELATION_SEND_SHANGDUO="";
     /* 发送发货提醒  -- 优尼雅 */
     public static String RELATION_SEND_YULIA="";
+    /* 发送发货提醒  -- 爱贝源 */
+    public static String RELATION_SEND_AIBERLE="";
 
     /* 添加客诉成功提醒  -- 美国watero */
     public static String ADD_CUSTOMER_SUCCESS_WATERO="";
@@ -55,6 +63,9 @@ public class SmsConfig {
     public static String ADD_CUSTOMER_SUCCESS_SHANGDUO="";
     /* 添加客诉成功提醒  -- 优尼雅 */
     public static String ADD_CUSTOMER_SUCCESS_YULIA="";
+    /* 添加客诉成功提醒  -- 爱贝源 */
+    public static String ADD_CUSTOMER_SUCCESS_AIBERLE="";
+
     /* 扫描牙刷二维码访问地址 */
     public static String scanningQrCode="";
 
@@ -81,18 +92,27 @@ public class SmsConfig {
             SEND_NOTICE=pro.getProperty("SEND_NOTICE");
             SEND_NOTICE_INFORM=pro.getProperty("SEND_NOTICE_INFORM");
             SEND_NOTICE_INFORM2=pro.getProperty("SEND_NOTICE_INFORM2");
+
             SEND_PRODUCT_SMS_WATERO=pro.getProperty("SEND_PRODUCT_SMS_WATERO");
             SEND_PRODUCT_SMS_SHANGDUO=pro.getProperty("SEND_PRODUCT_SMS_SHANGDUO");
             SEND_PRODUCT_SMS_YULIA=pro.getProperty("SEND_PRODUCT_SMS_YULIA");
+            SEND_PRODUCT_SMS_AIBERLE=pro.getProperty("SEND_PRODUCT_SMS_AIBERLE");
+
             SEND_PRODUCT_SEND_WATERO=pro.getProperty("SEND_PRODUCT_SEND_WATERO");
             SEND_PRODUCT_SEND_SHANGDUO=pro.getProperty("SEND_PRODUCT_SEND_SHANGDUO");
             SEND_PRODUCT_SEND_YULIA=pro.getProperty("SEND_PRODUCT_SEND_YULIA");
+            SEND_PRODUCT_SEND_AIBERLE=pro.getProperty("SEND_PRODUCT_SEND_AIBERLE");
+
             RELATION_SEND_WATERO=pro.getProperty("RELATION_SEND_WATERO");
             RELATION_SEND_SHANGDUO=pro.getProperty("RELATION_SEND_SHANGDUO");
             RELATION_SEND_YULIA=pro.getProperty("RELATION_SEND_YULIA");
+            RELATION_SEND_AIBERLE=pro.getProperty("RELATION_SEND_AIBERLE");
+
             ADD_CUSTOMER_SUCCESS_WATERO=pro.getProperty("ADD_CUSTOMER_SUCCESS_WATERO");
             ADD_CUSTOMER_SUCCESS_SHANGDUO=pro.getProperty("ADD_CUSTOMER_SUCCESS_SHANGDUO");
             ADD_CUSTOMER_SUCCESS_YULIA=pro.getProperty("ADD_CUSTOMER_SUCCESS_YULIA");
+            ADD_CUSTOMER_SUCCESS_AIBERLE=pro.getProperty("ADD_CUSTOMER_SUCCESS_AIBERLE");
+
             scanningQrCode=pro.getProperty("scanningQrCode");
         } catch (Exception e) {
             e.printStackTrace();

watero-rst-web/src/main/java/com/iamberry/rst/controllers/cm/AdminCustomerController.java

@@ -843,6 +843,10 @@ public class AdminCustomerController {
                     addCustomerSuccessMsg = SmsConfig.ADD_CUSTOMER_SUCCESS_YULIA;
                     typeMsg = "YULIA售后";
                     break;
+                case 4:
+                    addCustomerSuccessMsg = SmsConfig.ADD_CUSTOMER_SUCCESS_AIBERLE;
+                    typeMsg = "爱贝源售后";
+                    break;
             }
 //            Object [] msg = new Object[]{solveMsg,typeMsg};
 //            String text = MessageFormat.format(addCustomerSuccessMsg, msg);
@@ -980,6 +984,9 @@ public class AdminCustomerController {
                     case 3:
                         con = SmsConfig.SEND_PRODUCT_SEND_YULIA;
                         break;
+                    case 4:
+                        con = SmsConfig.SEND_PRODUCT_SEND_AIBERLE;
+                        break;
                 }
             } else if ("m".equals(type)) {
 
@@ -999,6 +1006,9 @@ public class AdminCustomerController {
                     case 3:
                         con = SmsConfig.SEND_PRODUCT_SMS_YULIA;
                         break;
+                    case 4:
+                        con = SmsConfig.SEND_PRODUCT_SMS_AIBERLE;
+                        break;
                 }
             }
         }

watero-rst-web/src/main/java/com/iamberry/rst/controllers/mq/MQTask.java

@@ -353,6 +353,9 @@ public class MQTask implements InitializingBean {
 					if (productType.getTypeCompany() == 3){
 						rejected_text = RELATION_SEND_YULIA;
 					}
+					if (productType.getTypeCompany() == 4){
+						rejected_text = RELATION_SEND_AIBERLE;
+					}
 					String text = MessageFormat.format(rejected_text, relation,postFirm+"，"+postNum);
 					smsService.sendOtherCMS(tel,text);
 				}

watero-rst-web/src/main/webapp/WEB-INF/views/cm/customer/add_customer.ftl

@@ -738,7 +738,7 @@
 //            setTDSCollect();
 //        });
 
-        /* 监听手机号 失去焦点时  将其他手机号码未填的 */
+        /* 监听手机号 失去焦点时  将其他手机号码未填的 补充上去 */
         $(".associated-phone").blur(function (){
             var phone = $(this).val();
             $(".associated-phone").each(function(){
@@ -748,6 +748,7 @@
                 }
             })
         })
+
     })
 </script>
 

watero-rst-web/src/main/webapp/WEB-INF/views/cm/customer/custome_list.ftl

@@ -103,7 +103,7 @@
                 </#if>
             </select>
             <br>
-            <button type="submit" class="btn" style="background: #32a3d8;color: #fff;-webkit-transform:translateY(-5%);height: 35px;" id="" name=""><i class="Hui-iconfont">&#xe665;</i> 搜索</button>
+            <button type="submit" class="btn" style="background: #32a3d8;color: #fff;height: 35px;margin-top: 10px;" id="" name=""><i class="Hui-iconfont">&#xe665;</i> 搜索</button>
         </form>
     </div>