Merge branch 'master' of http://git.iamberry.com/hexiugang/iamberry-common-parent

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

watero-rst-core/src/main/java/com.iamberry.rst.core/order/ProductType.java

@@ -27,6 +27,8 @@ public class ProductType implements Serializable {
 
     private Integer typeStatus;     //状态
 
+    private Integer typeCompany;    // 所属商城   1:美国watero； 2:上朵电动牙刷  3:优尼雅净水机
+
     public Integer getTypeId() {
         return typeId;
     }
@@ -74,4 +76,12 @@ public class ProductType implements Serializable {
     public void setTypeStatus(Integer typeStatus) {
         this.typeStatus = typeStatus;
     }
+
+    public Integer getTypeCompany() {
+        return typeCompany;
+    }
+
+    public void setTypeCompany(Integer typeCompany) {
+        this.typeCompany = typeCompany;
+    }
 }

watero-rst-service/src/main/java/com/iamberry/rst/service/cm/mapper/customerInfoMapper.xml

@@ -115,13 +115,13 @@
       company_id, store_id, customer_source_type, 
       customer_source, customer_counsel_type, customer_name, 
       customer_tel, customer_is_solve, customer_is_visit, 
-      customer_in_TDS, customer_out_TDS, customer_area
+      customer_in_TDS, customer_out_TDS, customer_area, type_id
       )
     values (#{customerId,jdbcType=INTEGER}, #{adminId,jdbcType=INTEGER}, #{questionId,jdbcType=INTEGER}, 
       #{companyId,jdbcType=INTEGER}, #{storeId,jdbcType=INTEGER}, #{customerSourceType,jdbcType=TINYINT}, 
       #{customerSource,jdbcType=VARCHAR}, #{customerCounselType,jdbcType=BIT}, #{customerName,jdbcType=VARCHAR}, 
       #{customerTel,jdbcType=VARCHAR}, #{customerIsSolve,jdbcType=TINYINT}, #{customerIsVisit,jdbcType=VARCHAR}, 
-      #{customerInTDS,jdbcType=INTEGER}, #{customerOutTDS,jdbcType=INTEGER}, #{customerArea,jdbcType=VARCHAR}
+      #{customerInTDS,jdbcType=INTEGER}, #{customerOutTDS,jdbcType=INTEGER}, #{customerArea,jdbcType=VARCHAR},#{typeId}
       )
   </insert>
 

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

@@ -29,6 +29,18 @@ 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="";
+    /* 发送问题回复  -- 美国watero */
+    public static String SEND_PRODUCT_SEND_WATERO="";
+    /* 发送问题回复  -- 上朵 */
+    public static String SEND_PRODUCT_SEND_SHANGDUO="";
+    /* 发送问题回复  -- 优尼雅 */
+    public static String SEND_PRODUCT_SEND_YULIA="";
 
 
 
@@ -51,6 +63,12 @@ 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_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");
         } catch (Exception e) {
             e.printStackTrace();
         }

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

@@ -11,14 +11,18 @@ import com.iamberry.rst.faces.order.EfastOrderService;
 import com.iamberry.rst.faces.product.ProductService;
 import com.iamberry.rst.faces.sms.SmsService;
 import com.iamberry.rst.faces.sys.SysService;
+import com.iamberry.rst.util.SmsConfig;
 import com.iamberry.rst.utils.AdminUtils;
 import com.iamberry.rst.utils.OrderNoUtil;
 import com.iamberry.rst.utils.StitchAttrUtil;
+import com.iamberry.wechat.tools.NameUtils;
 import com.iamberry.wechat.tools.ResponseJson;
 import net.sf.json.JSONArray;
 import net.sf.json.JSONObject;
 import org.apache.commons.lang.StringUtils;
 import org.apache.shiro.authz.annotation.RequiresPermissions;
