客诉修改

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

@@ -29,7 +29,7 @@ public class Postage implements Serializable {
     //订单来源 销售渠道id
     private Integer postageOrderSource;
     //售后处理方式 3：换新  4：维修  5：补发  6：退货  7：无理由退货
-    private Integer postageTreatmentMethod;
+//    private Integer postageTreatmentMethod;
     //efast订单号
     private String salesOrderId;
     //客户姓名
@@ -119,14 +119,6 @@ public class Postage implements Serializable {
         this.postageOrderSource = postageOrderSource;
     }
 
-    public Integer getPostageTreatmentMethod() {
-        return postageTreatmentMethod;
-    }
-
-    public void setPostageTreatmentMethod(Integer postageTreatmentMethod) {
-        this.postageTreatmentMethod = postageTreatmentMethod;
-    }
-
     public String getSalesOrderId() {
         return salesOrderId;
     }

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

@@ -1,26 +0,0 @@
-package com.iamberry.rst.faces.cm;
-
-import com.iamberry.rst.core.cm.BackGoods;
-
-/**
- * 退货service
- * Created by liuzhiwei on 2017/11/8.
- */
-@Deprecated
-public interface BackGoodsService {
-
-    /**
-     * 修改售后退货信息
-     * @param record
-     * @return
-     */
-    Integer updateBackGoods(BackGoods record, String closedProducts, String closedFittings);
-
-
-    /**
-     * 查询售后退货信息
-     * @param backGoods
-     * @return
-     */
-    BackGoods getBackGoods(BackGoods backGoods);
-}

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

@@ -41,6 +41,12 @@ public interface CmRelationService {
      */
     Integer  update(CmRelation  cmRelation);
     /**
+     * 修改数据
+     * @param  cmRelation
+     * @return Integer
+     */
+    Integer  updateStatus(CmRelation  cmRelation);
+    /**
      * 删除数据
      * @param  id
      * @return Integer

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

@@ -1,44 +0,0 @@
-package com.iamberry.rst.faces.cm;
-
-import com.iamberry.rst.core.cm.*;
-
-import java.util.List;
-
-@Deprecated
-public interface CustomerCommonService {
-    /**
-     * 获取寄送寄回的产品和配件
-     * @param customerCommon
-     * @return
-     */
-    CustomerCommon getListProduceAndFitting(CustomerCommon customerCommon);
-
-    /**
-     * 获取换新，维修，表的状态
-     * @param customerCommon
-     * @return
-     */
-    List<CustomerCommon> listCustomerCommon(CustomerCommon customerCommon);
-
-    /**
-     * 根据寄回状态查询对应的客诉数量
-     * @param customerCommon
-     * @return
-     */
-    Integer listCustomerCommonByStatus(CustomerCommon customerCommon);
-
-    /**
-     * 修改
-     * @param customerCommon
-     * @return
-     */
-    Integer updateCustomerCommon(CustomerCommon customerCommon);
-
-    /**
-     * 修改处理结果的状态，并添加邮费转账
-     * @param customerCommon
-     * @return
-     */
-    Integer updateCommonAndAddPostage(CustomerCommon customerCommon);
-
-}

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

@@ -1,38 +0,0 @@
-package com.iamberry.rst.faces.cm;
-
-import com.iamberry.rst.core.cm.FittingsInfo;
-
-import java.util.List;
-
-/**
- * 客诉-产品配件service
- */
-@Deprecated
-public interface FittingsInfoService {
-    /**
-     * 添加配件信息
-     * @param fittingsInfo
-     * @return
-     */
-    Integer addFittingsInfo(FittingsInfo fittingsInfo);
-
-    /**
-     * 根据id查询配件信息
-     * @param fittingsId
-     * @return
-     */
-    FittingsInfo getFittingsById(Integer fittingsId);
-
-    /**
-     * 修改配件信息
-     * @param fittingsInfo
-     * @return
-     */
-    Integer updateFittingsInfo(FittingsInfo fittingsInfo);
-
-    /**
-     * 查询所有配件信息
-     * @return
-     */
-    List<FittingsInfo> listFittings(FittingsInfo fittingsInfo);
-}

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

@@ -1,24 +0,0 @@
-package com.iamberry.rst.faces.cm;
-
-import com.iamberry.rst.core.cm.NoreasonBack;
-
-/**
- * Created by liuzhiwei on 2017/11/14.
- */
-@Deprecated
-public interface NoreasonBackService {
-
-    /**
-     * 修改无理由退货信息
-     * @param record
-     * @return
-     */
-    Integer updateNoreasonBack(NoreasonBack record, String closedProducts, String closedFittings);
-
-    /**
-     * 获取无理由退货信息
-     * @param noreasonBack
-     * @return
-     */
-    NoreasonBack getNoreasonBack(NoreasonBack noreasonBack);
-}

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

@@ -1,32 +0,0 @@
-package com.iamberry.rst.faces.cm;
-
-import com.iamberry.rst.core.cm.Reissue;
-
-import java.util.List;
-
-/**
- * Created by Administrator on 2017/11/9.
- */
-@Deprecated
-public interface ReissueService {
-
-    /**
-     * 修改售后补发信息
-     * @param record
-     * @return
-     */
-    Integer updateReissueInfo(Reissue record);
-    /**
-     * 查询售后补发集合 同步efast
-     * @param reissue
-     * @return
-     */
-    List<Reissue> listSynchronizingReissue(Reissue reissue);
-
-    /**
-     * 获取维修信息
-     * @param reissue
-     * @return
-     */
-    Reissue getReissue(Reissue reissue);
-}

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

@@ -1,41 +0,0 @@
-package com.iamberry.rst.faces.cm;
-
-import com.iamberry.rst.core.cm.ClosedFitting;
-import com.iamberry.rst.core.cm.Renewed;
-
-import java.util.List;
-
-/**
- * 换新service
- * Created by liuzhiwei on 2017/11/7.
- */
-@Deprecated
-public interface RenewedService {
-
-    /**
-     * 获取寄回配件集合
-     * @param closedFitting
-     * @return
-     */
-    List<ClosedFitting> listClosedFitting(ClosedFitting closedFitting);
-
-    /**
-     * 修改换新信息
-     * @param record
-     * @return
-     */
-    Integer updateRenewedInfo(Renewed record, String closedProducts, String closedFittings);
-
-    /**
-     * 获取所有需要同步的换新数据
-     * @return
-     */
-    List<Renewed> listSynchronizingRenewed(Renewed renewed);
-
-    /**
-     * 获取换新
-     * @param record
-     * @return
-     */
-    Renewed getRenewed(Renewed record);
-}

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

@@ -1,34 +0,0 @@
-package com.iamberry.rst.faces.cm;
-
-import com.iamberry.rst.core.cm.Repair;
-
-import java.util.List;
-
-/**
- * 维修Service
- * Created by liuzhiwei on 2017/11/8.
- */
-@Deprecated
-public interface RepairService {
-
-    /**
-     * 修改维修信息
-     * @param repair
-     * @return
-     */
-    Integer updateRepairInfo(Repair repair, String closedProducts, String closedFittings);
-
-    /**
-     * 查询售后维修需要同步订单的数据集合
-     * @param repair
-     * @return
-     */
-    List<Repair> listSynchronizingRepair(Repair repair);
-
-    /**
-     * 获取维修信息
-     * @param repair
-     * @return
-     */
-    Repair getRepair(Repair repair);
-}

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

@@ -1,96 +0,0 @@
-package com.iamberry.rst.service.cm;
-
-import com.iamberry.rst.core.cm.BackGoods;
-import com.iamberry.rst.core.cm.ClosedFitting;
-import com.iamberry.rst.core.cm.ClosedProdcue;
-import com.iamberry.rst.faces.cm.BackGoodsService;
-import com.iamberry.rst.service.cm.mapper.BackGoodsMapper;
-import com.iamberry.rst.service.cm.mapper.ClosedFittingMapper;
-import com.iamberry.rst.service.cm.mapper.ClosedProdcueMapper;
-import org.apache.commons.lang.StringUtils;
-import org.springframework.beans.factory.annotation.Autowired;
-import org.springframework.stereotype.Service;
-
-import java.util.ArrayList;
-import java.util.List;
-
-/**
- * 退货service
- * Created by liuzhiwei on 2017/11/8.
- */
-@Service
-public class BackGoodsServiceImpl implements BackGoodsService {
-
-    @Autowired
-    private BackGoodsMapper backGoodsMapper;
-    @Autowired
-    private ClosedProdcueMapper closedProdcueMapper;
-    @Autowired
-    private ClosedFittingMapper closedFittingMapper;
-
-    @Override
-    public Integer updateBackGoods(BackGoods record, String closedProducts, String closedFittings) {
-//        int productNum = 1;
-//        int fittingNum = 1;
-        /*List<ClosedProdcue> produceList = new ArrayList<ClosedProdcue>();
-        List<ClosedFitting> fittingList = new ArrayList<ClosedFitting>();
-        if (StringUtils.isNotEmpty(closedProducts)) {
-            ClosedProdcue closedProdcue = new ClosedProdcue();
-            closedProdcue.setRelationId(record.getBackGoodsId());
-            closedProdcue.setClosedProdcueType(6);
-            //删除原有寄回产品
-            int delNum = closedProdcueMapper.deleteProduce(closedProdcue);
-            //去掉最后一个","
-            closedProducts = closedProducts.substring(0,closedProducts.length()-1);
-            String[] products = closedProducts.split(",");
-            for (int i = 0;i < products.length;i++) {
-                String[] colors = products[i].split(":");
-                ClosedProdcue prodcue = new ClosedProdcue();
-                prodcue.setRelationId(record.getBackGoodsId());
-                prodcue.setClosedProdcueType(6);
-                prodcue.setProductId(Integer.parseInt(colors[0]));
-                prodcue.setColorId(Integer.parseInt(colors[1]));
-                prodcue.setClosedProdcueNumber(Integer.parseInt(colors[2]));
-                produceList.add(prodcue);
-            }
-            //批量添加寄回产品
-            productNum = closedProdcueMapper.insert(produceList);
-        }
-        if (StringUtils.isNotEmpty(closedFittings)) {
-            ClosedFitting closedFitting = new ClosedFitting();
-            closedFitting.setRelationId(record.getBackGoodsId());
-            closedFitting.setClosedFittingType(6);
-            //删除原有寄回配件信息
-            int delNum = closedFittingMapper.deleteFitting(closedFitting);
-            closedFittings = closedFittings.substring(0,closedFittings.length()-1);
-            String[] fittings = closedFittings.split(",");
-            for (int i = 0;i < fittings.length;i++) {
-                String[] fitting = fittings[i].split(":");
-                ClosedFitting cFitting = new ClosedFitting();
-                cFitting.setRelationId(record.getBackGoodsId());
-                cFitting.setClosedFittingType(6);
-                cFitting.setProductId(Integer.parseInt(fitting[0]));
-                cFitting.setFittingsId(Integer.parseInt(fitting[1]));
-                cFitting.setClosedFittingNumber(Integer.parseInt(fitting[2]));
-                fittingList.add(cFitting);
-            }
-            //批量添加寄回配件
-            fittingNum = closedFittingMapper.insert(fittingList);
-        }*/
-        
-        // TODO: 2018/12/28
-//        int num = backGoodsMapper.updateBackGoods(record);
-//        if (num > 0) {
-//            return 1;
-//        } else {
-//            return 0;
-//        }
-        return 0;
-    }
-
-    @Override
-    public BackGoods getBackGoods(BackGoods backGoods) {
-//        return backGoodsMapper.getBackGoods(backGoods);
-        return null;
-    }
-}

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

@@ -68,6 +68,15 @@ public class CmRelationServiceImpl  implements CmRelationService {
     public  Integer  update(CmRelation  cmRelation){
         return  cmRelationMapper.update(cmRelation);
     }
+
+    @Override
+    public Integer updateStatus(CmRelation cmRelation) {
+        CmRelation cr  = new CmRelation();
+        cr.setRelationId(cmRelation.getRelationId());
+        cr.setRelationBackStatus(4);		//已签收
+        return  cmRelationMapper.update(cr);
+    }
+
     /**
      * 删除数据
      * @param  id

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

@@ -1,7 +1,6 @@
 package com.iamberry.rst.service.cm;
 
 import com.iamberry.rst.core.cm.*;
-import com.iamberry.rst.faces.cm.CustomerCommonService;
 import com.iamberry.rst.service.cm.mapper.*;
 import com.iamberry.rst.util.CustomerCommonUtil;
 import org.springframework.beans.factory.annotation.Autowired;
@@ -13,11 +12,9 @@ import java.util.ArrayList;
 import java.util.List;
 
 @Service
-public class CustomerCommonServiceImpl implements CustomerCommonService {
+public class CustomerCommonServiceImpl{
 
     @Autowired
-    private CustomerCommonService customerCommonService;
-    @Autowired
     private RepairMapper repairMapper;
     @Autowired
     private BackGoodsMapper backGoodsMapper;
@@ -46,7 +43,6 @@ public class CustomerCommonServiceImpl implements CustomerCommonService {
     @Autowired
     private SalesOrderMapper salesOrderMapper;
 
-    @Override
     public CustomerCommon getListProduceAndFitting(CustomerCommon customerCommon) {
         ClosedProdcue closedProdcue = new ClosedProdcue();
         closedProdcue.setClosedProdcueType(customerCommon.getCustomerIsSolve());
@@ -60,7 +56,6 @@ public class CustomerCommonServiceImpl implements CustomerCommonService {
         return customerCommon;
     }
 
-    @Override
     public List<CustomerCommon> listCustomerCommon(CustomerCommon customerCommon) {
         List<CustomerCommon> customerCommonList  = customerCommonMapper.listCustomerCommon(customerCommon);
 
@@ -123,13 +118,10 @@ public class CustomerCommonServiceImpl implements CustomerCommonService {
         return customerCommonList;
     }
 
-    @Override
     public Integer listCustomerCommonByStatus(CustomerCommon customerCommon) {
         return customerCommonMapper.listCustomerCommonByStatus(customerCommon);
     }
 
-    @Override
-    @Transactional
     public Integer updateCustomerCommon(CustomerCommon customerCommon) {
         Integer flag = 0;
 //        switch (customerCommon.getCustomerIsSolve()){
@@ -160,17 +152,15 @@ public class CustomerCommonServiceImpl implements CustomerCommonService {
         return flag;
     }
 
-    @Override
-    @Transactional
     public Integer updateCommonAndAddPostage(CustomerCommon customerCommon) {
         CustomerCommon newCc = new CustomerCommon();
         newCc.setRelationId(customerCommon.getRelationId());
         newCc.setRelationBackStatus(4);		//已签收
         newCc.setCustomerIsSolve(customerCommon.getCustomerIsSolve());
-        Integer flag = customerCommonService.updateCustomerCommon(newCc);
-        if(flag < 1){
-            throw new RuntimeException("修改状态失败");
-        }
+//        Integer flag = customerCommonService.updateCustomerCommon(newCc);
+//        if(flag < 1){
+//            throw new RuntimeException("修改状态失败");
+//        }
 //        CustomerInfo customerInfo = customerInfoMapper.getCustomerInfo(customerCommon.getCustomerId());
 //        if(customerInfo == null){
 //            throw new RuntimeException("查询客诉失败");
@@ -199,7 +189,7 @@ public class CustomerCommonServiceImpl implements CustomerCommonService {
 //                }
 //            }
 //        }
-        return flag;
+        return 0;
     }
 
 }

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

@@ -76,8 +76,6 @@ public class CustomerServiceImpl implements CustomerService {
     @Autowired
     private StoreInfoMapper storeInfoMapper;
     @Autowired
-    private CustomerCommonService customerCommonService;
-    @Autowired
     private RelationOrderService relationOrderService;
     @Autowired
     private ProcMethodService procMethodService;
@@ -1358,171 +1356,172 @@ public class CustomerServiceImpl implements CustomerService {
         * 添加订单
         * 添加寄入寄出
         * */
-        Integer flag = 0;
-        CmRelation cmRelation = new CmRelation();
-        cmRelation.setCustomerId(customerInfo.getCustomerId());
-
-        /*判断是否是新加的客诉*/
-        CmRelation crold = cmRelationMapper.getCmRelationByCustomerId(customerInfo.getCustomerId());
-        if(crold != null ){
-            return 1;
-        }
-
-        CustomerCommon customerCommon = new CustomerCommon();
-        customerCommon.setCustomerId(customerInfo.getCustomerId());
-        List<CustomerCommon> customerCommonList = customerCommonService.listCustomerCommon(customerCommon);
-        if(customerCommonList != null && customerCommonList.size() > 0){
-            customerCommon = customerCommonList.get(0);
-            cmRelation.setRelationBackStatus(customerCommon.getRelationBackStatus());     //寄回状态 1：未寄回 2：已寄回 3：已收货 4: 已签收待确认
-            cmRelation.setRelationBackName(customerCommon.getRelationBackName());   //寄回人姓名
-            cmRelation.setRelationBackTel(customerCommon.getRelationBackTel());  //寄回人电话
-            cmRelation.setRelationBackLogisticsCompany(customerCommon.getRelationBackLogisticsCompany());   //寄回物流公司
-            cmRelation.setRelationBackLogisticsNo(customerCommon.getRelationBackLogisticsNo()); //寄回物流单号
-            cmRelation.setRelationBackPostage(customerCommon.getRelationBackPostage()); //寄回邮费 单位为分
-            cmRelation.setRelationSendStatus(customerCommon.getRelationSendStatus());   //寄送状态 1：未寄送 2：已寄送 3：已收货
-            cmRelation.setRelationSendName(customerCommon.getRelationSendName());//寄送人姓名
-            cmRelation.setRelationSendTel(customerCommon.getRelationSendTel());
-            cmRelation.setProvinceNumber(customerCommon.getProvinceNumber());   //寄送地址-省
-            cmRelation.setCityNumber(customerCommon.getCityNumber());   //寄送地址-市
-            cmRelation.setAreaNumber(customerCommon.getAreaNumber());   //寄送地址-区
-            cmRelation.setRelationSendMergeAddress(customerCommon.getRelationSendMergeAddress());    //寄送地址-省市区
-            cmRelation.setRelationSendAddress(customerCommon.getRelationSendAddress());  //寄送地址-详细地址
-            cmRelation.setRelationSendLogisticsCompany(customerCommon.getRelationSendLogisticsCompany());    //寄送物流公司
-            cmRelation.setRelationSendLogisticsNo(customerCommon.getRelationSendLogisticsNo());  //寄送物流单号
-            cmRelation.setRelationDesc(customerCommon.getRelationDesc());   //备注
-            cmRelation.setRelationState(1);//状态 1：使用中 2：停用中
-            cmRelation.setRelationAlipay(customerCommon.getRelationAlipay());   //转账账户
-            cmRelation.setRelationAlipayName(customerCommon.getRelationAlipayName()); //转账账户姓名
-            cmRelation.setRelationIsTransfer(customerCommon.getRelationIsTransfer());   //是否已转账邮费 0:不需要 1:已转 2:已申请待转 3:未申请
-            cmRelation.setRelationBackReceiptDate(customerCommon.getRelationBackReceiptDate()); //签收日期
-            cmRelation.setRelationFactoryCosts(customerCommon.getRelationFactoryCosts());//工厂维修报价
-            cmRelation.setRelationCustomerCosts(customerCommon.getRelationCustomerCosts());  //客户报价
-            cmRelation.setRelationCreateTime(customerCommon.getRelationCreateTime());
-            cmRelation.setRelationUpdateTime(customerCommon.getRelationUpdateTime());
-
-            cmRelation.setSendProdcues(customerCommon.getSendProdcues());
-            cmRelation.setClosedProdcues(customerCommon.getClosedProdcues());
-        }
-
-        Integer procMethodId;
-        switch (customerInfo.getCustomerIsSolve()){   //1：已解决  2：未解决 3：换新  4：维修 5：补发 6：退货 7：无理由退货     客诉修改
-            case 1:
-                procMethodId = 1;
-                cmRelation.setRelationBackStatus(1);     //寄回状态 1：未寄回 2：已寄回 3：已收货 4: 已签收待确认
-                cmRelation.setRelationSendStatus(1);   //寄送状态 1：未寄送 2：已寄送 3：已收货
-                cmRelation.setRelationSendName(customerInfo.getCustomerName());
-                cmRelation.setRelationBackName(customerInfo.getCustomerName());
-                cmRelation.setRelationSendTel(customerInfo.getCustomerTel());
-                cmRelation.setRelationBackTel(customerInfo.getCustomerTel());
-                cmRelation.setRelationIsTransfer(0);
-                cmRelation.setRelationBackPostage(0);
-                break;
-            case 2:
-                procMethodId = 2;
-                cmRelation.setRelationBackStatus(1);     //寄回状态 1：未寄回 2：已寄回 3：已收货 4: 已签收待确认
-                cmRelation.setRelationSendStatus(1);   //寄送状态 1：未寄送 2：已寄送 3：已收货
-                cmRelation.setRelationSendName(customerInfo.getCustomerName());
-                cmRelation.setRelationBackName(customerInfo.getCustomerName());
-                cmRelation.setRelationSendTel(customerInfo.getCustomerTel());
-                cmRelation.setRelationBackTel(customerInfo.getCustomerTel());
-                cmRelation.setRelationIsTransfer(0);
-                cmRelation.setRelationBackPostage(0);
-                break;
-            case 3:
-                procMethodId = 3;
-                break;
-            case 4:
-                procMethodId = 6;
-                break;
-            case 5:
-                procMethodId = 13;
-                cmRelation.setRelationBackStatus(1);     //寄回状态 1：未寄回 2：已寄回 3：已收货 4: 已签收待确认
-                break;
-            case 6:
-                procMethodId = 10;
-                cmRelation.setRelationSendStatus(1);   //寄送状态 1：未寄送 2：已寄送 3：已收货
-                break;
-            case 7:
-                procMethodId = 8;
-                cmRelation.setRelationSendStatus(1);   //寄送状态 1：未寄送 2：已寄送 3：已收货
-                break;
-            default:
-                procMethodId = 2;
-                cmRelation.setRelationBackStatus(1);     //寄回状态 1：未寄回 2：已寄回 3：已收货 4: 已签收待确认
-                cmRelation.setRelationSendStatus(1);   //寄送状态 1：未寄送 2：已寄送 3：已收货
-                break;
-        }
-        cmRelation.setProcMethodId(procMethodId);
-        cmRelation.setRelationState(1);
-
-        flag = cmRelationMapper.save(cmRelation);
-        if (flag < 1) {
-            throw new RuntimeException("添加处理方式失败");
-        }
-
-        if(customerInfo.getCustomerIsSolve() == 3 || customerInfo.getCustomerIsSolve() == 4 || customerInfo.getCustomerIsSolve() == 5 ||
-                customerInfo.getCustomerIsSolve() == 6 ||customerInfo.getCustomerIsSolve() == 7 ){
-
-            //删除寄出寄回产品 -----
-            ClosedProdcue closedrecord = new ClosedProdcue();
-            SendProdcue sendProdcue = new SendProdcue();
-            closedrecord.setRelationId(customerCommon.getRelationId());
-            closedrecord.setClosedProdcueType(customerCommon.getCustomerIsSolve());
-            closedProdcueMapper.deleteProduce(closedrecord);
-            sendProdcue.setRelationId(customerCommon.getRelationId());
-            sendProdcue.setSendProduceType(customerCommon.getCustomerIsSolve());
-            sendProdcueMapper.deleteByPrimaryKey(sendProdcue);
-
-               /*恢复订单状态 ------------ */
-            RelationOrder relationOrder = new RelationOrder();
-            relationOrder.setRelationType(customerCommon.getCustomerIsSolve());
-            relationOrder.setRelationId(customerCommon.getRelationId());
-            List<RelationOrder> relationOrderList = relationOrderService.getRelationOrderList(relationOrder);
-            for (int k=0; k<relationOrderList.size();k++){
-                SalesOrder newOrder = new SalesOrder(); //salesOrderStatus
-                newOrder.setSalesId(relationOrderList.get(k).getSalesId());
-                newOrder.setSalesOrderStatus(procMethodId);
-                salesOrderMapper.updateSalesOrder(newOrder);
-            }
-
-              /* 删除掉订单与处理的关联表  ----------- */
-            RelationOrder rol = new RelationOrder();
-            rol.setRelationType(customerCommon.getCustomerIsSolve());
-            rol.setRelationId(customerCommon.getRelationId());
-            relationOrderService.deleteByRelationOrder(rol);
-
-            /*添加客诉-添加处理与订单关联表 ---------- */
-            List<RelationOrder> relationAndOrderList = new ArrayList<>();
-            for (RelationOrder sokk : relationOrderList) {
-                RelationOrder ro = new RelationOrder();
-                ro.setRelationId(cmRelation.getRelationId());
-                ro.setSalesId(sokk.getSalesId());
-                ro.setRelationCustomerId(customerInfo.getCustomerId());
-                relationAndOrderList.add(ro);
-            }
-            if(relationAndOrderList != null && relationAndOrderList.size() > 0){
-                relationOrderService.saveList(relationAndOrderList);
-            }
-
-            Integer fl =  0;
-             /*产品整理*/
-             try{
-                 customerService.setName(cmRelation);
-                 fl = 1;
-             }catch (Exception e){
-                 e.printStackTrace();
-             }
-
-             if(fl == 1){
-                 CustomerCommonUtil.setProduce(cmRelation);
-                 if(cmRelation.getClosedProdcues() != null && cmRelation.getClosedProdcues().size()>0){
-                     closedProdcueMapper.insert(cmRelation.getClosedProdcues());
-                 }
-                 if(cmRelation.getSendProdcues() != null && cmRelation.getSendProdcues().size() > 0){
-                     sendProdcueMapper.insert(cmRelation.getSendProdcues());
-                 }
-             }
-        }
-        return flag;
+//        Integer flag = 0;
+//        CmRelation cmRelation = new CmRelation();
+//        cmRelation.setCustomerId(customerInfo.getCustomerId());
+//
+//        /*判断是否是新加的客诉*/
+//        CmRelation crold = cmRelationMapper.getCmRelationByCustomerId(customerInfo.getCustomerId());
+//        if(crold != null ){
+//            return 1;
+//        }
+//
+//        CustomerCommon customerCommon = new CustomerCommon();
+//        customerCommon.setCustomerId(customerInfo.getCustomerId());
+//        List<CustomerCommon> customerCommonList = customerCommonService.listCustomerCommon(customerCommon);
+//        if(customerCommonList != null && customerCommonList.size() > 0){
+//            customerCommon = customerCommonList.get(0);
+//            cmRelation.setRelationBackStatus(customerCommon.getRelationBackStatus());     //寄回状态 1：未寄回 2：已寄回 3：已收货 4: 已签收待确认
+//            cmRelation.setRelationBackName(customerCommon.getRelationBackName());   //寄回人姓名
+//            cmRelation.setRelationBackTel(customerCommon.getRelationBackTel());  //寄回人电话
+//            cmRelation.setRelationBackLogisticsCompany(customerCommon.getRelationBackLogisticsCompany());   //寄回物流公司
+//            cmRelation.setRelationBackLogisticsNo(customerCommon.getRelationBackLogisticsNo()); //寄回物流单号
+//            cmRelation.setRelationBackPostage(customerCommon.getRelationBackPostage()); //寄回邮费 单位为分
+//            cmRelation.setRelationSendStatus(customerCommon.getRelationSendStatus());   //寄送状态 1：未寄送 2：已寄送 3：已收货
+//            cmRelation.setRelationSendName(customerCommon.getRelationSendName());//寄送人姓名
+//            cmRelation.setRelationSendTel(customerCommon.getRelationSendTel());
+//            cmRelation.setProvinceNumber(customerCommon.getProvinceNumber());   //寄送地址-省
+//            cmRelation.setCityNumber(customerCommon.getCityNumber());   //寄送地址-市
+//            cmRelation.setAreaNumber(customerCommon.getAreaNumber());   //寄送地址-区
+//            cmRelation.setRelationSendMergeAddress(customerCommon.getRelationSendMergeAddress());    //寄送地址-省市区
+//            cmRelation.setRelationSendAddress(customerCommon.getRelationSendAddress());  //寄送地址-详细地址
+//            cmRelation.setRelationSendLogisticsCompany(customerCommon.getRelationSendLogisticsCompany());    //寄送物流公司
+//            cmRelation.setRelationSendLogisticsNo(customerCommon.getRelationSendLogisticsNo());  //寄送物流单号
+//            cmRelation.setRelationDesc(customerCommon.getRelationDesc());   //备注
+//            cmRelation.setRelationState(1);//状态 1：使用中 2：停用中
+//            cmRelation.setRelationAlipay(customerCommon.getRelationAlipay());   //转账账户
+//            cmRelation.setRelationAlipayName(customerCommon.getRelationAlipayName()); //转账账户姓名
+//            cmRelation.setRelationIsTransfer(customerCommon.getRelationIsTransfer());   //是否已转账邮费 0:不需要 1:已转 2:已申请待转 3:未申请
+//            cmRelation.setRelationBackReceiptDate(customerCommon.getRelationBackReceiptDate()); //签收日期
+//            cmRelation.setRelationFactoryCosts(customerCommon.getRelationFactoryCosts());//工厂维修报价
+//            cmRelation.setRelationCustomerCosts(customerCommon.getRelationCustomerCosts());  //客户报价
+//            cmRelation.setRelationCreateTime(customerCommon.getRelationCreateTime());
+//            cmRelation.setRelationUpdateTime(customerCommon.getRelationUpdateTime());
+//
+//            cmRelation.setSendProdcues(customerCommon.getSendProdcues());
+//            cmRelation.setClosedProdcues(customerCommon.getClosedProdcues());
+//        }
+//
+//        Integer procMethodId;
+//        switch (customerInfo.getCustomerIsSolve()){   //1：已解决  2：未解决 3：换新  4：维修 5：补发 6：退货 7：无理由退货     客诉修改
+//            case 1:
+//                procMethodId = 1;
+//                cmRelation.setRelationBackStatus(1);     //寄回状态 1：未寄回 2：已寄回 3：已收货 4: 已签收待确认
+//                cmRelation.setRelationSendStatus(1);   //寄送状态 1：未寄送 2：已寄送 3：已收货
+//                cmRelation.setRelationSendName(customerInfo.getCustomerName());
+//                cmRelation.setRelationBackName(customerInfo.getCustomerName());
+//                cmRelation.setRelationSendTel(customerInfo.getCustomerTel());
+//                cmRelation.setRelationBackTel(customerInfo.getCustomerTel());
+//                cmRelation.setRelationIsTransfer(0);
+//                cmRelation.setRelationBackPostage(0);
+//                break;
+//            case 2:
+//                procMethodId = 2;
+//                cmRelation.setRelationBackStatus(1);     //寄回状态 1：未寄回 2：已寄回 3：已收货 4: 已签收待确认
+//                cmRelation.setRelationSendStatus(1);   //寄送状态 1：未寄送 2：已寄送 3：已收货
+//                cmRelation.setRelationSendName(customerInfo.getCustomerName());
+//                cmRelation.setRelationBackName(customerInfo.getCustomerName());
+//                cmRelation.setRelationSendTel(customerInfo.getCustomerTel());
+//                cmRelation.setRelationBackTel(customerInfo.getCustomerTel());
+//                cmRelation.setRelationIsTransfer(0);
+//                cmRelation.setRelationBackPostage(0);
+//                break;
+//            case 3:
+//                procMethodId = 3;
+//                break;
+//            case 4:
+//                procMethodId = 6;
+//                break;
+//            case 5:
+//                procMethodId = 13;
+//                cmRelation.setRelationBackStatus(1);     //寄回状态 1：未寄回 2：已寄回 3：已收货 4: 已签收待确认
+//                break;
+//            case 6:
+//                procMethodId = 10;
+//                cmRelation.setRelationSendStatus(1);   //寄送状态 1：未寄送 2：已寄送 3：已收货
+//                break;
+//            case 7:
+//                procMethodId = 8;
+//                cmRelation.setRelationSendStatus(1);   //寄送状态 1：未寄送 2：已寄送 3：已收货
+//                break;
+//            default:
+//                procMethodId = 2;
+//                cmRelation.setRelationBackStatus(1);     //寄回状态 1：未寄回 2：已寄回 3：已收货 4: 已签收待确认
+//                cmRelation.setRelationSendStatus(1);   //寄送状态 1：未寄送 2：已寄送 3：已收货
+//                break;
+//        }
+//        cmRelation.setProcMethodId(procMethodId);
+//        cmRelation.setRelationState(1);
+//
+//        flag = cmRelationMapper.save(cmRelation);
+//        if (flag < 1) {
+//            throw new RuntimeException("添加处理方式失败");
+//        }
+//
+//        if(customerInfo.getCustomerIsSolve() == 3 || customerInfo.getCustomerIsSolve() == 4 || customerInfo.getCustomerIsSolve() == 5 ||
+//                customerInfo.getCustomerIsSolve() == 6 ||customerInfo.getCustomerIsSolve() == 7 ){
+//
+//            //删除寄出寄回产品 -----
+//            ClosedProdcue closedrecord = new ClosedProdcue();
+//            SendProdcue sendProdcue = new SendProdcue();
+//            closedrecord.setRelationId(customerCommon.getRelationId());
+//            closedrecord.setClosedProdcueType(customerCommon.getCustomerIsSolve());
+//            closedProdcueMapper.deleteProduce(closedrecord);
+//            sendProdcue.setRelationId(customerCommon.getRelationId());
+//            sendProdcue.setSendProduceType(customerCommon.getCustomerIsSolve());
+//            sendProdcueMapper.deleteByPrimaryKey(sendProdcue);
+//
+//               /*恢复订单状态 ------------ */
+//            RelationOrder relationOrder = new RelationOrder();
+//            relationOrder.setRelationType(customerCommon.getCustomerIsSolve());
+//            relationOrder.setRelationId(customerCommon.getRelationId());
+//            List<RelationOrder> relationOrderList = relationOrderService.getRelationOrderList(relationOrder);
+//            for (int k=0; k<relationOrderList.size();k++){
+//                SalesOrder newOrder = new SalesOrder(); //salesOrderStatus
+//                newOrder.setSalesId(relationOrderList.get(k).getSalesId());
+//                newOrder.setSalesOrderStatus(procMethodId);
+//                salesOrderMapper.updateSalesOrder(newOrder);
+//            }
+//
+//              /* 删除掉订单与处理的关联表  ----------- */
+//            RelationOrder rol = new RelationOrder();
+//            rol.setRelationType(customerCommon.getCustomerIsSolve());
+//            rol.setRelationId(customerCommon.getRelationId());
+//            relationOrderService.deleteByRelationOrder(rol);
+//
+//            /*添加客诉-添加处理与订单关联表 ---------- */
+//            List<RelationOrder> relationAndOrderList = new ArrayList<>();
+//            for (RelationOrder sokk : relationOrderList) {
+//                RelationOrder ro = new RelationOrder();
+//                ro.setRelationId(cmRelation.getRelationId());
+//                ro.setSalesId(sokk.getSalesId());
+//                ro.setRelationCustomerId(customerInfo.getCustomerId());
+//                relationAndOrderList.add(ro);
+//            }
+//            if(relationAndOrderList != null && relationAndOrderList.size() > 0){
+//                relationOrderService.saveList(relationAndOrderList);
+//            }
+//
+//            Integer fl =  0;
+//             /*产品整理*/
+//             try{
+//                 customerService.setName(cmRelation);
+//                 fl = 1;
+//             }catch (Exception e){
+//                 e.printStackTrace();
+//             }
+//
+//             if(fl == 1){
+//                 CustomerCommonUtil.setProduce(cmRelation);
+//                 if(cmRelation.getClosedProdcues() != null && cmRelation.getClosedProdcues().size()>0){
+//                     closedProdcueMapper.insert(cmRelation.getClosedProdcues());
+//                 }
+//                 if(cmRelation.getSendProdcues() != null && cmRelation.getSendProdcues().size() > 0){
+//                     sendProdcueMapper.insert(cmRelation.getSendProdcues());
+//                 }
+//             }
+//        }
+//        return flag;
+        return 0;
     }
 }

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

