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

# Conflicts:
#	watero-rst-core/src/main/java/com.iamberry.rst.core/order/EfastOrder.java
#	watero-rst-service/src/main/java/com/iamberry/rst/service/cm/CustomerServiceImpl.java

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

@@ -42,7 +42,7 @@ public class SalesOrder implements Serializable {
     @DateTimeFormat(pattern="yyyy-MM-dd HH:mm:ss")
     @JsonFormat(pattern="yyyy-MM-dd",timezone = "GMT+8")
     private Date salesCreateTime;           //创建时间
-    private String salesAdminRemark;        //后台的备注
+    private String salesAdminRemark;        //后台的备注 -- 卖家备注
     private String salesUserRemark;         //用户备注
     private String salesPayNumber;          //交易尾号
     private Integer salesStoreId;           //店铺id

watero-rst-service/src/main/java/com/iamberry/rst/service/cm/CustomerServiceImpl.java

@@ -873,6 +873,8 @@ public class CustomerServiceImpl implements CustomerService {
         efastOrder.setOrderOpenId("1");//身份证
 
         efastOrder.setOrderRemark(salesOrder.getOrderNoteRemark()); //订单备注
+        efastOrder.setOrderBuyerRemark(salesOrder.getSalesUserRemark()); //买家备注
+        efastOrder.setOrderSellerRemark(salesOrder.getSalesAdminRemark()); //卖家备注
 
         String[] address = salesOrder.getSalesAddressInfo().split("-");
         efastOrder.setOrderProvince(address[0]);

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

@@ -853,7 +853,7 @@ public class AdminCustomerController {
 //                return new ResponseJson(505, "添加客诉发送短信失败，失败原因：" + result + "<br>客诉信息发送失败并不影响客诉添加。客诉编号为："+ customerId, 505);
 //            }
         }
-        return new ResponseJson(200, "录入客诉成功！客诉编号：" + customerId + "请前往Efast 换货/退货操作。", 200);
+        return new ResponseJson(200, "录入客诉成功！客诉编号：" + customerId + ",请前往Efast进行换货/退货操作。", 200);
     }
 
     /**
@@ -920,53 +920,6 @@ public class AdminCustomerController {
             return new ResponseJson(500, "修改客诉失败!", 500);
         }
 
-        //处理结果： 1：已解决  2：未解决 3：换新  4：维修 5：补发 6：退货 7：无理由退货
-        /*if (customerIsSolve == 3 || customerIsSolve == 4 || customerIsSolve == 5 || customerIsSolve == 6 || customerIsSolve == 7) {
-            String solveMsg = "";
-            switch (customerIsSolve) {
-                case 3:
-                    solveMsg = "为您更换新机";
-                    break;
-                case 4:
-                    solveMsg = "为您维修机器";
-                    break;
-                case 5:
-                    solveMsg = "为您补发产品";
-                    break;
-                case 6:
-                    solveMsg = "为您办理退货";
-                    break;
-                case 7:
-                    solveMsg = "为您办理退货";
-                    break;
-            }
-
-            String addCustomerSuccessMsg = "";
-            String typeMsg = "";
-            switch (typeCompany) {
-                case 1:
-                    addCustomerSuccessMsg = SmsConfig.ADD_CUSTOMER_SUCCESS_WATERO;
-                    typeMsg = "美国WaterO售后";
-                    break;
-                case 2:
-                    addCustomerSuccessMsg = SmsConfig.ADD_CUSTOMER_SUCCESS_SHANGDUO;
-                    typeMsg = "上朵售后";
-                    break;
-                case 3:
-                    addCustomerSuccessMsg = SmsConfig.ADD_CUSTOMER_SUCCESS_YULIA;
-                    typeMsg = "YULIA售后";
-                    break;
-            }
-
-            Object [] msg = new Object[]{solveMsg,typeMsg};
-            String text = MessageFormat.format(addCustomerSuccessMsg, msg);
-            logger.info("添加客诉成功后，给 "+ phone +" 手机用户发送短信：" + text );
-            String result = smsService.sendOtherCMS(phone, text);
-
-            if (!"SUCCESS".equals(result)) {
-                return new ResponseJson(505, "添加客诉发送短信失败，失败原因：" + result + "<br>客诉信息发送失败并不影响客诉添加。客诉编号为："+ customerId, 505);
-            }
-        }*/
         return new ResponseJson(200, "修改客诉成功!客诉编号为：" + customerId, 200);
     }
 

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

@@ -262,7 +262,7 @@
                     <div class="row cl" id="recipientAddressText" 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-10 col-sm-10">
-                            <textarea name="orderNoteRemark" id="orderNoteRemark" cols="" rows="2" class="textarea" placeholder="订单备注" onKeyUp="$.Huitextarealength(this,50)"></textarea>
+                            <textarea name="salesAdminRemark" id="salesAdminRemark" cols="" rows="2" class="textarea" placeholder="订单备注" onKeyUp="$.Huitextarealength(this,50)"></textarea>
                         </div>
                     </div>