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-service/src/main/java/com/iamberry/rst/service/cm/CustomerServiceImpl.java

@@ -304,6 +304,7 @@ public class CustomerServiceImpl implements CustomerService {
         complaintDetectInfo.setCustomerId(customerCommon.getCustomerId());    //添加客诉
         complaintDetectInfo.setDetectState(1);      //状态  1待仓库转入
         complaintDetectInfo.setDetectRevolutionProduced(1);  //是否转入生产部门  1待转入
+        complaintDetectInfo.setDetectIsMaintenance(1);   //是否需要维修，1 需要 2不需要
         for(int i=0 ;i< customerCommon.getClosedProdcues().size();i++){
             ClosedProdcue closedProdcue = customerCommon.getClosedProdcues().get(i);
             for(int j=0; j<closedProdcue.getClosedProdcueNumber();j++){
@@ -470,7 +471,7 @@ public class CustomerServiceImpl implements CustomerService {
             map.put("EfastOrderId",oList.get(0).getOrderId());
             logger.info("换新，维修 ,补发向Efast 推送订单成功，订单号为：" + oList.get(0).getOrderId());
         }else{
-            logger.info("换新，维修 ,补发向Efast 推送订单，推送失败");
+            logger.info("换新，维修 ,补发向Efast 推送订单，推送失败,交易号为：" + customerCommon.getTransactionNumber());
         }
         return map;
     }
@@ -624,11 +625,9 @@ public class CustomerServiceImpl implements CustomerService {
         efastOrder.setItemList(itemList);
 
         JSONObject jsonObject = new JSONObject();
-        boolean fg = false;
         try{
             jsonObject = efastOrderService.returnOrderFormEfast(efastOrder);
             logger.info("------将原订单生成退货订单返回数据：" + jsonObject + "------");
-            fg = true;
             /*if(jsonObject != null){
                 Object obj;
                 obj = jsonObject.get("return_sn");
@@ -644,9 +643,6 @@ public class CustomerServiceImpl implements CustomerService {
         }catch (Exception e){
             logger.info("------将原订单生成退货订单报错------");
         }
-        if(!fg){
-            throw new RuntimeException("Efast生成退单失败");
-        }
     }
 
     @Override

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

@@ -63,7 +63,7 @@
       AND question_state = 1
     </where>
     ORDER BY question_create_time DESC
-    limit 0,5
+    limit 0,20
   </select>
 
   <insert id="insert" parameterType="ComplaintQuestionInfo"  useGeneratedKeys="true" keyProperty="questionId">

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

@@ -131,7 +131,6 @@ public class EfastOrderServiceImpl implements EfastOrderService {
             if (oderSn != null) {
                 String msg = respData.getString("msg");
                 if ("success".equals(msg)) {
-
                     order_sn = oderSn;
                     transactionNumber = order.getOrderId();
                     return true;
@@ -188,6 +187,12 @@ public class EfastOrderServiceImpl implements EfastOrderService {
                     || order.getOrderAmount() == null || order.getOrderPayMoney() == null
                     || order.getOrderNum() == null || order.getOrderPayType() == null) {
                 logger.info("rst-取消推送此订单-->>" + order.getOrderId() + ",到百胜 有内容为空-->" + order);
+                logger.info("rst-取消推送此订单--为空判断-->>：订单是否为空："+ order==null?"为空":"不为空" + "；省份："+order.getOrderProvince() + "； 订单编号Oid" + order.getOid()+
+                    "； 市:"+ order.getOrderCity() + "； 地区："+ order.getOrderArea() + "； 详细地址："+ order.getOrderAddress() +"； 收件人姓名："+ order.getOrderAddressName() +
+                        "； 收货人电话："+ order.getOrderAddressTel() +  "； 订单编号："+ order.getOrderId() + "； 身份证号："+ order.getOrderOpenId() + "； sku："+ order.getOrderProductBarCode() +
+                        "； 产品名称："+ order.getOrderProductName() + "； 订单金额："+ order.getOrderAmount() + "； 应付金额："+ order.getOrderPayMoney() + "； 商品数量："+ order.getOrderNum() +
+                        "； 支付方式："+ order.getOrderPayType()
+                );
                 it.remove();
             }
         }

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

@@ -165,7 +165,7 @@
                         <em></em>
                         <strong>相关QA</strong>
                         <a href="javascript:void(0)" style="margin-left: 200px;" onclick="closeQA()">关闭</a>
-                        <ul id="question">
+                        <ul id="question" style="padding-top: 15px">
                             <#--<li class="ask">1、净水机面板操作不灵敏，是怎么回事？</li>
                             <li class="answer">答：<span>4净水机面板操作不灵敏，是怎么回事。1、净水机面板操作不灵敏，是怎么回事？1、净水机面板操作不灵敏，是怎么回事？1、净水机面板操作不灵敏，是怎么回事？</span></li>-->
                         </ul>
@@ -551,15 +551,14 @@
     });
 
     $(document).on('click', '.dalog-ask .answer', function() {
-        var msg = $(this).find("span").html();
-        UE.getEditor('describeContentText').setContent(msg);
 
-        $("#questionId").val($(this).find(".quesId").val());
+        var questionId = $(this).find(".quesId").val()
+        var title = $(this).find("span").html();
+        var desc = $(this).find("#questionProfile").html()
 
-        var title = $(this).prev().html();
+        $("#questionId").val(questionId);
         $("#describeTitle").val(title);
-
-        //$("#questionId").val(.find(".quesId").val());
+        UE.getEditor('describeContentText').setContent(desc);
 
         //$("#answer-textarea").text();
         $(".dalog-ask").hide(); //隐藏qa
@@ -768,7 +767,6 @@
 
         /*监听处理结果选择事件*/
         $("[name='customerIsSolve']").change(function(){
-            allCustomerType = parseInt($(this).val());
             initProcessResult(parseInt($(this).val()));
         })
 
@@ -1010,6 +1008,8 @@
             type = 1;
         }
 
+        allCustomerType = type;
+
         if(allCustomerInfoType == null || allCustomerInfoType == ""){
             allCustomerInfoType = $("input[name='customerCounselType']:checked").val();
         }
@@ -1308,9 +1308,14 @@
                     if (data.returnCode == 200) {
                         for(var i=0;i<data.returnMsg.complaintQuestionInfoList.length;i++){
                             var complaintQuestion= data.returnMsg.complaintQuestionInfoList[i];
-                            html += '<li class="ask">'+ complaintQuestion.questionName +'' +
-                                    '</li>' +
-                                    '<li class="answer" style="height: 65px;overflow: hidden;">答：<span>'+ complaintQuestion.questionProfile +'</span><input class="quesId" type="hidden" value="'+ complaintQuestion.questionId +'"></li>';
+                            //html += '<li class="ask">'+ complaintQuestion.questionName +'' +
+                            //        '</li>' +
+                            //        '<li class="answer" style="height: 65px;overflow: hidden;">答：<span>'+ complaintQuestion.questionProfile +'</span><input class="quesId" type="hidden" value="'+ complaintQuestion.questionId +'"></li>';
+                            html += '' +
+                                    '<li class="answer" style="height: 20px;overflow: hidden;border-bottom: 1px solid #ddd;"><span>'+ complaintQuestion.questionName +'</span>' +
+                                    '<input class="quesId" type="hidden" value="'+ complaintQuestion.questionId +'">' +
+                                    '<div id="questionProfile" style="display: block">'+ complaintQuestion.questionProfile +'</div>' +
+                                    '</li>';
                         }
                     }else{
                         html = '<span style="font-size: 12px; margin-top: 10px; display: block;">未搜索到QA信息，请更换关键字或者直接录入到系统!</span>';