@@ -1,40 +0,0 @@
-package com.iamberry.rst.service.cm;
-
-
-import com.iamberry.rst.core.cm.FittingsInfo;
-import com.iamberry.rst.faces.cm.FittingsInfoService;
-import com.iamberry.rst.service.cm.mapper.FittingsInfoMapper;
-import org.springframework.beans.factory.annotation.Autowired;
-import org.springframework.stereotype.Service;
-
-import java.util.List;
-
-@Service
-public class FittingsInfoServiceImpl implements FittingsInfoService {
-    @Autowired
-    private FittingsInfoMapper fittingsInfoMapper;
-
-    @Override
-    public Integer addFittingsInfo(FittingsInfo fittingsInfo) {
-//        return fittingsInfoMapper.addFittingsInfo(fittingsInfo);
-        return null;
-    }
-
-    @Override
-    public FittingsInfo getFittingsById(Integer fittingsId) {
-//        return fittingsInfoMapper.getFittingsById(fittingsId);
-        return null;
-    }
-
-    @Override
-    public Integer updateFittingsInfo(FittingsInfo fittingsInfo) {
-//        return fittingsInfoMapper.updateFittingsInfo(fittingsInfo);
-        return null;
-    }
-
-    @Override
-    public List<FittingsInfo> listFittings(FittingsInfo fittingsInfo) {
-//        return fittingsInfoMapper.listFittings(fittingsInfo);
-        return null;
-    }
-}

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

