客诉样式修改

watero-rst-core/src/main/java/com.iamberry.rst.core/cm/CustomerInfo.java

@@ -34,6 +34,8 @@ public class CustomerInfo  implements Serializable {
     private String customerName;
     //  用户手机号码
     private String customerTel;
+    // 微信昵称
+    private String customerWechatName;
     //  处理结果： 1：已解决  2：未解决 3：换新  4：维修 5：补发 6：退货 7：无理由退货  
     private Integer customerIsSolve;
     //  是否需要回访  1:不需要回访  2:需要回复 
@@ -592,4 +594,12 @@ public class CustomerInfo  implements Serializable {
     public void setBackLogisticsNo(String backLogisticsNo) {
         this.backLogisticsNo = backLogisticsNo;
     }
+
+    public String getCustomerWechatName() {
+        return customerWechatName;
+    }
+
+    public void setCustomerWechatName(String customerWechatName) {
+        this.customerWechatName = customerWechatName;
+    }
 }

watero-rst-interface/src/main/java/com/iamberry/rst/faces/order/EfastOrderService.java

@@ -70,6 +70,14 @@ public interface EfastOrderService {
     JSONObject getOrderFormEfast(String orderid) throws Exception;
 
     /**
+     * 获取百胜订单信息,已百胜订单号查询
+     * @param orderid
+     * @return
+     * @throws Exception
+     */
+    JSONObject getOrderFormEfastByOrderId(String orderid) throws Exception;
+
+    /**
      * 获取百胜订单信息 同步到系统
      * @param orderid
      * @return

watero-rst-service/src/main/java/com/iamberry/rst/service/order/EfastOrderServiceImpl.java

@@ -477,6 +477,39 @@ public class EfastOrderServiceImpl implements EfastOrderService {
     }
 
     @Override
+    public JSONObject getOrderFormEfastByOrderId(String orderid) throws Exception {
+        if(StringUtils.isEmpty(orderid)) return null;
+
+        Map<String, String> requestData = getRequestData(EFAST_ORDER_SELECT);
+        requestData.put("oid", orderid);
+        requestData.put("type", "1");
+        requestData.put("feilds",NameUtils.getConfig("order_field"));   //1.order_status 订单状态:0(未确认)1(确认)2(挂起)3(作废)     2.shipping_status发货状态: 0(未发货)1(已发货,即已扫描出库)3(备货中)
+
+        try {
+            String result = HttpClient431Util.doGet(requestData, EFAST_BASE_URL);
+            result = StringEscapeUtils.unescapeJava(result); // unicode 编码
+            Pattern p = Pattern.compile("\\s*|\t|\r|\n");
+            Matcher m = p.matcher(result);
+            if (m.find()) {
+                result = m.replaceAll("");
+            }
+            logger.info("rst-getOrderFormEfastByOrderId-推送百胜订单号-->>" + orderid + "，百胜返回信息-->" + result);
+            // parse JSON String to Object
+            JSONObject jsonObject = JSONObject.fromObject(result);
+            JSONObject respData = JSONObject.fromObject(jsonObject.get("resp_data"));
+            if (respData != null) {
+                return respData;
+            } else {
+                logger.error("rst-获取百胜出错，订单号-->>" + orderid + "，百胜返回信息-->" + result);
+                throw new Exception(respData.getString("msg"));
+            }
+        } catch (Exception e) {
+            logger.error("rst-获取百胜出错，订单号-->>" + orderid + "，catch");
+            throw e;
+        }
+    }
+
+    @Override
     public boolean invalidOrderFromEfast(String orderId) throws Exception {
         if(StringUtils.isEmpty(orderId)) {
             logger.error("rst-作废百胜订单出错，传入参数订单号为空-->>");

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

@@ -316,7 +316,7 @@ public class AdminSalesOrderController {
         }
         synchronized (lock) {
             //获取订单详情
-            JSONObject orderInfo = efastOrderService.getOrderFormEfast(salesDealCode);
+            JSONObject orderInfo = efastOrderService.getOrderFormEfastByOrderId(salesDealCode);
             //添加订单和订单项
             boolean flag = salesOrderService.syncEfastOrder(orderInfo);
             if (flag) {

watero-rst-web/src/main/resources/watero-rst-ioc.xml

@@ -26,7 +26,7 @@
     <aop:aspectj-autoproxy proxy-target-class="true"/>
 
 	<!-- 开启注解启动定时器 -->
-    <task:annotation-driven/>
+    <!--<task:annotation-driven/>-->
 
 	<!-- DataSource -->
 	<import resource="classpath:watero-rst-db.xml"/>

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

@@ -28,12 +28,21 @@
         </div>
         <div class="row cl">
             <div class="formControls col-2 col-sm-2 text-r">
-                <strong>问题详情：</strong>
+                <strong>问题回复：</strong>
             </div>
             <div class="formControls col-10 col-sm-10" id="txtDescribeContent">
 
             </div>
         </div>
+
+        <div class="row cl">
+            <div class="formControls col-2 col-sm-2 text-r">
+                <strong>问题描述：</strong>
+            </div>
+            <div class="formControls col-10 col-sm-10" id="txtDescribeHandleDesc">
+
+            </div>
+        </div>
         <#--<div class="row cl">
             <div class="formControls col-2 col-sm-2">
 
@@ -65,6 +74,7 @@
                     var describe = data.returnMsg.describe;
                     $('#txtDescribeTitle').html(describe.describeTitle);
                     $('#txtDescribeContent').html(describe.describeContent);
+                    $('#txtDescribeHandleDesc').html(describe.describeHandleDesc);
                 }
             },
             error: function(XmlHttpRequest, textStatus, errorThrown){

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

@@ -137,6 +137,9 @@
             <div class="row cl">
                 <label class="form-label col-1 col-sm-1">客户信息：</label>
                 <div class="formControls col-2 col-sm-2 skin-minimal">
+                    <input type="text" class="input-text trim_input" placeholder="微信昵称" id="customerWechatName" name="customerWechatName" value="${customerInfo.customerWechatName!''}">
+                </div>
+                <div class="formControls col-2 col-sm-2 skin-minimal">
                     <input type="text" class="input-text" placeholder="用户姓名" id="customerName" name="customerName" value="${customerInfo.customerName!''}">
                 </div>
                 <div class="formControls col-2 col-sm-2 skin-minimal">
@@ -191,26 +194,27 @@
             </div>
 
             <div class="row cl">
-            <#--处理描述 - 客诉备注-->
-                <label class="form-label col-1 col-sm-1">问题描述：</label>
+                <label class="form-label col-1 col-sm-1"><span class="c-red">*</span>问题回复：</label>
                 <div class="formControls col-5 col-sm-5">
-                    <span>问题描述详情，内部使用，不会对外公布。</span>
-                    <script id="describeHandleDescText" type="text/plain" style="width:983px;height:250px;"></script>
+                    <input type="hidden" name="questionId" id="questionId" value="${customerInfo.questionId!''}">
+                    <script id="describeContentText" type="text/plain" style="width:983px;height:250px;"></script>
                     </script>
-                    <input type="hidden" id="describeHandleDesc" name="describeHandleDesc" value="">
+                    <input type="hidden" name="describeContent" id="describeContent" value="">
+                    <input type="hidden" name="describeId" id="describeId" value="">
                 </div>
             </div>
 
             <div class="row cl">
-                <label class="form-label col-1 col-sm-1"><span class="c-red">*</span>问题回复：</label>
+            <#--处理描述 - 客诉备注-->
+                <label class="form-label col-1 col-sm-1">问题描述：</label>
                 <div class="formControls col-5 col-sm-5">
-                    <input type="hidden" name="questionId" id="questionId" value="${customerInfo.questionId!''}">
-                    <script id="describeContentText" type="text/plain" style="width:983px;height:250px;"></script>
+                    <span>问题描述详情，内部使用，不会对外公布。</span>
+                    <script id="describeHandleDescText" type="text/plain" style="width:983px;height:250px;"></script>
                     </script>
-                    <input type="hidden" name="describeContent" id="describeContent" value="">
-                    <input type="hidden" name="describeId" id="describeId" value="">
+                    <input type="hidden" id="describeHandleDesc" name="describeHandleDesc" value="">
                 </div>
             </div>
+
             <div class="row cl">
                 <label class="form-label col-1 col-sm-1"></label>
                 <div class="formControls col-2 col-sm-2">

watero-rst-web/src/main/webapp/WEB-INF/views/cm/salesOrder/sales_order_list.ftl

@@ -64,7 +64,7 @@
             <input type="text" style="width:150px;height:36px;margin-right: 0px;" name="endDate" id="endDate" class="input-text" placeholder="结束时间" onClick="WdatePicker({ dateFmt:'yyyy-MM-dd HH:mm:ss',skin:'whyGreen' })" value="${(salesOrder.endDate?string("yyyy-MM-dd HH:mm:ss"))!''}" readonly="readonly"/>
             <button type="submit" class="btn" style="background: #32a3d8;color: #fff;-webkit-transform:translateY(-5%);height: 35px;" id=""><i class="Hui-iconfont">&#xe665;</i> 搜索</button>
             <button type="button" class="btn" style="background: #32a3d8;color: #fff;-webkit-transform:translateY(-5%);height: 35px;" id="order_excel"><i class="Hui-iconfont">&#xe644;</i> 导出</button>
-            <button type="button" class="btn" style="background: #32a3d8;color: #fff;-webkit-transform:translateY(-5%);height: 35px;" id="synOrder"><i class="Hui-iconfont">&#xe632;</i> 同步订单</button><br>
+            <button type="button" class="btn" style="background: #32a3d8;color: #fff;-webkit-transform:translateY(-5%);height: 35px;" id="synOrder"><i class="Hui-iconfont">&#xe632;</i> 同步订单</button>
             <button onClick="upFiles();" class="btn radius" style="background: #32a3d8;color: #fff;" type="button"><i class="Hui-iconfont">&#xe632;</i> 上传Excel(仅支持XLS类型)</button>
             <button onClick="downloadOrder();" class="btn radius" style="background: #32a3d8;color: #fff;" type="button"><i class="Hui-iconfont">&#xe640;</i> 下载订单</button>
 

watero-rst-web/src/main/webapp/WEB-INF/views/pts/batch/update_batch.ftl

@@ -152,7 +152,7 @@
             <label class="form-label col-xs-4 col-sm-3">批次描述:</label>
             <div class="formControls col-xs-8 col-sm-9">
                 <textarea name="batchDesc" id="batchDesc" cols="" rows="" class="textarea"
-                          placeholder="批次描述，最多支持100字符" onKeyUp="$.Huitextarealength(this,100)" >${ptsBatch.batchDesc}</textarea>
+                          placeholder="批次描述，最多支持100字符" onKeyUp="$.Huitextarealength(this,100)" >${ptsBatch.batchDesc!''}</textarea>
                 <p class="textarea-numberbar"><em class="textarea-length"><#if ptsBatch.batchDesc??>${ptsBatch.batchDesc?length} <#else>0</#if></em>/100</p>
             </div>
         </div>
@@ -172,7 +172,7 @@
 </article>
 <script type="text/javascript">
     /*颜色枚举值*/
-    var colorAll = ['黑色','白色',"金色",'红色','蓝色','绿色','橙色','黄色','青色','紫色'];
+    var colorAll = ['黑色','白色','金色','红色','蓝色','绿色','橙色','黄色','青色','紫色','蔷薇粉','云烟紫','琉璃绿','亚麻灰'];
 
     /*修改批次时，获取之前的批次编号，添加页面为空*/
     var upBatchNo = '${ptsBatch.batchNo}';

watero-rst-web/src/main/webapp/common/js/customer/customer.js

@@ -1578,11 +1578,19 @@ function addCustomerReady(){
         vailErrorMsg($("#describeTitle"),"未填写问题描述");
         return false;
     }
+    if(describeContentText.length > 3000){
+        vailErrorMsg($("#describeContent"),"问题回复最大支持3000个字符");
+        return false;
+    }
     $("#describeContent").val(describeContentText);
     /*----问题描述--end-----*/
 
     /*----处理描述- start --*/
     var describeHandleDescText = UE.getEditor('describeHandleDescText').getContent();
+    if(describeHandleDescText.length > 3000){
+        vailErrorMsg($("#describeHandleDesc"),"问题描述最大支持3000个字符");
+        return false;
+    }
     $("#describeHandleDesc").val(describeHandleDescText);
     /*----处理描述--end-----*/
 

watero-rst-web/src/main/webapp/common/lib/ueditor/1.4.3/ueditor.config.js

@@ -250,8 +250,8 @@
         //,elementPathEnabled : true
 
         //wordCount
-        //,wordCount:true          //是否开启字数统计
-        //,maximumWords:10000       //允许的最大字符数
+        ,wordCount:true          //是否开启字数统计
+        ,maximumWords:3000       //允许的最大字符数
         //字数统计提示，{#count}代表当前字数，{#leave}代表还可以输入多少字符数,留空支持多语言自动切换，否则按此配置显示
         //,wordCountMsg:''   //当前已输入 {#count} 个字符，您还可以输入{#leave} 个字符
         //超出字数限制提示  留空支持多语言自动切换，否则按此配置显示