+import org.slf4j.Logger;
+import org.slf4j.LoggerFactory;
 import org.springframework.beans.factory.annotation.Autowired;
 import org.springframework.stereotype.Controller;
 import org.springframework.web.bind.annotation.RequestMapping;
@@ -39,6 +43,8 @@ import static com.iamberry.rst.util.SmsConfig.CONFIRM_TEXT;
 @RequestMapping("/admin/customer")
 public class AdminCustomerController {
 
+    private Logger logger = LoggerFactory.getLogger(AdminCustomerController.class);
+
     @Autowired
     private CompanyInfoService companyInfoService;
     @Autowired
@@ -621,33 +627,66 @@ public class AdminCustomerController {
     @ResponseBody
     @RequiresPermissions("customer:add:customer")
     @RequestMapping("/send_phone_sms")
-    public ResponseJson sendPhoneSms(HttpServletRequest request,String type,String phone,ComplaintQuestionInfo complaintQuestionInfo) throws Exception {
-        String url = "https://rst.iamberry.com/QA";
+    public ResponseJson sendPhoneSms(HttpServletRequest request,String type,String phone,Integer typeCompany,ComplaintQuestionInfo complaintQuestionInfo) throws Exception {
+        String url = NameUtils.getConfig("website");
         Integer flag = 1;
+
+        if(typeCompany == null || typeCompany == 0){
+            return new ResponseJson(500, "未获取到产品类型!", 500);
+        }
+
+        String con = "";
         if(type != null && !"".equals(type)){
             if( "p".equals(type)){
                 url += "/problem?questionId="+complaintQuestionInfo.getQuestionId();
+
+                switch (typeCompany){
+                    case 1:
+                        con = SmsConfig.SEND_PRODUCT_SMS_WATERO;
+                        break;
+                    case 2:
+                        con = SmsConfig.SEND_PRODUCT_SMS_SHANGDUO;
+                        break;
+                    case 3:
+                        con = SmsConfig.SEND_PRODUCT_SMS_YULIA;
+                        break;
+                }
+
             }else if( "m".equals(type)){
-                url += "/adress";
+                complaintQuestionInfo.setQuestionName(null);
+                url += "/address";
+
+                switch (typeCompany){
+                    case 1:
+                        con = SmsConfig.SEND_PRODUCT_SEND_WATERO;
+                        break;
+                    case 2:
+                        con = SmsConfig.SEND_PRODUCT_SEND_SHANGDUO;
+                        break;
+                    case 3:
+                        con = SmsConfig.SEND_PRODUCT_SEND_YULIA;
+                        break;
+                }
+
             }
         }
 
+        logger.info("发送短信url地址：" + url);
+
         flag =  complaintQuestionInfoService.updateQuestionById(complaintQuestionInfo);
         if (flag < 1) {
             return new ResponseJson(500, "问题修改失败!", 500);
         }
-
-        String text = MessageFormat.format(CONFIRM_TEXT, complaintQuestionInfo.getQuestionProfile());
+        String text = MessageFormat.format(con, url);
         String result = smsService.sendOtherCMS(phone, text);
 
-        ResponseJson json = new ResponseJson();
-        ResponseJson rj = json.addResponseKeyValue(result);
-
-        if (rj.getResultCode() != 200) {
-            return new ResponseJson(500, "发送短信失败!", 500);
-        } else {
-            return new ResponseJson(200, "发送短信成功!", 200);
+        if("SUCCESS".equals(result)){
+            return new ResponseJson(200, "发送短信成功", 200);
+        }else{
+            return new ResponseJson(200, "发送短信失败", 200);
         }
+
+
     }
 
     /**

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

@@ -0,0 +1,133 @@
+package com.iamberry.rst.controllers.cm;
+
+import com.iamberry.rst.core.cm.ComplaintQuestionInfo;
+import com.iamberry.rst.faces.cm.ComplaintQuestionInfoService;
+import com.iamberry.wechat.tools.ResponseJson;
+import org.springframework.beans.factory.annotation.Autowired;
+import org.springframework.stereotype.Controller;
+import org.springframework.web.bind.annotation.RequestMapping;
+import org.springframework.web.bind.annotation.ResponseBody;
+import org.springframework.web.servlet.ModelAndView;
+
+import javax.servlet.http.HttpServletRequest;
+
+/**
+ * Created by wxm
+ * 问题
+ */
+@Controller
+@RequestMapping("/QA")
+public class AppComplaintQuestionInfoController {
+
+    /**
+     *  邮寄地址id
+     */
+    private Integer backOutQuestionId = 5;
+
+
+    @Autowired
+    private ComplaintQuestionInfoService complaintQuestionInfoService;
+
+
+    /**
+     * 进入客诉问题描述
+     *
+     * @param request
+     * @return
+     * @throws Exception
+     */
+    @RequestMapping("/problem")
+    public ModelAndView problem(HttpServletRequest request) throws Exception {
+        ModelAndView mv = new ModelAndView("wap/cm/request_message");
+        String questionId = request.getParameter("questionId");
+        mv.addObject("questionId", questionId);
+        return mv;
+    }
+
+    /**
+     * 进入客诉问题描述
+     *
+     * @param request
+     * @return
+     * @throws Exception
+     */
+    @RequestMapping("/address")
+    public ModelAndView adress(HttpServletRequest request) throws Exception {
+        ModelAndView mv = new ModelAndView("wap/cm/send_message");
+        return mv;
+    }
+
+    /**
+     * 查询退回短信客诉问题
+     *
+     * @return
+     */
+    @ResponseBody
+    @RequestMapping(value = "/get_back_out_question")
+    public ResponseJson getBackOutQuestion(HttpServletRequest request){
+        ResponseJson msg = new ResponseJson();
+        ComplaintQuestionInfo complaintQuestionInfo = complaintQuestionInfoService.getQuestionById(backOutQuestionId);
+        if (complaintQuestionInfo  == null) {
+            msg.setResultCode(500);
+            msg.setReturnCode(500);
+        } else {
+            msg.setResultCode(200);
+            msg.setReturnCode(200);
+            msg.addResponseKeyValue("complaintQuestionInfo",complaintQuestionInfo);
+        }
+        return msg;
+    }
+
+    /**
+     * 查询客诉问题
+     *
+     * @return
+     */
+    @ResponseBody
+    @RequestMapping(value = "/get_question")
+    public ResponseJson getQuestion(HttpServletRequest request, Integer questionId){
+        ResponseJson msg = new ResponseJson();
+        if(questionId == null){
+            msg.setResultCode(500);
+            msg.setReturnCode(500);
+            return msg;
+        }
+        ComplaintQuestionInfo complaintQuestionInfo = complaintQuestionInfoService.getQuestionById(questionId);
+        if (complaintQuestionInfo  == null) {
+            msg.setResultCode(500);
+            msg.setReturnCode(500);
+        } else {
+            msg.setResultCode(200);
+            msg.setReturnCode(200);
+            msg.addResponseKeyValue("complaintQuestionInfo",complaintQuestionInfo);
+        }
+        return msg;
+    }
+
+    /**
+     * 修改是否已解决总数
+     *
+     * @return
+     */
+    @ResponseBody
+    @RequestMapping(value = "/update_question_num")
+    public ResponseJson updateQuestionNum(HttpServletRequest request, ComplaintQuestionInfo complaintQuestionInfo){
+        ResponseJson msg = new ResponseJson();
+        if(complaintQuestionInfo == null){
+            msg.setResultCode(500);
+            msg.setReturnCode(500);
+            return msg;
+        }
+        Integer num = complaintQuestionInfoService.updateQuestionById(complaintQuestionInfo);
+        if (num < 1) {
+            msg.setResultCode(500);
+            msg.setReturnCode(500);
+        } else {
+            msg.setResultCode(200);
+            msg.setReturnCode(200);
+        }
+        return msg;
+    }
+
+
+}

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

@@ -1,45 +0,0 @@
-package com.iamberry.rst.controllers.cm.app;
-
-import org.springframework.stereotype.Controller;
-import org.springframework.web.bind.annotation.RequestMapping;
-import org.springframework.web.servlet.ModelAndView;
-
-import javax.servlet.http.HttpServletRequest;
-
-/**
- * Created by wxm
- * 问题
- */
-@Controller
-@RequestMapping("/QA")
-public class AppComplaintQuestionInfoController {
-
-
-    /**
-     * 进入客诉问题描述
-     *
-     * @param request
-     * @return
-     * @throws Exception
-     */
-    @RequestMapping("/problem")
-    public ModelAndView problem(HttpServletRequest request) throws Exception {
-        ModelAndView mv = new ModelAndView("wap/cm/request_message");
-        String questionId = request.getParameter("questionId");
-        mv.addObject("questionId", questionId);
-        return mv;
-    }
-
-    /**
-     * 进入客诉问题描述
-     *
-     * @param request
-     * @return
-     * @throws Exception
-     */
-    @RequestMapping("/adress")
-    public ModelAndView adress(HttpServletRequest request) throws Exception {
-        ModelAndView mv = new ModelAndView("wap/cm/send_message");
-        return mv;
-    }
-}

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

@@ -68,6 +68,10 @@
 <article class="page-container" style="padding: 10px;">
     <div class="pd-20 cl">
         <form action="${path}/admin/customer/save_customer" method="post" class="form form-horizontal" id="form-customer-add"  onkeydown="if(event.keyCode==13)return false;">
+
+            <input type="hidden" id="customerName" name="customerName" value="">
+            <input type="hidden" id="customerTel" name="customerTel" value="">
+
             <div class="row cl">
 
                 <label class="form-label col-3">
@@ -298,7 +302,7 @@
                     <input type="text" class="input-text" value="" placeholder="填写收件人姓名" id="sendName" name="relationSendName" datatype="s1-20" errormsg="联系人格式不正确！" >
                 </div>
                 <div class="formControls col-2 col-sm-2">
-                    <input type="text" class="input-text associated-phone" value="" placeholder="填写收件人手机号" id="sendTel" name="relationSendTel" datatype="m" errormsg="联系人电话格式不正确！">
+                    <input type="text" class="input-text" value="" placeholder="填写收件人手机号" id="sendTel" name="relationSendTel" datatype="m" errormsg="联系人电话格式不正确！">
                 </div>
             </div>
             <div class="row cl" id="recipientAddress" style="display: none;">
@@ -406,8 +410,8 @@
             </div>
             <div class="row cl" id="sendAddressInfo">
                 <label class="form-label col-1 col-sm-1"><span class="c-red">*</span>寄回信息：</label>
-                <div class="formControls col-5 col-sm-5" style="height: 300px">
-                    <script id="sendAddressSms" type="text/plain" style="width:1000px;height:250px;"></script>
+                <div class="formControls col-5 col-sm-5" style="height: 250px">
+                    <script id="sendAddressSms" type="text/plain" style="width:1000px;height:200px;"></script>
                     </script>
                 </div>
             </div>
@@ -586,7 +590,7 @@
     var sendAddressSms = UE.getEditor('sendAddressSms');
 
     sendAddressSms.ready(function() {
-        sendAddressSms.setHeight(250);  //固定高度
+        sendAddressSms.setHeight(130);  //固定高度
     });
 </script>
 <script type="text/javascript">
@@ -827,7 +831,7 @@
                     for(var i=0;i<data.returnMsg.productTypeList.length;i++){
                         var produce = data.returnMsg.productTypeList[i];
                         html += ' <div class="radio-box">' +
-                                '<input type="radio" id="produce-type-'+ i +'" name="typeId"  datatype="*" value="'+ produce.typeId +'"  '+ check +' nullmsg="请选择产品类型！" >' +
+                                '<input type="radio" id="produce-type-'+ i +'" name="typeId" typeCompany="'+ produce.typeCompany +'"  datatype="*" value="'+ produce.typeId +'"  '+ check +' nullmsg="请选择产品类型！" >' +
                                 ' <label for="produce-type-'+ i +'">'+ produce.typeName +'</label>' +
                                 ' </div>';
                         check = "";
@@ -1132,6 +1136,7 @@
         var phone = "";
         var questionId = "";
         var describeTitle = "";
+        var typeCompany = parseInt($("input:radio[name='typeId']:checked").attr("typeCompany"));
         if(type == "p"){
             phone = $("#p-phone").val();
             questionId = $("#questionId").val();
@@ -1140,7 +1145,7 @@
         }else if(type == "m"){
             phone = $("#m-phone").val();
             questionId = complaint_questionId;
-            desc = UE.getEditor('describeContentText').getContent();
+            desc = UE.getEditor('sendAddressSms').getContent();
         }else{
             layer.close(index);
             layer.msg("发送报错", {icon: 5, time: 3000});
@@ -1158,6 +1163,7 @@
             type: "POST",
             data: {
                 type : type,
+                typeCompany : typeCompany,
                 phone : phone,
                 questionId : questionId,
                 questionName : describeTitle,

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

@@ -86,10 +86,10 @@
             <div class="row cl" id="recipientInfo" style=" margin-top: 20px;">
                 <label class="form-label col-1 col-sm-1" style="width: 110px;"><span class="c-red">*</span>购买信息：</label>
                 <div class="formControls col-3 col-sm-3">
-                    <input type="text" class="input-text" value="" placeholder="填写收件人姓名" id="sendName" name="salesAddressTel" datatype="s1-20" errormsg="联系人格式不正确！" >
+                    <input type="text" class="input-text" value="" placeholder="填写收件人姓名" id="sendName" name="salesAddressName" datatype="s1-20" errormsg="联系人格式不正确！" >
                 </div>
                 <div class="formControls col-3 col-sm-3">
-                    <input type="text" class="input-text associated-phone" value="" placeholder="填写收件人手机号" id="sendTel" name="salesAddressName" datatype="m" errormsg="联系人电话格式不正确！">
+                    <input type="text" class="input-text associated-phone" value="" placeholder="填写收件人手机号" id="sendTel" name="salesAddressTel" datatype="m" errormsg="联系人电话格式不正确！">
                 </div>
                 <div class="formControls col-3 col-sm-3">
                     <input type="text" placeholder="购买日期" id="salesPayTime"  name="salesPayTime" datatype="*" class="input-text Wdate" onclick="WdatePicker({skin:'whyGreen',dateFmt: 'yyyy-MM-dd HH:mm:ss'})"  readonly="readonly">

watero-rst-web/src/main/webapp/WEB-INF/views/wap/cm/request_message.ftl

@@ -59,15 +59,18 @@
 			<button type="button" class="mui-btn my-btn no">未解决</button>
 			<button type="button" class="mui-btn my-btn yes">已解决</button>
 		</div>
-</div>	
-<script type="text/javascript" src="../lib/mui/js/mui.min.js"></script>
-<script type="text/javascript" src="../lib/jquery/1.9.1/jquery.min.js"></script>
+</div>
+<script type="text/javascript" src="${path}/common/lib/mui/js/mui.min.js"></script>
+<script type="text/javascript" src="${path}/common/lib/mui/js/mui.view.js"></script>
+<script type="text/javascript" src="${path}/common/lib/mui/js/mui.picker.min.js"></script>
+<script type="text/javascript" src="${path}/common/lib/mui/js/city.data-3.js"></script>
+<script type="text/javascript" src="${path}/common/lib/jquery/1.9.1/jquery.min.js"></script>
 <script>
 	var questionId=getQueryString("questionId");
 	//自己写的js
 	mui.ready(function() {
 		if(questionId!=null){
-		$.ajax('${path}/admin/complaintQuestion/get_question?dates=' + new Date().getTime(), {
+		$.ajax('${path}/QA/get_question?dates=' + new Date().getTime(), {
 						data: {
 							"questionId":questionId
 						},
@@ -84,9 +87,9 @@
 								location.href = dt.redirectURL;
 							} else {
 								if(dt.returnCode == "200") {
-									$(".my-btn").attr("name",dt.complaintQuestionInfo.questionId);
-									$("#questionName").text(dt.complaintQuestionInfo.questionName);
-									$(".ul-list").html('<li>'+dt.complaintQuestionInfo.questionProfile+'</li>');
+									$(".my-btn").attr("name",dt.returnMsg.complaintQuestionInfo.questionId);
+									$("#questionName").text(dt.returnMsg.complaintQuestionInfo.questionName);
+									$(".ul-list").html('<li>'+dt.returnMsg.complaintQuestionInfo.questionProfile+'</li>');
 								}else {
 									mui.alert("获取数据失败！")
 								}
@@ -109,7 +112,7 @@
 			parameter["questionNotSolvedNum"] = 1;
 		}
 		
-		$.ajax('${path}/admin/complaintQuestion/update_question_num?dates=' + new Date().getTime(), {
+		$.ajax('${path}/QA/update_question_num?dates=' + new Date().getTime(), {
 						data:parameter,
 						dataType: 'json',
 						xhrFields: {

watero-rst-web/src/main/webapp/WEB-INF/views/wap/cm/send_message.ftl

@@ -57,12 +57,15 @@
 			<button type="button" class="mui-btn my-btn yes">已解决</button>
 		</div>
 </div>	
-<script type="text/javascript" src="../lib/mui/js/mui.min.js"></script>
-<script type="text/javascript" src="../lib/jquery/1.9.1/jquery.min.js"></script>
+<script type="text/javascript" src="${path}/common/lib/mui/js/mui.min.js"></script>
+<script type="text/javascript" src="${path}/common/lib/mui/js/mui.view.js"></script>
+<script type="text/javascript" src="${path}/common/lib/mui/js/mui.picker.min.js"></script>
+<script type="text/javascript" src="${path}/common/lib/mui/js/city.data-3.js"></script>
+<script type="text/javascript" src="${path}/common/lib/jquery/1.9.1/jquery.min.js"></script>
 <script>
 	//自己写的js
 	mui.ready(function() {
-		$.ajax('${path}/admin/complaintQuestion/get_back_out_question?dates=' + new Date().getTime(), {
+		$.ajax('${path}/QA/get_back_out_question?dates=' + new Date().getTime(), {
 						data: {},
 						dataType: 'json',
 						xhrFields: {
@@ -77,8 +80,8 @@
 								location.href = dt.redirectURL;
 							} else {
 								if(dt.returnCode == "200") {
-									$(".my-btn").attr("name",dt.complaintQuestionInfo.questionId);
-									$(".ul-list").html('<li>'+dt.complaintQuestionInfo.questionProfile+'</li>');
+									$(".my-btn").attr("name",dt.returnMsg.complaintQuestionInfo.questionId);
+									$(".ul-list").html('<li>'+dt.returnMsg.complaintQuestionInfo.questionProfile+'</li>');
 								}else {
 									mui.alert("获取数据失败！")
 								}
@@ -100,7 +103,7 @@
 			parameter["questionNotSolvedNum"] = 1;
 		}
 		
-		$.ajax('${path}/admin/complaintQuestion/update_question_num?dates=' + new Date().getTime(), {
+		$.ajax('${path}/QA/update_question_num?dates=' + new Date().getTime(), {
 						data:parameter,
 						dataType: 'json',
 						xhrFields: {