@@ -1,91 +0,0 @@
-package com.iamberry.rst.service.cm;
-
-import com.iamberry.rst.core.cm.ClosedFitting;
-import com.iamberry.rst.core.cm.ClosedProdcue;
-import com.iamberry.rst.core.cm.NoreasonBack;
-import com.iamberry.rst.faces.cm.NoreasonBackService;
-import com.iamberry.rst.service.cm.mapper.ClosedFittingMapper;
-import com.iamberry.rst.service.cm.mapper.ClosedProdcueMapper;
-import com.iamberry.rst.service.cm.mapper.NoreasonBackMapper;
-import org.apache.commons.lang.StringUtils;
-import org.springframework.beans.factory.annotation.Autowired;
-import org.springframework.stereotype.Service;
-
-import java.util.ArrayList;
-import java.util.List;
-
-/**
- * Created by liuzhiwei on 2017/11/14.
- */
-@Service
-public class NoreasonBackServiceImpl implements NoreasonBackService {
-
-    @Autowired
-    private NoreasonBackMapper noreasonBackMapper;
-    @Autowired
-    private ClosedProdcueMapper closedProdcueMapper;
-    @Autowired
-    private ClosedFittingMapper closedFittingMapper;
-
-    @Override
-    public Integer updateNoreasonBack(NoreasonBack record, String closedProducts, String closedFittings) {
-        /*int productNum = 1;
-        int fittingNum = 1;
-        List<ClosedProdcue> produceList = new ArrayList<ClosedProdcue>();
-        List<ClosedFitting> fittingList = new ArrayList<ClosedFitting>();
-        if (StringUtils.isNotEmpty(closedProducts)) {
-            ClosedProdcue closedProdcue = new ClosedProdcue();
-            closedProdcue.setRelationId(record.getNoreasonBackId());
-            closedProdcue.setClosedProdcueType(7);
-            //删除原有寄回产品
-            int delNum = closedProdcueMapper.deleteProduce(closedProdcue);
-            //去掉最后一个","
-            closedProducts = closedProducts.substring(0,closedProducts.length()-1);
-            String[] products = closedProducts.split(",");
-            for (int i = 0;i < products.length;i++) {
-                String[] colors = products[i].split(":");
-                ClosedProdcue prodcue = new ClosedProdcue();
-                prodcue.setRelationId(record.getNoreasonBackId());
-                prodcue.setClosedProdcueType(7);
-                prodcue.setProductId(Integer.parseInt(colors[0]));
-                prodcue.setColorId(Integer.parseInt(colors[1]));
-                prodcue.setClosedProdcueNumber(Integer.parseInt(colors[2]));
-                produceList.add(prodcue);
-            }
-            //批量添加寄回产品
-            productNum = closedProdcueMapper.insert(produceList);
-        }
-        if (StringUtils.isNotEmpty(closedFittings)) {
-            ClosedFitting closedFitting = new ClosedFitting();
-            closedFitting.setRelationId(record.getNoreasonBackId());
-            closedFitting.setClosedFittingType(7);
-            //删除原有寄回配件信息
-            int delNum = closedFittingMapper.deleteFitting(closedFitting);
-            closedFittings = closedFittings.substring(0,closedFittings.length()-1);
-            String[] fittings = closedFittings.split(",");
-            for (int i = 0;i < fittings.length;i++) {
-                String[] fitting = fittings[i].split(":");
-                ClosedFitting cFitting = new ClosedFitting();
-                cFitting.setRelationId(record.getNoreasonBackId());
-                cFitting.setClosedFittingType(7);
-                cFitting.setProductId(Integer.parseInt(fitting[0]));
-                cFitting.setFittingsId(Integer.parseInt(fitting[1]));
-                cFitting.setClosedFittingNumber(Integer.parseInt(fitting[2]));
-                fittingList.add(cFitting);
-            }
-            //批量添加寄回配件
-            fittingNum = closedFittingMapper.insert(fittingList);
-        }*/
-        int num = noreasonBackMapper.updateNoreasonBack(record);
-        if (num > 0) {
-            return 1;
-        } else {
-            return 0;
-        }
-    }
-
-    @Override
-    public NoreasonBack getNoreasonBack(NoreasonBack noreasonBack) {
-        return noreasonBackMapper.getNoreasonBack(noreasonBack);
-    }
-}

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

