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

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

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

@@ -63,8 +63,10 @@ public class Renewed  implements Serializable {
     private String renewedDesc;
      //状态    1：使用中  2：停用中 
     private Integer renewedState;
-     //转账账户 
+     //转账账户 (支付宝账户)
     private String renewedAlipay;
+    //转账账户 (账户姓名)
+    private String renewedAlipayName;
      //是否已转账邮费  0:不需要 1:已转  2:待转 
     private Integer renewedIsTransfer;
      //创建时间 
@@ -481,4 +483,12 @@ public class Renewed  implements Serializable {
     public void setSalesDealCode(String salesDealCode) {
         this.salesDealCode = salesDealCode;
     }
+
+    public String getRenewedAlipayName() {
+        return renewedAlipayName;
+    }
+
+    public void setRenewedAlipayName(String renewedAlipayName) {
+        this.renewedAlipayName = renewedAlipayName;
+    }
 }

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

@@ -63,8 +63,10 @@ public class Repair implements Serializable {
     private String repairDesc;
     //  状态    1：使用中  2：停用中 
     private Integer repairState;
-    //  转账账户 
+    //  转账账户
     private String repairAlipay;
+    //  转账账户 姓名
+    private String repairAlipayName;
     //  是否已转账邮费  0:不需要 1:已转  2:待转 
     private Integer repairIsTransfer;
     //  创建时间 
@@ -481,4 +483,12 @@ public class Repair implements Serializable {
     public void setSalesDealCode(String salesDealCode) {
         this.salesDealCode = salesDealCode;
     }
+
+    public String getRepairAlipayName() {
+        return repairAlipayName;
+    }
+
+    public void setRepairAlipayName(String repairAlipayName) {
+        this.repairAlipayName = repairAlipayName;
+    }
 }

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

@@ -61,6 +61,8 @@ public class SalesOrder implements Serializable {
     private String companyName;             //销售公司名称
     private String storeName;               //店铺名称
 
+    private String orderNoteRemark;         //订单备注，推送到efast
+
     private String storeEfast;               //Efast 的店铺id
 
     @DateTimeFormat(pattern="yyyy-MM-dd HH:mm:ss")
@@ -453,4 +455,12 @@ public class SalesOrder implements Serializable {
     public void setStoreEfast(String storeEfast) {
         this.storeEfast = storeEfast;
     }
+
+    public String getOrderNoteRemark() {
+        return orderNoteRemark;
+    }
+
+    public void setOrderNoteRemark(String orderNoteRemark) {
+        this.orderNoteRemark = orderNoteRemark;
+    }
 }

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

@@ -37,6 +37,8 @@ public class EfastOrder implements Serializable{
     private Integer orderNum;                    // 产品数量
     private String orderProductName;             //产品名称
     private String orderRemark;                  //订单备注
+    private String orderBuyerRemark;             //订单买家备注
+    private String orderSellerRemark;             //订单商家备注
     private String orderPostType;                //送货方式
     private String orderStoreId;                 //仓库id
 
@@ -266,7 +268,6 @@ public class EfastOrder implements Serializable{
     public void setPlatformOrderId(String platformOrderId) {
         this.platformOrderId = platformOrderId;
     }
-
     public Integer getReturnOrderType() {
         return returnOrderType;
     }
@@ -274,4 +275,20 @@ public class EfastOrder implements Serializable{
     public void setReturnOrderType(Integer returnOrderType) {
         this.returnOrderType = returnOrderType;
     }
+
+    public String getOrderSellerRemark() {
+        return orderSellerRemark;
+    }
+
+    public void setOrderSellerRemark(String orderSellerRemark) {
+        this.orderSellerRemark = orderSellerRemark;
+    }
+
+    public String getOrderBuyerRemark() {
+        return orderBuyerRemark;
+    }
+
+    public void setOrderBuyerRemark(String orderBuyerRemark) {
+        this.orderBuyerRemark = orderBuyerRemark;
+    }
 }

watero-rst-interface/src/main/java/com/iamberry/rst/faces/cm/CustomerService.java

@@ -141,4 +141,7 @@ public interface CustomerService {
 
     /*查询问题个数*/
     Integer getQuestionNumber(CustomerInfo customerInfo);
+
+    /*删除旧的售后信息*/
+    void deleteCustomerAfterSales(CustomerInfo customer);
 }

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

@@ -1,9 +1,6 @@
 package com.iamberry.rst.service.cm;
 
 import com.github.pagehelper.PageHelper;
-import com.iamberry.rst.core.address.City;
-import com.iamberry.rst.core.address.District;
-import com.iamberry.rst.core.address.Province;
 import com.iamberry.rst.core.cm.*;
 import com.iamberry.rst.core.order.*;
 import com.iamberry.rst.core.page.PagedResult;
@@ -11,7 +8,6 @@ import com.iamberry.rst.faces.cm.CustomerService;
 import com.iamberry.rst.faces.order.EfastOrderService;
 import com.iamberry.rst.service.address.mapper.AddressMapper;
 import com.iamberry.rst.service.cm.mapper.*;
-import com.iamberry.rst.service.order.EfastOrderServiceImpl;
 import com.iamberry.rst.service.product.mapper.ProductMapper;
 import com.iamberry.rst.util.PageUtil;
 import net.sf.json.JSONObject;
@@ -73,6 +69,8 @@ public class CustomerServiceImpl implements CustomerService {
     private FittingsInfoMapper fittingsInfoMapper;
     @Autowired
     private EfastOrderService efastOrderService;
+    @Autowired
+    private StoreInfoMapper storeInfoMapper;
 
     @Override
     public CustomerInfo getCustomerInfo(Integer customerId) {
@@ -151,49 +149,45 @@ public class CustomerServiceImpl implements CustomerService {
             boolean isReturn = false;
             switch (customerInfo.getCustomerIsSolve()) {  //处理结果： 1：已解决  2：未解决 3：换新  4：维修 5：补发 6：退货 7：无理由退货
                 case 3: //换新
-
-                    customerService.chargebackEfastOrder(customerCommon,salesOrder,2,2);    //原订单生成退单
-                    //在生成退单后不需要在推送新的订单
-                    /*map = customerService.sendEfastOrder(customerCommon,salesOrder);  //换新需要向Efast推送一条换新发货的订单
-                    if(map.get("status") == 1){
-                        customerCommon.setRelationBackEfastOrderId(String.valueOf(map.get("EfastOrderId")));  //存放Efast订单编号
-                        complaintSignclosedInfo.setNewEfastId(String.valueOf(map.get("EfastOrderId")));     //仓储签收表添加  发货的Efast订单id
-                    }else{
-                        throw new RuntimeException("换新创建Efast订单失败");
-                    }*/
+//                    customerService.chargebackEfastOrder(customerCommon,salesOrder,2);    //原订单生成退单
+//                    map = customerService.sendEfastOrder(customerCommon,salesOrder);  //换新需要向Efast推送一条换新发货的订单
+//                    if(map.get("status") == 1){
+//                        customerCommon.setRelationBackEfastOrderId(String.valueOf(map.get("EfastOrderId")));  //存放Efast订单编号
+//                        complaintSignclosedInfo.setNewEfastId(String.valueOf(map.get("EfastOrderId")));     //仓储签收表添加  发货的Efast订单id
+//                    }else{
+//                        throw new RuntimeException("换新创建Efast订单失败");
+//                    }
                     complaintSignclosedInfo.setOldEfastId(salesOrder.getSalesOrderId());    //原有订单的Efast的订单编号
                     customerService.saveComplaintSignclosedInfo(complaintSignclosedInfo,customerCommon);//创建仓储任务
                     complaintDetectInfo.setSignclosedId(complaintSignclosedInfo.getSignclosedId()); //设置仓储签收id
                     customerService.saveComplaintDetectInfo(complaintDetectInfo,customerCommon);   //创建品检
                     break;
                 case 4: //维修
-
-                    customerService.chargebackEfastOrder(customerCommon,salesOrder,2,2);    //原订单生成退单
-                    //在生成退单后不需要在推送新的订单
-                    /*map = customerService.sendEfastOrder(customerCommon,salesOrder);  //维修需要向Efast推送一条维修发货的订单
-                    if(map.get("status") == 1){
-                        customerCommon.setRelationBackEfastOrderId(String.valueOf(map.get("EfastOrderId")));  //存放Efast订单编号
-                        complaintSignclosedInfo.setNewEfastId(String.valueOf(map.get("EfastOrderId")));     //仓储签收表添加  发货的Efast订单id
-                    }else{
-                        throw new RuntimeException("维修创建Efast订单失败");
-                    }*/
+//                    customerService.chargebackEfastOrder(customerCommon,salesOrder,2);    //原订单生成退单
+//                    map = customerService.sendEfastOrder(customerCommon,salesOrder);  //维修需要向Efast推送一条维修发货的订单
+//                    if(map.get("status") == 1){
+//                        customerCommon.setRelationBackEfastOrderId(String.valueOf(map.get("EfastOrderId")));  //存放Efast订单编号
+//                        complaintSignclosedInfo.setNewEfastId(String.valueOf(map.get("EfastOrderId")));     //仓储签收表添加  发货的Efast订单id
+//                    }else{
+//                        throw new RuntimeException("维修创建Efast订单失败");
+//                    }
                     complaintSignclosedInfo.setOldEfastId(salesOrder.getSalesOrderId());    //原有订单的Efast的订单编号
                     customerService.saveComplaintSignclosedInfo(complaintSignclosedInfo,customerCommon);//创建仓储任务
                     complaintDetectInfo.setSignclosedId(complaintSignclosedInfo.getSignclosedId()); //设置仓储签收id
                     customerService.saveComplaintDetectInfo(complaintDetectInfo,customerCommon);   //创建品检
                     break;
                 case 5: //补发  不用创建仓储签收任务
-                    map = customerService.sendEfastOrder(customerCommon,salesOrder);  //补发需要向Efast推送一条发货的订单
-                    if(map.get("status") == 1){
-                        customerCommon.setRelationBackEfastOrderId(String.valueOf(map.get("EfastOrderId")));  //存放Efast订单编号
-                        complaintSignclosedInfo.setNewEfastId(String.valueOf(map.get("EfastOrderId")));     //仓储签收表添加  发货的Efast订单id
-                    }else{
-                        throw new RuntimeException("补发创建Efast订单失败");
-                    }
+//                    map = customerService.sendEfastOrder(customerCommon,salesOrder);  //补发需要向Efast推送一条发货的订单
+//                    if(map.get("status") == 1){
+//                        customerCommon.setRelationBackEfastOrderId(String.valueOf(map.get("EfastOrderId")));  //存放Efast订单编号
+//                        complaintSignclosedInfo.setNewEfastId(String.valueOf(map.get("EfastOrderId")));     //仓储签收表添加  发货的Efast订单id
+//                    }else{
+//                        throw new RuntimeException("补发创建Efast订单失败");
+//                    }
                     break;
                 case 6: //退货
 
-                    customerService.chargebackEfastOrder(customerCommon,salesOrder,3,1);    //原订单生成退单
+//                    customerService.chargebackEfastOrder(customerCommon,salesOrder,3);    //原订单生成退单
 
                     complaintSignclosedInfo.setOldEfastId(salesOrder.getSalesOrderId());    //原有订单的Efast的订单编号
                     customerService.saveComplaintSignclosedInfo(complaintSignclosedInfo,customerCommon);//创建仓储任务
@@ -202,7 +196,7 @@ public class CustomerServiceImpl implements CustomerService {
                     break;
                 case 7: //无理由退货
 
-                    customerService.chargebackEfastOrder(customerCommon,salesOrder,3,1);    //原订单生成退单
+//                    customerService.chargebackEfastOrder(customerCommon,salesOrder,3);    //原订单生成退单
 
                     complaintSignclosedInfo.setOldEfastId(salesOrder.getSalesOrderId());    //原有订单的Efast的订单编号
                     customerService.saveComplaintSignclosedInfo(complaintSignclosedInfo,customerCommon);//创建仓储任务
@@ -213,7 +207,9 @@ public class CustomerServiceImpl implements CustomerService {
             logger.info("-----------添加客诉-创建仓储/品检成功--------------");
             customerCommon.setSignclosedId(complaintSignclosedInfo.getSignclosedId()); //设置仓储id
 
+            /*将公共的对象 转换换新/维修/退款等*/
             Object object = CustomerCommon.getRelation(customerInfo.getCustomerIsSolve(), customerCommon);
+
             Integer relationId = 0;
             switch (customerInfo.getCustomerIsSolve()) {  //处理结果： 1：已解决  2：未解决 3：换新  4：维修 5：补发 6：退货 7：无理由退货
                 case 3: //换新
@@ -273,7 +269,8 @@ public class CustomerServiceImpl implements CustomerService {
     public Integer updateCustomerInfo(CustomerInfo customerInfo,SalesOrder salesOrder){
 
         //删除旧的售后数据
-        deleteCustomerAfterSales(customerInfo);
+        customerService.deleteCustomerAfterSales(customerInfo);
+
         //修改客诉基本信息
         Integer flag = 0;
         flag = customerInfoMapper.updateCustomerInfo(customerInfo);
@@ -341,48 +338,45 @@ public class CustomerServiceImpl implements CustomerService {
             boolean isReturn = false;
             switch (customerInfo.getCustomerIsSolve()) {  //处理结果： 1：已解决  2：未解决 3：换新  4：维修 5：补发 6：退货 7：无理由退货
                 case 3: //换新
-                    customerService.chargebackEfastOrder(customerCommon,salesOrder,2,2);    //原订单生成退单
-
-                    map = customerService.sendEfastOrder(customerCommon,salesOrder);  //换新需要向Efast推送一条换新发货的订单
-                    if(map.get("status") == 1){
-                        customerCommon.setRelationBackEfastOrderId(String.valueOf(map.get("EfastOrderId")));  //存放Efast订单编号
-                        complaintSignclosedInfo.setNewEfastId(String.valueOf(map.get("EfastOrderId")));     //仓储签收表添加  发货的Efast订单id
-                    }else{
-                        throw new RuntimeException("换新创建Efast订单失败");
-                    }
+//                    customerService.chargebackEfastOrder(customerCommon,salesOrder,2);    //原订单生成退单
+//                    map = customerService.sendEfastOrder(customerCommon,salesOrder);  //换新需要向Efast推送一条换新发货的订单
+//                    if(map.get("status") == 1){
+//                        customerCommon.setRelationBackEfastOrderId(String.valueOf(map.get("EfastOrderId")));  //存放Efast订单编号
+//                        complaintSignclosedInfo.setNewEfastId(String.valueOf(map.get("EfastOrderId")));     //仓储签收表添加  发货的Efast订单id
+//                    }else{
+//                        throw new RuntimeException("换新创建Efast订单失败");
+//                    }
                     complaintSignclosedInfo.setOldEfastId(salesOrder.getSalesOrderId());    //原有订单的Efast的订单编号
                     customerService.saveComplaintSignclosedInfo(complaintSignclosedInfo,customerCommon);//创建仓储任务
                     complaintDetectInfo.setSignclosedId(complaintSignclosedInfo.getSignclosedId()); //设置仓储签收id
                     customerService.saveComplaintDetectInfo(complaintDetectInfo,customerCommon);   //创建品检
                     break;
                 case 4: //维修
-
-                    customerService.chargebackEfastOrder(customerCommon,salesOrder,2,2);    //原订单生成退单
-
-                    map = customerService.sendEfastOrder(customerCommon,salesOrder);  //维修需要向Efast推送一条维修发货的订单
-                    if(map.get("status") == 1){
-                        customerCommon.setRelationBackEfastOrderId(String.valueOf(map.get("EfastOrderId")));  //存放Efast订单编号
-                        complaintSignclosedInfo.setNewEfastId(String.valueOf(map.get("EfastOrderId")));     //仓储签收表添加  发货的Efast订单id
-                    }else{
-                        throw new RuntimeException("维修创建Efast订单失败");
-                    }
+//                    customerService.chargebackEfastOrder(customerCommon,salesOrder,2);    //原订单生成退单
+//                    map = customerService.sendEfastOrder(customerCommon,salesOrder);  //维修需要向Efast推送一条维修发货的订单
+//                    if(map.get("status") == 1){
+//                        customerCommon.setRelationBackEfastOrderId(String.valueOf(map.get("EfastOrderId")));  //存放Efast订单编号
+//                        complaintSignclosedInfo.setNewEfastId(String.valueOf(map.get("EfastOrderId")));     //仓储签收表添加  发货的Efast订单id
+//                    }else{
+//                        throw new RuntimeException("维修创建Efast订单失败");
+//                    }
                     complaintSignclosedInfo.setOldEfastId(salesOrder.getSalesOrderId());    //原有订单的Efast的订单编号
                     customerService.saveComplaintSignclosedInfo(complaintSignclosedInfo,customerCommon);//创建仓储任务
                     complaintDetectInfo.setSignclosedId(complaintSignclosedInfo.getSignclosedId()); //设置仓储签收id
                     customerService.saveComplaintDetectInfo(complaintDetectInfo,customerCommon);   //创建品检
                     break;
                 case 5: //补发  不用创建仓储签收任务
-                    map = customerService.sendEfastOrder(customerCommon,salesOrder);  //补发需要向Efast推送一条发货的订单
-                    if(map.get("status") == 1){
-                        customerCommon.setRelationBackEfastOrderId(String.valueOf(map.get("EfastOrderId")));  //存放Efast订单编号
-                        complaintSignclosedInfo.setNewEfastId(String.valueOf(map.get("EfastOrderId")));     //仓储签收表添加  发货的Efast订单id
-                    }else{
-                        throw new RuntimeException("补发创建Efast订单失败");
-                    }
+//                    map = customerService.sendEfastOrder(customerCommon,salesOrder);  //补发需要向Efast推送一条发货的订单
+//                    if(map.get("status") == 1){
+//                        customerCommon.setRelationBackEfastOrderId(String.valueOf(map.get("EfastOrderId")));  //存放Efast订单编号
+//                        complaintSignclosedInfo.setNewEfastId(String.valueOf(map.get("EfastOrderId")));     //仓储签收表添加  发货的Efast订单id
+//                    }else{
+//                        throw new RuntimeException("补发创建Efast订单失败");
+//                    }
                     break;
                 case 6: //退货
 
-                    customerService.chargebackEfastOrder(customerCommon,salesOrder,3,1);    //原订单生成退单
+//                    customerService.chargebackEfastOrder(customerCommon,salesOrder,3);    //原订单生成退单
 
                     complaintSignclosedInfo.setOldEfastId(salesOrder.getSalesOrderId());    //原有订单的Efast的订单编号
                     customerService.saveComplaintSignclosedInfo(complaintSignclosedInfo,customerCommon);//创建仓储任务
@@ -391,7 +385,7 @@ public class CustomerServiceImpl implements CustomerService {
                     break;
                 case 7: //无理由退货
 
-                    customerService.chargebackEfastOrder(customerCommon,salesOrder,3,1);    //原订单生成退单
+//                    customerService.chargebackEfastOrder(customerCommon,salesOrder,3);    //原订单生成退单
 
                     complaintSignclosedInfo.setOldEfastId(salesOrder.getSalesOrderId());    //原有订单的Efast的订单编号
                     customerService.saveComplaintSignclosedInfo(complaintSignclosedInfo,customerCommon);//创建仓储任务
@@ -460,6 +454,8 @@ public class CustomerServiceImpl implements CustomerService {
      * 删除旧的售后数据
      * @param customer
      */
+    @Override
+    @Transactional
     public void deleteCustomerAfterSales(CustomerInfo customer){
         CustomerInfo customerInfo = customerInfoMapper.getCustomerInfo(customer.getCustomerId());
         //删除回访信息
@@ -721,7 +717,6 @@ public class CustomerServiceImpl implements CustomerService {
                 awaitingSignclosedProductInfoArrayList.add(awaitingSignclosedProductInfo);
             }
         }
-
         flag = complaintSignclosedProductInfoMapper.insertList(awaitingSignclosedProductInfoArrayList);
         if(flag < 1){
             throw new RuntimeException("添加签收产品失败");
@@ -877,6 +872,8 @@ public class CustomerServiceImpl implements CustomerService {
         efastOrder.setOrderAddressTel(salesOrder.getSalesAddressTel());//收货人电话
         efastOrder.setOrderOpenId("1");//身份证
 
+        efastOrder.setOrderRemark(salesOrder.getOrderNoteRemark()); //订单备注
+
         String[] address = salesOrder.getSalesAddressInfo().split("-");
         efastOrder.setOrderProvince(address[0]);
         efastOrder.setOrderCity(address[1]);
@@ -919,6 +916,11 @@ public class CustomerServiceImpl implements CustomerService {
         efastOrder.setOrderProductName(productName);    //产品名称
 
         efastOrder.setOrderId(salesOrder.getSalesDealCode());   //外部交易号
+
+        StoreInfo storeInfo = new StoreInfo();
+        storeInfo = storeInfoMapper.getStoreInfoById(salesOrder.getSalesStoreId());
+        efastOrder.setOrderStoreId(storeInfo.getStoreEfast());
+
         efastOrder.setOid(1);
 
         orderList.add(efastOrder);

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

@@ -71,7 +71,8 @@
       renewed_alipay,
       renewed_is_transfer,
       renewed_create_time,
-      renewed_update_time
+      renewed_update_time,
+      renewed_alipay_name
     from
       tb_rst_renewed
     <where>
@@ -297,6 +298,9 @@
       <if test="renewedUpdateTime != null" >
         renewed_update_time = #{renewedUpdateTime},
       </if>
+      <if test="renewedAlipayName != null" >
+        renewed_alipay_name = #{renewedAlipayName},
+      </if>
     </set>
     where renewed_id = #{renewedId}
   </update>

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

@@ -97,7 +97,8 @@
       repair_alipay,
       repair_is_transfer,
       repair_create_time,
-      repair_update_time
+      repair_update_time,
+      repair_alipay_name
     from
       tb_rst_repair
     <where>
@@ -287,6 +288,9 @@
       <if test="repairUpdateTime != null" >
         repair_update_time = #{repairUpdateTime},
       </if>
+      <if test="repairAlipayName != null" >
+        repair_alipay_name = #{repairAlipayName},
+      </if>
     </set>
     where repair_id = #{repairId}
   </update>

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

@@ -253,7 +253,6 @@ public class EfastOrderServiceImpl implements EfastOrderService {
         orderData.put("orders", maps);													// 订单产品
         orderData.put("pay_name", PAY_TYPE[order.getOrderPayType()]);					// 支付方式
         orderData.put("pay_time", DateTimeUtil.format(new Date()));						// 支付时间
-        orderData.put("postscript", "");												// 买家留言
 
         orderData.put("sd_id", StringUtils.isEmpty(order.getOrderStoreId()) ? SD_ID : order.getOrderStoreId());	// 对应 efast 店铺 id
 
@@ -266,7 +265,11 @@ public class EfastOrderServiceImpl implements EfastOrderService {
             orderData.put("shipping_name", order.getOrderPostType());	    			// 快递公司代码
         }
         orderData.put("tel", "");									    		        // 我司电话
-        orderData.put("to_buyer", StringUtil.formatNull(order.getOrderRemark()));		// 商家备注
+
+        orderData.put("postscript", StringUtil.formatNull(order.getOrderBuyerRemark()));	// 买家留言
+        orderData.put("to_buyer", StringUtil.formatNull(order.getOrderSellerRemark()));	// 商家备注
+        orderData.put("order_note", StringUtil.formatNull(order.getOrderRemark()));		// 订单备注
+
         orderData.put("total_amount", order.getOrderAmount() / 100);					// 订单总额
         orderData.put("user_name", StringUtil.formatNull(order.getOrderOpenId()));		// 买家账户   百胜根据user_name来判断是否有重复，传openId是为了防止重复
         orderData.put("zipcode", "");													// 邮编

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

@@ -844,17 +844,16 @@ public class AdminCustomerController {
                     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);
-            }
+//            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);
+        return new ResponseJson(200, "录入客诉成功！客诉编号：" + customerId + "请前往Efast 换货/退货操作。", 200);
     }
 
     /**

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

@@ -67,7 +67,7 @@
                         <button type="button" class="btn btn-primary" style="background: #32a3d8;color: #fff;-webkit-transform:translateY(-5%);" id="" name="" onclick="addOrder()">添加订单</button>
                     </div>-->
                     <div class="formControls col-2 col-sm-2" style="padding: 0px 10px 0px 0px; width: 110px;" > <span class="select-box">
-                        <select name="" class="select" id="companyId">
+                        <select name="companyId" class="select" id="companyId">
                              <option value="">销售公司</option>
                             <#if companyInfoList?? &&  (companyInfoList?size > 0) >
                                 <#list companyInfoList as companyInfo>
@@ -78,7 +78,7 @@
                         </span>
                     </div>
                     <div class="formControls col-2 col-sm-2" style="padding: 0px 10px 0px 0px; width: 110px;"> <span class="select-box">
-                        <select name="" class="select" id="storeId">
+                        <select name="storeId" class="select" id="storeId">
                         </select>
                         </span>
                     </div>
@@ -165,11 +165,35 @@
         <form action="${path}/admin/customer/add_order_info" method="post" class="form form-horizontal" id="form-order-add"  onkeydown="if(event.keyCode==13)return false;">
             <div id="addOrder" >
                 <input type="hidden" name="itemJson" id="itemJson" value="">
-                <input type="hidden" name="salesStoreId" id="salesStoreId" value="0">
-                <input type="hidden" name="salesCompanyId" id="salesCompanyId" value="0">
+                <#--<input type="hidden" name="salesStoreId" id="salesStoreId" value="0">-->
+               <#-- <input type="hidden" name="salesCompanyId" id="salesCompanyId" value="0">-->
                 <input type="hidden" name="salesPayType" id="salesPayType" value="1">
                 <input type="hidden" name="salesSendType" id="salesSendType" value="2">
 
+                <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">
+                        <span class="select-box">
+                            <select name="salesCompanyId" class="select" id="salesCompanyId">
+                                <option value="">销售公司</option>
+                                <#if companyInfoList?? &&  (companyInfoList?size > 0) >
+                                    <#list companyInfoList as companyInfo>
+                                        <option value ="${companyInfo.companyId!""}">${companyInfo.companyName!""}</option>
+                                    </#list>
+                                </#if>
+                            </select>
+                        </span>
+                    </div>
+
+                    <div class="formControls col-3 col-sm-3">
+                        <span class="select-box">
+                            <select name="salesStoreId" class="select" id="salesStoreId">
+
+                            </select>
+                        </span>
+                    </div>
+                </div>
+
                 <div style="">
                     <div class="row cl" id="productInfo" style="">
                         <label class="form-label col-1 col-sm-1" style="width: 110px;"><span class="c-red">*</span>购买信息：</label>
@@ -235,6 +259,13 @@
                         </div>
                     </div>
 
+                    <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>
+                        </div>
+                    </div>
+
                     <div class="row cl"  margin-top: 20px;">
                         <label class="form-label col-1 col-sm-1" style="width: 110px;"></label>
                         <div class="formControls col-2 col-sm-2">
@@ -264,52 +295,37 @@
 
     $(function () {
         /*选择店铺*/
-        selectStoreInfo();
+        $("[name='companyId']").change(function (){
+            var companyId = $(this).val();
+            setStore(companyId,$("#storeId"));       //获取店铺
+        })
 
         /*搜索*/
         $(document).on('click', '#searchOrder', function() {
             searchOrder();
         });
 
+<<<<<<< .mine
         /*初始化  搜索订单  */
         //searchOrder();
 
+=======
+
+
+
+>>>>>>> .theirs
         /*回车搜索*/
         $('.input-text').keydown(function(event){
             if(event.keyCode == 13){ //绑定回车
                 $('#searchOrder').click();
             }
         });
+<<<<<<< .mine
 
-    })
+=======
 
-    /*获取销售公司下的所有店铺*/
-    function selectStoreInfo() {
-        var companyId = $("#companyId").val();
-        var html = '<option value="">店铺</option>';
-        $.ajax({
-            type: "POST",
-            data: {
-                companyId : companyId
-            },
-            url: "${path}/admin/customer/select_storeInfo",
-            async: false,
-            success: function(data){
-                var id;
-                if (data.returnCode == 200) {
-                    for(var i=0;i<data.returnMsg.storeInfoList.length;i++){
-                        var storeInfo = data.returnMsg.storeInfoList[i];
-                        html += '<option value="'+ storeInfo.storeId +'">'+ storeInfo.storeName +'</option>';
-                    }
-                }else{
-                    html = '';
-                }
-                $("#storeId").html(html);
-            },
-            error: function(XmlHttpRequest, textStatus, errorThrown){
-            }
-        });
-    }
+>>>>>>> .theirs
+    })
 
     /**
      * 搜索订单
@@ -479,6 +495,13 @@
         $(".order-add").show();
         $(".order-list").hide();
 
+
+        /*监听销售公司选择事件*/
+        $("[name='salesCompanyId']").change(function (){
+            var companyId = $(this).val();
+            setStore(companyId,$("#salesStoreId"));       //获取店铺
+        })
+
         /*初始化产品*/
         setProduce();
 
@@ -532,6 +555,36 @@
     }
 
     /**
+     * 展示销售公司
+     */
+    function setStore(companyId,node){
+        var companyId = $("#companyId").val();
+        var html = '<option value="">店铺</option>';
+        $.ajax({
+            type: "POST",
+            data: {
+                companyId : companyId
+            },
+            url: "${path}/admin/customer/select_storeInfo",
+            async: false,
+            success: function(data){
+                var id;
+                if (data.returnCode == 200) {
+                    for(var i=0;i<data.returnMsg.storeInfoList.length;i++){
+                        var storeInfo = data.returnMsg.storeInfoList[i];
+                        html += '<option value="'+ storeInfo.storeId +'">'+ storeInfo.storeName +'</option>';
+                    }
+                }else{
+                    html = '';
+                }
+                $(node).html(html);
+            },
+            error: function(XmlHttpRequest, textStatus, errorThrown){
+            }
+        });
+    }
+
+    /**
      * 展示产品
      * @param orderItemList
      */

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

@@ -158,6 +158,7 @@
                 <div class="formControls col-2 col-sm-2 text-r">
                     <input style="width: 150px;margin-right: 10px;" type="text" class="input-text" value="" placeholder="寄回邮费" id="renewedBackPostage" name="renewedBackPostage" seleType="postage">
                     <input style="width: 150px;margin-top: 20px;" type="text" class="input-text" value="" placeholder="用户支付宝账户" id="renewedAlipay" name="renewedAlipay" seleType="postage">
+                    <input style="width: 150px;margin-top: 20px;" type="text" class="input-text" value="" placeholder="用户支付宝姓名" id="renewedAlipayName" name="renewedAlipayName" seleType="postage">
                 </div>
             </div>
 
@@ -642,6 +643,7 @@
                     $('#renewedBackLogisticsNo').val(renewed.renewedBackLogisticsNo);
                     $('#renewedBackPostage').val(renewed.renewedBackPostage/100);
                     $('#renewedAlipay').val(renewed.renewedAlipay);
+                    $('#renewedAlipayName').val(renewed.renewedAlipayName);
                     $('input[name="renewedIsTransfer"]').each(function(){
                         if (this.value == renewed.renewedIsTransfer) {
                             $(this).iCheck('check');
@@ -833,6 +835,7 @@
             var renewedIsTransfer = $('input[name="renewedIsTransfer"]:checked').val();
             var renewedBackPostage = $('#renewedBackPostage').val().trim();//寄回邮费
             var renewedAlipay = $('#renewedAlipay').val().trim();//支付宝账户
+            var renewedAlipayName = $('#renewedAlipayName').val().trim();//支付宝账户姓名
 
             if(renewedIsTransfer == 1){
                 if (!money.test(renewedBackPostage)) {
@@ -845,6 +848,11 @@
                     renewed_flag = false;
                     return renewed_flag;
                 }
+                if (renewedAlipayName == null || renewedAlipayName == '') {
+                    layer.msg("支付宝姓名不能为空，请重新输入!",{icon: 5,time:1000});
+                    renewed_flag = false;
+                    return renewed_flag;
+                }
             }
         }else if(type == 3){
             var renewedSendStatus = $('input[name="renewedSendStatus"]:checked').val();//寄回状态

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

@@ -158,6 +158,7 @@
                     <div class="formControls col-2 col-sm-2 text-r">
                         <input style="width: 150px;margin-right: 10px;" type="text" class="input-text" value="" placeholder="寄回邮费" id="repairBackPostage" name="repairBackPostage" seleType="postage">
                         <input style="width: 150px;margin-top: 20px;" type="text" class="input-text" value="" placeholder="用户支付宝账户" id="repairAlipay" name="repairAlipay" seleType="postage">
+                        <input style="width: 150px;margin-top: 20px;" type="text" class="input-text" value="" placeholder="用户支付宝姓名" id="repairAlipayName" name="repairAlipayName" seleType="postage">
                     </div>
                 </div>
 
@@ -642,6 +643,7 @@
                     $('#repairBackLogisticsNo').val(repair.repairBackLogisticsNo);
                     $('#repairBackPostage').val(repair.repairBackPostage/100);
                     $('#repairAlipay').val(repair.repairAlipay);
+                    $('#repairAlipayName').val(repair.repairAlipayName);
                     $('input[name="repairIsTransfer"]').each(function(){
                         if (this.value == repair.repairIsTransfer) {
                             $(this).iCheck('check');
@@ -833,6 +835,7 @@
             var repairIsTransfer = $('input[name="repairIsTransfer"]:checked').val();
             var repairBackPostage = $('#repairBackPostage').val().trim();//寄回邮费
             var repairAlipay = $('#repairAlipay').val().trim();//支付宝账户
+            var repairAlipayName = $('#repairAlipayName').val().trim();//支付宝账户
 
             if(repairIsTransfer == 1){
                 if (!money.test(repairBackPostage)) {
@@ -845,6 +848,11 @@
                     repair_flag = false;
                     return repair_flag;
                 }
+                if (repairAlipayName == null || repairAlipayName == '') {
+                    layer.msg("支付宝姓名不能为空!",{icon: 5,time:1000});
+                    repair_flag = false;
+                    return repair_flag;
+                }
             }
         }else if(type == 3){
             var repairSendStatus = $('input[name="repairSendStatus"]:checked').val();//寄回状态