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

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

@@ -38,10 +38,12 @@ public class ClosedProdcue  implements Serializable {
         this.closedProductName = closedProductName;
     }
 
+    @Deprecated
     public Integer getClosedProdcueType() {
         return closedProdcueType;
     }
 
+    @Deprecated
     public void setClosedProdcueType(Integer closedProdcueType) {
         this.closedProdcueType = closedProdcueType;
     }

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

@@ -93,7 +93,6 @@ public class CmRelation implements  Serializable{
 
     /*订单关联集合*/
     private List<RelationOrder> relationOrderList = new ArrayList<>();
-
     /*订单集合*/
     private List<SalesOrder> salesOrderList = new ArrayList<>();
 

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

@@ -38,7 +38,7 @@ public class CustomerInfo  implements Serializable {
     private String customerTel;
     // 微信昵称
     private String customerWechatName;
-    //  处理结果： 1：已解决  2：未解决 3：换新  4：维修 5：补发 6：退货 7：无理由退货
+    //  处理结果： 1：已解决  2：未解决 3：换新  4：维修 5：补发 6：退货 7：无理由退货     客诉修改 --> 不维护此字段
     private Integer customerIsSolve;
     //  是否需要回访  1:不需要回访  2:需要回复 
     private String customerIsVisit;
@@ -129,6 +129,7 @@ public class CustomerInfo  implements Serializable {
 
     private Visit visit = new Visit();  //回访类
 
+    @Deprecated
     private CustomerCommon customerCommon = new CustomerCommon(); //处理结果综合  公共类
 
     private CmRelation cmRelation = new CmRelation();
@@ -437,7 +438,6 @@ public class CustomerInfo  implements Serializable {
     public Integer getCustomerIsSolve() {
         return customerIsSolve;
     }
-
     public void setCustomerIsSolve(Integer customerIsSolve) {
         this.customerIsSolve = customerIsSolve;
     }
@@ -508,7 +508,7 @@ public class CustomerInfo  implements Serializable {
 
     /**
      * 请使用 getCmRelation
-     * @param customerCommon
+     * @param
      */
     @Deprecated
     public CustomerCommon getCustomerCommon() {

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

@@ -27,10 +27,12 @@ public class RelationOrder  implements  Serializable{
         this.relationOrderId=relationOrderId;
     }
 
+    @Deprecated
     public Integer getRelationType(){
         return relationType;
     }
 
+    @Deprecated
     public void setRelationType(Integer  relationType){
         this.relationType=relationType;
     }

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

@@ -57,7 +57,7 @@ public class SalesOrder implements Serializable {
     private Integer salesCompanyId;         //销售公司id
     private Integer salesType;              //订单类型  1：购买2：租赁
     private String salesDealCode;           //交易号
-    private Integer salesOrderStatus;       //订单状态 订单状态：1：正常 2：换货 3：退货  4:维修  5：补发
+    private Integer salesOrderStatus;       //订单状态 订单状态：1：正常 2：换货 3：退货  4:维修  5：补发 -- TODO: 2019/1/4 改为 ProcTypeId
     private Integer salesShippingStatus;    //发货状态 0(未发货)1(已发货,即已扫描出库)3(备货中)4（收货） 11(已通知配货，后加)
     private Integer salesDeliver;            //出库状态  1：未出库   2：已出库
     private Date salesDeliverTime;            //出库时间

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

@@ -17,6 +17,7 @@ public class SendProdcue  implements Serializable {
 
     private Integer sendProdcueNumber;      //产品数量
 
+    @Deprecated
     private Integer sendProduceType;    //售后类型  3：换新;4：维修;5：补发;6：退货;7：无理由退货
 
     private String sendProduceName; //产品名称
@@ -37,10 +38,12 @@ public class SendProdcue  implements Serializable {
         this.sendProduceName = sendProduceName;
     }
 
+    @Deprecated
     public Integer getSendProduceType() {
         return sendProduceType;
     }
 
+    @Deprecated
     public void setSendProduceType(Integer sendProduceType) {
         this.sendProduceType = sendProduceType;
     }

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

@@ -6,6 +6,7 @@ import com.iamberry.rst.core.cm.BackGoods;
  * 退货service
  * Created by liuzhiwei on 2017/11/8.
  */
+@Deprecated
 public interface BackGoodsService {
 
     /**

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

@@ -23,6 +23,12 @@ public interface CmRelationService {
      */
     CmRelation  getCmRelationById(Integer  id);
     /**
+     * select relation by customer
+     * @param  id
+     * @return  cmRelation
+     */
+    CmRelation  getCmRelationByCustomerId(Integer  id);
+    /**
      * 增加数据
      * @param  cmRelation
      * @return Integer
@@ -40,4 +46,6 @@ public interface CmRelationService {
      * @return Integer
      */
     Integer  delete(Integer  id);
+
+    void getSendAndBackProduct(CmRelation cmRelation);
 }

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

@@ -4,6 +4,7 @@ import com.iamberry.rst.core.cm.*;
 
 import java.util.List;
 
+@Deprecated
 public interface CustomerCommonService {
     /**
      * 获取寄送寄回的产品和配件

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

@@ -112,6 +112,10 @@ public interface CustomerService {
     ProductType getcompanyAffiliation(Integer customerId);
 
     /*设置产品，配件参数*/
+    void setName(CmRelation cr);
+
+    /*设置产品，配件参数*/
+    @Deprecated
     void setName(CustomerCommon cc);
     /**
      * 将原订单生成退货单

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

@@ -7,6 +7,7 @@ import java.util.List;
 /**
  * 客诉-产品配件service
  */
+@Deprecated
 public interface FittingsInfoService {
     /**
      * 添加配件信息

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

@@ -5,6 +5,7 @@ import com.iamberry.rst.core.cm.NoreasonBack;
 /**
  * Created by liuzhiwei on 2017/11/14.
  */
+@Deprecated
 public interface NoreasonBackService {
 
     /**

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

@@ -7,6 +7,7 @@ import java.util.List;
 /**
  * Created by Administrator on 2017/11/9.
  */
+@Deprecated
 public interface ReissueService {
 
     /**

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

@@ -9,6 +9,7 @@ import java.util.List;
  * 换新service
  * Created by liuzhiwei on 2017/11/7.
  */
+@Deprecated
 public interface RenewedService {
 
     /**

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

@@ -8,6 +8,7 @@ import java.util.List;
  * 维修Service
  * Created by liuzhiwei on 2017/11/8.
  */
+@Deprecated
 public interface RepairService {
 
     /**

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

@@ -1,8 +1,12 @@
 package com.iamberry.rst.service.cm;
 
+import com.iamberry.rst.core.cm.ClosedProdcue;
 import com.iamberry.rst.core.cm.CmRelation;
+import com.iamberry.rst.core.cm.SendProdcue;
 import com.iamberry.rst.faces.cm.CmRelationService;
+import com.iamberry.rst.service.cm.mapper.ClosedProdcueMapper;
 import com.iamberry.rst.service.cm.mapper.CmRelationMapper;
+import com.iamberry.rst.service.cm.mapper.SendProdcueMapper;
 import org.springframework.beans.factory.annotation.Autowired;
 import org.springframework.stereotype.Service;
 
@@ -17,6 +21,11 @@ import java.util.List;
 public class CmRelationServiceImpl  implements CmRelationService {
     @Autowired
     private CmRelationMapper cmRelationMapper;
+    @Autowired
+    private ClosedProdcueMapper closedProdcueMapper;
+    @Autowired
+    private SendProdcueMapper sendProdcueMapper;
+
     /**
      * 获取集合
      * @param  cmRelation
@@ -35,6 +44,12 @@ public class CmRelationServiceImpl  implements CmRelationService {
     public  CmRelation  getCmRelationById(Integer  id){
         return  cmRelationMapper.getCmRelationById(id);
     }
+
+    @Override
+    public CmRelation getCmRelationByCustomerId(Integer id) {
+        return  cmRelationMapper.getCmRelationByCustomerId(id);
+    }
+
     /**
      * 增加数据
      * @param  cmRelation
@@ -62,4 +77,17 @@ public class CmRelationServiceImpl  implements CmRelationService {
     public  Integer  delete(Integer  id){
         return  cmRelationMapper.delete(id);
     }
+
+    @Override
+    public void getSendAndBackProduct(CmRelation cmRelation) {
+        ClosedProdcue closedProdcue = new ClosedProdcue();
+        closedProdcue.setRelationId(cmRelation.getRelationId());
+        List<ClosedProdcue>  closedProdcueList = closedProdcueMapper.listclosedProdcue(closedProdcue);
+        cmRelation.setClosedProdcues(closedProdcueList);
+
+        SendProdcue sendProdcue = new SendProdcue();
+        sendProdcue.setRelationId(cmRelation.getRelationId());
+        List<SendProdcue> sendProdcueList = sendProdcueMapper.listSendProdcue(sendProdcue);
+        cmRelation.setSendProdcues(sendProdcueList);
+    }
 }

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

@@ -9,6 +9,7 @@ import com.iamberry.rst.core.order.*;
 import com.iamberry.rst.core.page.PagedResult;
 import com.iamberry.rst.faces.cm.CustomerCommonService;
 import com.iamberry.rst.faces.cm.CustomerService;
+import com.iamberry.rst.faces.cm.ProcMethodService;
 import com.iamberry.rst.faces.cm.RelationOrderService;
 import com.iamberry.rst.faces.order.EfastOrderService;
 import com.iamberry.rst.service.address.mapper.AddressMapper;
@@ -81,6 +82,10 @@ public class CustomerServiceImpl implements CustomerService {
     private CustomerCommonService customerCommonService;
     @Autowired
     private RelationOrderService relationOrderService;
+    @Autowired
+    private ProcMethodService procMethodService;
+    @Autowired
+    private CmRelationMapper cmRelationMapper;
 
     @Override
     public CustomerInfo getCustomerInfo(Integer customerId) {
@@ -130,156 +135,72 @@ public class CustomerServiceImpl implements CustomerService {
             logger.info("-----------添加客诉-添加客诉回访信息---------------");
         }
 
-        if (2 == customerInfo.getCustomerCounselType() &&
-                (customerInfo.getCustomerIsSolve() == 3 || customerInfo.getCustomerIsSolve() == 4 || customerInfo.getCustomerIsSolve() == 5 ||
-                customerInfo.getCustomerIsSolve() == 6 || customerInfo.getCustomerIsSolve() == 7)
-                ){
-
+        ProcMethod procMethod = procMethodService.getProcMethodById(customerInfo.getProcMethodId());
+        if (2 == customerInfo.getCustomerCounselType() && (procMethod.getProcMethodIsBack()==1||procMethod.getProcMethodIsSend()==1)){
             if(isNeedSelectOrder == 1){
                 SalesOrder so = new SalesOrder();
                 if(salesOrder.getIds()!= null && salesOrder.getIds().indexOf("_") > -1){
                     String[] salesIds = salesOrder.getIds().split("_");
                     so.setSalesIds(salesIds);
                     orderList = salesOrderMapper.listSalesOrder(so);
-                    logger.info("-----------添加客诉-查询订单--------------");
                     if(orderList == null || orderList.size() < 1){
-                        logger.info("-----------添加客诉-订单为空-请重新添加订单 --------------");
                         throw new RuntimeException("添加客诉-订单为空-请重新添加订单");
                     }
+                }else{
+                    throw new RuntimeException("添加客诉-订单为空-请重新添加订单");
                 }
             }
-
-            CustomerCommon customerCommon = customerInfo.getCustomerCommon();
-            customerCommon.setCustomerId(customerInfo.getCustomerId()); //设置客诉id
-            customerCommon.setRelationBackStatus(1); //寄回状态 1：未寄回
-            customerCommon.setRelationSendStatus(1); //寄送状态 1：未寄送
-            customerCommon.setRelationState(1); //状态  默认使用中
-            customerCommon.setTransactionNumber(customerInfo.getTransactionNumber());   //外部交易号
-
+            logger.info("-----------添加客诉-添加订单 --------------");
+
+            CmRelation cmRelation = customerInfo.getCmRelation();
+            cmRelation.setCustomerId(customerInfo.getCustomerId());
+            cmRelation.setRelationBackStatus(1); //寄回状态 1：未寄回
+            cmRelation.setRelationSendStatus(1); //寄送状态 1：未寄送
+            cmRelation.setRelationState(1); //状态  默认使用中
+            //cmRelation.setTransactionNumber(customerInfo.getTransactionNumber());   //外部交易号
             // TODO: 2018/3/27 是否转账邮费，默认为不需要转账 ： 0
-            customerCommon.setRelationIsTransfer(0);    //是否已转账邮费
-            customerCommon.setRelationBackPostage(0);   //邮费默认为0
+            cmRelation.setRelationIsTransfer(0);    //是否已转账邮费
+            cmRelation.setRelationBackPostage(0);   //邮费默认为0
+            cmRelation.setRelationBackName(cmRelation.getRelationSendName()); //姓名
+            cmRelation.setRelationBackTel(cmRelation.getRelationSendTel()); //电话号码
 
-            customerCommon.setRelationBackName(customerCommon.getRelationSendName()); //姓名
-            customerCommon.setRelationBackTel(customerCommon.getRelationSendTel()); //电话号码
-
-            /*  初始化产品类型，名称，配件名称 */
-            customerService.setName(customerCommon);
+             /*  初始化产品类型，名称，配件名称 */
+            customerService.setName(cmRelation);
             logger.info("-----------添加客诉-初始化产品，配件信息--------------");
 
             ComplaintDetectInfo complaintDetectInfo = new ComplaintDetectInfo();  //品质检测
             ComplaintSignclosedInfo complaintSignclosedInfo = new ComplaintSignclosedInfo(); //客诉-签收表
-            Map<String,Object> map;
-            boolean isReturn = false;
-            switch (customerInfo.getCustomerIsSolve()) {  //处理结果： 1：已解决  2：未解决 3：换新  4：维修 5：补发 6：退货 7：无理由退货
-                case 3: //换新
-//                    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);    //原订单生成退单
-//                    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订单失败");
-//                    }
-                    break;
-                case 6: //退货
-
-//                   customerService.chargebackEfastOrder(customerCommon,salesOrder,3);    //原订单生成退单
 
-                    //complaintSignclosedInfo.setOldEfastId(salesOrder.getSalesOrderId());    //原有订单的Efast的订单编号
-                    //customerService.saveComplaintSignclosedInfo(complaintSignclosedInfo,customerCommon);//创建仓储任务
-                    //complaintDetectInfo.setSignclosedId(complaintSignclosedInfo.getSignclosedId()); //设置仓储签收id
-                    //customerService.saveComplaintDetectInfo(complaintDetectInfo,customerCommon);   //创建品检
-                    break;
-                case 7: //无理由退货
-
-//                   customerService.chargebackEfastOrder(customerCommon,salesOrder,3);    //原订单生成退单
-
-                    //complaintSignclosedInfo.setOldEfastId(salesOrder.getSalesOrderId());    //原有订单的Efast的订单编号
-                    //customerService.saveComplaintSignclosedInfo(complaintSignclosedInfo,customerCommon);//创建仓储任务
-                    //complaintDetectInfo.setSignclosedId(complaintSignclosedInfo.getSignclosedId()); //设置仓储签收id
-                    //customerService.saveComplaintDetectInfo(complaintDetectInfo,customerCommon);   //创建品检
-                    break;
+      /*       Map<String,Object> map;
+           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订单失败");
             }
-            logger.info("-----------添加客诉-创建仓储/品检成功--------------");
-            customerCommon.setSignclosedId(complaintSignclosedInfo.getSignclosedId()); //设置仓储id
+            complaintSignclosedInfo.setOldEfastId(salesOrder.getSalesOrderId());    //原有订单的Efast的订单编号
+            customerService.saveComplaintSignclosedInfo(complaintSignclosedInfo,customerCommon);//创建仓储任务
+            complaintDetectInfo.setSignclosedId(complaintSignclosedInfo.getSignclosedId()); //设置仓储签收id
+            customerService.saveComplaintDetectInfo(complaintDetectInfo,customerCommon);   //创建品检*/
 
+            logger.info("-----------添加客诉-创建仓储/品检成功--------------");
 
-            /*将公共的对象 转换换新/维修/退款等*/
-            Object object = CustomerCommonUtil.getRelation(customerInfo.getCustomerIsSolve(), customerCommon);
+            cmRelation.setSignclosedId(complaintSignclosedInfo.getSignclosedId()); //设置仓储id
 
-            Integer relationId = 0;
-            Integer orderStatus = 1;
-//            switch (customerInfo.getCustomerIsSolve()) {  //处理结果： 1：已解决  2：未解决 3：换新  4：维修 5：补发 6：退货 7：无理由退货
-//                case 3: //换新
-//                    Renewed renewed = (Renewed) object;
-//                    flag = renewedMapper.insert(renewed);
-//                    relationId = renewed.getRenewedId();
-//                    orderStatus = 2;
-//                    break;
-//                case 4: //维修
-//                    Repair repair = (Repair) object;
-//                    flag = repairMapper.insert(repair);
-//                    relationId = repair.getRepairId();
-//                    orderStatus = 4;
-//                    break;
-//                case 5: //补发
-//                    Reissue reissue = (Reissue) object;
-//                    flag = reissueMapper.insert(reissue);
-//                    relationId = reissue.getReissueId();
-//                    orderStatus = 5;
-//                    break;
-//                case 6: //退货
-//                    BackGoods backGoods = (BackGoods) object;
-//                    flag = backGoodsMapper.insert(backGoods);
-//                    relationId = backGoods.getBackGoodsId();
-//                    orderStatus = 3;
-//                    break;
-//                case 7: //无理由退货
-//                    NoreasonBack noreasonBack = (NoreasonBack) object;
-//                    flag = noreasonBackMapper.insert(noreasonBack);
-//                    relationId = noreasonBack.getNoreasonBackId();
-//                    orderStatus = 3;
-//                    break;
-//            }
+            /*添加处理方式*/
+            flag = cmRelationMapper.save(cmRelation);
             if (flag < 1) {
                 throw new RuntimeException("添加客诉处理结果失败");
             }
-            logger.info("-----------添加客诉-添加换新/维修/补发/退货/无理由退货信息成功--------------");
+            logger.info("-----------添加客诉-添加客诉处理成功--------------");
 
             /*添加客诉-添加处理与订单关联表*/
             List<RelationOrder> relationOrderList = new ArrayList<>();
             for (SalesOrder sor : orderList) {
                 RelationOrder ro = new RelationOrder();
-                ro.setRelationType(customerInfo.getCustomerIsSolve());
-                ro.setRelationId(relationId);
+                ro.setRelationId(cmRelation.getRelationId());
                 ro.setSalesId(sor.getSalesId());
                 ro.setRelationCustomerId(customerInfo.getCustomerId());
                 relationOrderList.add(ro);
@@ -290,26 +211,24 @@ public class CustomerServiceImpl implements CustomerService {
                     throw new RuntimeException("添加客诉，关联订单失败");
                 }
             }
+            logger.info("-----------添加客诉-添加处理与订单关联表--------------");
 
             for (SalesOrder sor : orderList) {
                 SalesOrder newOrder = new SalesOrder(); //salesOrderStatus
                 newOrder.setSalesId(sor.getSalesId());
-                newOrder.setSalesOrderStatus(orderStatus);
+                newOrder.setSalesOrderStatus(procMethod.getProcTypeId());
                 flag = salesOrderMapper.updateSalesOrder(newOrder);
                 if(flag < 1){
                     throw new RuntimeException("添加客诉，修改订单失败");
                 }
             }
-            logger.info("-----------添加客诉-添加处理与订单关联表--------------");
-
-            customerCommon.setRelationId(relationId);
-            CustomerCommonUtil.setProduceOrFitting(customerInfo.getCustomerIsSolve(),customerCommon);
-
-            if(customerCommon.getClosedProdcues() != null && customerCommon.getClosedProdcues().size()>0){
-                closedProdcueMapper.insert(customerCommon.getClosedProdcues());
+            logger.info("-----------添加客诉-修改订单--------------");
+            CustomerCommonUtil.setProduceOrFitting(cmRelation);
+            if(cmRelation.getClosedProdcues() != null && cmRelation.getClosedProdcues().size()>0){
+                closedProdcueMapper.insert(cmRelation.getClosedProdcues());
             }
-            if(customerCommon.getSendProdcues() != null && customerCommon.getSendProdcues().size() > 0){
-                sendProdcueMapper.insert(customerCommon.getSendProdcues());
+            if(cmRelation.getSendProdcues() != null && cmRelation.getSendProdcues().size() > 0){
+                sendProdcueMapper.insert(cmRelation.getSendProdcues());
             }
             logger.info("-----------添加客诉-寄回寄出产品配件成功--------------");
         }
@@ -821,53 +740,43 @@ public class CustomerServiceImpl implements CustomerService {
 
     /**
      * 产品配件初始化
-     * @param cc
+     * @param cr
      */
+    @Override
     @Transactional
-    public void setName(CustomerCommon cc){
-        for (int i=0;i<cc.getSendProdcues().size();i++) {
-            ProductColor productColor = productMapper.getProductBySku(cc.getSendProdcues().get(i).getColorBar());
-            cc.getSendProdcues().get(i).setProductColor(productColor);
-            cc.getSendProdcues().get(i).setColorId(productColor.getColorId());
-
+    public void setName(CmRelation cr) {
+        for (int i=0;i<cr.getSendProdcues().size();i++) {
+            ProductColor productColor = productMapper.getProductBySku(cr.getSendProdcues().get(i).getColorBar());
+            cr.getSendProdcues().get(i).setProductColor(productColor);
+            cr.getSendProdcues().get(i).setColorId(productColor.getColorId());
             Product product = productMapper.getProduce(productColor.getColorProductId());
-            cc.getSendProdcues().get(i).setProductId(product.getProductId());
-            cc.getSendProdcues().get(i).setSendProduceName(product.getProductName());
-            cc.getSendProdcues().get(i).setProductType(product.getProductType());
-            cc.getSendProdcues().get(i).setProductNumber(product.getProductNumber());
-        }
-        for (int i=0;i<cc.getSendFittings().size();i++) {
-            FittingsInfo fittingsInfo = productMapper.getFittingsBySku( cc.getSendFittings().get(i).getColorBar());
-            cc.getSendFittings().get(i).setFittingsId(fittingsInfo.getFittingsId());
-            cc.getSendFittings().get(i).setProductId(fittingsInfo.getFittingsId());
-            cc.getSendFittings().get(i).setSendFittingsName(fittingsInfo.getFittingsName());
-
-            Product product = productMapper.getProduce(fittingsInfo.getProductId());
-            cc.getSendFittings().get(i).setSendFittingsName(product.getProductName());
+            cr.getSendProdcues().get(i).setProductId(product.getProductId());
+            cr.getSendProdcues().get(i).setSendProduceName(product.getProductName());
+            cr.getSendProdcues().get(i).setProductType(product.getProductType());
+            cr.getSendProdcues().get(i).setProductNumber(product.getProductNumber());
         }
-        for (int i=0;i<cc.getClosedProdcues().size();i++) {
-            ProductColor productColor = productMapper.getProductBySku(cc.getClosedProdcues().get(i).getColorBar());
-            cc.getClosedProdcues().get(i).setProductColor(productColor);
-            cc.getClosedProdcues().get(i).setColorId(productColor.getColorId());
-
+        for (int i=0;i<cr.getClosedProdcues().size();i++) {
+            ProductColor productColor = productMapper.getProductBySku(cr.getClosedProdcues().get(i).getColorBar());
+            cr.getClosedProdcues().get(i).setProductColor(productColor);
+            cr.getClosedProdcues().get(i).setColorId(productColor.getColorId());
             Product product = productMapper.getProduce(productColor.getColorProductId());
-            cc.getClosedProdcues().get(i).setProductId(product.getProductId());
-            cc.getClosedProdcues().get(i).setClosedProductName(product.getProductName());
-            cc.getClosedProdcues().get(i).setProductType(product.getProductType());
-            cc.getClosedProdcues().get(i).setProductNumber(product.getProductNumber());
-        }
-        for (int i=0;i<cc.getClosedFittings().size();i++) {
-            FittingsInfo fittingsInfo = productMapper.getFittingsBySku(cc.getClosedFittings().get(i).getColorBar());
-            cc.getClosedFittings().get(i).setFittingsId(fittingsInfo.getFittingsId());
-            cc.getClosedFittings().get(i).setProductId(fittingsInfo.getProductId());
-            cc.getClosedFittings().get(i).setClosedFittingsName(fittingsInfo.getFittingsName());
-
-            Product product = productMapper.getProduce(fittingsInfo.getProductId());
-            cc.getClosedFittings().get(i).setClosedProductName(product.getProductName());
+            cr.getClosedProdcues().get(i).setProductId(product.getProductId());
+            cr.getClosedProdcues().get(i).setClosedProductName(product.getProductName());
+            cr.getClosedProdcues().get(i).setProductType(product.getProductType());
+            cr.getClosedProdcues().get(i).setProductNumber(product.getProductNumber());
         }
     }
 
     /**
+     * 产品配件初始化
+     * @param cc
+     */
+    @Override
+    @Transactional
+    public void setName(CustomerCommon cc){
+    }
+
+    /**
      * 添加品检
      * @param complaintDetectInfo
      * @param customerCommon

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

@@ -22,6 +22,14 @@ public interface CmRelationMapper {
      * @return  cmRelation
      */
     CmRelation  getCmRelationById(Integer  id);
+
+    /**
+     * select relation by customer
+     * @param  id
+     * @return  cmRelation
+     */
+    CmRelation  getCmRelationByCustomerId(Integer  id);
+
     /**
      * 增加数据
      * @param  cmRelation

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

@@ -21,12 +21,12 @@
 
   <insert id="insert" parameterType="ClosedProdcue" >
     insert into tb_rst_cm_closed_prodcue ( relation_id, product_id, closed_prodcue_machine_no,
-      color_id, closed_prodcue_number,closed_prodcue_type,color_bar)
+      color_id, closed_prodcue_number,color_bar)
     values
     <foreach collection="list" item="node" index="index" separator="," open="" close="">
       (
         #{node.relationId}, #{node.productId}, #{node.closedProdcueMachineNo},
-       #{node.colorId}, #{node.closedProdcueNumber},#{node.closedProdcueType},#{node.colorBar}
+       #{node.colorId}, #{node.closedProdcueNumber},#{node.colorBar}
       )
     </foreach>
   </insert>

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

@@ -1,6 +1,6 @@
 <?xml version="1.0" encoding="UTF-8" ?>
 <!DOCTYPE mapper PUBLIC "-//mybatis.org//DTD Mapper 3.0//EN" "http://mybatis.org/dtd/mybatis-3-mapper.dtd">
-<mapper namespace="com.mapper.CmRelationMapper">
+<mapper namespace="com.iamberry.rst.service.cm.mapper.CmRelationMapper">
     <resultMap  id="BaseResultMap" type="CmRelation" >
         <result    column="relation_id"    property="relationId" />
         <result    column="proc_method_id"    property="procMethodId" />
@@ -149,10 +149,19 @@
         from tb_rst_cm_relation t
         where t.relation_id= #{relationId}
     </select>
-    <insert id="save" parameterType="CmRelation" >
+
+    <select id="getCmRelationByCustomerId" resultMap="BaseResultMap" parameterType="Integer" >
+        select
+        <include refid="Base_List" />
+        from tb_rst_cm_relation t
+        where t.customer_id= #{customerId}
+    </select>
+
+    <insert id="save" parameterType="CmRelation"  useGeneratedKeys="true"  keyProperty="relationId" >
         insert into
         tb_rst_cm_relation
         (
+        relation_id,
         proc_method_id,
         customer_id,
         signclosed_id,
@@ -185,6 +194,7 @@
         )
         values
         (
+         #{relationId},
         #{procMethodId},
         #{customerId},
         #{signclosedId},

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

@@ -53,12 +53,12 @@
 
   <insert id="insert" parameterType="SendProdcue" >
     insert into tb_rst_cm_send_prodcue ( relation_id, product_id,
-      color_id, send_prodcue_number,send_produce_type,color_bar)
+      color_id, send_prodcue_number,color_bar)
     values
     <foreach collection="list" item="node" index="index" separator="," open="" close="">
       (
         #{node.relationId}, #{node.productId},
-        #{node.colorId}, #{node.sendProdcueNumber}, #{node.sendProduceType}, #{node.colorBar}
+        #{node.colorId}, #{node.sendProdcueNumber},  #{node.colorBar}
       )
     </foreach>
 

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

@@ -11,6 +11,7 @@ public class CustomerCommonUtil {
      * @param type 处理结果： 1：已解决  2：未解决 3：换新  4：维修 5：补发 6：退货 7：无理由退货
      * @return
      */
+    @Deprecated
     public static Object getRelation(Integer type,CustomerCommon c){
         switch (type){
             case 3: //换新
@@ -156,6 +157,7 @@ public class CustomerCommonUtil {
      * @param object
      * @return
      */
+    @Deprecated
     public static CustomerCommon getCustomerCommon(int solve, Object object) {
         if (object == null) {
             return null;
@@ -309,6 +311,7 @@ public class CustomerCommonUtil {
      * @param relationList
      * @return
      */
+    @Deprecated
     public static List<CustomerCommon> listToCustomerCommon(int solve,List<?> relationList){
         List<CustomerCommon> ccList = new ArrayList<>();
         for (Object relation : relationList){
@@ -324,6 +327,7 @@ public class CustomerCommonUtil {
      * 售后类型  3：换新;4：维修;5：补发;6：退货;7：无理由退货
      * @param type
      */
+    @Deprecated
     public static void setProduceOrFitting(Integer type,CustomerCommon cc){
         for (int i=0;i<cc.getSendProdcues().size();i++) {
             cc.getSendProdcues().get(i).setSendProduceType(type);
@@ -343,6 +347,18 @@ public class CustomerCommonUtil {
         }
     }
 
+    /**
+     * 将所有的寄回寄出中的类型改为  type
+     * @param cc
+     */
+    public static void setProduceOrFitting(CmRelation cc){
+        for (int i=0;i<cc.getSendProdcues().size();i++) {
+            cc.getSendProdcues().get(i).setRelationId(cc.getRelationId());
+        }
+        for (int i=0;i<cc.getClosedProdcues().size();i++) {
+            cc.getClosedProdcues().get(i).setRelationId(cc.getRelationId());
+        }
+    }
 
 
 

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

@@ -105,6 +105,10 @@ public class AdminCustomerController {
     private RelationOrderService relationOrderService;
     @Autowired
     private GenerateKeyUtil generateKeyUtil ;
+    @Autowired
+    private CmRelationService cmRelationService ;
+    @Autowired
+    private ProcMethodService procMethodService ;
 
 
     /**
@@ -173,95 +177,18 @@ public class AdminCustomerController {
         Integer loginAdminId = AdminUtils.getLoginAdminId();
         //查询客诉基本信息
         CustomerInfo customerInfo = customerService.getCustomerInfo(customerId);
-        /*客诉信息处理-stast*/
-        //对于区域处理
-        if (customerInfo != null && customerInfo.getCustomerArea() != null) {
-//            String[] customerAreaAndCity = customerInfo.getCustomerArea().split("-");
-//            customerInfo.setProvinceName(customerAreaAndCity[0]);
-//            City city
-//            addressService.listCity(customerAreaAndCity[0]);
-//            customerInfo.setCityName(customerAreaAndCity[0]);
-        }
-        /*客诉信息处理-end*/
-        CustomerCommon customerCommon = new CustomerCommon();
-        if (customerInfo.getCustomerIsSolve() != null) {
-            switch (customerInfo.getCustomerIsSolve()) {   //处理结果： 1：已解决  2：未解决 3：换新  4：维修 5：补发 6：退货 7：无理由退货
-                case 3://获取换新
-                    Renewed renewed = new Renewed();
-                    renewed.setCustomerId(customerInfo.getCustomerId());
-                    renewed = renewedService.getRenewed(renewed);
-                    customerCommon = CustomerCommonUtil.getCustomerCommon(3, renewed);
-                    break;
-                case 4://维修
-                    Repair repair = new Repair();
-                    repair.setCustomerId(customerInfo.getCustomerId());
-                    repair = repairService.getRepair(repair);
-                    customerCommon = CustomerCommonUtil.getCustomerCommon(4, repair);
-                    break;
-                case 5:
-                    Reissue reissue = new Reissue();
-                    reissue.setCustomerId(customerInfo.getCustomerId());
-                    reissue = reissueService.getReissue(reissue);
-                    customerCommon = CustomerCommonUtil.getCustomerCommon(5, reissue);
-                    break;
-                case 6:
-                    BackGoods backGoods = new BackGoods();
-                    backGoods.setCustomerId(customerInfo.getCustomerId());
-                    backGoods = backGoodsService.getBackGoods(backGoods);
-                    customerCommon = CustomerCommonUtil.getCustomerCommon(6, backGoods);
-                    break;
-                case 7:
-                    NoreasonBack noreasonBack = new NoreasonBack();
-                    noreasonBack.setCustomerId(customerInfo.getCustomerId());
-                    noreasonBack = noreasonBackService.getNoreasonBack(noreasonBack);
-                    customerCommon = CustomerCommonUtil.getCustomerCommon(7, noreasonBack);
-                    break;
-            }
-
-            /*查询所有需要寄入寄出的产品*/
-            customerCommon.setCustomerIsSolve(customerInfo.getCustomerIsSolve());
-            customerCommon = customerCommonService.getListProduceAndFitting(customerCommon);
-
-            // 2018/4/18  页面只会给寄回的赋值，在处理方式为补发的情况下，寄出需要赋值到寄回当中
-            if (customerInfo.getCustomerIsSolve() == 5) {
-                //售后寄回产品表
-                List<ClosedProdcue> closedProdcues = new ArrayList<ClosedProdcue>();
-                for (SendProdcue sendProdcue : customerCommon.getSendProdcues()) {
-                    ClosedProdcue closedProdcue = new ClosedProdcue();
-                    closedProdcue.setRelationId(sendProdcue.getRelationId());
-                    closedProdcue.setProductType(sendProdcue.getProductType());
-                    closedProdcue.setProductId(sendProdcue.getProductId());
-                    closedProdcue.setColorId(sendProdcue.getColorId());
-                    closedProdcue.setClosedProductName(sendProdcue.getSendProduceName());
-                    closedProdcue.setClosedColorName(sendProdcue.getSendColorName());
-                    closedProdcue.setClosedProdcueNumber(sendProdcue.getSendProdcueNumber());
-                    closedProdcue.setColorBar(sendProdcue.getColorBar());
-                    closedProdcues.add(closedProdcue);
-                }
-                //售后寄回产品配件表
-                List<ClosedFitting> closedFittings = new ArrayList<ClosedFitting>();
-                for (SendFitting sendFitting : customerCommon.getSendFittings()) {
-                    ClosedFitting closedFitting = new ClosedFitting();
-                    closedFitting.setRelationId(sendFitting.getRelationId());
-                    closedFitting.setClosedFittingType(sendFitting.getSendFittingType());
-                    closedFitting.setProductId(sendFitting.getProductId());
-                    closedFitting.setFittingsId(sendFitting.getFittingsId());
-                    closedFitting.setClosedProductName(sendFitting.getSendProductName());
-                    closedFitting.setClosedFittingsName(sendFitting.getSendFittingsName());
-                    closedFitting.setClosedFittingNumber(sendFitting.getSendFittingNumber());
-                    closedFitting.setColorBar(sendFitting.getColorBar());
-                    closedFittings.add(closedFitting);
-                }
-                customerCommon.setClosedProdcues(closedProdcues);
-                customerCommon.setClosedFittings(closedFittings);
-            }
-            mv.addObject("customerCommon", customerCommon);
-
-            if (customerInfo.getTypeId() == 1) {
-                customerInfo.setIsNeedSelectOrder(2);       //不需要订单
-            } else {
-                customerInfo.setIsNeedSelectOrder(1);
-            }
+        /*查询处理方式*/
+        CmRelation cmRelation = cmRelationService.getCmRelationByCustomerId(customerInfo.getCustomerId());
+        /*获取寄出寄入产品*/
+        cmRelationService.getSendAndBackProduct(cmRelation);
+        /*处理方式*/
+        ProcMethod procMethod = procMethodService.getProcMethodById(cmRelation.getProcMethodId());
+
+        if (customerInfo.getTypeId() == 1 || (procMethod.getProcMethodIsSend()==2 && procMethod.getProcMethodIsBack() == 2)) {
+            customerInfo.setIsNeedSelectOrder(2);       //不需要订单
+        } else {
+            customerInfo.setIsNeedSelectOrder(1);
+        }
 
             /*查询所有的产品，颜色和配件信息*/
 //            List<Product> productList = productService.listProduce(new Product());
@@ -278,31 +205,30 @@ public class AdminCustomerController {
 //            }
 //            mv.addObject("productList", productList);
 
-            if (customerInfo.getTypeId() != 1 && (customerInfo.getCustomerIsSolve() == 3 || customerInfo.getCustomerIsSolve() == 4 || customerInfo.getCustomerIsSolve() == 5 ||
-                    customerInfo.getCustomerIsSolve() == 6 || customerInfo.getCustomerIsSolve() == 7)) {
-                RelationOrder relationOrder = new RelationOrder();
-                relationOrder.setRelationType(customerCommon.getCustomerIsSolve());
-                relationOrder.setRelationId(customerCommon.getRelationId());
-                List<RelationOrder> relationOrderList = relationOrderService.getRelationOrderList(relationOrder);
+        //setIsNeedSelectOrder
+        if (customerInfo.getIsNeedSelectOrder() == 1 ) {
+            RelationOrder relationOrder = new RelationOrder();
+            relationOrder.setRelationId(cmRelation.getRelationId());
+            List<RelationOrder> relationOrderList = relationOrderService.getRelationOrderList(relationOrder);
 
-                String[] salesIds = new String[relationOrderList.size()];
-                for (int k = 0; k < relationOrderList.size(); k++) {
-                    salesIds[k] = String.valueOf(relationOrderList.get(k).getSalesId());
-                }
-                SalesOrder so = new SalesOrder();
-                so.setSalesIds(salesIds);
-                List<SalesOrder> orderList = salesOrderService.listSalesOrder(so);
-                for (SalesOrder sor : orderList) {
-                    SalesOrderItem salesOrderItem = new SalesOrderItem();
-                    salesOrderItem.setItemOrderId(sor.getSalesId());
-                    List<SalesOrderItem> salesOrderItemList = salesOrderService.listSalesOrderItem(salesOrderItem);
-                    sor.setSalesOrderItemList(salesOrderItemList);
-                }
-                mv.addObject("salesOrderList", orderList);
-            } else {
-                mv.addObject("salesOrderList", null);
+            String[] salesIds = new String[relationOrderList.size()];
+            for (int k = 0; k < relationOrderList.size(); k++) {
+                salesIds[k] = String.valueOf(relationOrderList.get(k).getSalesId());
+            }
+            SalesOrder so = new SalesOrder();
+            so.setSalesIds(salesIds);
+            List<SalesOrder> orderList = salesOrderService.listSalesOrder(so);
+            for (SalesOrder sor : orderList) {
+                SalesOrderItem salesOrderItem = new SalesOrderItem();
+                salesOrderItem.setItemOrderId(sor.getSalesId());
+                List<SalesOrderItem> salesOrderItemList = salesOrderService.listSalesOrderItem(salesOrderItem);
+                sor.setSalesOrderItemList(salesOrderItemList);
             }
+            mv.addObject("salesOrderList", orderList);
+        } else {
+            mv.addObject("salesOrderList", null);
         }
+
         if ("2".equals(customerInfo.getCustomerIsVisit())) { //1:不需要回访  2:需要回访
             Visit visit = new Visit();
             visit.setCustomerId(customerInfo.getCustomerId());
@@ -320,7 +246,8 @@ public class AdminCustomerController {
         ComplaintTypeInfo complaintTypeInfo = new ComplaintTypeInfo();
         List<ComplaintTypeInfo> complaintTypeInfoList = complaintTypeInfoService.listComplaintTypeInfo(complaintTypeInfo);
 
-
+        mv.addObject("cmRelation", cmRelation);
+        mv.addObject("procMethod", procMethod);
         mv.addObject("customerInfo", customerInfo);
         mv.addObject("typeList", typeList);
         mv.addObject("complaintTypeList", complaintTypeList);
@@ -866,7 +793,7 @@ public class AdminCustomerController {
     @RequiresPermissions("customer:add:customer")
     @RequestMapping("/save_customer")
     public ResponseJson addCustomer(HttpServletRequest request, CustomerInfo customerInfo, SalesOrder salesOrder, CmRelation cmRelation,
-                                    String sendProdcuesJson,  String closedProdcuesJson) throws Exception {
+                                    String sendProdcuesJson,String closedProdcuesJson) throws Exception {
         ResponseJson rjx = this.isValiData(customerInfo);
         if (rjx.getResultCode() == 500) {
             return rjx;

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

@@ -349,59 +349,26 @@
             </div>
 
             <input type="hidden" id="sendProdcues" name="sendProdcuesJson" value="">
-            <input type="hidden" id="sendFittings" name="sendFittingsJson" value="">
             <input type="hidden" id="closedProdcues" name="closedProdcuesJson" value="">
-            <input type="hidden" id="closedFittings" name="closedFittingsJson" value="">
+
+            <input type="hidden" id="customerIsSolve" name="customerIsSolve" value="">
 
             <div class="row cl init_proMethod" id="" code="returnCode" msg="resultMsg" data="returnMsg" >
                 <label class="form-label col-1 col-sm-1">处理结果：</label>
                 <div class="formControls col-2 col-sm-2">
                     <span class="select-box">
-                         <select class="select" id="procTypeId" ulcId="2" ulcValName="procTypeName" ulcValId="procTypeId"  ulcURL="/admin/proc/type" msg="" ulcList="list">
+                         <select class="select" id="procTypeId" name="procTypeId" ulcId="2" ulcValName="procTypeName" ulcValId="procTypeId"  ulcURL="/admin/proc/type" msg="" ulcList="list">
                          </select>
                      </span>
                 </div>
                 <div class="formControls col-2 col-sm-2">
                     <span class="select-box">
-                         <select class="select" id="procMethodId"  ulcId="3"  ulcValName="procMethodName" ulcValId="procMethodId"  ulcURL="/admin/proc/method?procTypeId=" msg="" ulcList="list" >
+                         <select class="select" id="procMethodId" name="procMethodId"  ulcId="3"  ulcValName="procMethodName" ulcValId="procMethodId"  ulcURL="/admin/proc/method?procTypeId=" msg="" ulcList="list" >
                          </select>
                      </span>
                 </div>
             </div>
-            <#--
-            <div class="row cl">
-                <label class="form-label col-1 col-sm-1">处理类型：</label>
-                <div class="formControls col-10 col-sm-10 skin-minimal">
-                    <div class="radio-box" id="solved">
-                        <input type="radio" id="customer-process-1" value="1" name="customerIsSolve" >
-                        <label for="customer-process-1">已解决</label>
-                    </div>
-                    <div class="radio-box" id="noSolved">
-                        <input type="radio" id="customer-process-2" value="2" name="customerIsSolve">
-                        <label for="customer-process-2">未解决</label>
-                    </div>
-                    <div class="radio-box" id="renewed" style="display: none">
-                        <input type="radio" id="customer-process-3" value="3" name="customerIsSolve" checked>
-                        <label for="customer-process-3">换新</label>
-                    </div>
-                    <div class="radio-box" id="maintain" style="display: none">
-                        <input type="radio" id="customer-process-4" value="4" name="customerIsSolve" >
-                        <label for="customer-process-4">维修</label>
-                    </div>
-                    <div class="radio-box" id="reissue" style="display: none">
-                        <input type="radio" id="customer-process-5" value="5" name="customerIsSolve">
-                        <label for="customer-process-5">补发</label>
-                    </div>
-                    <div class="radio-box" id="backGoods" style="display: none">
-                        <input type="radio" id="customer-process-6" value="6" name="customerIsSolve">
-                        <label for="customer-process-6">退货</label>
-                    </div>
-                    <div class="radio-box" id="noReasonBack" style="display: none">
-                        <input type="radio" id="customer-process-7" value="7" name="customerIsSolve">
-                        <label for="customer-process-7">无理由退货</label>
-                    </div>
-                </div>
-            </div>-->
+
 
             <div class="row cl" style="display: none;">
                 <label class="form-label col-1 col-sm-1"></label>

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

@@ -455,13 +455,13 @@
             <div class="row cl" id="recipientInfo" style="display: none;">
                 <label class="form-label col-1 col-sm-1"></label>
                 <div class="formControls col-2 col-sm-2">
-                    <input type="text" class="input-text" value="${customerCommon.relationSendName!''}" placeholder="填写收件人姓名" id="sendName" name="relationSendName" datatype="/^[\u4e00-\u9fa5]{1,20}$/" errormsg="联系人格式不正确！" >
+                    <input type="text" class="input-text" value="${cmRelation.relationSendName!''}" placeholder="填写收件人姓名" id="sendName" name="relationSendName" datatype="/^[\u4e00-\u9fa5]{1,20}$/" errormsg="联系人格式不正确！" >
                 </div>
                 <div class="formControls col-2 col-sm-2">
-                    <input type="text" class="input-text" value="${customerCommon.relationSendTel!''}" placeholder="填写收件人手机号" id="sendTel" name="relationSendTel" datatype="m" errormsg="联系人电话格式不正确！">
+                    <input type="text" class="input-text" value="${cmRelation.relationSendTel!''}" placeholder="填写收件人手机号" id="sendTel" name="relationSendTel" datatype="m" errormsg="联系人电话格式不正确！">
                 </div>
                 <div class="formControls col-2 col-sm-2"  id="postageAccount">
-                    <input type="text" class="input-text" value="${customerCommon.relationAlipay!''}" placeholder="邮费转账 支付宝账户" id="relationAlipay" name="relationAlipay" errormsg="邮费转账账户！">
+                    <input type="text" class="input-text" value="${cmRelation.relationAlipay!''}" placeholder="邮费转账 支付宝账户" id="relationAlipay" name="relationAlipay" errormsg="邮费转账账户！">
                 </div>
             </div>
             <div class="row cl" id="recipientAddress" style="display: none;">
@@ -493,7 +493,7 @@
             <div class="row cl" id="recipientAddressText" style="display: none;">
                 <label class="form-label col-1 col-sm-1"></label>
                 <div class="formControls col-5 col-sm-5">
-                    <textarea name="relationSendAddress" id="sendAddress" cols="" rows="2" datatype="*" errormsg="收货地址不正确！" class="textarea" placeholder="请填写详细地址，最多支持50字符" onKeyUp="$.Huitextarealength(this,50)">${customerCommon.relationSendAddress!''}</textarea>
+                    <textarea name="relationSendAddress" id="sendAddress" cols="" rows="2" datatype="*" errormsg="收货地址不正确！" class="textarea" placeholder="请填写详细地址，最多支持50字符" onKeyUp="$.Huitextarealength(this,50)">${cmRelation.relationSendAddress!''}</textarea>
                     <span id="addrssMsg"></span>
                 </div>
             </div>
@@ -512,8 +512,8 @@
                         </thead>
                         <tbody id="addProduct">
 
-                            <#if (customerCommon.closedProdcues?size>0)>
-                                <#list customerCommon.closedProdcues as closedProdcues>
+                            <#if (cmRelation.closedProdcues?size>0)>
+                                <#list cmRelation.closedProdcues as closedProdcues>
                                 <tr>
                                         <td style="text-align: center;">
                                             ${closedProdcues.closedProductName!""}
@@ -532,7 +532,7 @@
                                         </td>
                                 </tr>
                                 </#list>
-                                <#list customerCommon.closedFittings as closedFittings>
+                                <#list cmRelation.closedFittings as closedFittings>
                                     <tr>
                                         <td style="text-align: center;">
                                             ${closedFittings.closedProductName!""}
@@ -564,11 +564,11 @@
                     <div class="row cl" id="customerCostsDiv" style="display: none;">
                             <label class="form-label col-1 col-sm-1">工厂报价：</label>
                     <div class="col-2 col-sm-2">
-                            <input type="text" class="input-text trim_input" placeholder="工厂报价" id="relationFactoryCosts" name="relationFactoryCosts" value="${customerCommon.relationFactoryCosts!''}">
+                            <input type="text" class="input-text trim_input" placeholder="工厂报价" id="relationFactoryCosts" name="relationFactoryCosts" value="${cmRelation.relationFactoryCosts!''}">
                             </div>
                             <label class="form-label col-1 col-sm-1">给客户报价：</label>
                     <div class="col-2 col-sm-2">
-                            <input type="text" class="input-text trim_input" placeholder="客户报价" id="relationCustomerCosts" name="relationCustomerCosts" value="${customerCommon.relationCustomerCosts!''}">
+                            <input type="text" class="input-text trim_input" placeholder="客户报价" id="relationCustomerCosts" name="relationCustomerCosts" value="${cmRelation.relationCustomerCosts!''}">
                             </div>
                             </div>
                     <div class="row cl" id="sendInformationTitle">
@@ -1057,20 +1057,20 @@
      */
     function setAddressInfo(){
         var proId = setPro(null,1);  //创建省
-        <#if customerCommon.provinceNumber?? >
-            var proId = ${customerCommon.provinceNumber!''};
+        <#if cmRelation.provinceNumber?? >
+            var proId = ${cmRelation.provinceNumber!''};
             $("#province option[value='"+ proId +"']").attr("selected","true"); //设置省
         </#if>
 
         var cityId = setCity(null,proId,2);
-        <#if customerCommon.cityNumber?? >
-            var cityId = ${customerCommon.cityNumber!''};
+        <#if cmRelation.cityNumber?? >
+            var cityId = ${cmRelation.cityNumber!''};
             $("#city option[value='" + cityId + "']").attr("selected", "true"); //设置市
         </#if>
 
         setDistrict(null, cityId, 2);
-        <#if customerCommon.areaNumber?? >
-            var disId = ${customerCommon.areaNumber!''};
+        <#if cmRelation.areaNumber?? >
+            var disId = ${cmRelation.areaNumber!''};
             $("#district option[value='" + disId + "']").attr("selected", "true"); //设置地区
             isInitAddress = 1;
         </#if>

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

@@ -8,6 +8,7 @@
                 /*配置删除的字符，用于设置name的时候，需要删除某些字符更好确认选项*/
                 judgeNameShield : [],
                 /*选中的数据，按照集合的形式存放 -- 用于回调出去*/
+                dataList : [],
                 data : [],
                 allCallback:function (array) {}
             },
@@ -50,6 +51,7 @@
                 /*初始化层次结构*/
                 $(this.ulcNode).attr("ulclevel",index);
             });
+            this.options.dataList = new Array(num);
             this.options.data = new Array(num);
         },
         initUlcHtml : function(level,id,thisId){
@@ -102,13 +104,14 @@
                     // $(node.ulcNode).unbind("change"); //移除change
 
                     /* 将每次选中的数据加入到data */
-                    var valId = $(node.ulcNode).val();
-                    $(res.data).each(function (){
-                        var data =  node.parseData(this);
-                        if(valId == data.id){
-                            ulc.options.data[level] = this;
-                        }
-                    });
+                    ulc.options.dataList[level] = res.data;
+                    // var valId = $(node.ulcNode).val();
+                    // $(res.data).each(function (){
+                    //     var data =  node.parseData(this);
+                    //     if(valId == data.id){
+                    //         ulc.options.dataList[level] = this;
+                    //     }
+                    // });
 
                     /* 绑定事件 */
                     if(ulc.options.ulcLevel.length-1 > level &&  node.isSelected == 1){
@@ -280,13 +283,20 @@
             /*绑定回调函数的值*/
             this.options.ulcLevel[level].callback(this.options.data[level]);
         },
-        allBackData:function (level) {
-            if(this.ulcIsEmpty(level)){
-                /*绑定回调函数的值*/
-                this.options.allCallback(this.options.data[level]);
-            }else{
-                this.options.allCallback(this.options.data);
+        allBackData:function () {
+            var ulc = this;
+            for (var i=0;i<ulc.options.ulcLevel.length;i++){
+                var node = ulc.options.ulcLevel[i];
+                var valId = $(node.ulcNode).val();
+                var dataList = ulc.options.dataList[i];
+                $(dataList).each(function (){
+                    var data =  node.parseData(this);
+                    if(valId == data.id){
+                        ulc.options.data[i] = this;
+                    }
+                });
             }
+            this.options.allCallback(ulc.options.data);
         },
         setUlcCallback:function (fun,level) {
             /*回调函数设置*/
@@ -367,13 +377,13 @@ function init_ulc(node){
     return ulc;
 };
 
-function ulcSecc(data) {
-    console.log(JSON.stringify(data));
-}
-
-function ulcSecc1(data) {
-    console.log("------"+JSON.stringify(data));
-}
+// function ulcSecc(data) {
+//     console.log(JSON.stringify(data));
+// }
+//
+// function ulcSecc1(data) {
+//     console.log("------"+JSON.stringify(data));
+// }
 //
 // var  ulcLevel = new Array();
 // $(node).find("select").each(function () {

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

@@ -392,10 +392,12 @@ function initProduceType(){
                     default:
                         break;
                 }
-                opentionSelectOrder(isOrder);
+                isNeedSelectOrder = isOrder ;
+                opentionSelectOrder();
             })
             /*当前第一个默认选中上朵电动牙刷  isNeedSelectOrder = 2  默认不需要选择订单*/
-            opentionSelectOrder(2);
+            isNeedSelectOrder = 2 ;
+            opentionSelectOrder();
         },
         error: function(XmlHttpRequest, textStatus, errorThrown){
         }
@@ -1396,8 +1398,7 @@ function setStore(companyId,node){
  * 控制展示订单
  *  1：需要有订单    2：不需要有订单
  */
-function  opentionSelectOrder(type){
-    isNeedSelectOrder = type ;
+function  opentionSelectOrder(){
     opentionSelectOrderDiv();
 }
 
@@ -1464,6 +1465,9 @@ $(function(){
 
 /* 添加客诉的准备 */
 function addCustomerReady(){
+
+    $("#customerIsSolve").val($("#procMethodId").val());
+
     /* 是否需要添加订单，赋值 */
     $("#isNeedSelectOrder").val(isNeedSelectOrder);
     if(isNeedSelectOrder == 1){