@@ -1,38 +0,0 @@
-package com.iamberry.rst.service.cm;
-
-import com.iamberry.rst.core.cm.Reissue;
-import com.iamberry.rst.faces.cm.ReissueService;
-import com.iamberry.rst.service.cm.mapper.ReissueMapper;
-import org.springframework.beans.factory.annotation.Autowired;
-import org.springframework.stereotype.Service;
-
-import java.util.List;
-
-/**
- * 补寄
- * Created by liuzhiwei on 2017/11/9.
- */
-@Service
-public class ReissueServiceImpl implements ReissueService {
-
-    @Autowired
-    private ReissueMapper reissueMapper;
-
-    @Override
-    public Integer updateReissueInfo(Reissue record) {
-//        return reissueMapper.updateReissueInfo(record);
-        return null;
-    }
-
-    @Override
-    public List<Reissue> listSynchronizingReissue(Reissue reissue) {
-//        return reissueMapper.listSynchronizingReissue(reissue);
-        return null;
-    }
-
-    @Override
-    public Reissue getReissue(Reissue reissue) {
-//        return reissueMapper.getReissue(reissue);
-        return null;
-    }
-}

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

@@ -1,107 +0,0 @@
-package com.iamberry.rst.service.cm;
-
-import com.iamberry.rst.core.cm.ClosedFitting;
-import com.iamberry.rst.core.cm.ClosedProdcue;
-import com.iamberry.rst.core.cm.Renewed;
-import com.iamberry.rst.faces.cm.RenewedService;
-import com.iamberry.rst.service.cm.mapper.ClosedFittingMapper;
-import com.iamberry.rst.service.cm.mapper.ClosedProdcueMapper;
-import com.iamberry.rst.service.cm.mapper.RenewedMapper;
-import org.apache.commons.lang.StringUtils;
-import org.springframework.beans.factory.annotation.Autowired;
-import org.springframework.stereotype.Service;
-
-import java.util.ArrayList;
-import java.util.List;
-
-/**
- * 换新service
- * Created by liuzhiwei on 2017/11/7.
- */
-@Service
-public class RenewedServiceImpl implements RenewedService {
-
-    @Autowired
-    private RenewedMapper renewedMapper;
-    @Autowired
-    private ClosedProdcueMapper closedProdcueMapper;
-    @Autowired
-    private ClosedFittingMapper closedFittingMapper;
-
-    @Override
-    public List<ClosedFitting> listClosedFitting(ClosedFitting closedFitting) {
-//        return renewedMapper.listClosedFitting(closedFitting);
-        return null;
-    }
-
-    @Override
-    public Integer updateRenewedInfo(Renewed record, String closedProducts, String closedFittings) {
-//        int productNum = 1;
-//        int fittingNum = 1;
-//        List<ClosedProdcue> produceList = new ArrayList<ClosedProdcue>();
-//        List<ClosedFitting> fittingList = new ArrayList<ClosedFitting>();
-//        if (StringUtils.isNotEmpty(closedProducts)) {
-//            ClosedProdcue closedProdcue = new ClosedProdcue();
-//            closedProdcue.setRelationId(record.getRenewedId());
-//            closedProdcue.setClosedProdcueType(3);
-//            //删除原有寄回产品
-//            int delNum = closedProdcueMapper.deleteProduce(closedProdcue);
-//            //去掉最后一个","
-//            closedProducts = closedProducts.substring(0,closedProducts.length()-1);
-//            String[] products = closedProducts.split(",");
-//            for (int i = 0;i < products.length;i++) {
-//                String[] colors = products[i].split(":");
-//                ClosedProdcue prodcue = new ClosedProdcue();
-//                prodcue.setRelationId(record.getRenewedId());
-//                prodcue.setClosedProdcueType(3);
-//                prodcue.setProductId(Integer.parseInt(colors[0]));
-//                prodcue.setColorId(Integer.parseInt(colors[1]));
-//                prodcue.setClosedProdcueNumber(Integer.parseInt(colors[2]));
-//                produceList.add(prodcue);
-//            }
-//            //批量添加寄回产品
-//            productNum = closedProdcueMapper.insert(produceList);
-//        }
-//        if (StringUtils.isNotEmpty(closedFittings)) {
-//            ClosedFitting closedFitting = new ClosedFitting();
-//            closedFitting.setRelationId(record.getRenewedId());
-//            closedFitting.setClosedFittingType(3);
-//            //删除原有寄回配件信息
-//            int delNum = closedFittingMapper.deleteFitting(closedFitting);
-//            closedFittings = closedFittings.substring(0,closedFittings.length()-1);
-//            String[] fittings = closedFittings.split(",");
-//            for (int i = 0;i < fittings.length;i++) {
-//                String[] fitting = fittings[i].split(":");
-//                ClosedFitting cFitting = new ClosedFitting();
-//                cFitting.setRelationId(record.getRenewedId());
-//                cFitting.setClosedFittingType(3);
-//                cFitting.setProductId(Integer.parseInt(fitting[0]));
-//                cFitting.setFittingsId(Integer.parseInt(fitting[1]));
-//                cFitting.setClosedFittingNumber(Integer.parseInt(fitting[2]));
-//                fittingList.add(cFitting);
-//            }
-//            //批量添加寄回配件
-//            fittingNum = closedFittingMapper.insert(fittingList);
-//        }
-//        //修改换新信息
-//        int num = renewedMapper.updateRenewedInfo(record);
-//        if (num > 0 && productNum > 0 && fittingNum > 0) {
-//            return 1;
-//        } else {
-//            return 0;
-//        }
-        return 0;
-    }
-
-    @Override
-    public List<Renewed> listSynchronizingRenewed(Renewed renewed) {
-//        return renewedMapper.listSynchronizingRenewed(renewed);
-        return null;
-    }
-
-    @Override
-    public Renewed getRenewed(Renewed record) {
-//        return renewedMapper.getRenewedInfo(record);
-       return null;
-    }
-}

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

@@ -1,105 +0,0 @@
-package com.iamberry.rst.service.cm;
-
-import com.iamberry.rst.core.cm.ClosedFitting;
-import com.iamberry.rst.core.cm.ClosedProdcue;
-import com.iamberry.rst.core.cm.Repair;
-import com.iamberry.rst.faces.cm.RepairService;
-import com.iamberry.rst.service.cm.mapper.ClosedFittingMapper;
-import com.iamberry.rst.service.cm.mapper.ClosedProdcueMapper;
-import com.iamberry.rst.service.cm.mapper.RepairMapper;
-import org.apache.commons.lang.StringUtils;
-import org.springframework.beans.factory.annotation.Autowired;
-import org.springframework.stereotype.Service;
-import org.springframework.transaction.annotation.Transactional;
-
-import java.util.ArrayList;
-import java.util.List;
-
-import java.util.List;
-
-/**
- * 维修Service
- * Created by liuzhiwei on 2017/11/8.
- */
-@Service
-public class RepairServiceImpl implements RepairService {
-
-    @Autowired
-    private RepairMapper repairMapper;
-    @Autowired
-    private ClosedProdcueMapper closedProdcueMapper;
-    @Autowired
-    private ClosedFittingMapper closedFittingMapper;
-
-    @Transactional
-    @Override
-    public Integer updateRepairInfo(Repair repair, String closedProducts, String closedFittings) {
-//        int productNum = 1;
-//        int fittingNum = 1;
-//        List<ClosedProdcue> produceList = new ArrayList<ClosedProdcue>();
-//        List<ClosedFitting> fittingList = new ArrayList<ClosedFitting>();
-//        if (StringUtils.isNotEmpty(closedProducts)) {
-//            ClosedProdcue closedProdcue = new ClosedProdcue();
-//            closedProdcue.setRelationId(repair.getRepairId());
-//            closedProdcue.setClosedProdcueType(4);
-//            //删除原有寄回产品
-//            int delNum = closedProdcueMapper.deleteProduce(closedProdcue);
-//            //去掉最后一个","
-//            closedProducts = closedProducts.substring(0,closedProducts.length()-1);
-//            String[] products = closedProducts.split(",");
-//            for (int i = 0;i < products.length;i++) {
-//                String[] colors = products[i].split(":");
-//                ClosedProdcue prodcue = new ClosedProdcue();
-//                prodcue.setRelationId(repair.getRepairId());
-//                prodcue.setClosedProdcueType(4);
-//                prodcue.setProductId(Integer.parseInt(colors[0]));
-//                prodcue.setColorId(Integer.parseInt(colors[1]));
-//                prodcue.setClosedProdcueNumber(Integer.parseInt(colors[2]));
-//                produceList.add(prodcue);
-//            }
-//            //批量添加寄回产品
-//            productNum = closedProdcueMapper.insert(produceList);
-//        }
-//        if (StringUtils.isNotEmpty(closedFittings)) {
-//            ClosedFitting closedFitting = new ClosedFitting();
-//            closedFitting.setRelationId(repair.getRepairId());
-//            closedFitting.setClosedFittingType(4);
-//            //删除原有寄回配件信息
-//            int delNum = closedFittingMapper.deleteFitting(closedFitting);
-//            closedFittings = closedFittings.substring(0,closedFittings.length()-1);
-//            String[] fittings = closedFittings.split(",");
-//            for (int i = 0;i < fittings.length;i++) {
-//                String[] fitting = fittings[i].split(":");
-//                ClosedFitting cFitting = new ClosedFitting();
-//                cFitting.setRelationId(repair.getRepairId());
-//                cFitting.setClosedFittingType(4);
-//                cFitting.setProductId(Integer.parseInt(fitting[0]));
-//                cFitting.setFittingsId(Integer.parseInt(fitting[1]));
-//                cFitting.setClosedFittingNumber(Integer.parseInt(fitting[2]));
-//                fittingList.add(cFitting);
-//            }
-//            //批量添加寄回配件
-//            fittingNum = closedFittingMapper.insert(fittingList);
-//        }
-//
-//        int num = repairMapper.updateRepairInfo(repair);
-//        if (num > 0 && productNum > 0 && fittingNum > 0) {
-//            return 1;
-//        } else {
-//            return 0;
-//        }
-        return 0;
-    }
-
-    @Override
-    public List<Repair> listSynchronizingRepair(Repair repair) {
-//        return repairMapper.listSynchronizingRepair(repair);
-        return null;
-    }
-
-    @Override
-    public Repair getRepair(Repair repair) {
-//        return repairMapper.getRepairInfo(repair);
-        return null;
-    }
-}

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

@@ -73,18 +73,6 @@ public class AdminCustomerController {
     @Autowired
     private QuestionDescribeService questionDescribeService;
     @Autowired
-    private RenewedService renewedService;
-    @Autowired
-    private RepairService repairService;
-    @Autowired
-    private BackGoodsService backGoodsService;
-    @Autowired
-    private FittingsInfoService fittingsInfoService;
-    @Autowired
-    private ReissueService reissueService;
-    @Autowired
-    private NoreasonBackService noreasonBackService;
-    @Autowired
     private ComplaintQuestionInfoService complaintQuestionInfoService;
     @Autowired
     private SmsService smsService;
@@ -93,8 +81,6 @@ public class AdminCustomerController {
     @Autowired
     private ComplaintSmallClassInfoService complaintSmallClassInfoService;
     @Autowired
-    private CustomerCommonService customerCommonService;
-    @Autowired
     private AddressService addressService;
     @Autowired
     private PostageService postageService;
@@ -109,7 +95,6 @@ public class AdminCustomerController {
     @Autowired
     private ProcMethodService procMethodService ;
 
-
     /**
      * 获取客诉列表
      *
@@ -326,17 +311,6 @@ public class AdminCustomerController {
                 salesOrderItem.setItemProductDiscount(productColor.getColorDiscount());
                 salesOrderItem.setItemIsSource(1);
                 salesAmount += productColor.getColorDiscount();
-            } else if (salesOrderItem.getItemIsSource() == 2) {
-                Product product = productService.getProductByFittingsId(salesOrderItem.getItemColorId());
-                FittingsInfo fittingsInfo = fittingsInfoService.getFittingsById(salesOrderItem.getItemColorId());
-                salesOrderItem.setItemProductType(product.getProductType());
-                salesOrderItem.setItemProductName(product.getProductName());
-                salesOrderItem.setItemProductColor(fittingsInfo.getFittingsName());
-                salesOrderItem.setItemColorBar(fittingsInfo.getFittingsBar());
-                salesOrderItem.setItemProductPrice(fittingsInfo.getFittingsPrice());
-                salesOrderItem.setItemProductDiscount(fittingsInfo.getFittingsDiscount());
-                salesOrderItem.setItemIsSource(2);
-                salesAmount += fittingsInfo.getFittingsDiscount();
             }
         }
 
@@ -746,28 +720,6 @@ public class AdminCustomerController {
     }
 
     /**
-     * 查询产品
-     *
-     * @param request
-     * @return
-     */
-    @ResponseBody
-    @RequiresPermissions("customer:add:customer")
-    @RequestMapping("/select_produce_fittings")
-    public ResponseJson selectProduceFittings(HttpServletRequest request, FittingsInfo fittingsInfo) {
-        ResponseJson rj = new ResponseJson(200, "查询成功!", 200);
-
-        List<FittingsInfo> produceFittingsList = fittingsInfoService.listFittings(fittingsInfo);
-
-        if (produceFittingsList != null && produceFittingsList.size() > 0) {
-            rj.addResponseKeyValue("produceFittingsList", produceFittingsList);
-            return rj;
-        } else {
-            return new ResponseJson(500, "查询失败!", 500);
-        }
-    }
-
-    /**
      * 添加客诉
      *
      * @param request
@@ -1331,77 +1283,7 @@ public class AdminCustomerController {
         }
     }
 
-    /**
-     * 修改维修处理信息
-     *
-     * @param request
-     * @param repair
-     * @return
-     * @throws Exception
-     */
-    @ResponseBody
-    @RequiresPermissions("customer:update:repair")
-    @RequestMapping("/update_repair_info")
-    public ResponseJson updateRepairInfo(HttpServletRequest request, Repair repair) throws Exception {
-        if (!StringUtils.isNotEmpty(repair.getRepairId().toString())) {
-            return new ResponseJson(500, "该换新信息不能修改!", 500);
-        }
-       /* String closedProducts = request.getParameter("closed_products");
-        String closedFittings = request.getParameter("closed_fittings");*/
-        String provinceNumber = request.getParameter("repairProvinceNumber");
-        String cityNumber = request.getParameter("repairCityNumber");
-        String areaNumber = request.getParameter("repairAreaNumber");
-        String mergeAddress = request.getParameter("merge_address");
-        if (StringUtils.isNotEmpty(provinceNumber)) {
-            repair.setProvinceNumber(Integer.parseInt(provinceNumber));
-        }
-        if (StringUtils.isNotEmpty(cityNumber)) {
-            repair.setCityNumber(Integer.parseInt(cityNumber));
-        }
-        if (StringUtils.isNotEmpty(areaNumber)) {
-            repair.setAreaNumber(Integer.parseInt(areaNumber));
-        }
-        if (StringUtils.isNotEmpty(mergeAddress)) {
-            repair.setRepairSendMergeAddress(mergeAddress);
-        }
-//        if (StringUtils.isNotEmpty(repair.getRepairBackPostage().toString())) {
-//            repair.setRepairBackPostage(repair.getRepairBackPostage().intValue() * 100);
-//        }
-        /*if (!StringUtils.isNotEmpty(repair.getRepairBackEfastOrderId())) {
-            return new ResponseJson(500, "请输入efast订单号!", 500);
-        }*/
-        if (StringUtils.isNotEmpty(mergeAddress)) {
-            repair.setRepairSendMergeAddress(mergeAddress);
-        }
-
-        /*SalesOrder order = new SalesOrder();
-        order.setSalesOrderStatus(1);
-        order.setSalesOrderId(repair.getRepairBackEfastOrderId());
-        int count = salesOrderService.getOrderInfoCount(order);
-        //判断efast订单是否可查出有效数据
-        if (count == 0) {
-            return new ResponseJson(500, "该efast订单号无效，请重新输入!", 500);
-        }*/
-
-        if (repair.getRepairBackStatus() != null) {
-            if (repair.getRepairBackStatus() != 1) {
-                ComplaintSignclosedInfo cs = new ComplaintSignclosedInfo();
-                cs.setSignclosedCustomerId(repair.getCustomerId());
-                cs.setSignclosedLogistics(repair.getRepairBackLogisticsCompany());
-                cs.setSignclosedLogisticsNumber(repair.getRepairBackLogisticsNo());
-                complaintSignclosedInfoService.updateSignclosedByCustomerId(cs);
-            }
-        }
-
-        //修改维修信息
-        int num = repairService.updateRepairInfo(repair, null, null);
 
-        if (num > 0) {
-            return new ResponseJson(200, "修改成功!", 200);
-        } else {
-            return new ResponseJson(500, "修改失败!", 500);
-        }
-    }
 
     /**
      * 进入修改退货页面
@@ -1447,42 +1329,6 @@ public class AdminCustomerController {
         }
     }
 
-    /**
-     * 修改售后退货信息
-     *
-     * @param request
-     * @param backGoods
-     * @return
-     * @throws Exception
-     */
-    @ResponseBody
-    @RequiresPermissions("customer:update:backGoods")
-    @RequestMapping("/update_back_goods")
-    public ResponseJson updateBackGoods(HttpServletRequest request, BackGoods backGoods) throws Exception {
-        String closedProducts = request.getParameter("closed_products");
-        String closedFittings = request.getParameter("closed_fittings");
-        if (!StringUtils.isNotEmpty(backGoods.getBackGoodsId().toString())) {
-            return new ResponseJson(500, "该售后退货信息不能修改!", 500);
-        }
-//        if (StringUtils.isNotEmpty(backGoods.getBackGoodsBackPostage().toString())) {
-//            backGoods.setBackGoodsBackPostage(backGoods.getBackGoodsBackPostage().intValue() * 100);
-//        }
-
-//        if(backGoods.getBackGoodsBackStatus() != 1){
-//            ComplaintSignclosedInfo cs = new ComplaintSignclosedInfo();
-//            cs.setSignclosedCustomerId(backGoods.getCustomerId());
-//            cs.setSignclosedLogistics(backGoods.getBackGoodsBackLogisticsCompany());
-//            cs.setSignclosedLogisticsNumber(backGoods.getBackGoodsBackLogisticsNo());
-//            complaintSignclosedInfoService.updateSignclosedByCustomerId(cs);
-//        }
-
-        int num = backGoodsService.updateBackGoods(backGoods, closedProducts, closedFittings);
-        if (num > 0) {
-            return new ResponseJson(200, "修改成功!", 200);
-        } else {
-            return new ResponseJson(500, "修改失败!", 500);
-        }
-    }
 
     /**
      * 进入修改补寄页面
@@ -1527,45 +1373,6 @@ public class AdminCustomerController {
         }
     }
 
-    /**
-     * 修改售后补寄信息
-     *
-     * @param request
-     * @param reissue
-     * @return
-     * @throws Exception
-     */
-    @ResponseBody
-    @RequiresPermissions("customer:update:reissue")
-    @RequestMapping("/update_reissue_info")
-    public ResponseJson updateReissueInfo(HttpServletRequest request, Reissue reissue) throws Exception {
-        String provinceNumber = request.getParameter("reissueProvinceNumber");
-        String cityNumber = request.getParameter("reissueCityNumber");
-        String areaNumber = request.getParameter("reissueAreaNumber");
-        String mergeAddress = request.getParameter("merge_address");
-        if (!StringUtils.isNotEmpty(reissue.getReissueId().toString())) {
-            return new ResponseJson(500, "该售后补寄信息不能修改!", 500);
-        }
-        if (StringUtils.isNotEmpty(provinceNumber)) {
-            reissue.setProvinceNumber(Integer.parseInt(provinceNumber));
-        }
-        if (StringUtils.isNotEmpty(cityNumber)) {
-            reissue.setCityNumber(Integer.parseInt(cityNumber));
-        }
-        if (StringUtils.isNotEmpty(areaNumber)) {
-            reissue.setAreaNumber(Integer.parseInt(areaNumber));
-        }
-        if (StringUtils.isNotEmpty(mergeAddress)) {
-            reissue.setReissueSendMergeAddress(mergeAddress);
-        }
-        //修改售后补寄信息
-        int num = reissueService.updateReissueInfo(reissue);
-        if (num > 0) {
-            return new ResponseJson(200, "修改成功!", 200);
-        } else {
-            return new ResponseJson(500, "修改失败!", 500);
-        }
-    }
 
     /**
      * 进入修改退货页面
@@ -1612,42 +1419,7 @@ public class AdminCustomerController {
         }
     }
 
-    /**
-     * 修改售后无理由退货信息
-     *
-     * @param request
-     * @param noreasonBack
-     * @return
-     * @throws Exception
-     */
-    @ResponseBody
-    @RequiresPermissions("customer:update:noreason")
-    @RequestMapping("/update_noreason")
-    public ResponseJson updateNoreason(HttpServletRequest request, NoreasonBack noreasonBack) throws Exception {
-        String closedProducts = request.getParameter("closed_products");
-        String closedFittings = request.getParameter("closed_fittings");
-        if (!StringUtils.isNotEmpty(noreasonBack.getNoreasonBackId().toString())) {
-            return new ResponseJson(500, "该售后无理由退货信息不能修改!", 500);
-        }
-//        if (StringUtils.isNotEmpty(noreasonBack.getNoreasonBackBackPostage().toString())) {
-//            noreasonBack.setNoreasonBackBackPostage(noreasonBack.getNoreasonBackBackPostage().intValue() * 100);
-//        }
-
-//        if(noreasonBack.getNoreasonBackBackStatus() != 1){
-//            ComplaintSignclosedInfo cs = new ComplaintSignclosedInfo();
-//            cs.setSignclosedCustomerId(noreasonBack.getCustomerId());
-//            cs.setSignclosedLogistics(noreasonBack.getNoreasonBackBackLogisticsCompany());
-//            cs.setSignclosedLogisticsNumber(noreasonBack.getNoreasonBackBackLogisticsNo());
-//            complaintSignclosedInfoService.updateSignclosedByCustomerId(cs);
-//        }
 
-        int num = noreasonBackService.updateNoreasonBack(noreasonBack, closedProducts, closedFittings);
-        if (num > 0) {
-            return new ResponseJson(200, "修改成功!", 200);
-        } else {
-            return new ResponseJson(500, "修改失败!", 500);
-        }
-    }
 
     /**
      * 查询未解决客诉数量
@@ -1659,22 +1431,22 @@ public class AdminCustomerController {
         CustomerInfo customerInfo = new CustomerInfo();
         //获取登录员工id
         Admin admin = AdminUtils.getLoginAdmin();
-        customerInfo.setAdminId(admin.getAdminId());
-        customerInfo.setCustomerIsSolve(2);
+//        customerInfo.setAdminId(admin.getAdminId());
+//        customerInfo.setCustomerIsSolve(2);
         //未解决客诉数量
-        Integer notSolvedCustomer = customerService.selectNotSolvedCustomer(customerInfo);
+//        Integer notSolvedCustomer = customerService.selectNotSolvedCustomer(customerInfo);
         //需要向工厂确认所有已签收的产品数量
-        CustomerCommon customerCommon = new CustomerCommon();
-        customerCommon.setAdminId(admin.getAdminId());
-        customerCommon.setRelationBackStatus(4);
-        Integer amountReceivedCustomer = customerCommonService.listCustomerCommonByStatus(customerCommon);
+//        CustomerCommon customerCommon = new CustomerCommon();
+//        customerCommon.setAdminId(admin.getAdminId());
+//        customerCommon.setRelationBackStatus(4);
+//        Integer amountReceivedCustomer = customerCommonService.listCustomerCommonByStatus(customerCommon);
         //需要填写Efast订单号的客诉数量
-        customerCommon.setRelationBackStatus(3);
-        Integer noEntryCustomer = customerCommonService.listCustomerCommonByStatus(customerCommon);
+//        customerCommon.setRelationBackStatus(3);
+//        Integer noEntryCustomer = customerCommonService.listCustomerCommonByStatus(customerCommon);
         //客诉录入后，三天后未寄回的客诉数量
-        customerCommon.setRelationBackStatus(1);
-        customerCommon.setRelationCreateTime(new Date());
-        Integer notSendCustomer = customerCommonService.listCustomerCommonByStatus(customerCommon);
+//        customerCommon.setRelationBackStatus(1);
+//        customerCommon.setRelationCreateTime(new Date());
+//        Integer notSendCustomer = customerCommonService.listCustomerCommonByStatus(customerCommon);
 
        SalesOrder salesOrder = new SalesOrder();
        salesOrder.setSalesStatus(0);   //未确认
@@ -1706,10 +1478,11 @@ public class AdminCustomerController {
         numberMap.put("toBeDelivered", toBeDelivered);
         numberMap.put("allToDayOrder", allToDayOrder);
 
-        numberMap.put("notSolvedCustomer", notSolvedCustomer);
-        numberMap.put("amountReceivedCustomer", amountReceivedCustomer);
-        numberMap.put("noEntryCustomer", noEntryCustomer);
-        numberMap.put("notSendCustomer", notSendCustomer);
+//        numberMap.put("notSolvedCustomer", notSolvedCustomer);
+//        numberMap.put("amountReceivedCustomer", amountReceivedCustomer);
+//        numberMap.put("noEntryCustomer", noEntryCustomer);
+//        numberMap.put("notSendCustomer", notSendCustomer);
+
         numberMap.put("adminDept", admin.getAdminDept());
         msg.setResultCode(ResultInfo.SUCCESSCODE);
         msg.setStatus(true);
@@ -1717,28 +1490,28 @@ public class AdminCustomerController {
         return msg;
     }
 
-    /**
-     * 根据微信昵称/姓名/电话查询客诉
-     *
-     * @param request
-     * @return
-     */
-    @ResponseBody
-    @RequiresPermissions("customer:list:customer")
-    @RequestMapping("/get_custoner_info")
-    public ResponseJson getCustonerInfo(HttpServletRequest request, CustomerCommon customerCommon) throws Exception {
-        if (customerCommon == null) {
-            return new ResponseJson(500, "参数错误!", 500);
-        }
-        List<CustomerCommon> customerCommonList = customerCommonService.listCustomerCommon(customerCommon);
-        if (customerCommonList.size() < 1) {
-            return new ResponseJson(500, "不存在相关客诉信息!", 500);
-        } else {
-            ResponseJson rj = new ResponseJson(200, "查询成功", 200);
-            rj.addResponseKeyValue("customer", customerCommonList.get(0));
-            return rj;
-        }
-    }
+//    /**
+//     * 根据微信昵称/姓名/电话查询客诉
+//     *
+//     * @param request
+//     * @return
+//     */
+//    @ResponseBody
+//    @RequiresPermissions("customer:list:customer")
+//    @RequestMapping("/get_custoner_info")
+//    public ResponseJson getCustonerInfo(HttpServletRequest request, CustomerCommon customerCommon) throws Exception {
+//        if (customerCommon == null) {
+//            return new ResponseJson(500, "参数错误!", 500);
+//        }
+//        List<CustomerCommon> customerCommonList = customerCommonService.listCustomerCommon(customerCommon);
+//        if (customerCommonList.size() < 1) {
+//            return new ResponseJson(500, "不存在相关客诉信息!", 500);
+//        } else {
+//            ResponseJson rj = new ResponseJson(200, "查询成功", 200);
+//            rj.addResponseKeyValue("customer", customerCommonList.get(0));
+//            return rj;
+//        }
+//    }
 
 
     /**
@@ -1755,25 +1528,22 @@ public class AdminCustomerController {
             return new ResponseJson(500, "未获取到客诉", 500);
         }
 
-        CustomerCommon customerCommon = new CustomerCommon();
-        customerCommon.setCustomerId(customerId);
-        List<CustomerCommon> customerCommonList = customerCommonService.listCustomerCommon(customerCommon);
-        customerCommon = customerCommonList.get(0);
+        CmRelation cmRelation = cmRelationService.getCmRelationByCustomerId(customerId);
 
-        if (customerCommon.getRelationBackStatus() == 1) {    //1：未寄回  2：已寄回  3：已收货  4:已签收待确认
+        if (cmRelation.getRelationBackStatus() == 1) {    //1：未寄回  2：已寄回  3：已收货  4:已签收待确认
             return new ResponseJson(500, "请修改寄回状态，并填写寄回信息", 500);
         }
 
-        if (customerCommon.getRelationBackStatus() == 2) {    //1：未寄回  2：已寄回  3：已收货  4:已签收待确认
+        if (cmRelation.getRelationBackStatus() == 2) {    //1：未寄回  2：已寄回  3：已收货  4:已签收待确认
             return new ResponseJson(500, "产品正在寄回中！", 500);
         }
 
-        if (customerCommon.getRelationIsTransfer() == 0) {    //relationIsTransfer 是否需要转账邮费  0:不需要 10:需要转账
+        if (cmRelation.getRelationIsTransfer() == 0) {    //relationIsTransfer 是否需要转账邮费  0:不需要 10:需要转账
             return new ResponseJson(500, "请修改邮费转账状态，并填写邮费信息", 500);
         }
 
-        if (customerCommon.getRelationBackPostage() == null || customerCommon.getRelationBackPostage() == 0  //relationBackPostage
-                || customerCommon.getRelationAlipay() == null || customerCommon.getRelationAlipayName() == null) {
+        if (cmRelation.getRelationBackPostage() == null || cmRelation.getRelationBackPostage() == 0  //relationBackPostage
+                || cmRelation.getRelationAlipay() == null || cmRelation.getRelationAlipayName() == null) {
             return new ResponseJson(500, "请填写邮费信息", 500);
         }
 
@@ -1789,7 +1559,7 @@ public class AdminCustomerController {
         }
 
         ResponseJson rj = new ResponseJson(200, "可以申请邮费", 200);
-        rj.addResponseKeyValue("customerCommon", customerCommon);
+        rj.addResponseKeyValue("customerCommon", cmRelation);
         rj.addResponseKeyValue("customerInfo", customerInfo);
         return rj;
     }
@@ -1808,25 +1578,22 @@ public class AdminCustomerController {
             return new ResponseJson(500, "未获取到客诉", 500);
         }
 
-        CustomerCommon customerCommon = new CustomerCommon();
-        customerCommon.setCustomerId(customerId);
-        List<CustomerCommon> customerCommonList = customerCommonService.listCustomerCommon(customerCommon);
-        customerCommon = customerCommonList.get(0);
+        CmRelation cmRelation = cmRelationService.getCmRelationByCustomerId(customerId);
 
-        if (customerCommon.getRelationBackStatus() == 1) {    //1：未寄回  2：已寄回  3：已收货  4:已签收待确认
+        if (cmRelation.getRelationBackStatus() == 1) {    //1：未寄回  2：已寄回  3：已收货  4:已签收待确认
             return new ResponseJson(500, "请修改寄回状态，并填写寄回信息", 500);
         }
 
-        if (customerCommon.getRelationBackStatus() == 2) {    //1：未寄回  2：已寄回  3：已收货  4:已签收待确认
+        if (cmRelation.getRelationBackStatus() == 2) {    //1：未寄回  2：已寄回  3：已收货  4:已签收待确认
             return new ResponseJson(500, "产品正在寄回中！", 500);
         }
 
-        if (customerCommon.getRelationIsTransfer() == 0) {    //relationIsTransfer 是否需要转账邮费  0:不需要 10:需要转账
+        if (cmRelation.getRelationIsTransfer() == 0) {    //relationIsTransfer 是否需要转账邮费  0:不需要 10:需要转账
             return new ResponseJson(500, "请修改邮费转账状态，并填写邮费信息", 500);
         }
 
-        if (customerCommon.getRelationBackPostage() == null || customerCommon.getRelationBackPostage() == 0  //relationBackPostage
-                || customerCommon.getRelationAlipay() == null || customerCommon.getRelationAlipayName() == null) {
+        if (cmRelation.getRelationBackPostage() == null || cmRelation.getRelationBackPostage() == 0  //relationBackPostage
+                || cmRelation.getRelationAlipay() == null || cmRelation.getRelationAlipayName() == null) {
             return new ResponseJson(500, "请填写邮费信息", 500);
         }
 
@@ -1842,7 +1609,7 @@ public class AdminCustomerController {
         }
 
         String orderId = "";
-        for (SalesOrder salesOrder : customerCommon.getSalesOrderList()) {
+        for (SalesOrder salesOrder : cmRelation.getSalesOrderList()) {
             if ("".equals(orderId)) {
                 orderId = salesOrder.getSalesOrderId();
             } else {
@@ -1858,16 +1625,16 @@ public class AdminCustomerController {
         postage.setPostageCustomerStatus(2);            //------考虑手动点, 直接变为申请中
         postage.setPostageManagerStatus(1);     //------考虑手动点, 直接变为申请中
         postage.setPostageOrderSource(customerInfo.getStoreId());   //店铺id
-        postage.setPostageTreatmentMethod(customerCommon.getCustomerIsSolve()); //处理方式
+//        postage.setPostageTreatmentMethod(cmRelation.getProcMethodId()); //处理方式
         postage.setSalesOrderId(orderId);       //efast订单号
-        postage.setPostageClientName(customerCommon.getRelationBackName());
-        postage.setPostageClientTel(customerCommon.getRelationBackTel());
-        postage.setPostageClientAddress(customerCommon.getRelationSendAddress());
-        postage.setPostageLogisticsCompany(customerCommon.getRelationBackLogisticsCompany());
-        postage.setPostageLogisticsNo(customerCommon.getRelationBackLogisticsNo());
-        postage.setPostageAmount(customerCommon.getRelationBackPostage());  //寄回邮费
-        postage.setPostageAlipay(customerCommon.getRelationAlipay());   //支付宝账户
-        postage.setPostageAlipayName(customerCommon.getRelationAlipayName());   //支付宝账号名称
+        postage.setPostageClientName(cmRelation.getRelationBackName());
+        postage.setPostageClientTel(cmRelation.getRelationBackTel());
+        postage.setPostageClientAddress(cmRelation.getRelationSendAddress());
+        postage.setPostageLogisticsCompany(cmRelation.getRelationBackLogisticsCompany());
+        postage.setPostageLogisticsNo(cmRelation.getRelationBackLogisticsNo());
+        postage.setPostageAmount(cmRelation.getRelationBackPostage());  //寄回邮费
+        postage.setPostageAlipay(cmRelation.getRelationAlipay());   //支付宝账户
+        postage.setPostageAlipayName(cmRelation.getRelationAlipayName());   //支付宝账号名称
         postage.setPostageLogisticsImg(postageLogisticsImg);
         flag = postageService.savePostage(postage);
 
@@ -1982,7 +1749,7 @@ public class AdminCustomerController {
             BeanUtils.copyProperties(customerInfo, customer);
             CustomerCommon customerCommon = new CustomerCommon();
             customerCommon.setCustomerId(customerInfo.getCustomerId());
-            List<CustomerCommon> listCustomerCommon = customerCommonService.listCustomerCommon(customerCommon);
+            List<CustomerCommon> listCustomerCommon = new ArrayList<>();//customerCommonService.listCustomerCommon(customerCommon);
             if(listCustomerCommon.size() > 0) {
                 for (CustomerCommon common : listCustomerCommon) {
                     if (common.getSalesOrderList().size() > 0) {

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

@@ -8,7 +8,6 @@ import com.iamberry.rst.core.pts.PtsMachine;
 import com.iamberry.rst.faces.fm.AwaitingSignclosedProductInfoService;
 import com.iamberry.rst.faces.fm.ComplaintDetectInfoService;
 import com.iamberry.rst.faces.fm.ComplaintSignclosedInfoService;
-import com.iamberry.rst.faces.cm.FittingsInfoService;
 import com.iamberry.rst.faces.product.ProductService;
 import com.iamberry.rst.faces.pts.MachineService;
 import com.iamberry.rst.service.fm.mapper.ComplaintSignclosedProductInfoMapper;
@@ -41,8 +40,6 @@ public class AdminSignclosedController {
     @Autowired
     private ProductService productService;
     @Autowired
-    private FittingsInfoService fittingsInfoService;
-    @Autowired
     private ComplaintSignclosedInfoService complaintSignclosedInfoService;
     @Autowired
     private AwaitingSignclosedProductInfoService awaitingSignclosedProductInfoService;

watero-rst-web/src/main/java/com/iamberry/rst/controllers/mq/MQTask.java

@@ -65,20 +65,13 @@ public class MQTask implements InitializingBean {
 	@Autowired
 	private SysService sysService;
 	@Autowired
-	private RepairService repairService;
-	@Autowired
 	private AddressService addressService;
-	@Autowired
-	private RenewedService renewedService;
-	@Autowired
-	private ReissueService reissueService;
+
 	@Autowired
 	private CustomerService customerService;
 	@Autowired
 	private SysConfigService sysConfigService;
 	@Autowired
-	private CustomerCommonService customerCommonService;
-	@Autowired
 	private KuaiDi100 kuaidi100;
 	@Autowired
 	private PostageAuthorityService postageAuthorityService;
@@ -87,6 +80,8 @@ public class MQTask implements InitializingBean {
 	@Autowired
 	private  CompanyInfoService companyInfoService;
 	@Autowired
+	private  CmRelationService cmRelationService;
+	@Autowired
 	private  EfastUtil efastUtil;
 
 	private Object lock = new Object();
@@ -240,106 +235,108 @@ public class MQTask implements InitializingBean {
 	}
 
 	/**客诉系统  自动追踪发货信息**/
-	@Scheduled(cron = "0 0/30 * * * ?")//每30分钟执行一次
+//	@Scheduled(cron = "0 0/30 * * * ?")//每30分钟执行一次
 	/*@Scheduled(cron = "0 0/3 * * * ?")//每三分钟执行一次*/
-	public void synchronousDelivery()throws Exception{
-		/*同步维修订单*/
-		Repair repair = new Repair();
-		List<Repair> listRepair = repairService.listSynchronizingRepair(repair);
-		if(listRepair.size() > 0){
-			for(Repair re:listRepair){
-					JSONObject respData = efastOrderService.getOrderFormEfastByOrderId(re.getRepairBackEfastOrderId());
-					EfastOrder efastOrder = efastUtil.respDataConversion(respData);
-					if(efastOrder == null){
-						return;
-					}
-					if (efastOrder.getOrderStatus() == 1){//1代表已发货  发货状态: 0(未发货)1(已发货,即已扫描出库)3(备货中)
-						re.setRepairSendName(efastOrder.getOrderAddressName());
-						re.setRepairSendTel(efastOrder.getOrderAddressTel());
-						//查询省市县id
-						/*Map<String,String> pccMap = provincesCitiesCounties(efastOrder);
-						re.setProvinceNumber(Integer.valueOf(pccMap.get("provinceId")));
-						re.setCityNumber(Integer.valueOf(pccMap.get("cityId")));
-						re.setAreaNumber(Integer.valueOf(pccMap.get("districtId")));*/
-						/*re.setRepairSendMergeAddress(pccMap.get("province")+"-"+pccMap.get("city")+"-"+pccMap.get("district"));*/
-						/*re.setRepairSendAddress(efastOrder.getOrderAddress());*/
-						re.setRepairSendLogisticsCompany(efastOrder.getOrderPostFirm());
-						re.setRepairSendLogisticsNo(efastOrder.getOrderPostNum());
-						/*re.setRepairSendStatus(2);*/
-						Integer msg = repairService.updateRepairInfo(re,null,null);
-						if(msg > 0){
-							//发送维修发货通知短信
-							sendSMS("<维修业务>",efastOrder.getOrderPostFirm(),efastOrder.getOrderPostNum(),re.getCustomerId(),re.getRepairBackTel());
-						}
-					}
-
-			}
-		}
-
-		/*同步换货订单*/
-		Renewed renewed = new Renewed();
-		List<Renewed> listRenewed = renewedService.listSynchronizingRenewed(renewed);
-		if(listRenewed.size() > 0){
-			for(Renewed re:listRenewed){
-					JSONObject respData = efastOrderService.getOrderFormEfastByOrderId(re.getRenewedBackEfastOrderId());
-					EfastOrder efastOrder = efastUtil.respDataConversion(respData);
-					if(efastOrder == null){
-						return;
-					}
-					if (efastOrder.getOrderStatus() == 1){//1代表已发货  发货状态: 0(未发货)1(已发货,即已扫描出库)3(备货中)
-						re.setRenewedSendName(efastOrder.getOrderAddressName());
-						re.setRenewedSendTel(efastOrder.getOrderAddressTel());
-						/*//查询省市县id
-						Map<String,String> pccMap = provincesCitiesCounties(efastOrder);
-						re.setProvinceNumber(Integer.valueOf(pccMap.get("provinceId")));
-						re.setCityNumber(Integer.valueOf(pccMap.get("cityId")));
-						re.setAreaNumber(Integer.valueOf(pccMap.get("districtId")));
-						re.setRenewedSendMergeAddress(pccMap.get("province")+"-"+pccMap.get("city")+"-"+pccMap.get("district"));
-						re.setRenewedSendAddress(efastOrder.getOrderAddress());*/
-						re.setRenewedSendLogisticsCompany(efastOrder.getOrderPostFirm());
-						re.setRenewedSendLogisticsNo(efastOrder.getOrderPostNum());
-						/*re.setRenewedSendStatus(2);*/
-						Integer msg = renewedService.updateRenewedInfo(re,null,null);
-						if(msg > 0){
-							//发送换货发货通知短信
-							sendSMS("<换货业务>",efastOrder.getOrderPostFirm(),efastOrder.getOrderPostNum(),re.getCustomerId(),re.getRenewedBackTel());
-						}
-					}
-			}
-		}
-		/*同步补发订单*/
-		Reissue reissue = new Reissue();
-		List<Reissue> listReissue = reissueService.listSynchronizingReissue(reissue);
-		if(listReissue.size() > 0){
-			for(Reissue re:listReissue){
-					JSONObject respData = efastOrderService.getOrderFormEfastByOrderId(re.getReissueBackEfastOrderId());
-					EfastOrder efastOrder = efastUtil.respDataConversion(respData);
-					if(efastOrder == null){
-						return;
-					}
-					if (efastOrder.getOrderStatus() == 1){//1代表已发货  发货状态: 0(未发货)1(已发货,即已扫描出库)3(备货中)
-						re.setReissueSendName(efastOrder.getOrderAddressName());
-						re.setReissueSendTel(efastOrder.getOrderAddressTel());
-						/*//查询省市县id
-						Map<String,String> pccMap = provincesCitiesCounties(efastOrder);
-						re.setProvinceNumber(Integer.valueOf(pccMap.get("provinceId")));
-						re.setCityNumber(Integer.valueOf(pccMap.get("cityId")));
-						re.setAreaNumber(Integer.valueOf(pccMap.get("districtId")));
-						re.setReissueSendMergeAddress(pccMap.get("province")+"-"+pccMap.get("city")+"-"+pccMap.get("district"));
-						re.setReissueSendAddress(efastOrder.getOrderAddress());*/
-						re.setReissueSendLogisticsCompany(efastOrder.getOrderPostFirm());
-						re.setReissueSendLogisticsNo(efastOrder.getOrderPostNum());
-						/*re.setReissueSendStatus(2);*/
-						Integer msg = reissueService.updateReissueInfo(re);
-						if(msg > 0){
-							//发送补发发货通知短信
-							sendSMS("<补发业务>",efastOrder.getOrderPostFirm(),efastOrder.getOrderPostNum(),re.getCustomerId(),re.getReissueSendTel());
-
-						}
-					}
-			}
-		}
-	}
+//	public void synchronousDelivery()throws Exception{
+//
+//
+//		/*同步维修订单*/
+//		Repair repair = new Repair();
+//		List<Repair> listRepair = repairService.listSynchronizingRepair(repair);
+//		if(listRepair.size() > 0){
+//			for(Repair re:listRepair){
+//					JSONObject respData = efastOrderService.getOrderFormEfastByOrderId(re.getRepairBackEfastOrderId());
+//					EfastOrder efastOrder = efastUtil.respDataConversion(respData);
+//					if(efastOrder == null){
+//						return;
+//					}
+//					if (efastOrder.getOrderStatus() == 1){//1代表已发货  发货状态: 0(未发货)1(已发货,即已扫描出库)3(备货中)
+//						re.setRepairSendName(efastOrder.getOrderAddressName());
+//						re.setRepairSendTel(efastOrder.getOrderAddressTel());
+//						//查询省市县id
+//						/*Map<String,String> pccMap = provincesCitiesCounties(efastOrder);
+//						re.setProvinceNumber(Integer.valueOf(pccMap.get("provinceId")));
+//						re.setCityNumber(Integer.valueOf(pccMap.get("cityId")));
+//						re.setAreaNumber(Integer.valueOf(pccMap.get("districtId")));*/
+//						/*re.setRepairSendMergeAddress(pccMap.get("province")+"-"+pccMap.get("city")+"-"+pccMap.get("district"));*/
+//						/*re.setRepairSendAddress(efastOrder.getOrderAddress());*/
+//						re.setRepairSendLogisticsCompany(efastOrder.getOrderPostFirm());
+//						re.setRepairSendLogisticsNo(efastOrder.getOrderPostNum());
+//						/*re.setRepairSendStatus(2);*/
+//						Integer msg = repairService.updateRepairInfo(re,null,null);
+//						if(msg > 0){
+//							//发送维修发货通知短信
+//							sendSMS("<维修业务>",efastOrder.getOrderPostFirm(),efastOrder.getOrderPostNum(),re.getCustomerId(),re.getRepairBackTel());
+//						}
+//					}
+//
+//			}
+//		}
+//
+//		/*同步换货订单*/
+//		Renewed renewed = new Renewed();
+//		List<Renewed> listRenewed = renewedService.listSynchronizingRenewed(renewed);
+//		if(listRenewed.size() > 0){
+//			for(Renewed re:listRenewed){
+//					JSONObject respData = efastOrderService.getOrderFormEfastByOrderId(re.getRenewedBackEfastOrderId());
+//					EfastOrder efastOrder = efastUtil.respDataConversion(respData);
+//					if(efastOrder == null){
+//						return;
+//					}
+//					if (efastOrder.getOrderStatus() == 1){//1代表已发货  发货状态: 0(未发货)1(已发货,即已扫描出库)3(备货中)
+//						re.setRenewedSendName(efastOrder.getOrderAddressName());
+//						re.setRenewedSendTel(efastOrder.getOrderAddressTel());
+//						/*//查询省市县id
+//						Map<String,String> pccMap = provincesCitiesCounties(efastOrder);
+//						re.setProvinceNumber(Integer.valueOf(pccMap.get("provinceId")));
+//						re.setCityNumber(Integer.valueOf(pccMap.get("cityId")));
+//						re.setAreaNumber(Integer.valueOf(pccMap.get("districtId")));
+//						re.setRenewedSendMergeAddress(pccMap.get("province")+"-"+pccMap.get("city")+"-"+pccMap.get("district"));
+//						re.setRenewedSendAddress(efastOrder.getOrderAddress());*/
+//						re.setRenewedSendLogisticsCompany(efastOrder.getOrderPostFirm());
+//						re.setRenewedSendLogisticsNo(efastOrder.getOrderPostNum());
+//						/*re.setRenewedSendStatus(2);*/
+//						Integer msg = renewedService.updateRenewedInfo(re,null,null);
+//						if(msg > 0){
+//							//发送换货发货通知短信
+//							sendSMS("<换货业务>",efastOrder.getOrderPostFirm(),efastOrder.getOrderPostNum(),re.getCustomerId(),re.getRenewedBackTel());
+//						}
+//					}
+//			}
+//		}
+//		/*同步补发订单*/
+//		Reissue reissue = new Reissue();
+//		List<Reissue> listReissue = reissueService.listSynchronizingReissue(reissue);
+//		if(listReissue.size() > 0){
+//			for(Reissue re:listReissue){
+//					JSONObject respData = efastOrderService.getOrderFormEfastByOrderId(re.getReissueBackEfastOrderId());
+//					EfastOrder efastOrder = efastUtil.respDataConversion(respData);
+//					if(efastOrder == null){
+//						return;
+//					}
+//					if (efastOrder.getOrderStatus() == 1){//1代表已发货  发货状态: 0(未发货)1(已发货,即已扫描出库)3(备货中)
+//						re.setReissueSendName(efastOrder.getOrderAddressName());
+//						re.setReissueSendTel(efastOrder.getOrderAddressTel());
+//						/*//查询省市县id
+//						Map<String,String> pccMap = provincesCitiesCounties(efastOrder);
+//						re.setProvinceNumber(Integer.valueOf(pccMap.get("provinceId")));
+//						re.setCityNumber(Integer.valueOf(pccMap.get("cityId")));
+//						re.setAreaNumber(Integer.valueOf(pccMap.get("districtId")));
+//						re.setReissueSendMergeAddress(pccMap.get("province")+"-"+pccMap.get("city")+"-"+pccMap.get("district"));
+//						re.setReissueSendAddress(efastOrder.getOrderAddress());*/
+//						re.setReissueSendLogisticsCompany(efastOrder.getOrderPostFirm());
+//						re.setReissueSendLogisticsNo(efastOrder.getOrderPostNum());
+//						/*re.setReissueSendStatus(2);*/
+//						Integer msg = reissueService.updateReissueInfo(re);
+//						if(msg > 0){
+//							//发送补发发货通知短信
+//							sendSMS("<补发业务>",efastOrder.getOrderPostFirm(),efastOrder.getOrderPostNum(),re.getCustomerId(),re.getReissueSendTel());
+//
+//						}
+//					}
+//			}
+//		}
+//	}
 
 
 	/**
@@ -438,17 +435,17 @@ public class MQTask implements InitializingBean {
 	@Scheduled(cron = "0 0/60 * * * ?")//每60分钟执行一次
 //	@Scheduled(cron = "0 0/1 * * * ?")//每1分钟执行一次
 	public void syncSendBackCustomer()throws Exception{
-		CustomerCommon customerCommon = new CustomerCommon();
-		customerCommon.setRelationBackStatus(2);
-		List<CustomerCommon> customerCommonList = customerCommonService.listCustomerCommon(customerCommon);
-		for(int i=0;i<customerCommonList.size();i++){
-			CustomerCommon cc = customerCommonList.get(i);
+		CmRelation cmRelation = new CmRelation();
+		cmRelation.setRelationBackStatus(2);
+		List<CmRelation> cmRelationList = cmRelationService.getCmRelationList(cmRelation);
+		for(int i=0;i<cmRelationList.size();i++){
+			CmRelation cc = cmRelationList.get(i);
 			if(!StringUtils.isEmpty(cc.getRelationBackLogisticsCompany()) && !StringUtils.isEmpty(cc.getRelationBackLogisticsNo())){
 				JSONObject rst = kuaidi100.getExpressInfo(cc.getRelationBackLogisticsCompany(),cc.getRelationBackLogisticsNo());
 				if(rst.has("state") && rst.getInt("state") == 3){	//当快递状态为已签收的时候
 					Integer flag = 0;
 					try{
-						flag = customerCommonService.updateCommonAndAddPostage(cc);
+						flag = cmRelationService.updateStatus(cc);
 					}catch (RuntimeException e){
 						logger.info("====== 客诉寄回签收报错 ：客诉id："+cc.getCustomerId()+" ======"+e.getMessage());
 					}

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

@@ -432,7 +432,7 @@
             <div class="row cl recipientInfo" id="" 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="" placeholder="填写收件人姓名" id="sendName" name="relationSendName" datatype="*1-16" errormsg="联系人格式不正确！" >
+                    <input type="text" class="input-text" value="" placeholder="填写收件人姓名" id="sendName" name="relationSendName"  errormsg="联系人格式不正确！" >
                 </div>
                 <div class="formControls col-2 col-sm-2">
                     <input type="text" class="input-text" value="" placeholder="填写收件人手机号" id="sendTel" name="relationSendTel" datatype="m" errormsg="联系人电话格式不正确！">

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

@@ -312,12 +312,13 @@
                                         <font color=#06c>需要回访</font>
                                     </a><br/>
                                 </#if>-->
-                                <a style="text-decoration:none" href="javascript:void(0)" title="查询签收信息" onclick="toSignclosed(${customer.customerId!''})">
+
+                               <#-- <a style="text-decoration:none" href="javascript:void(0)" title="查询签收信息" onclick="toSignclosed(${customer.customerId!''})">
                                     <font color=#06c>签收信息</font>
                                 </a><br/>
                                 <a style="text-decoration:none" href="javascript:void(0)" title="查询品检信息" onclick="toDetect(${customer.customerId!''})">
                                     <font color=#06c>品检信息</font>
-                                </a><br/>
+                                </a><br/>-->
                             </td>
                         </tr>
                     </#list>

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

@@ -646,7 +646,6 @@
 
         for(var i=0;i<productList.length;i++) {
             var product = productList[i];
-            var produceFittings = getProduceFittings(product.productId);  //获取该产品的所有配件
             var colorList = product.colorList;  //该产品的所有颜色
 
             var productType = product.productType;
@@ -682,30 +681,6 @@
                 colorHtml += '<span>暂无该产品的颜色！<span>';
             }
 
-            var produceFittingsHtml = '';
-            /*
-            if(produceFittings != null && produceFittings.length > 0){
-                produceFittingsHtml += '<table style="height: 100%;">';
-                for(var m=0;m<produceFittings.length;m++){
-                    var produceFit = produceFittings[m];
-                    if(produceFit.productId == product.productId) {
-                        var fristInputStyle = "border-top: 1px solid #ddd;";
-                        produceFittingsHtml += '<tr >' +
-                                '         <td width="85" style="border-left: none;text-align: center; '+ fristInputStyle +'">' + produceFit.fittingsName +'</td>' +
-                                '         <td width="15" style="'+ fristInputStyle +'">' +
-                                '             <input type="hidden" class="input-produce-id" value="' + produceFit.productId + '">' +
-                                '             <input type="hidden" class="input-fittings-id" value="' + produceFit.fittingsId +'">' +
-                                '             <input type="text" class="input-text input-fittings-number" style="width: 100%;" value="'+ number +'" placeholder="数量" id="" name="" onkeyup="keyFun($(this))" onpaste="keyFun($(this))" >' +
-                                '         </td>' +
-                                '     </tr>';
-                        fristInputStyle = "";
-                    }
-                }
-                produceFittingsHtml += '</table>';
-            }else{
-                produceFittingsHtml += '<span>暂无产品配件！<span>';
-            }*/
-
             var produceHtml = '<input type="hidden" value="'+ product.productId +'">' +
                     '<span>'+  product.productName +'</span>';
 
@@ -739,26 +714,6 @@
         return productList;
     }
 
-    /*获取产品配件*/
-    function getProduceFittings(productId){
-        var produceFittings;
-        $.ajax({
-            type: "get",
-            data: {
-                productId : productId
-            },
-            url: "${path}/admin/customer/select_produce_fittings",
-            async: false,
-            success: function(data){
-                if (data.returnCode == 200) {
-                    produceFittings = data.returnMsg.produceFittingsList;
-                }
-            },
-            error: function(XmlHttpRequest, textStatus, errorThrown){
-            }
-        });
-        return produceFittings;
-    }
 
 </script>
 </body>

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

@@ -447,7 +447,7 @@
             <div class="row cl recipientInfo" id="" 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="${cmRelation.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" errormsg="联系人格式不正确！" >
                 </div>
                 <div class="formControls col-2 col-sm-2">
                     <input type="text" class="input-text" value="${cmRelation.relationSendTel!''}" placeholder="填写收件人手机号" id="sendTel" name="relationSendTel" datatype="m" errormsg="联系人电话格式不正确！">
@@ -1004,26 +1004,6 @@
         if(provinceNumber != "xxxxx"){
             ulcRelationAddress.setUlcById(0,${cmRelation.provinceNumber!'1'},${cmRelation.cityNumber!'1'},${cmRelation.areaNumber!'1'});
         }
-
-
-        <#--var proId = setPro(null,1);  //创建省-->
-        <#--<#if cmRelation.provinceNumber?? >-->
-            <#--var proId = ;-->
-            <#--$("#province option[value='"+ proId +"']").attr("selected","true"); //设置省-->
-        <#--</#if>-->
-
-        <#--var cityId = setCity(null,proId,2);-->
-        <#--<#if cmRelation.cityNumber?? >-->
-            <#--var cityId = ${cmRelation.cityNumber!''};-->
-            <#--$("#city option[value='" + cityId + "']").attr("selected", "true"); //设置市-->
-        <#--</#if>-->
-
-        <#--setDistrict(null, cityId, 2);-->
-        <#--<#if cmRelation.areaNumber?? >-->
-            <#--var disId = ${cmRelation.areaNumber!''};-->
-            <#--$("#district option[value='" + disId + "']").attr("selected", "true"); //设置地区-->
-        <#--</#if>-->
-
         isInitAddress = 1;
     }
 </script>

watero-rst-web/src/main/webapp/WEB-INF/views/home/pc_index.ftl

@@ -99,11 +99,11 @@
             <a onclick="toOrserList('${path}/admin/salesOrder/list_order_page?salesShippingStatus=11',1,'')"  ><span>（</span><span id="toBeDelivered" style="color: #f00">0</span><span>）待发货数量</span></a><br>
             <a onclick="toOrserList('${path}/admin/salesOrder/list_order_page?1=1',1,'today')"  ><span>（</span><span id="allToDayOrder" style="color: #f00">0</span><span>）今日订单总数</span></a><br>
 
-            <div>客诉</div>
-            <a onclick="toOrserList('${path}/admin/customer/select_customer_list?customerIsSolve=2&isFirst=1',2,'')"  ><span>（</span><span id="notSolvedCustomer" style="color: #f00">0</span><span>）未解决客诉数量</span></a><br>
-            <a onclick="toOrserList('${path}/admin/customer/select_customer_list?backStatus=4&isFirst=1',2,'')"  ><span>（</span><span id="amountReceivedCustomer" style="color: #f00">0</span><span>）需要向工厂确认是否已签收的产品数量</span></a><br>
-            <a onclick="toOrserList('${path}/admin/customer/select_customer_list?backStatus=3&isFirst=1',2,'')"  ><span>（</span><span id="noEntryCustomer" style="color: #f00">0</span><span>）需要填写Efast订单号的客诉数量</span></a><br>
-            <a onclick="toOrserList('${path}/admin/customer/select_customer_list?backStatus=1&isFirst=1',2,'')"  ><span>（</span><span id="notSendCustomer" style="color: #f00">0</span><span>）录入三天后未寄回的客诉数量</span></a>
+            <#--<div>客诉</div>-->
+            <#--<a onclick="toOrserList('${path}/admin/customer/select_customer_list?customerIsSolve=2&isFirst=1',2,'')"  ><span>（</span><span id="notSolvedCustomer" style="color: #f00">0</span><span>）未解决客诉数量</span></a><br>-->
+            <#--<a onclick="toOrserList('${path}/admin/customer/select_customer_list?backStatus=4&isFirst=1',2,'')"  ><span>（</span><span id="amountReceivedCustomer" style="color: #f00">0</span><span>）需要向工厂确认是否已签收的产品数量</span></a><br>-->
+            <#--<a onclick="toOrserList('${path}/admin/customer/select_customer_list?backStatus=3&isFirst=1',2,'')"  ><span>（</span><span id="noEntryCustomer" style="color: #f00">0</span><span>）需要填写Efast订单号的客诉数量</span></a><br>-->
+            <#--<a onclick="toOrserList('${path}/admin/customer/select_customer_list?backStatus=1&isFirst=1',2,'')"  ><span>（</span><span id="notSendCustomer" style="color: #f00">0</span><span>）录入三天后未寄回的客诉数量</span></a>-->
         </div>
     </div>
 </section>
@@ -131,10 +131,10 @@
                 $("#toBeDelivered").html(data.data.toBeDelivered);
                 $("#allToDayOrder").html(data.data.allToDayOrder);
 
-                $("#notSolvedCustomer").html(data.data.notSolvedCustomer);
-                $("#amountReceivedCustomer").html(data.data.amountReceivedCustomer);
-                $("#noEntryCustomer").html(data.data.noEntryCustomer);
-                $("#notSendCustomer").html(data.data.notSendCustomer);
+//                $("#notSolvedCustomer").html(data.data.notSolvedCustomer);
+//                $("#amountReceivedCustomer").html(data.data.amountReceivedCustomer);
+//                $("#noEntryCustomer").html(data.data.noEntryCustomer);
+//                $("#notSendCustomer").html(data.data.notSendCustomer);
                 if(data.data.adminDept == 3){
                     toDoShow();
                 }
@@ -149,7 +149,7 @@
         layer.open({
             title: '待办事项',
             type: 1,
-            area: ['300px', '300px'], //宽高
+            area: ['300px', '175px'], //宽高
             content: $("#selectTodo").html(),
             offset: 'rb',
             shade: 0

watero-rst-web/src/main/webapp/WEB-INF/views/order/salesOrder/order_correct_list.ftl

@@ -647,7 +647,6 @@
 
         for(var i=0;i<productList.length;i++) {
             var product = productList[i];
-            var produceFittings = getProduceFittings(product.productId);  //获取该产品的所有配件
             var colorList = product.colorList;  //该产品的所有颜色
 
             var productType = product.productType;
@@ -683,30 +682,6 @@
                 colorHtml += '<span>暂无该产品的颜色！<span>';
             }
 
-            var produceFittingsHtml = '';
-            /*
-            if(produceFittings != null && produceFittings.length > 0){
-                produceFittingsHtml += '<table style="height: 100%;">';
-                for(var m=0;m<produceFittings.length;m++){
-                    var produceFit = produceFittings[m];
-                    if(produceFit.productId == product.productId) {
-                        var fristInputStyle = "border-top: 1px solid #ddd;";
-                        produceFittingsHtml += '<tr >' +
-                                '         <td width="85" style="border-left: none;text-align: center; '+ fristInputStyle +'">' + produceFit.fittingsName +'</td>' +
-                                '         <td width="15" style="'+ fristInputStyle +'">' +
-                                '             <input type="hidden" class="input-produce-id" value="' + produceFit.productId + '">' +
-                                '             <input type="hidden" class="input-fittings-id" value="' + produceFit.fittingsId +'">' +
-                                '             <input type="text" class="input-text input-fittings-number" style="width: 100%;" value="'+ number +'" placeholder="数量" id="" name="" onkeyup="keyFun($(this))" onpaste="keyFun($(this))" >' +
-                                '         </td>' +
-                                '     </tr>';
-                        fristInputStyle = "";
-                    }
-                }
-                produceFittingsHtml += '</table>';
-            }else{
-                produceFittingsHtml += '<span>暂无产品配件！<span>';
-            }*/
-
             var produceHtml = '<input type="hidden" value="'+ product.productId +'">' +
                     '<span>'+  product.productName +'</span>';
 
@@ -739,28 +714,6 @@
         });
         return productList;
     }
-
-    /*获取产品配件*/
-    function getProduceFittings(productId){
-        var produceFittings;
-        $.ajax({
-            type: "get",
-            data: {
-                productId : productId
-            },
-            url: "${path}/admin/customer/select_produce_fittings",
-            async: false,
-            success: function(data){
-                if (data.returnCode == 200) {
-                    produceFittings = data.returnMsg.produceFittingsList;
-                }
-            },
-            error: function(XmlHttpRequest, textStatus, errorThrown){
-            }
-        });
-        return produceFittings;
-    }
-
 </script>
 </body>
 </html>

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

@@ -1199,26 +1199,6 @@ function getProduct(){
     return productList;
 }
 
-/*获取产品配件*/
-function getProduceFittings(productId){
-    var produceFittings;
-    $.ajax({
-        type: "get",
-        data: {
-            productId : productId
-        },
-        url: url_path + "/admin/customer/select_produce_fittings",
-        async: false,
-        success: function(data){
-            if (data.returnCode == 200) {
-                produceFittings = data.returnMsg.produceFittingsList;
-            }
-        },
-        error: function(XmlHttpRequest, textStatus, errorThrown){
-        }
-    });
-    return produceFittings;
-}
 
 /*设置TDS收集信息*/
 function setTDSCollect(){