客诉修改

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

@@ -1,6 +1,7 @@
 package com.iamberry.rst.core.cm;
 
 import com.fasterxml.jackson.annotation.JsonFormat;
+import com.iamberry.rst.core.fm.ComplaintDetectInfo;
 import org.springframework.format.annotation.DateTimeFormat;
 
 import java.io.Serializable;

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

@@ -0,0 +1,331 @@
+package com.iamberry.rst.core.cm;
+
+import  java.util.Date;
+import  java.io.Serializable;
+/**
+ *  售后处理类
+ * @author
+ * @Date 2018-12-28
+ */
+public class CmRelation implements  Serializable{
+    //处理主键
+    private Integer relationId;
+    //
+    private Integer procMethodId;
+    //客诉基本信息主键
+    private Integer customerId;
+    //仓储任务(签收id)
+    private Integer signclosedId;
+    //售后生成订单的交易号
+    private String relationBackEfastOrderId;
+    //寄回状态 1：未寄回 2：已寄回 3：已收货 4: 已签收待确认
+    private Integer relationBackStatus;
+    //寄回人姓名
+    private String relationBackName;
+    //寄回人电话
+    private String relationBackTel;
+    //寄回物流公司
+    private String relationBackLogisticsCompany;
+    //寄回物流单号
+    private String relationBackLogisticsNo;
+    //寄回邮费 单位为分
+    private Integer relationBackPostage;
+    //寄回机器编号
+    private String relationBackMachineNo;
+    //寄送状态 1：未寄送 2：已寄送 3：已收货
+    private Integer relationSendStatus;
+    //寄送人姓名
+    private String relationSendName;
+    //寄送人电话
+    private String relationSendTel;
+    //寄送地址-省
+    private Integer provinceNumber;
+    //寄送地址-市
+    private Integer cityNumber;
+    //寄送地址-区
+    private Integer areaNumber;
+    //寄送地址-省市区
+    private String relationSendMergeAddress;
+    //寄送地址-详细地址
+    private String relationSendAddress;
+    //寄送物流公司
+    private String relationSendLogisticsCompany;
+    //寄送物流单号
+    private String relationSendLogisticsNo;
+    //备注
+    private String relationDesc;
+    //状态 1：使用中 2：停用中
+    private Integer relationState;
+    //转账账户
+    private String relationAlipay;
+    //是否已转账邮费 0:不需要 1:已转 2:已申请待转 3:未申请
+    private Integer relationIsTransfer;
+    //转账账户姓名
+    private String relationAlipayName;
+    //签收日期
+    private Date relationBackReceiptDate;
+    //工厂维修报价
+    private Integer relationFactoryCosts;
+    //客户报价
+    private Integer relationCustomerCosts;
+    //创建时间
+    private Date relationCreateTime;
+    //修改时间
+    private Date relationUpdateTime;
+
+    public Integer getRelationId(){
+        return relationId;
+    }
+
+    public void setRelationId(Integer  relationId){
+        this.relationId=relationId;
+    }
+
+    public Integer getProcMethodId(){
+        return procMethodId;
+    }
+
+    public void setProcMethodId(Integer  procMethodId){
+        this.procMethodId=procMethodId;
+    }
+
+    public Integer getCustomerId(){
+        return customerId;
+    }
+
+    public void setCustomerId(Integer  customerId){
+        this.customerId=customerId;
+    }
+
+    public Integer getSignclosedId(){
+        return signclosedId;
+    }
+
+    public void setSignclosedId(Integer  signclosedId){
+        this.signclosedId=signclosedId;
+    }
+
+    public String getRelationBackEfastOrderId(){
+        return relationBackEfastOrderId;
+    }
+
+    public void setRelationBackEfastOrderId(String  relationBackEfastOrderId){
+        this.relationBackEfastOrderId=relationBackEfastOrderId;
+    }
+
+    public Integer getRelationBackStatus(){
+        return relationBackStatus;
+    }
+
+    public void setRelationBackStatus(Integer  relationBackStatus){
+        this.relationBackStatus=relationBackStatus;
+    }
+
+    public String getRelationBackName(){
+        return relationBackName;
+    }
+
+    public void setRelationBackName(String  relationBackName){
+        this.relationBackName=relationBackName;
+    }
+
+    public String getRelationBackTel(){
+        return relationBackTel;
+    }
+
+    public void setRelationBackTel(String  relationBackTel){
+        this.relationBackTel=relationBackTel;
+    }
+
+    public String getRelationBackLogisticsCompany(){
+        return relationBackLogisticsCompany;
+    }
+
+    public void setRelationBackLogisticsCompany(String  relationBackLogisticsCompany){
+        this.relationBackLogisticsCompany=relationBackLogisticsCompany;
+    }
+
+    public String getRelationBackLogisticsNo(){
+        return relationBackLogisticsNo;
+    }
+
+    public void setRelationBackLogisticsNo(String  relationBackLogisticsNo){
+        this.relationBackLogisticsNo=relationBackLogisticsNo;
+    }
+
+    public Integer getRelationBackPostage(){
+        return relationBackPostage;
+    }
+
+    public void setRelationBackPostage(Integer  relationBackPostage){
+        this.relationBackPostage=relationBackPostage;
+    }
+
+    public String getRelationBackMachineNo(){
+        return relationBackMachineNo;
+    }
+
+    public void setRelationBackMachineNo(String  relationBackMachineNo){
+        this.relationBackMachineNo=relationBackMachineNo;
+    }
+
+    public Integer getRelationSendStatus(){
+        return relationSendStatus;
+    }
+
+    public void setRelationSendStatus(Integer  relationSendStatus){
+        this.relationSendStatus=relationSendStatus;
+    }
+
+    public String getRelationSendName(){
+        return relationSendName;
+    }
+
+    public void setRelationSendName(String  relationSendName){
+        this.relationSendName=relationSendName;
+    }
+
+    public String getRelationSendTel(){
+        return relationSendTel;
+    }
+
+    public void setRelationSendTel(String  relationSendTel){
+        this.relationSendTel=relationSendTel;
+    }
+
+    public Integer getProvinceNumber(){
+        return provinceNumber;
+    }
+
+    public void setProvinceNumber(Integer  provinceNumber){
+        this.provinceNumber=provinceNumber;
+    }
+
+    public Integer getCityNumber(){
+        return cityNumber;
+    }
+
+    public void setCityNumber(Integer  cityNumber){
+        this.cityNumber=cityNumber;
+    }
+
+    public Integer getAreaNumber(){
+        return areaNumber;
+    }
+
+    public void setAreaNumber(Integer  areaNumber){
+        this.areaNumber=areaNumber;
+    }
+
+    public String getRelationSendMergeAddress(){
+        return relationSendMergeAddress;
+    }
+
+    public void setRelationSendMergeAddress(String  relationSendMergeAddress){
+        this.relationSendMergeAddress=relationSendMergeAddress;
+    }
+
+    public String getRelationSendAddress(){
+        return relationSendAddress;
+    }
+
+    public void setRelationSendAddress(String  relationSendAddress){
+        this.relationSendAddress=relationSendAddress;
+    }
+
+    public String getRelationSendLogisticsCompany(){
+        return relationSendLogisticsCompany;
+    }
+
+    public void setRelationSendLogisticsCompany(String  relationSendLogisticsCompany){
+        this.relationSendLogisticsCompany=relationSendLogisticsCompany;
+    }
+
+    public String getRelationSendLogisticsNo(){
+        return relationSendLogisticsNo;
+    }
+
+    public void setRelationSendLogisticsNo(String  relationSendLogisticsNo){
+        this.relationSendLogisticsNo=relationSendLogisticsNo;
+    }
+
+    public String getRelationDesc(){
+        return relationDesc;
+    }
+
+    public void setRelationDesc(String  relationDesc){
+        this.relationDesc=relationDesc;
+    }
+
+    public Integer getRelationState(){
+        return relationState;
+    }
+
+    public void setRelationState(Integer  relationState){
+        this.relationState=relationState;
+    }
+
+    public String getRelationAlipay(){
+        return relationAlipay;
+    }
+
+    public void setRelationAlipay(String  relationAlipay){
+        this.relationAlipay=relationAlipay;
+    }
+
+    public Integer getRelationIsTransfer(){
+        return relationIsTransfer;
+    }
+
+    public void setRelationIsTransfer(Integer  relationIsTransfer){
+        this.relationIsTransfer=relationIsTransfer;
+    }
+
+    public String getRelationAlipayName(){
+        return relationAlipayName;
+    }
+
+    public void setRelationAlipayName(String  relationAlipayName){
+        this.relationAlipayName=relationAlipayName;
+    }
+
+    public Date getRelationBackReceiptDate(){
+        return relationBackReceiptDate;
+    }
+
+    public void setRelationBackReceiptDate(Date  relationBackReceiptDate){
+        this.relationBackReceiptDate=relationBackReceiptDate;
+    }
+
+    public Integer getRelationFactoryCosts(){
+        return relationFactoryCosts;
+    }
+
+    public void setRelationFactoryCosts(Integer  relationFactoryCosts){
+        this.relationFactoryCosts=relationFactoryCosts;
+    }
+
+    public Integer getRelationCustomerCosts(){
+        return relationCustomerCosts;
+    }
+
+    public void setRelationCustomerCosts(Integer  relationCustomerCosts){
+        this.relationCustomerCosts=relationCustomerCosts;
+    }
+
+    public Date getRelationCreateTime(){
+        return relationCreateTime;
+    }
+
+    public void setRelationCreateTime(Date  relationCreateTime){
+        this.relationCreateTime=relationCreateTime;
+    }
+
+    public Date getRelationUpdateTime(){
+        return relationUpdateTime;
+    }
+
+    public void setRelationUpdateTime(Date  relationUpdateTime){
+        this.relationUpdateTime=relationUpdateTime;
+    }
+}

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

@@ -1,5 +1,7 @@
 package com.iamberry.rst.core.cm;
 
+import com.iamberry.rst.core.fm.ComplaintSmallClassInfo;
+
 import java.io.Serializable;
 import java.util.ArrayList;
 import java.util.Date;

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

@@ -1,6 +1,7 @@
 package com.iamberry.rst.core.cm;
 
 import com.fasterxml.jackson.annotation.JsonFormat;
+import com.iamberry.rst.core.fm.ComplaintDetectInfo;
 import org.springframework.format.annotation.DateTimeFormat;
 
 import java.io.Serializable;

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

@@ -1,6 +1,7 @@
 package com.iamberry.rst.core.cm;
 
 import com.fasterxml.jackson.annotation.JsonFormat;
+import com.iamberry.rst.core.fm.ComplaintDetectInfo;
 import org.springframework.format.annotation.DateTimeFormat;
 
 import java.io.Serializable;

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

@@ -0,0 +1,101 @@
+package com.iamberry.rst.core.cm;
+
+import  java.util.Date;
+import  java.io.Serializable;
+/**
+ *  处理方式类
+ * @author Administrator
+ * @Date 2018-12-29
+ */
+public class ProcMethod  implements  Serializable{
+    //处理方式id
+    private Integer procMethodId;
+    //处理方式类型id
+    private Integer procTypeId;
+    //处理方式名称
+    private String procMethodName;
+    //处理方式状态 1：使用中 2：未使用
+    private Integer procMethodStatus;
+    //处理方式描述
+    private String procMethodDesc;
+    //是否需要寄回 1:需要寄回 2:不需要寄回
+    private Integer procMethodIsBack;
+    //是否需要寄出 1:需要寄出 2:不需要寄出
+    private Integer procMethodIsSend;
+    //处理方式创建时间
+    private Date procMethodCreateTime;
+    //处理方式修改时间'
+    private Date procMethodUpdateTime;
+
+    public Integer getProcMethodId(){
+        return procMethodId;
+    }
+
+    public void setProcMethodId(Integer  procMethodId){
+        this.procMethodId=procMethodId;
+    }
+
+    public Integer getProcTypeId(){
+        return procTypeId;
+    }
+
+    public void setProcTypeId(Integer  procTypeId){
+        this.procTypeId=procTypeId;
+    }
+
+    public String getProcMethodName(){
+        return procMethodName;
+    }
+
+    public void setProcMethodName(String  procMethodName){
+        this.procMethodName=procMethodName;
+    }
+
+    public Integer getProcMethodStatus(){
+        return procMethodStatus;
+    }
+
+    public void setProcMethodStatus(Integer  procMethodStatus){
+        this.procMethodStatus=procMethodStatus;
+    }
+
+    public String getProcMethodDesc(){
+        return procMethodDesc;
+    }
+
+    public void setProcMethodDesc(String  procMethodDesc){
+        this.procMethodDesc=procMethodDesc;
+    }
+
+    public Integer getProcMethodIsBack(){
+        return procMethodIsBack;
+    }
+
+    public void setProcMethodIsBack(Integer  procMethodIsBack){
+        this.procMethodIsBack=procMethodIsBack;
+    }
+
+    public Integer getProcMethodIsSend(){
+        return procMethodIsSend;
+    }
+
+    public void setProcMethodIsSend(Integer  procMethodIsSend){
+        this.procMethodIsSend=procMethodIsSend;
+    }
+
+    public Date getProcMethodCreateTime(){
+        return procMethodCreateTime;
+    }
+
+    public void setProcMethodCreateTime(Date  procMethodCreateTime){
+        this.procMethodCreateTime=procMethodCreateTime;
+    }
+
+    public Date getProcMethodUpdateTime(){
+        return procMethodUpdateTime;
+    }
+
+    public void setProcMethodUpdateTime(Date  procMethodUpdateTime){
+        this.procMethodUpdateTime=procMethodUpdateTime;
+    }
+}

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

@@ -0,0 +1,71 @@
+package com.iamberry.rst.core.cm;
+
+import  java.util.Date;
+import  java.io.Serializable;
+/**
+ *  处理方式类型类
+ * @author
+ * @Date 2018-12-28
+ */
+public class ProcType  implements  Serializable{
+    //处理方式类型主键
+    private Integer procTypeId;
+    //处理方式类型名称
+    private String procTypeName;
+    //处理方式状态 1：使用中 2：未使用
+    private Integer procTypeStatus;
+    //处理方式描述
+    private String procTypeDesc;
+    //处理方式创建时间
+    private Date procTypeCreateTime;
+    //处理方式修改时间'
+    private Date procTypeUpdateTime;
+
+    public Integer getProcTypeId(){
+        return procTypeId;
+    }
+
+    public void setProcTypeId(Integer  procTypeId){
+        this.procTypeId=procTypeId;
+    }
+
+    public String getProcTypeName(){
+        return procTypeName;
+    }
+
+    public void setProcTypeName(String  procTypeName){
+        this.procTypeName=procTypeName;
+    }
+
+    public Integer getProcTypeStatus(){
+        return procTypeStatus;
+    }
+
+    public void setProcTypeStatus(Integer  procTypeStatus){
+        this.procTypeStatus=procTypeStatus;
+    }
+
+    public String getProcTypeDesc(){
+        return procTypeDesc;
+    }
+
+    public void setProcTypeDesc(String  procTypeDesc){
+        this.procTypeDesc=procTypeDesc;
+    }
+
+    public Date getProcTypeCreateTime(){
+        return procTypeCreateTime;
+    }
+
+    public void setProcTypeCreateTime(Date  procTypeCreateTime){
+        this.procTypeCreateTime=procTypeCreateTime;
+    }
+
+    public Date getProcTypeUpdateTime(){
+        return procTypeUpdateTime;
+    }
+
+    public void setProcTypeUpdateTime(Date  procTypeUpdateTime){
+        this.procTypeUpdateTime=procTypeUpdateTime;
+    }
+}

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

@@ -1,6 +1,7 @@
 package com.iamberry.rst.core.cm;
 
 import com.fasterxml.jackson.annotation.JsonFormat;
+import com.iamberry.rst.core.fm.ComplaintDetectInfo;
 import org.springframework.format.annotation.DateTimeFormat;
 
 import java.io.Serializable;

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

@@ -1,6 +1,7 @@
 package com.iamberry.rst.core.cm;
 
 import com.fasterxml.jackson.annotation.JsonFormat;
+import com.iamberry.rst.core.fm.ComplaintDetectInfo;
 import org.springframework.format.annotation.DateTimeFormat;
 
 import java.io.Serializable;

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

@@ -3,7 +3,7 @@ package com.iamberry.rst.core.cm;
 import  java.util.Date;
 import  java.io.Serializable;
 /**
- *  类
+ *
  * @author ljk
  * @Date 2018-09-13
  */

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

@@ -1,4 +1,4 @@
-package com.iamberry.rst.core.cm;
+package com.iamberry.rst.core.fm;
 
 import java.io.Serializable;
 import java.util.Date;

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

@@ -1,4 +1,4 @@
-package com.iamberry.rst.core.cm;
+package com.iamberry.rst.core.fm;
 
 import com.fasterxml.jackson.annotation.JsonFormat;
 import org.springframework.format.annotation.DateTimeFormat;

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

@@ -1,4 +1,4 @@
-package com.iamberry.rst.core.cm;
+package com.iamberry.rst.core.fm;
 
 import java.io.Serializable;
 import java.util.Date;

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

@@ -1,4 +1,4 @@
-package com.iamberry.rst.core.cm;
+package com.iamberry.rst.core.fm;
 
 import java.io.Serializable;
 import java.util.Date;

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

@@ -1,4 +1,4 @@
-package com.iamberry.rst.core.cm;
+package com.iamberry.rst.core.fm;
 
 import java.io.Serializable;
 import java.util.ArrayList;

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

@@ -1,4 +1,6 @@
-package com.iamberry.rst.core.cm;
+package com.iamberry.rst.core.fm;
+
+import com.iamberry.rst.core.cm.ComplaintQuestionInfo;
 
 import java.io.Serializable;
 import java.util.ArrayList;

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

@@ -1,4 +1,4 @@
-package com.iamberry.rst.core.cm;
+package com.iamberry.rst.core.fm;
 
 import java.io.Serializable;
 

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

@@ -1,4 +1,4 @@
-package com.iamberry.rst.core.cm;
+package com.iamberry.rst.core.fm;
 
 import java.io.Serializable;
 import java.util.Date;

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

@@ -1,4 +1,4 @@
-package com.iamberry.rst.core.cm;
+package com.iamberry.rst.core.fm;
 
 import java.io.Serializable;
 import java.util.Date;

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

@@ -1,4 +1,4 @@
-package com.iamberry.rst.core.cm;
+package com.iamberry.rst.core.fm;
 
 import java.io.Serializable;
 import java.util.Date;

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

@@ -1,4 +1,4 @@
-package com.iamberry.rst.core.cm;
+package com.iamberry.rst.core.fm;
 
 import java.io.Serializable;
 import java.util.Date;

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

@@ -1,4 +1,4 @@
-package com.iamberry.rst.core.cm;
+package com.iamberry.rst.core.fm;
 
 import java.io.Serializable;
 import java.util.Date;

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

@@ -0,0 +1,43 @@
+package com.iamberry.rst.faces.cm;
+
+import com.iamberry.rst.core.cm.CmRelation;
+
+import java.util.List;
+
+/**
+ *  售后处理接口
+ * @author
+ * @Date 2018-12-28
+ */
+public interface CmRelationService {
+    /**
+     * 获取集合
+     * @param  cmRelation
+     * @return List
+     */
+    List<CmRelation> getCmRelationList(CmRelation cmRelation);
+    /**
+     * 查询单条数据
+     * @param  id
+     * @return  cmRelation
+     */
+    CmRelation  getCmRelationById(Integer  id);
+    /**
+     * 增加数据
+     * @param  cmRelation
+     * @return Integer
+     */
+    Integer  save(CmRelation  cmRelation);
+    /**
+     * 修改数据
+     * @param  cmRelation
+     * @return Integer
+     */
+    Integer  update(CmRelation  cmRelation);
+    /**
+     * 删除数据
+     * @param  id
+     * @return Integer
+     */
+    Integer  delete(Integer  id);
+}

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

@@ -1,12 +1,8 @@
 package com.iamberry.rst.faces.cm;
 
 import com.iamberry.rst.core.cm.ComplaintQuestionInfo;
-import com.iamberry.rst.core.cm.ComplaintSmallClassInfo;
-import com.iamberry.rst.core.cm.SalesOrder;
 import com.iamberry.rst.core.page.PagedResult;
 
-import java.util.List;
-
 /**
  * 客诉-客诉问题Service
  */

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

@@ -1,9 +1,10 @@
 package com.iamberry.rst.faces.cm;
 
 import com.iamberry.rst.core.cm.*;
+import com.iamberry.rst.core.fm.ComplaintDetectInfo;
+import com.iamberry.rst.core.fm.ComplaintSignclosedInfo;
 import com.iamberry.rst.core.order.ProductType;
 import com.iamberry.rst.core.page.PagedResult;
-import org.springframework.transaction.annotation.Transactional;
 
 import java.util.List;
 import java.util.Map;
@@ -125,14 +126,14 @@ public interface CustomerService {
      * @param customerCommon
      * @return
      */
-    void saveComplaintSignclosedInfo(ComplaintSignclosedInfo complaintSignclosedInfo,CustomerCommon customerCommon);
+    void saveComplaintSignclosedInfo(ComplaintSignclosedInfo complaintSignclosedInfo, CustomerCommon customerCommon);
     /**
      * 添加品检
      * @param complaintDetectInfo
      * @param customerCommon
      * @return
      */
-    void saveComplaintDetectInfo(ComplaintDetectInfo complaintDetectInfo,CustomerCommon customerCommon);
+    void saveComplaintDetectInfo(ComplaintDetectInfo complaintDetectInfo, CustomerCommon customerCommon);
     /**
      * 向Efast推送订单  仅换新，维修 ,补发
      * @return

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

@@ -1,8 +1,7 @@
 package com.iamberry.rst.faces.cm;
 
-import com.iamberry.rst.core.cm.FactoryInfo;
-import com.iamberry.rst.core.cm.InventoryLog;
-import com.iamberry.rst.core.cm.WarehouseInfo;
+import com.iamberry.rst.core.fm.InventoryLog;
+import com.iamberry.rst.core.fm.WarehouseInfo;
 import com.iamberry.rst.core.page.PageRequest;
 import com.iamberry.rst.core.page.PagedResult;
 

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

@@ -1,10 +1,8 @@
 package com.iamberry.rst.faces.cm;
-import com.iamberry.rst.core.cm.InventoryInfo;
+import com.iamberry.rst.core.fm.InventoryInfo;
 import com.iamberry.rst.core.page.PageRequest;
 import com.iamberry.rst.core.page.PagedResult;
 
-import java.util.List;
-
 /**
  * Created by Administrator on 2018/8/15.
  */

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

@@ -0,0 +1,43 @@
+package com.iamberry.rst.faces.cm;
+
+import com.iamberry.rst.core.cm.ProcMethod;
+
+import java.util.List;
+
+/**
+ *  处理方式接口
+ * @author
+ * @Date 2018-12-28
+ */
+public interface ProcMethodService {
+    /**
+     * 获取集合
+     * @param  procMethod
+     * @return List
+     */
+    List<ProcMethod> getProcMethodList(ProcMethod  procMethod);
+    /**
+     * 查询单条数据
+     * @param  id
+     * @return  procMethod
+     */
+    ProcMethod  getProcMethodById(Integer  id);
+    /**
+     * 增加数据
+     * @param  procMethod
+     * @return Integer
+     */
+    Integer  save(ProcMethod  procMethod);
+    /**
+     * 修改数据
+     * @param  procMethod
+     * @return Integer
+     */
+    Integer  update(ProcMethod  procMethod);
+    /**
+     * 删除数据
+     * @param  id
+     * @return Integer
+     */
+    Integer  delete(Integer  id);
+}

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

@@ -0,0 +1,43 @@
+package com.iamberry.rst.faces.cm;
+
+import com.iamberry.rst.core.cm.ProcType;
+
+import java.util.List;
+
+/**
+ *  处理方式类型接口
+ * @author
+ * @Date 2018-12-28
+ */
+public interface ProcTypeService {
+    /**
+     * 获取集合
+     * @param  procType
+     * @return List
+     */
+    List<ProcType> getProcTypeList(ProcType  procType);
+    /**
+     * 查询单条数据
+     * @param  id
+     * @return  procType
+     */
+    ProcType  getProcTypeById(Integer  id);
+    /**
+     * 增加数据
+     * @param  procType
+     * @return Integer
+     */
+    Integer  save(ProcType procType);
+    /**
+     * 修改数据
+     * @param  procType
+     * @return Integer
+     */
+    Integer  update(ProcType  procType);
+    /**
+     * 删除数据
+     * @param  id
+     * @return Integer
+     */
+    Integer  delete(Integer  id);
+}

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

@@ -1,7 +1,6 @@
-package com.iamberry.rst.faces.cm;
+package com.iamberry.rst.faces.fm;
 
-import com.iamberry.rst.core.cm.AwaitingSignclosedProductInfo;
-import com.iamberry.rst.core.cm.SignclosedProductInfo;
+import com.iamberry.rst.core.fm.AwaitingSignclosedProductInfo;
 
 import java.util.List;
 

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

@@ -1,9 +1,8 @@
-package com.iamberry.rst.faces.cm;
+package com.iamberry.rst.faces.fm;
 
-import com.iamberry.rst.core.cm.ComplaintDetectInfo;
-import com.iamberry.rst.core.cm.ComplaintDetectItem;
-import com.iamberry.rst.core.cm.DetectionBasis;
-import com.iamberry.rst.core.order.Order;
+import com.iamberry.rst.core.fm.ComplaintDetectInfo;
+import com.iamberry.rst.core.fm.ComplaintDetectItem;
+import com.iamberry.rst.core.fm.DetectionBasis;
 import com.iamberry.rst.core.page.PageRequest;
 import com.iamberry.rst.core.page.PagedResult;
 

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

@@ -1,7 +1,6 @@
-package com.iamberry.rst.faces.cm;
+package com.iamberry.rst.faces.fm;
 
-import com.iamberry.rst.core.cm.ComplaintMaintenanceInfo;
-import com.iamberry.rst.core.cm.ComplaintSignclosedInfo;
+import com.iamberry.rst.core.fm.ComplaintMaintenanceInfo;
 import com.iamberry.rst.core.page.PageRequest;
 import com.iamberry.rst.core.page.PagedResult;
 

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

@@ -1,8 +1,7 @@
-package com.iamberry.rst.faces.cm;
+package com.iamberry.rst.faces.fm;
 
-import com.iamberry.rst.core.cm.ComplaintDetectInfo;
-import com.iamberry.rst.core.cm.ComplaintSignclosedInfo;
-import com.iamberry.rst.core.cm.SignclosedProductInfo;
+import com.iamberry.rst.core.fm.ComplaintSignclosedInfo;
+import com.iamberry.rst.core.fm.SignclosedProductInfo;
 import com.iamberry.rst.core.page.PageRequest;
 import com.iamberry.rst.core.page.PagedResult;
 

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

@@ -1,6 +1,6 @@
-package com.iamberry.rst.faces.cm;
+package com.iamberry.rst.faces.fm;
 
-import com.iamberry.rst.core.cm.SignclosedProductInfo;
+import com.iamberry.rst.core.fm.SignclosedProductInfo;
 
 import java.util.List;
 

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

@@ -1,6 +1,6 @@
-package com.iamberry.rst.faces.cm;
+package com.iamberry.rst.faces.fm;
 
-import com.iamberry.rst.core.cm.ComplaintSmallClassInfo;
+import com.iamberry.rst.core.fm.ComplaintSmallClassInfo;
 
 import java.util.List;
 

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

@@ -77,16 +77,20 @@ public class BackGoodsServiceImpl implements BackGoodsService {
             //批量添加寄回配件
             fittingNum = closedFittingMapper.insert(fittingList);
         }*/
-        int num = backGoodsMapper.updateBackGoods(record);
-        if (num > 0) {
-            return 1;
-        } else {
-            return 0;
-        }
+        
+        // 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 backGoodsMapper.getBackGoods(backGoods);
+        return null;
     }
 }

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

@@ -0,0 +1,65 @@
+package com.iamberry.rst.service.cm;
+
+import com.iamberry.rst.core.cm.CmRelation;
+import com.iamberry.rst.faces.cm.CmRelationService;
+import com.iamberry.rst.service.cm.mapper.CmRelationMapper;
+import org.springframework.beans.factory.annotation.Autowired;
+import org.springframework.stereotype.Service;
+
+import java.util.List;
+
+/**
+ *  售后处理接口
+ * @author
+ * @Date 2018-12-28
+ */
+@Service
+public class CmRelationServiceImpl  implements CmRelationService {
+    @Autowired
+    private CmRelationMapper cmRelationMapper;
+    /**
+     * 获取集合
+     * @param  cmRelation
+     * @return List
+     */
+    @Override
+    public List<CmRelation> getCmRelationList(CmRelation  cmRelation){
+        return  cmRelationMapper.getCmRelationList(cmRelation);
+    }
+    /**
+     * 查询单条数据
+     * @param  id
+     * @return  cmRelation
+     */
+    @Override
+    public  CmRelation  getCmRelationById(Integer  id){
+        return  cmRelationMapper.getCmRelationById(id);
+    }
+    /**
+     * 增加数据
+     * @param  cmRelation
+     * @return Integer
+     */
+    @Override
+    public  Integer  save(CmRelation  cmRelation){
+        return  cmRelationMapper.save(cmRelation);
+    }
+    /**
+     * 修改数据
+     * @param  cmRelation
+     * @return Integer
+     */
+    @Override
+    public  Integer  update(CmRelation  cmRelation){
+        return  cmRelationMapper.update(cmRelation);
+    }
+    /**
+     * 删除数据
+     * @param  id
+     * @return Integer
+     */
+    @Override
+    public  Integer  delete(Integer  id){
+        return  cmRelationMapper.delete(id);
+    }
+}

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

@@ -2,13 +2,9 @@ package com.iamberry.rst.service.cm;
 
 
 import com.github.pagehelper.PageHelper;
-import com.iamberry.rst.core.approval.ApprovalApplyPick;
-import com.iamberry.rst.core.cm.ComplaintDetectInfo;
 import com.iamberry.rst.core.cm.ComplaintQuestionInfo;
 import com.iamberry.rst.core.page.PagedResult;
-import com.iamberry.rst.faces.cm.ComplaintDetectInfoService;
 import com.iamberry.rst.faces.cm.ComplaintQuestionInfoService;
-import com.iamberry.rst.service.cm.mapper.ComplaintDetectInfoMapper;
 import com.iamberry.rst.service.cm.mapper.ComplaintQuestionInfoMapper;
 import com.iamberry.rst.util.PageUtil;
 import org.springframework.beans.factory.annotation.Autowired;

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

@@ -1,11 +1,8 @@
 package com.iamberry.rst.service.cm;
 
 
-import com.iamberry.rst.core.cm.ComplaintSmallClassInfo;
 import com.iamberry.rst.core.cm.ComplaintTypeInfo;
-import com.iamberry.rst.faces.cm.ComplaintSmallClassInfoService;
 import com.iamberry.rst.faces.cm.ComplaintTypeInfoService;
-import com.iamberry.rst.service.cm.mapper.ComplaintSmallClassInfoMapper;
 import com.iamberry.rst.service.cm.mapper.ComplaintTypeInfoMapper;
 import org.springframework.beans.factory.annotation.Autowired;
 import org.springframework.stereotype.Service;

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

@@ -49,11 +49,6 @@ public class CustomerCommonServiceImpl implements CustomerCommonService {
 
     @Override
     public CustomerCommon getListProduceAndFitting(CustomerCommon customerCommon) {
-        ClosedFitting closedFitting = new ClosedFitting();
-        closedFitting.setClosedFittingType(customerCommon.getCustomerIsSolve());
-        closedFitting.setRelationId(customerCommon.getRelationId());
-        customerCommon.setClosedFittings(closedFittingMapper.listClosedFitting(closedFitting));
-
         ClosedProdcue closedProdcue = new ClosedProdcue();
         closedProdcue.setClosedProdcueType(customerCommon.getCustomerIsSolve());
         closedProdcue.setRelationId(customerCommon.getRelationId());
@@ -63,12 +58,6 @@ public class CustomerCommonServiceImpl implements CustomerCommonService {
         sendProdcue.setSendProduceType(customerCommon.getCustomerIsSolve());
         sendProdcue.setRelationId(customerCommon.getRelationId());
         customerCommon.setSendProdcues(sendProdcueMapper.listSendProdcue(sendProdcue));
-
-        SendFitting sendFitting = new SendFitting();
-        sendFitting.setSendFittingType(customerCommon.getCustomerIsSolve());
-        sendFitting.setRelationId(customerCommon.getRelationId());
-        customerCommon.setSendFittings(sendFittingMapper.listSendFitting(sendFitting));
-
         return customerCommon;
     }
 
@@ -132,31 +121,31 @@ public class CustomerCommonServiceImpl implements CustomerCommonService {
     @Transactional
     public Integer updateCustomerCommon(CustomerCommon customerCommon) {
         Integer flag = 0;
-        switch (customerCommon.getCustomerIsSolve()){
-            case 3:
-                Renewed renewed = (Renewed)CustomerCommonUtil.getRelation(3,customerCommon);
-                flag = renewedMapper.updateRenewedInfo(renewed);
-                break;
-            case 4:
-                Repair repair = (Repair)CustomerCommonUtil.getRelation(4,customerCommon);
-                flag = repairMapper.updateRepairInfo(repair);
-                break;
-            case 5:
-                Reissue reissue = (Reissue)CustomerCommonUtil.getRelation(5,customerCommon);
-                flag = reissueMapper.updateReissueInfo(reissue);
-                break;
-            case 6:
-                BackGoods backGoods = (BackGoods)CustomerCommonUtil.getRelation(6,customerCommon);
-                flag = backGoodsMapper.updateBackGoods(backGoods);
-                break;
-            case 7:
-                NoreasonBack noreasonBack = (NoreasonBack)CustomerCommonUtil.getRelation(7,customerCommon);
-                flag = noreasonBackMapper.updateNoreasonBack(noreasonBack);
-                break;
-            default:
-                flag = 0;
-                break;
-        }
+//        switch (customerCommon.getCustomerIsSolve()){
+//            case 3:
+//                Renewed renewed = (Renewed)CustomerCommonUtil.getRelation(3,customerCommon);
+//                flag = renewedMapper.updateRenewedInfo(renewed);
+//                break;
+//            case 4:
+//                Repair repair = (Repair)CustomerCommonUtil.getRelation(4,customerCommon);
+//                flag = repairMapper.updateRepairInfo(repair);
+//                break;
+//            case 5:
+//                Reissue reissue = (Reissue)CustomerCommonUtil.getRelation(5,customerCommon);
+//                flag = reissueMapper.updateReissueInfo(reissue);
+//                break;
+//            case 6:
+//                BackGoods backGoods = (BackGoods)CustomerCommonUtil.getRelation(6,customerCommon);
+//                flag = backGoodsMapper.updateBackGoods(backGoods);
+//                break;
+//            case 7:
+//                NoreasonBack noreasonBack = (NoreasonBack)CustomerCommonUtil.getRelation(7,customerCommon);
+//                flag = noreasonBackMapper.updateNoreasonBack(noreasonBack);
+//                break;
+//            default:
+//                flag = 0;
+//                break;
+//        }
         return flag;
     }
 

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

@@ -1,9 +1,7 @@
 package com.iamberry.rst.service.cm;
 
 
-import com.iamberry.rst.core.cm.AwaitingSignclosedProductInfo;
 import com.iamberry.rst.core.cm.FittingsInfo;
-import com.iamberry.rst.faces.cm.AwaitingSignclosedProductInfoService;
 import com.iamberry.rst.faces.cm.FittingsInfoService;
 import com.iamberry.rst.service.cm.mapper.FittingsInfoMapper;
 import org.springframework.beans.factory.annotation.Autowired;
@@ -18,21 +16,25 @@ public class FittingsInfoServiceImpl implements FittingsInfoService {
 
     @Override
     public Integer addFittingsInfo(FittingsInfo fittingsInfo) {
-        return fittingsInfoMapper.addFittingsInfo(fittingsInfo);
+//        return fittingsInfoMapper.addFittingsInfo(fittingsInfo);
+        return null;
     }
 
     @Override
     public FittingsInfo getFittingsById(Integer fittingsId) {
-        return fittingsInfoMapper.getFittingsById(fittingsId);
+//        return fittingsInfoMapper.getFittingsById(fittingsId);
+        return null;
     }
 
     @Override
     public Integer updateFittingsInfo(FittingsInfo fittingsInfo) {
-        return fittingsInfoMapper.updateFittingsInfo(fittingsInfo);
+//        return fittingsInfoMapper.updateFittingsInfo(fittingsInfo);
+        return null;
     }
 
     @Override
     public List<FittingsInfo> listFittings(FittingsInfo fittingsInfo) {
-        return fittingsInfoMapper.listFittings(fittingsInfo);
+//        return fittingsInfoMapper.listFittings(fittingsInfo);
+        return null;
     }
 }

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

@@ -1,14 +1,12 @@
 package com.iamberry.rst.service.cm;
 
 import com.github.pagehelper.PageHelper;
-import com.iamberry.rst.core.cm.ComplaintSignclosedInfo;
-import com.iamberry.rst.core.cm.FactoryInfo;
-import com.iamberry.rst.core.cm.InventoryLog;
-import com.iamberry.rst.core.cm.WarehouseInfo;
+import com.iamberry.rst.core.fm.InventoryLog;
+import com.iamberry.rst.core.fm.WarehouseInfo;
 import com.iamberry.rst.core.page.PageRequest;
 import com.iamberry.rst.core.page.PagedResult;
 import com.iamberry.rst.faces.cm.InventoryLogService;
-import com.iamberry.rst.service.cm.mapper.InventoryLogMapper;
+import com.iamberry.rst.service.fm.mapper.InventoryLogMapper;
 import com.iamberry.rst.util.PageUtil;
 import org.springframework.beans.factory.annotation.Autowired;
 import org.springframework.stereotype.Service;

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

@@ -2,12 +2,11 @@ package com.iamberry.rst.service.cm;
 
 
 import com.github.pagehelper.PageHelper;
-import com.iamberry.rst.core.cm.InventoryInfo;
-import com.iamberry.rst.core.cm.InventoryLog;
+import com.iamberry.rst.core.fm.InventoryInfo;
 import com.iamberry.rst.core.page.PageRequest;
 import com.iamberry.rst.core.page.PagedResult;
 import com.iamberry.rst.faces.cm.InventoryService;
-import com.iamberry.rst.service.cm.mapper.InventoryMapper;
+import com.iamberry.rst.service.fm.mapper.InventoryMapper;
 import com.iamberry.rst.util.PageUtil;
 import org.springframework.beans.factory.annotation.Autowired;
 import org.springframework.stereotype.Service;

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

@@ -0,0 +1,65 @@
+package com.iamberry.rst.service.cm;
+
+import com.iamberry.rst.core.cm.ProcMethod;
+import com.iamberry.rst.faces.cm.ProcMethodService;
+import com.iamberry.rst.service.cm.mapper.ProcMethodMapper;
+import org.springframework.beans.factory.annotation.Autowired;
+import org.springframework.stereotype.Service;
+
+import java.util.List;
+
+/**
+ *  处理方式接口
+ * @author
+ * @Date 2018-12-28
+ */
+@Service
+public class ProcMethodServiceImpl  implements ProcMethodService {
+    @Autowired
+    private ProcMethodMapper procMethodMapper;
+    /**
+     * 获取集合
+     * @param  procMethod
+     * @return List
+     */
+    @Override
+    public List<ProcMethod> getProcMethodList(ProcMethod  procMethod){
+        return  procMethodMapper.getProcMethodList(procMethod);
+    }
+    /**
+     * 查询单条数据
+     * @param  id
+     * @return  procMethod
+     */
+    @Override
+    public ProcMethod getProcMethodById(Integer  id){
+        return  procMethodMapper.getProcMethodById(id);
+    }
+    /**
+     * 增加数据
+     * @param  procMethod
+     * @return Integer
+     */
+    @Override
+    public  Integer  save(ProcMethod  procMethod){
+        return  procMethodMapper.save(procMethod);
+    }
+    /**
+     * 修改数据
+     * @param  procMethod
+     * @return Integer
+     */
+    @Override
+    public  Integer  update(ProcMethod  procMethod){
+        return  procMethodMapper.update(procMethod);
+    }
+    /**
+     * 删除数据
+     * @param  id
+     * @return Integer
+     */
+    @Override
+    public  Integer  delete(Integer  id){
+        return  procMethodMapper.delete(id);
+    }
+}

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

@@ -0,0 +1,65 @@
+package com.iamberry.rst.service.cm;
+
+import com.iamberry.rst.core.cm.ProcType;
+import com.iamberry.rst.faces.cm.ProcTypeService;
+import com.iamberry.rst.service.cm.mapper.ProcTypeMapper;
+import org.springframework.beans.factory.annotation.Autowired;
+import org.springframework.stereotype.Service;
+
+import java.util.List;
+
+/**
+ *  处理方式类型接口
+ * @author
+ * @Date 2018-12-28
+ */
+@Service
+public class ProcTypeServiceImpl  implements ProcTypeService {
+    @Autowired
+    private ProcTypeMapper procTypeMapper;
+    /**
+     * 获取集合
+     * @param  procType
+     * @return List
+     */
+    @Override
+    public List<ProcType> getProcTypeList(ProcType  procType){
+        return  procTypeMapper.getProcTypeList(procType);
+    }
+    /**
+     * 查询单条数据
+     * @param  id
+     * @return  procType
+     */
+    @Override
+    public  ProcType  getProcTypeById(Integer  id){
+        return  procTypeMapper.getProcTypeById(id);
+    }
+    /**
+     * 增加数据
+     * @param  procType
+     * @return Integer
+     */
+    @Override
+    public  Integer  save(ProcType procType){
+        return  procTypeMapper.save(procType);
+    }
+    /**
+     * 修改数据
+     * @param  procType
+     * @return Integer
+     */
+    @Override
+    public  Integer  update(ProcType  procType){
+        return  procTypeMapper.update(procType);
+    }
+    /**
+     * 删除数据
+     * @param  id
+     * @return Integer
+     */
+    @Override
+    public  Integer  delete(Integer  id){
+        return  procTypeMapper.delete(id);
+    }
+}

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

@@ -20,16 +20,19 @@ public class ReissueServiceImpl implements ReissueService {
 
     @Override
     public Integer updateReissueInfo(Reissue record) {
-        return reissueMapper.updateReissueInfo(record);
+//        return reissueMapper.updateReissueInfo(record);
+        return null;
     }
 
     @Override
     public List<Reissue> listSynchronizingReissue(Reissue reissue) {
-        return reissueMapper.listSynchronizingReissue(reissue);
+//        return reissueMapper.listSynchronizingReissue(reissue);
+        return null;
     }
 
     @Override
     public Reissue getReissue(Reissue reissue) {
-        return reissueMapper.getReissue(reissue);
+//        return reissueMapper.getReissue(reissue);
+        return null;
     }
 }

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

@@ -30,74 +30,78 @@ public class RenewedServiceImpl implements RenewedService {
 
     @Override
     public List<ClosedFitting> listClosedFitting(ClosedFitting closedFitting) {
-        return renewedMapper.listClosedFitting(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;
-        }
+//        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 renewedMapper.listSynchronizingRenewed(renewed);
+        return null;
     }
 
     @Override
     public Renewed getRenewed(Renewed record) {
-        return renewedMapper.getRenewedInfo(record);
+//        return renewedMapper.getRenewedInfo(record);
+       return null;
     }
 }

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

@@ -34,69 +34,72 @@ public class RepairServiceImpl implements RepairService {
     @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;
-        }
+//        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 repairMapper.listSynchronizingRepair(repair);
+        return null;
     }
 
     @Override
     public Repair getRepair(Repair repair) {
-        return repairMapper.getRepairInfo(repair);
+//        return repairMapper.getRepairInfo(repair);
+        return null;
     }
 }

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

@@ -646,29 +646,30 @@ public class SalesOrderServiceImpl implements SalesOrderService {
                     item.setItemProductPrice(color.getColorPrice());
                     item.setItemIsSource(1);
                     itemList.add(item);
-                } else {
-                    //获取配件信息
-                    FittingsInfo fittingsInfo = new FittingsInfo();
-                    fittingsInfo.setFittingsBar(itemJson.getString("goods_sn"));
-                    List<FittingsInfo> Fittings = fittingsInfoMapper.listFittings(fittingsInfo);
-                    if (Fittings == null || Fittings.size() == 0) {
-                        continue;
-                    }
-                    fittingsInfo = Fittings.get(0);
-                    item.setItemColorBar(itemJson.getString("goods_sn"));//商品69码
-                    item.setItemNum(itemJson.getInt("goods_number"));//商品数量
-                    item.setItemCreateTime(salesOrder.getSalesCreateTime());
-                    item.setItemColorId(fittingsInfo.getFittingsId());
-                    item.setItemProductColor(fittingsInfo.getFittingsName());
-                    item.setItemProductDiscount(fittingsInfo.getFittingsDiscount());
-                    item.setItemProductId(fittingsInfo.getProductId());
-                    item.setItemProductName(fittingsInfo.getFittingsName());
-                    item.setItemProductPic("");
-                    item.setItemProductType(0);
-                    item.setItemProductPrice(fittingsInfo.getFittingsPrice());
-                    item.setItemIsSource(2);
-                    itemList.add(item);
                 }
+//                else {
+//                    //获取配件信息
+//                    FittingsInfo fittingsInfo = new FittingsInfo();
+//                    fittingsInfo.setFittingsBar(itemJson.getString("goods_sn"));
+//                    List<FittingsInfo> Fittings = fittingsInfoMapper.listFittings(fittingsInfo);
+//                    if (Fittings == null || Fittings.size() == 0) {
+//                        continue;
+//                    }
+//                    fittingsInfo = Fittings.get(0);
+//                    item.setItemColorBar(itemJson.getString("goods_sn"));//商品69码
+//                    item.setItemNum(itemJson.getInt("goods_number"));//商品数量
+//                    item.setItemCreateTime(salesOrder.getSalesCreateTime());
+//                    item.setItemColorId(fittingsInfo.getFittingsId());
+//                    item.setItemProductColor(fittingsInfo.getFittingsName());
+//                    item.setItemProductDiscount(fittingsInfo.getFittingsDiscount());
+//                    item.setItemProductId(fittingsInfo.getProductId());
+//                    item.setItemProductName(fittingsInfo.getFittingsName());
+//                    item.setItemProductPic("");
+//                    item.setItemProductType(0);
+//                    item.setItemProductPrice(fittingsInfo.getFittingsPrice());
+//                    item.setItemIsSource(2);
+//                    itemList.add(item);
+//                }
             }
             //添加订单和订单项
             try{
@@ -779,29 +780,30 @@ public class SalesOrderServiceImpl implements SalesOrderService {
                 item.setItemProductPrice(color.getColorPrice());
                 item.setItemIsSource(1);
                 itemList.add(item);
-            } else {
-                //获取配件信息
-                FittingsInfo fittingsInfo = new FittingsInfo();
-                fittingsInfo.setFittingsBar(itemJson.getString("goods_barcode"));
-                List<FittingsInfo> Fittings = fittingsInfoMapper.listFittings(fittingsInfo);
-                if (Fittings == null || Fittings.size() == 0) {
-                    continue;
-                }
-                fittingsInfo = Fittings.get(0);
-                item.setItemColorBar(itemJson.getString("goods_barcode"));//商品69码
-                item.setItemNum(itemJson.getInt("goods_number"));//商品数量
-                item.setItemCreateTime(salesOrder.getSalesCreateTime());
-                item.setItemColorId(fittingsInfo.getFittingsId());
-                item.setItemProductColor(fittingsInfo.getFittingsName());
-                item.setItemProductDiscount(fittingsInfo.getFittingsDiscount());
-                item.setItemProductId(fittingsInfo.getProductId());
-                item.setItemProductName(fittingsInfo.getFittingsName());
-                item.setItemProductPic("");
-                item.setItemProductType(0);
-                item.setItemProductPrice(fittingsInfo.getFittingsPrice());
-                item.setItemIsSource(2);
-                itemList.add(item);
             }
+//            else {
+//                //获取配件信息
+//                FittingsInfo fittingsInfo = new FittingsInfo();
+//                fittingsInfo.setFittingsBar(itemJson.getString("goods_barcode"));
+//                List<FittingsInfo> Fittings = fittingsInfoMapper.listFittings(fittingsInfo);
+//                if (Fittings == null || Fittings.size() == 0) {
+//                    continue;
+//                }
+//                fittingsInfo = Fittings.get(0);
+//                item.setItemColorBar(itemJson.getString("goods_barcode"));//商品69码
+//                item.setItemNum(itemJson.getInt("goods_number"));//商品数量
+//                item.setItemCreateTime(salesOrder.getSalesCreateTime());
+//                item.setItemColorId(fittingsInfo.getFittingsId());
+//                item.setItemProductColor(fittingsInfo.getFittingsName());
+//                item.setItemProductDiscount(fittingsInfo.getFittingsDiscount());
+//                item.setItemProductId(fittingsInfo.getProductId());
+//                item.setItemProductName(fittingsInfo.getFittingsName());
+//                item.setItemProductPic("");
+//                item.setItemProductType(0);
+//                item.setItemProductPrice(fittingsInfo.getFittingsPrice());
+//                item.setItemIsSource(2);
+//                itemList.add(item);
+//            }
         }
         boolean flag = salesOrderService.addOrderAndItem(salesOrder,itemList);
         if (flag) {

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

@@ -6,7 +6,7 @@ import java.util.List;
 
 
 public interface BackGoodsMapper {
-    int deleteByPrimaryKey(BackGoods record);
+ /*   int deleteByPrimaryKey(BackGoods record);
 
     int insert(BackGoods record);
 
@@ -14,24 +14,24 @@ public interface BackGoodsMapper {
 
     BackGoods selectByPrimaryKey(Integer backGoodsId);
 
-    /**
+    *//**
      * 查询售后退货信息
      * @param backGoods
      * @return
-     */
+     *//*
     BackGoods getBackGoods(BackGoods backGoods);
 
-    /**
+    *//**
      * 修改售后退货信息
      * @param record
      * @return
-     */
+     *//*
     Integer updateBackGoods(BackGoods record);
 
-    /**
+    *//**
      * 查询售后退货集合
      * @param backGoods
      * @return
-     */
-    List<BackGoods> listBackGoods(BackGoods backGoods);
+     *//*
+    List<BackGoods> listBackGoods(BackGoods backGoods);*/
 }

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

@@ -5,7 +5,7 @@ import com.iamberry.rst.core.cm.ClosedFitting;
 import java.util.List;
 
 public interface ClosedFittingMapper {
-    int deleteByPrimaryKey(ClosedFitting record);
+   /* int deleteByPrimaryKey(ClosedFitting record);
 
     int insert(List<ClosedFitting> record);
 
@@ -14,17 +14,17 @@ public interface ClosedFittingMapper {
     int updateByPrimaryKeySelective(ClosedFitting record);
 
 
-    /**
+    *//**
      * 获取寄回配件集合
      * @param record
      * @return
-     */
+     *//*
     List<ClosedFitting> listClosedFitting(ClosedFitting record);
 
-    /**
+    *//**
      * 删除寄回配件
      * @param record
      * @return
-     */
-    Integer deleteFitting(ClosedFitting record);
+     *//*
+    Integer deleteFitting(ClosedFitting record);*/
 }

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

@@ -0,0 +1,43 @@
+package com.iamberry.rst.service.cm.mapper;
+
+import com.iamberry.rst.core.cm.CmRelation;
+
+import java.util.List;
+
+/**
+ *  售后处理接口
+ * @author
+ * @Date 2018-12-28
+ */
+public interface CmRelationMapper {
+    /**
+     * 获取集合
+     * @param  cmRelation
+     * @return List
+     */
+    List<CmRelation>  getCmRelationList(CmRelation  cmRelation);
+    /**
+     * 查询单条数据
+     * @param  id
+     * @return  cmRelation
+     */
+    CmRelation  getCmRelationById(Integer  id);
+    /**
+     * 增加数据
+     * @param  cmRelation
+     * @return Integer
+     */
+    Integer  save(CmRelation  cmRelation);
+    /**
+     * 修改数据
+     * @param  cmRelation
+     * @return Integer
+     */
+    Integer  update(CmRelation  cmRelation);
+    /**
+     * 删除数据
+     * @param  id
+     * @return Integer
+     */
+    Integer  delete(Integer  id);
+}

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

@@ -6,29 +6,29 @@ import java.util.List;
 
 public interface FittingsInfoMapper {
 
-    /**
+  /*  *//**
      * 添加配件信息
      * @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);
+     *//*
+    List<FittingsInfo> listFittings(FittingsInfo fittingsInfo);*/
 }

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

@@ -0,0 +1,43 @@
+package com.iamberry.rst.service.cm.mapper;
+
+import com.iamberry.rst.core.cm.ProcMethod;
+
+import java.util.List;
+
+/**
+ *  处理方式接口
+ * @author
+ * @Date 2018-12-28
+ */
+public interface ProcMethodMapper {
+    /**
+     * 获取集合
+     * @param  procMethod
+     * @return List
+     */
+    List<ProcMethod> getProcMethodList(ProcMethod  procMethod);
+    /**
+     * 查询单条数据
+     * @param  id
+     * @return  procMethod
+     */
+    ProcMethod  getProcMethodById(Integer  id);
+    /**
+     * 增加数据
+     * @param  procMethod
+     * @return Integer
+     */
+    Integer  save(ProcMethod  procMethod);
+    /**
+     * 修改数据
+     * @param  procMethod
+     * @return Integer
+     */
+    Integer  update(ProcMethod  procMethod);
+    /**
+     * 删除数据
+     * @param  id
+     * @return Integer
+     */
+    Integer  delete(Integer  id);
+}

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

@@ -0,0 +1,43 @@
+package com.iamberry.rst.service.cm.mapper;
+
+import com.iamberry.rst.core.cm.ProcType;
+
+import java.util.List;
+
+/**
+ *  处理方式类型接口
+ * @author
+ * @Date 2018-12-28
+ */
+public interface ProcTypeMapper {
+    /**
+     * 获取集合
+     * @param  procType
+     * @return List
+     */
+    List<ProcType> getProcTypeList(ProcType  procType);
+    /**
+     * 查询单条数据
+     * @param  id
+     * @return  procType
+     */
+    ProcType  getProcTypeById(Integer  id);
+    /**
+     * 增加数据
+     * @param  procType
+     * @return Integer
+     */
+    Integer  save(ProcType  procType);
+    /**
+     * 修改数据
+     * @param  procType
+     * @return Integer
+     */
+    Integer  update(ProcType  procType);
+    /**
+     * 删除数据
+     * @param  id
+     * @return Integer
+     */
+    Integer  delete(Integer  id);
+}

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

@@ -5,7 +5,7 @@ import com.iamberry.rst.core.cm.Reissue;
 import java.util.List;
 
 public interface ReissueMapper {
-    int deleteByPrimaryKey(Reissue record);
+    /*int deleteByPrimaryKey(Reissue record);
 
     int insert(Reissue record);
 
@@ -13,32 +13,32 @@ public interface ReissueMapper {
 
     Reissue selectByPrimaryKey(Integer reissueId);
 
-    /**
+    *//**
      * 获取维修信息
      * @param reissue
      * @return
-     */
+     *//*
     Reissue getReissue(Reissue reissue);
 
-    /**
+    *//**
      * 修改售后补发信息
      * @param record
      * @return
-     */
+     *//*
     Integer updateReissueInfo(Reissue record);
 
-    /**
+    *//**
      * 查询售后补发集合
      * @param reissue
      * @return
-     */
+     *//*
     List<Reissue> listReissue(Reissue reissue);
-    /**
+    *//**
      * 查询售后补发集合 同步efast
      * @param reissue
      * @return
-     */
-    List<Reissue> listSynchronizingReissue(Reissue reissue);
+     *//*
+    List<Reissue> listSynchronizingReissue(Reissue reissue);*/
 
 
 }

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

@@ -6,46 +6,46 @@ import com.iamberry.rst.core.cm.Renewed;
 import java.util.List;
 
 public interface RenewedMapper {
-    /**
+  /*  *//**
      * 删除换新数据
      * @param record
      * @return
-     */
+     *//*
     int deleteByPrimaryKey(Renewed record);
 
     int insert(Renewed record);
 
-    /**
+    *//**
      * 修改换新信息
      * @param record
      * @return
-     */
+     *//*
     Integer updateRenewedInfo(Renewed record);
 
-    /**
+    *//**
      * 查询售后换新集合
      * @param renewed
      * @return
-     */
+     *//*
     List<Renewed> listRenewed(Renewed renewed);
 
-    /**
+    *//**
      * 获取换新详情和品质检测信息
      * @param renewed
      * @return
-     */
+     *//*
     Renewed getRenewedInfo(Renewed renewed);
 
-    /**
+    *//**
      * 获取寄回配件集合
      * @param closedFitting
      * @return
-     */
+     *//*
     List<ClosedFitting> listClosedFitting(ClosedFitting closedFitting);
-    /**
+    *//**
      * 获取所有需要同步的换新数据
      * @return
-     */
+     *//*
     List<Renewed> listSynchronizingRenewed(Renewed renewed);
-
+*/
 }

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

@@ -5,7 +5,7 @@ import com.iamberry.rst.core.cm.Repair;
 import java.util.List;
 
 public interface RepairMapper {
-    int deleteByPrimaryKey(Repair record);
+    /*int deleteByPrimaryKey(Repair record);
 
     int insert(Repair record);
 
@@ -13,30 +13,30 @@ public interface RepairMapper {
 
     int updateByPrimaryKeySelective(Repair record);
 
-    /**
+    *//**
      * 查询售后维修集合
      * @param repair
      * @return
-     */
+     *//*
     List<Repair> listRepair(Repair repair);
 
-    /**
+    *//**
      * 获取维修详情和品质检测信息
      * @param repair
      * @return
-     */
+     *//*
     Repair getRepairInfo(Repair repair);
 
-    /**
+    *//**
      * 修改维修信息
      * @param repair
      * @return
-     */
+     *//*
     Integer updateRepairInfo(Repair repair);
-    /**
+    *//**
      * 查询售后维修需要同步订单的数据集合
      * @param repair
      * @return
-     */
-    List<Repair> listSynchronizingRepair(Repair repair);
+     *//*
+    List<Repair> listSynchronizingRepair(Repair repair);*/
 }

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

@@ -5,7 +5,7 @@ import com.iamberry.rst.core.cm.SendFitting;
 import java.util.List;
 
 public interface SendFittingMapper {
-    int deleteByPrimaryKey(SendFitting record);
+   /* int deleteByPrimaryKey(SendFitting record);
 
     int insert(List<SendFitting> record);
 
@@ -16,10 +16,10 @@ public interface SendFittingMapper {
     int updateByPrimaryKeySelective(SendFitting record);
 
 
-    /**
+    *//**
      * 查询寄送的配件集合
      * @param record
      * @return
-     */
-    List<SendFitting> listSendFitting(SendFitting record);
+     *//*
+    List<SendFitting> listSendFitting(SendFitting record);*/
 }

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

@@ -15,12 +15,12 @@
   <select id="selectByPrimaryKey" resultMap="BaseResultMap" parameterType="java.lang.Integer" >
     select 
     <include refid="Base_Column_List" />
-    from tb_rst_closed_prodcue
+    from tb_rst_cm_closed_prodcue
     where closed_prodcue_id = #{closedProdcueId,jdbcType=INTEGER}
   </select>
 
   <insert id="insert" parameterType="ClosedProdcue" >
-    insert into tb_rst_closed_prodcue ( relation_id, product_id, closed_prodcue_machine_no,
+    insert into tb_rst_cm_closed_prodcue ( relation_id, product_id, closed_prodcue_machine_no,
       color_id, closed_prodcue_number,closed_prodcue_type,color_bar)
     values
     <foreach collection="list" item="node" index="index" separator="," open="" close="">
@@ -34,7 +34,7 @@
   <!-- 删除寄回产品信息 -->
   <delete id="deleteProduce" parameterType="ClosedProdcue">
     delete from
-      tb_rst_closed_prodcue
+      tb_rst_cm_closed_prodcue
     where
       relation_id = #{relationId}
     and
@@ -43,7 +43,7 @@
   <!-- 删除寄回产品信息 -->
   <delete id="deleteByPrimaryKey" parameterType="ClosedProdcue">
     delete from
-    tb_rst_closed_prodcue
+    tb_rst_cm_closed_prodcue
     <where>
       <if test="relationId != null and relationId != ''">
         relation_id = #{relationId}
@@ -55,7 +55,7 @@
   </delete>
 
   <update id="updateByPrimaryKeySelective" parameterType="ClosedProdcue" >
-    update tb_rst_closed_prodcue
+    update tb_rst_cm_closed_prodcue
     <set >
       <if test="relationId != null" >
         relation_id = #{relationId,jdbcType=INTEGER},
@@ -82,7 +82,7 @@
       cp.*,
       pi.product_name closedProductName,
       po.color_name closedColorName
-    from tb_rst_closed_prodcue cp
+    from tb_rst_cm_closed_prodcue cp
     LEFT JOIN tb_rst_product_info pi ON cp.product_id = pi.product_id
     LEFT JOIN tb_rst_product_color po ON cp.color_id = po.color_id
     <where>

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

@@ -0,0 +1,318 @@
+<?xml version="1.0" encoding="UTF-8" ?>
+<!DOCTYPE mapper PUBLIC "-//mybatis.org//DTD Mapper 3.0//EN" "http://mybatis.org/dtd/mybatis-3-mapper.dtd">
+<mapper namespace="com.mapper.CmRelationMapper">
+    <resultMap  id="BaseResultMap" type="CmRelation" >
+        <result    column="relation_id"    property="relationId" />
+        <result    column="proc_method_id"    property="procMethodId" />
+        <result    column="customer_id"    property="customerId" />
+        <result    column="signclosed_id"    property="signclosedId" />
+        <result    column="relation_back_efast_order_id"    property="relationBackEfastOrderId" />
+        <result    column="relation_back_status"    property="relationBackStatus" />
+        <result    column="relation_back_name"    property="relationBackName" />
+        <result    column="relation_back_tel"    property="relationBackTel" />
+        <result    column="relation_back_logistics_company"    property="relationBackLogisticsCompany" />
+        <result    column="relation_back_logistics_no"    property="relationBackLogisticsNo" />
+        <result    column="relation_back_postage"    property="relationBackPostage" />
+        <result    column="relation_back_machine_no"    property="relationBackMachineNo" />
+        <result    column="relation_send_status"    property="relationSendStatus" />
+        <result    column="relation_send_name"    property="relationSendName" />
+        <result    column="relation_send_tel"    property="relationSendTel" />
+        <result    column="province_number"    property="provinceNumber" />
+        <result    column="city_number"    property="cityNumber" />
+        <result    column="area_number"    property="areaNumber" />
+        <result    column="relation_send_merge_address"    property="relationSendMergeAddress" />
+        <result    column="relation_send_address"    property="relationSendAddress" />
+        <result    column="relation_send_logistics_company"    property="relationSendLogisticsCompany" />
+        <result    column="relation_send_logistics_no"    property="relationSendLogisticsNo" />
+        <result    column="relation_desc"    property="relationDesc" />
+        <result    column="relation_state"    property="relationState" />
+        <result    column="relation_alipay"    property="relationAlipay" />
+        <result    column="relation_is_transfer"    property="relationIsTransfer" />
+        <result    column="relation_alipay_name"    property="relationAlipayName" />
+        <result    column="relation_back_receipt_date"    property="relationBackReceiptDate" />
+        <result    column="relation_factory_costs"    property="relationFactoryCosts" />
+        <result    column="relation_customer_costs"    property="relationCustomerCosts" />
+        <result    column="relation_create_time"    property="relationCreateTime" />
+        <result    column="relation_update_time"    property="relationUpdateTime" />
+    </resultMap>
+    <sql    id="Base_List" >
+        t.relation_id,
+        t.proc_method_id,
+        t.customer_id,
+        t.signclosed_id,
+        t.relation_back_efast_order_id,
+        t.relation_back_status,
+        t.relation_back_name,
+        t.relation_back_tel,
+        t.relation_back_logistics_company,
+        t.relation_back_logistics_no,
+        t.relation_back_postage,
+        t.relation_back_machine_no,
+        t.relation_send_status,
+        t.relation_send_name,
+        t.relation_send_tel,
+        t.province_number,
+        t.city_number,
+        t.area_number,
+        t.relation_send_merge_address,
+        t.relation_send_address,
+        t.relation_send_logistics_company,
+        t.relation_send_logistics_no,
+        t.relation_desc,
+        t.relation_state,
+        t.relation_alipay,
+        t.relation_is_transfer,
+        t.relation_alipay_name,
+        t.relation_back_receipt_date,
+        t.relation_factory_costs,
+        t.relation_customer_costs,
+        t.relation_create_time,
+        t.relation_update_time
+    </sql>
+    <select id="getCmRelationList" resultMap="BaseResultMap" parameterType="CmRelation" >
+        select
+        <include refid="Base_List" />
+        from tb_rst_cm_relation t
+        <where>
+            <if test="relationId != null ">
+                AND t.relation_id = #{relationId}
+            </if >
+            <if test="procMethodId != null ">
+                AND t.proc_method_id = #{procMethodId}
+            </if >
+            <if test="customerId != null ">
+                AND t.customer_id = #{customerId}
+            </if >
+            <if test="signclosedId != null ">
+                AND t.signclosed_id = #{signclosedId}
+            </if >
+            <if test="relationBackEfastOrderId != null and relationBackEfastOrderId != ''">
+                AND t.relation_back_efast_order_id = #{relationBackEfastOrderId}
+            </if >
+            <if test="relationBackStatus != null ">
+                AND t.relation_back_status = #{relationBackStatus}
+            </if >
+            <if test="relationBackName != null and relationBackName != ''">
+                AND t.relation_back_name  like  CONCAT ('%',#{relationBackName},'%')
+            </if >
+            <if test="relationBackTel != null and relationBackTel != ''">
+                AND t.relation_back_tel  like  CONCAT ('%',#{relationBackTel},'%')
+            </if >
+            <if test="relationBackLogisticsCompany != null and relationBackLogisticsCompany != ''">
+                AND t.relation_back_logistics_company = #{relationBackLogisticsCompany}
+            </if >
+            <if test="relationBackLogisticsNo != null and relationBackLogisticsNo != ''">
+                AND t.relation_back_logistics_no  like  CONCAT ('%',#{relationBackLogisticsNo},'%')
+            </if >
+            <if test="relationBackMachineNo != null and relationBackMachineNo != ''">
+                AND t.relation_back_machine_no  like  CONCAT ('%',#{relationBackMachineNo},'%')
+            </if >
+            <if test="relationSendStatus != null ">
+                AND t.relation_send_status = #{relationSendStatus}
+            </if >
+            <if test="relationSendName != null and relationSendName != ''">
+                AND t.relation_send_name  like  CONCAT ('%',#{relationSendName},'%')
+            </if >
+            <if test="relationSendTel != null and relationSendTel != ''">
+                AND t.relation_send_tel  like  CONCAT ('%',#{relationSendTel},'%')
+            </if >
+            <if test="relationSendAddress != null and relationSendAddress != ''">
+                AND t.relation_send_address  like  CONCAT ('%',#{relationSendAddress},'%')
+            </if >
+            <if test="relationSendLogisticsCompany != null and relationSendLogisticsCompany != ''">
+                AND t.relation_send_logistics_company = #{relationSendLogisticsCompany}
+            </if >
+            <if test="relationSendLogisticsNo != null and relationSendLogisticsNo != ''">
+                AND t.relation_send_logistics_no  like  CONCAT ('%',#{relationSendLogisticsNo},'%')
+            </if >
+            <if test="relationState != null ">
+                AND t.relation_state = #{relationState}
+            </if >
+            <if test="relationIsTransfer != null ">
+                AND t.relation_is_transfer = #{relationIsTransfer}
+            </if >
+            <if test="relationCreateTime != null and relationCreateTime != ''">
+                <![CDATA[
+                    AND t.relation_create_time >= #{beginTime}
+                ]]>
+            </if >
+            <if test="relationCreateTime != null and relationCreateTime != ''">
+                <![CDATA[
+                    AND t.relation_create_time <= #{endTime}
+                ]]>
+            </if >
+        </where>
+    </select>
+    <select id="getCmRelationById" resultMap="BaseResultMap" parameterType="Integer" >
+        select
+        <include refid="Base_List" />
+        from tb_rst_cm_relation t
+        where t.relation_id= #{relationId}
+    </select>
+    <insert id="save" parameterType="CmRelation" >
+        insert into
+        tb_rst_cm_relation
+        (
+        proc_method_id,
+        customer_id,
+        signclosed_id,
+        relation_back_efast_order_id,
+        relation_back_status,
+        relation_back_name,
+        relation_back_tel,
+        relation_back_logistics_company,
+        relation_back_logistics_no,
+        relation_back_postage,
+        relation_back_machine_no,
+        relation_send_status,
+        relation_send_name,
+        relation_send_tel,
+        province_number,
+        city_number,
+        area_number,
+        relation_send_merge_address,
+        relation_send_address,
+        relation_send_logistics_company,
+        relation_send_logistics_no,
+        relation_desc,
+        relation_state,
+        relation_alipay,
+        relation_is_transfer,
+        relation_alipay_name,
+        relation_back_receipt_date,
+        relation_factory_costs,
+        relation_customer_costs
+        )
+        values
+        (
+        #{procMethodId},
+        #{customerId},
+        #{signclosedId},
+        #{relationBackEfastOrderId},
+        #{relationBackStatus},
+        #{relationBackName},
+        #{relationBackTel},
+        #{relationBackLogisticsCompany},
+        #{relationBackLogisticsNo},
+        #{relationBackPostage},
+        #{relationBackMachineNo},
+        #{relationSendStatus},
+        #{relationSendName},
+        #{relationSendTel},
+        #{provinceNumber},
+        #{cityNumber},
+        #{areaNumber},
+        #{relationSendMergeAddress},
+        #{relationSendAddress},
+        #{relationSendLogisticsCompany},
+        #{relationSendLogisticsNo},
+        #{relationDesc},
+        #{relationState},
+        #{relationAlipay},
+        #{relationIsTransfer},
+        #{relationAlipayName},
+        #{relationBackReceiptDate},
+        #{relationFactoryCosts},
+        #{relationCustomerCosts}
+        )
+    </insert>
+    <update id="update" parameterType="CmRelation" >
+        update
+        tb_rst_cm_relation
+        <set >
+            <if test="procMethodId != null ">
+                proc_method_id = #{procMethodId},
+            </if >
+            <if test="customerId != null ">
+                customer_id = #{customerId},
+            </if >
+            <if test="signclosedId != null ">
+                signclosed_id = #{signclosedId},
+            </if >
+            <if test="relationBackEfastOrderId != null and relationBackEfastOrderId != ''">
+                relation_back_efast_order_id = #{relationBackEfastOrderId},
+            </if >
+            <if test="relationBackStatus != null ">
+                relation_back_status = #{relationBackStatus},
+            </if >
+            <if test="relationBackName != null and relationBackName != ''">
+                relation_back_name = #{relationBackName},
+            </if >
+            <if test="relationBackTel != null and relationBackTel != ''">
+                relation_back_tel = #{relationBackTel},
+            </if >
+            <if test="relationBackLogisticsCompany != null and relationBackLogisticsCompany != ''">
+                relation_back_logistics_company = #{relationBackLogisticsCompany},
+            </if >
+            <if test="relationBackLogisticsNo != null and relationBackLogisticsNo != ''">
+                relation_back_logistics_no = #{relationBackLogisticsNo},
+            </if >
+            <if test="relationBackPostage != null ">
+                relation_back_postage = #{relationBackPostage},
+            </if >
+            <if test="relationBackMachineNo != null and relationBackMachineNo != ''">
+                relation_back_machine_no = #{relationBackMachineNo},
+            </if >
+            <if test="relationSendStatus != null ">
+                relation_send_status = #{relationSendStatus},
+            </if >
+            <if test="relationSendName != null and relationSendName != ''">
+                relation_send_name = #{relationSendName},
+            </if >
+            <if test="relationSendTel != null and relationSendTel != ''">
+                relation_send_tel = #{relationSendTel},
+            </if >
+            <if test="provinceNumber != null ">
+                province_number = #{provinceNumber},
+            </if >
+            <if test="cityNumber != null ">
+                city_number = #{cityNumber},
+            </if >
+            <if test="areaNumber != null ">
+                area_number = #{areaNumber},
+            </if >
+            <if test="relationSendMergeAddress != null and relationSendMergeAddress != ''">
+                relation_send_merge_address = #{relationSendMergeAddress},
+            </if >
+            <if test="relationSendAddress != null and relationSendAddress != ''">
+                relation_send_address = #{relationSendAddress},
+            </if >
+            <if test="relationSendLogisticsCompany != null and relationSendLogisticsCompany != ''">
+                relation_send_logistics_company = #{relationSendLogisticsCompany},
+            </if >
+            <if test="relationSendLogisticsNo != null and relationSendLogisticsNo != ''">
+                relation_send_logistics_no = #{relationSendLogisticsNo},
+            </if >
+            <if test="relationDesc != null and relationDesc != ''">
+                relation_desc = #{relationDesc},
+            </if >
+            <if test="relationState != null ">
+                relation_state = #{relationState},
+            </if >
+            <if test="relationAlipay != null and relationAlipay != ''">
+                relation_alipay = #{relationAlipay},
+            </if >
+            <if test="relationIsTransfer != null ">
+                relation_is_transfer = #{relationIsTransfer},
+            </if >
+            <if test="relationAlipayName != null and relationAlipayName != ''">
+                relation_alipay_name = #{relationAlipayName},
+            </if >
+            <if test="relationBackReceiptDate != null and relationBackReceiptDate != ''">
+                relation_back_receipt_date = #{relationBackReceiptDate},
+            </if >
+            <if test="relationFactoryCosts != null ">
+                relation_factory_costs = #{relationFactoryCosts},
+            </if >
+            <if test="relationCustomerCosts != null ">
+                relation_customer_costs = #{relationCustomerCosts},
+            </if >
+        </set >
+        where relation_id= #{relationId}
+    </update>
+    <delete id="delete" parameterType="Integer" >
+        delete FROM
+        tb_rst_cm_relation
+        where relation_id=#{relationId}
+    </delete>
+</mapper>

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

@@ -35,43 +35,43 @@
         t.question_create_time,
         t.question_update_time,
         sc.complaint_id
-    from tb_rst_complaint_question t
-    LEFT JOIN tb_rst_complaint_small_class sc ON  t.small_class_id = sc.small_class_id
+    from tb_rst_cm_complaint_question t
+    LEFT JOIN tb_rst_cm_complaint_small_class sc ON  t.small_class_id = sc.small_class_id
     where question_id = #{questionId,jdbcType=INTEGER}
   </select>
 
   <select id="listComplaintQuestionInfo" resultType="ComplaintQuestionInfo" parameterType="ComplaintQuestionInfo" >
     SELECT
-      tb_rst_complaint_question.question_id,
-      tb_rst_complaint_question.small_class_id,
-      tb_rst_complaint_question.question_name,
-      tb_rst_complaint_question.question_profile,
-      tb_rst_complaint_question.question_state,
-      tb_rst_complaint_question.question_is_qc_detect,
-      tb_rst_complaint_question.question_create_time,
-      tb_rst_complaint_question.question_update_time,
-      tb_rst_complaint_question.question_resolved_num,
-      tb_rst_complaint_question.question_not_solved_num,
-      tb_rst_complaint_type.complaint_id AS complaintId
+      tb_rst_cm_complaint_question.question_id,
+      tb_rst_cm_complaint_question.small_class_id,
+      tb_rst_cm_complaint_question.question_name,
+      tb_rst_cm_complaint_question.question_profile,
+      tb_rst_cm_complaint_question.question_state,
+      tb_rst_cm_complaint_question.question_is_qc_detect,
+      tb_rst_cm_complaint_question.question_create_time,
+      tb_rst_cm_complaint_question.question_update_time,
+      tb_rst_cm_complaint_question.question_resolved_num,
+      tb_rst_cm_complaint_question.question_not_solved_num,
+      tb_rst_cm_complaint_type.complaint_id AS complaintId
     FROM
-      tb_rst_complaint_question
-    INNER JOIN tb_rst_complaint_small_class ON tb_rst_complaint_question.small_class_id = tb_rst_complaint_small_class.small_class_id
-    INNER JOIN tb_rst_complaint_type ON tb_rst_complaint_small_class.complaint_id = tb_rst_complaint_type.complaint_id
+      tb_rst_cm_complaint_question
+    INNER JOIN tb_rst_cm_complaint_small_class ON tb_rst_cm_complaint_question.small_class_id = tb_rst_cm_complaint_small_class.small_class_id
+    INNER JOIN tb_rst_cm_complaint_type ON tb_rst_cm_complaint_small_class.complaint_id = tb_rst_cm_complaint_type.complaint_id
     <where>
       <if test="questionId !=null">
         AND question_id = #{questionId}
       </if>
       <if test="smallClassId !=null">
-        AND tb_rst_complaint_small_class.small_class_id = #{smallClassId}
+        AND tb_rst_cm_complaint_small_class.small_class_id = #{smallClassId}
       </if>
       <if test="complaintId !=null">
-        AND tb_rst_complaint_type.complaint_id = #{complaintId}
+        AND tb_rst_cm_complaint_type.complaint_id = #{complaintId}
       </if>
       <if test="questionName !=null and questionName !=''">
         AND question_name like CONCAT('%',#{questionName},'%')
       </if>
       <if test="complaintType != null">
-        AND tb_rst_complaint_type.complaint_consulting_type = #{complaintType}
+        AND tb_rst_cm_complaint_type.complaint_consulting_type = #{complaintType}
       </if>
       AND question_state = 1
     </where>
@@ -80,7 +80,7 @@
   </select>
 
   <insert id="insert" parameterType="ComplaintQuestionInfo"  useGeneratedKeys="true" keyProperty="questionId">
-    insert into tb_rst_complaint_question (small_class_id, question_name,
+    insert into tb_rst_cm_complaint_question (small_class_id, question_name,
       question_state, question_is_qc_detect, question_create_time, 
       question_update_time, question_profile,question_resolved_num,question_not_solved_num
       )
@@ -91,7 +91,7 @@
       )
   </insert>
   <update id="updateQuestionById" parameterType="ComplaintQuestionInfo" >
-    update tb_rst_complaint_question
+    update tb_rst_cm_complaint_question
     <set >
       <if test="smallClassId != null" >
         small_class_id = #{smallClassId,jdbcType=INTEGER},

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

@@ -17,14 +17,14 @@
   <select id="getTypeById" resultMap="BaseResultMap" parameterType="java.lang.Integer" >
     select 
     <include refid="Base_Column_List" />
-    from tb_rst_complaint_type
+    from tb_rst_cm_complaint_type
     where complaint_id = #{complaintId,jdbcType=INTEGER}
   </select>
 
   <select id="listComplaintTypeInfo" resultMap="BaseResultMap" parameterType="ComplaintTypeInfo" >
     select
     <include refid="Base_Column_List" />
-    from tb_rst_complaint_type
+    from tb_rst_cm_complaint_type
     <where>
       <if test="complaintConsultingType !=null">
         AND complaint_consulting_type = #{complaintConsultingType}
@@ -35,7 +35,7 @@
 
 
   <insert id="insert" parameterType="ComplaintTypeInfo" >
-    insert into tb_rst_complaint_type (complaint_id, complaint_consulting_type, 
+    insert into tb_rst_cm_complaint_type (complaint_id, complaint_consulting_type,
       complaint_class_name, complaint_class_profile, 
       complaint_class_state, complaint_create_time, 
       complaint_update_time)
@@ -45,7 +45,7 @@
       #{complaintUpdateTime,jdbcType=TIMESTAMP})
   </insert>
   <update id="updateTypeById" parameterType="ComplaintTypeInfo" >
-    update tb_rst_complaint_type
+    update tb_rst_cm_complaint_type
     <set >
       <if test="complaintConsultingType != null" >
         complaint_consulting_type = #{complaintConsultingType,jdbcType=TINYINT},
@@ -78,7 +78,7 @@
     <result column="complaint_create_time" property="complaintCreateTime"  />
     <result column="complaint_update_time" property="complaintUpdateTime" />
     <collection property="smallClassInfoList" column="complaintId" javaType="ArrayList"
-                ofType="com.iamberry.rst.core.cm.ComplaintSmallClassInfo" select="getListComplaintSmallClassInfo"/>
+                ofType="com.iamberry.rst.core.fm.ComplaintSmallClassInfo" select="getListComplaintSmallClassInfo"/>
   </resultMap>
   <resultMap id="complaintSmallClassInfoMap" type="ComplaintSmallClassInfo" >
     <id column="smallClassId" property="smallClassId"  />
@@ -112,7 +112,7 @@
       complaint_class_state,
       complaint_create_time,
       complaint_update_time
-    from tb_rst_complaint_type
+    from tb_rst_cm_complaint_type
   </select>
   <select id="getListComplaintSmallClassInfo" resultMap="complaintSmallClassInfoMap" parameterType="java.lang.Integer" >
     select
@@ -124,7 +124,7 @@
       small_question_num,
       small_class_create_time,
       small_class_update_time
-    from tb_rst_complaint_small_class
+    from tb_rst_cm_complaint_small_class
     where
       complaint_id = #{complaintId}
   </select>
@@ -140,8 +140,8 @@
       cq.question_create_time,
       cq.question_update_time,
       COUNT(ci.customer_id) AS questionNum
-    from tb_rst_complaint_question cq
-    LEFT JOIN tb_rst_customer_info ci ON cq.question_id = ci.question_id
+    from tb_rst_cm_complaint_question cq
+    LEFT JOIN tb_rst_cm_customer_info ci ON cq.question_id = ci.question_id
     where
       cq.small_class_id = #{smallClassId}
     GROUP BY cq.question_id

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

@@ -166,7 +166,7 @@
                 noreason_back_alipay_name AS relationAlipayName
             FROM tb_rst_noreason_back
         )cc
-        LEFT JOIN tb_rst_customer_info c on cc.customerId = c.customer_id
+        LEFT JOIN tb_rst_cm_customer_info c on cc.customerId = c.customer_id
         <where>
             <if test="customerId != null and customerId != ''">
                 AND cc.customerId = #{customerId}
@@ -244,7 +244,7 @@
         noreason_back_create_time AS relationCreateTime,
         '0' AS relationBackEfastOrderId
         FROM tb_rst_noreason_back
-        )cc LEFT JOIN tb_rst_customer_info c on cc.customerId = c.customer_id
+        )cc LEFT JOIN tb_rst_cm_customer_info c on cc.customerId = c.customer_id
         <where>
             <if test="relationBackStatus != null and relationBackStatus != ''">
                 AND cc.relationBackStatus = #{relationBackStatus}

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

@@ -59,12 +59,12 @@
       t.customer_secondary_customer,
       t.customer_last_id,
       t.customer_initial_id
-    from tb_rst_customer_info t
+    from tb_rst_cm_customer_info t
     where t.customer_id = #{customerId,jdbcType=INTEGER}
   </select>
 
   <delete id="deleteByPrimaryKey" parameterType="java.lang.Integer" >
-    delete from tb_rst_customer_info
+    delete from tb_rst_cm_customer_info
     where customer_id = #{customerId,jdbcType=INTEGER}
   </delete>
 
@@ -109,16 +109,16 @@
       d.describe_handle_desc,
       d.describe_content
     from
-      tb_rst_customer_info c
-    LEFT JOIN tb_rst_question_describe d ON c.customer_id = d.customer_id
+      tb_rst_cm_customer_info c
+    LEFT JOIN tb_rst_cm_question_describe d ON c.customer_id = d.customer_id
     LEFT JOIN tb_rst_product_type t ON c.type_id = t.type_id
-    LEFT JOIN tb_rst_complaint_question q ON c.question_id = q.question_id
-    LEFT JOIN tb_rst_complaint_small_class s ON q.small_class_id = s.small_class_id
-    LEFT JOIN tb_rst_complaint_type ct ON s.complaint_id = ct.complaint_id
+    LEFT JOIN tb_rst_cm_complaint_question q ON c.question_id = q.question_id
+    LEFT JOIN tb_rst_cm_complaint_small_class s ON q.small_class_id = s.small_class_id
+    LEFT JOIN tb_rst_cm_complaint_type ct ON s.complaint_id = ct.complaint_id
     LEFT JOIN tb_rst_sales_company sc ON c.company_id = sc.company_id
     LEFT JOIN tb_rst_store_info si ON c.store_id = si.store_id
     LEFT JOIN tb_rst_sys_admin a ON c.admin_id = a.admin_id
-    LEFT JOIN tb_rst_visit v ON v.customer_id = c.customer_id
+    LEFT JOIN tb_rst_cm_visit v ON v.customer_id = c.customer_id
     LEFT JOIN tb_rst_sys_admin sa ON v.designated_admin_id = sa.admin_id
     <where>
       <if test="customerName != null and customerName != ''">
@@ -283,7 +283,7 @@
     cc.relationBackLogisticsCompany AS backLogisticsCompany,
     oi.sales_pay_time AS salesTime
     FROM
-    tb_rst_customer_info c
+    tb_rst_cm_customer_info c
     LEFT JOIN (
       SELECT
         xx.*
@@ -293,7 +293,7 @@
           '3' AS customerIsSolve,
           renewed_id AS relationId,
           customer_id AS customerId,
-          tb_rst_relation_order.sales_id AS orderId,
+          tb_rst_cm_relation_order.sales_id AS orderId,
           signclosed_id AS signclosedId,
           renewed_back_status AS relationBackStatus,
           renewed_send_status AS relationSendStatus,
@@ -303,14 +303,14 @@
           renewed_back_logistics_company AS relationBackLogisticsCompany
           FROM
             tb_rst_renewed
-          LEFT JOIN tb_rst_relation_order ON tb_rst_relation_order.relation_id = tb_rst_renewed.renewed_id
-          AND tb_rst_relation_order.relation_type = '3'
+          LEFT JOIN tb_rst_cm_relation_order ON tb_rst_cm_relation_order.relation_id = tb_rst_renewed.renewed_id
+          AND tb_rst_cm_relation_order.relation_type = '3'
         UNION ALL
           SELECT
           '4' AS customerIsSolve,
           repair_id AS relationId,
           customer_id AS customerId,
-          tb_rst_relation_order.sales_id AS orderId,
+          tb_rst_cm_relation_order.sales_id AS orderId,
           signclosed_id AS signclosedId,
           repair_back_status AS relationBackStatus,
           repair_send_status AS relationSendStatus,
@@ -320,14 +320,14 @@
           repair_back_logistics_company AS relationBackLogisticsCompany
           FROM
           tb_rst_repair
-          LEFT JOIN tb_rst_relation_order ON tb_rst_relation_order.relation_id = tb_rst_repair.repair_id
-          AND tb_rst_relation_order.relation_type = '4'
+          LEFT JOIN tb_rst_cm_relation_order ON tb_rst_cm_relation_order.relation_id = tb_rst_repair.repair_id
+          AND tb_rst_cm_relation_order.relation_type = '4'
         UNION ALL
           SELECT
           '5' AS customerIsSolve,
           reissue_id AS relationId,
           customer_id AS customerId,
-          tb_rst_relation_order.sales_id AS orderId,
+          tb_rst_cm_relation_order.sales_id AS orderId,
           NULL AS signclosedId,
           NULL AS relationBackStatus,
           reissue_send_status AS relationSendStatus,
@@ -337,14 +337,14 @@
           NULL AS relationBackLogisticsCompany
           FROM
           tb_rst_reissue
-          LEFT JOIN tb_rst_relation_order ON tb_rst_relation_order.relation_id = tb_rst_reissue.reissue_id
-          AND tb_rst_relation_order.relation_type = '5'
+          LEFT JOIN tb_rst_cm_relation_order ON tb_rst_cm_relation_order.relation_id = tb_rst_reissue.reissue_id
+          AND tb_rst_cm_relation_order.relation_type = '5'
         UNION ALL
           SELECT
           '6' AS customerIsSolve,
           back_goods_id AS relationId,
           customer_id AS customerId,
-          tb_rst_relation_order.sales_id AS orderId,
+          tb_rst_cm_relation_order.sales_id AS orderId,
           signclosed_id AS signclosedId,
           back_goods_back_status AS relationBackStatus,
           NULL AS relationSendStatus,
@@ -354,14 +354,14 @@
           back_goods_back_logistics_company AS relationBackLogisticsCompany
           FROM
           tb_rst_back_goods
-          LEFT JOIN tb_rst_relation_order ON tb_rst_relation_order.relation_id = tb_rst_back_goods.back_goods_id
-          AND tb_rst_relation_order.relation_type = '6'
+          LEFT JOIN tb_rst_cm_relation_order ON tb_rst_cm_relation_order.relation_id = tb_rst_back_goods.back_goods_id
+          AND tb_rst_cm_relation_order.relation_type = '6'
         UNION ALL
           SELECT
           '7' AS customerIsSolve,
           noreason_back_id AS relationId,
           customer_id AS customerId,
-          tb_rst_relation_order.sales_id AS orderId,
+          tb_rst_cm_relation_order.sales_id AS orderId,
           signclosed_id AS signclosedId,
           noreason_back_back_status AS relationBackStatus,
           NULL AS relationSendStatus,
@@ -371,16 +371,16 @@
           noreason_back_back_logistics_company AS relationBackLogisticsCompany
           FROM
           tb_rst_noreason_back
-          LEFT JOIN tb_rst_relation_order ON tb_rst_relation_order.relation_id = tb_rst_noreason_back.noreason_back_id
-          AND tb_rst_relation_order.relation_type = '7'
+          LEFT JOIN tb_rst_cm_relation_order ON tb_rst_cm_relation_order.relation_id = tb_rst_noreason_back.noreason_back_id
+          AND tb_rst_cm_relation_order.relation_type = '7'
       ) xx
     ) cc ON cc.customerId = c.customer_id
-    LEFT JOIN tb_rst_visit v ON v.customer_id = c.customer_id
+    LEFT JOIN tb_rst_cm_visit v ON v.customer_id = c.customer_id
     LEFT JOIN tb_rst_sales_order_info oi ON cc.orderId = oi.sales_id
-    LEFT JOIN tb_rst_question_describe qd ON c.customer_id = qd.customer_id
-    LEFT JOIN tb_rst_complaint_question cq ON c.question_id = cq.question_id
-    LEFT JOIN tb_rst_complaint_small_class csc ON csc.small_class_id = cq.small_class_id
-    LEFT JOIN tb_rst_complaint_type ct ON ct.complaint_id = csc.complaint_id
+    LEFT JOIN tb_rst_cm_question_describe qd ON c.customer_id = qd.customer_id
+    LEFT JOIN tb_rst_cm_complaint_question cq ON c.question_id = cq.question_id
+    LEFT JOIN tb_rst_cm_complaint_small_class csc ON csc.small_class_id = cq.small_class_id
+    LEFT JOIN tb_rst_cm_complaint_type ct ON ct.complaint_id = csc.complaint_id
     LEFT JOIN tb_rst_sales_company sc ON c.company_id = sc.company_id
     LEFT JOIN tb_rst_store_info si ON c.store_id = si.store_id
     LEFT JOIN tb_rst_product_type t ON c.type_id = t.type_id
@@ -531,7 +531,7 @@
   </select>
 
   <insert id="insert" parameterType="CustomerInfo"  useGeneratedKeys="true"  keyProperty="customerId">
-    insert into tb_rst_customer_info (customer_id, admin_id, question_id, 
+    insert into tb_rst_cm_customer_info (customer_id, admin_id, question_id,
       company_id, store_id, customer_source_type, 
       customer_source, customer_counsel_type, customer_name, 
       customer_tel,customer_wechat_name, customer_is_solve, customer_is_visit,
@@ -548,7 +548,7 @@
 
   <!-- 修改客诉信息 -->
   <update id="updateCustomerInfo" parameterType="CustomerInfo" >
-    update tb_rst_customer_info
+    update tb_rst_cm_customer_info
     <set >
       <if test="adminId != null" >
         admin_id = #{adminId},
@@ -631,7 +631,7 @@
         pt.*
     FROM
         tb_rst_product_type pt
-    LEFT JOIN tb_rst_customer_info ci ON pt.type_id = ci.type_id
+    LEFT JOIN tb_rst_cm_customer_info ci ON pt.type_id = ci.type_id
     where
     ci.customer_id = #{customerId}
   </select>
@@ -640,7 +640,7 @@
       SELECT
         COUNT(customer_id)
       FROM
-        tb_rst_customer_info
+        tb_rst_cm_customer_info
       <where>
         <if test="questionId != null" >
            question_id = #{questionId}
@@ -698,16 +698,16 @@
     d.describe_handle_desc,
     d.describe_content
     from
-    tb_rst_customer_info c
-    LEFT JOIN tb_rst_question_describe d ON c.customer_id = d.customer_id
+    tb_rst_cm_customer_info c
+    LEFT JOIN tb_rst_cm_question_describe d ON c.customer_id = d.customer_id
     LEFT JOIN tb_rst_product_type t ON c.type_id = t.type_id
-    LEFT JOIN tb_rst_complaint_question q ON c.question_id = q.question_id
-    LEFT JOIN tb_rst_complaint_small_class s ON q.small_class_id = s.small_class_id
-    LEFT JOIN tb_rst_complaint_type ct ON s.complaint_id = ct.complaint_id
+    LEFT JOIN tb_rst_cm_complaint_question q ON c.question_id = q.question_id
+    LEFT JOIN tb_rst_cm_complaint_small_class s ON q.small_class_id = s.small_class_id
+    LEFT JOIN tb_rst_cm_complaint_type ct ON s.complaint_id = ct.complaint_id
     LEFT JOIN tb_rst_sales_company sc ON c.company_id = sc.company_id
     LEFT JOIN tb_rst_store_info si ON c.store_id = si.store_id
     LEFT JOIN tb_rst_sys_admin a ON c.admin_id = a.admin_id
-    LEFT JOIN tb_rst_visit v ON v.customer_id = c.customer_id
+    LEFT JOIN tb_rst_cm_visit v ON v.customer_id = c.customer_id
     LEFT JOIN tb_rst_sys_admin sa ON v.designated_admin_id = sa.admin_id
     <where>
       <if test="customerName != null and customerName != ''">
@@ -804,11 +804,11 @@ ELSE
 END) AS customerSecondaryCustomer,
 sa.admin_name AS adminName
 FROM
-	tb_rst_customer_info c
-LEFT JOIN tb_rst_question_describe qd ON c.customer_id = qd.customer_id
-LEFT JOIN tb_rst_complaint_question cq ON c.question_id = cq.question_id
-LEFT JOIN tb_rst_complaint_small_class csc ON csc.small_class_id = cq.small_class_id
-LEFT JOIN tb_rst_complaint_type ct ON ct.complaint_id = csc.complaint_id
+	tb_rst_cm_customer_info c
+LEFT JOIN tb_rst_cm_question_describe qd ON c.customer_id = qd.customer_id
+LEFT JOIN tb_rst_cm_complaint_question cq ON c.question_id = cq.question_id
+LEFT JOIN tb_rst_cm_complaint_small_class csc ON csc.small_class_id = cq.small_class_id
+LEFT JOIN tb_rst_cm_complaint_type ct ON ct.complaint_id = csc.complaint_id
 LEFT JOIN tb_rst_sales_company sc ON c.company_id = sc.company_id
 LEFT JOIN tb_rst_store_info si ON c.store_id = si.store_id
 LEFT JOIN tb_rst_sys_admin sa ON c.admin_id = sa.admin_id
@@ -871,7 +871,7 @@ LEFT JOIN tb_rst_sys_admin sa ON c.admin_id = sa.admin_id
       </if>
     </where>
     GROUP BY oi.sales_id) salesNum
-    LEFT JOIN tb_rst_relation_order ro
+    LEFT JOIN tb_rst_cm_relation_order ro
     on ro.sales_id = salesNum.sales_id
     WHERE relation_type = 3) salesExchange
     GROUP BY
@@ -905,7 +905,7 @@ LEFT JOIN tb_rst_sys_admin sa ON c.admin_id = sa.admin_id
       </if>
     </where>
     GROUP BY oi.sales_id) salesNum
-    LEFT JOIN tb_rst_relation_order ro
+    LEFT JOIN tb_rst_cm_relation_order ro
     on ro.sales_id = salesNum.sales_id
     WHERE relation_type in (6,7)) salesExchange
     GROUP BY
@@ -939,11 +939,11 @@ LEFT JOIN tb_rst_sys_admin sa ON c.admin_id = sa.admin_id
       </if>
     </where>
     GROUP BY oi.sales_id) salesNum
-    LEFT JOIN tb_rst_relation_order ro
+    LEFT JOIN tb_rst_cm_relation_order ro
     on ro.sales_id = salesNum.sales_id
     LEFT JOIN tb_rst_renewed rr
     on ro.relation_id = rr.renewed_id
-    LEFT JOIN tb_rst_customer_info ci
+    LEFT JOIN tb_rst_cm_customer_info ci
     ON rr.customer_id = ci.customer_id
     WHERE relation_type = 3 and ci.customer_secondary_customer = 1) salesExchange
     GROUP BY
@@ -977,11 +977,11 @@ LEFT JOIN tb_rst_sys_admin sa ON c.admin_id = sa.admin_id
       </if>
     </where>
     GROUP BY oi.sales_id) salesNum
-    LEFT JOIN tb_rst_relation_order ro
+    LEFT JOIN tb_rst_cm_relation_order ro
     on ro.sales_id = salesNum.sales_id
     LEFT JOIN tb_rst_renewed rr
     on ro.relation_id = rr.renewed_id
-    LEFT JOIN tb_rst_customer_info ci
+    LEFT JOIN tb_rst_cm_customer_info ci
     ON rr.customer_id = ci.customer_id
     WHERE relation_type in(6,7) and ci.customer_secondary_customer = 1) salesExchange
     GROUP BY

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

@@ -243,7 +243,7 @@
         LEFT JOIN tb_rst_sales_company trsc ON t.sales_company_id = trsc.company_id
         LEFT JOIN tb_rst_store_info si ON t.sales_store_id = si.store_id
         LEFT JOIN tb_rst_sales_order_item soi ON t.sales_id = soi.item_order_id
-        LEFT JOIN tb_rst_customer_info ci ON t.sales_customer_id = ci.customer_id
+        LEFT JOIN tb_rst_cm_customer_info ci ON t.sales_customer_id = ci.customer_id
         <where>
             <if test="isCustmerAddOrder !=null and isCustmerAddOrder == 2">
                 AND sales_batch_id != 'KS00000000000001'

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

@@ -0,0 +1,103 @@
+<?xml version="1.0" encoding="UTF-8" ?>
+<!DOCTYPE mapper PUBLIC "-//mybatis.org//DTD Mapper 3.0//EN" "http://mybatis.org/dtd/mybatis-3-mapper.dtd">
+<mapper namespace="com.iamberry.rst.service.cm.mapper.ProcMethodMapper">
+    <resultMap  id="BaseResultMap" type="ProcMethod" >
+        <result    column="proc_method_id"    property="procMethodId" />
+        <result    column="proc_type_id"    property="procTypeId" />
+        <result    column="proc_method_name"    property="procMethodName" />
+        <result    column="proc_method_status"    property="procMethodStatus" />
+        <result    column="proc_method_desc"    property="procMethodDesc" />
+        <result    column="proc_method_is_back"    property="procMethodIsBack" />
+        <result    column="proc_method_is_send"    property="procMethodIsSend" />
+        <result    column="proc_method_create_time"    property="procMethodCreateTime" />
+        <result    column="proc_method_update_time"    property="procMethodUpdateTime" />
+    </resultMap>
+    <sql    id="Base_List" >
+        t.proc_method_id,
+        t.proc_type_id,
+        t.proc_method_name,
+        t.proc_method_status,
+        t.proc_method_desc,
+        t.proc_method_is_back,
+        t.proc_method_is_send,
+        t.proc_method_create_time,
+        t.proc_method_update_time
+    </sql>
+    <select id="getProcMethodList" resultMap="BaseResultMap" parameterType="ProcMethod" >
+        select
+        <include refid="Base_List" />
+        from tb_rst_cm_proc_method t
+        <where>
+            <if test="procMethodId != null ">
+                AND t.proc_method_id = #{procMethodId}
+            </if >
+            <if test="procTypeId != null ">
+                AND t.proc_type_id = #{procTypeId}
+            </if >
+            <if test="procMethodName != null and procMethodName != ''">
+                AND t.proc_method_name  like  CONCAT ('%',#{procMethodName},'%')
+            </if >
+            <if test="procMethodStatus != null ">
+                AND t.proc_method_status = #{procMethodStatus}
+            </if >
+            <if test="procMethodIsBack != null ">
+                AND t.proc_method_is_back = #{procMethodIsBack}
+            </if >
+            <if test="procMethodIsSend != null ">
+                AND t.proc_method_is_send = #{procMethodIsSend}
+            </if >
+        </where>
+    </select>
+    <select id="getProcMethodById" resultMap="BaseResultMap" parameterType="Integer" >
+        select
+        <include refid="Base_List" />
+        from tb_rst_cm_proc_method t
+        where t.proc_method_id= #{procMethodId}
+    </select>
+    <insert id="save" parameterType="ProcMethod" >
+        insert into
+        tb_rst_cm_proc_method
+        (
+        proc_type_id,
+        proc_method_name,
+        proc_method_status,
+        proc_method_desc,
+        proc_method_is_back,
+        proc_method_is_send
+        )
+        values
+        (
+        #{procTypeId},
+        #{procMethodName},
+        #{procMethodStatus},
+        #{procMethodDesc},
+        #{procMethodIsBack},
+        #{procMethodIsSend}
+        )
+    </insert>
+    <update id="update" parameterType="ProcMethod" >
+        update
+        tb_rst_cm_proc_method
+        <set >
+            <if test="procTypeId != null ">
+                proc_type_id = #{procTypeId},
+            </if >
+            <if test="procMethodName != null and procMethodName != ''">
+                proc_method_name = #{procMethodName},
+            </if >
+            <if test="procMethodStatus != null ">
+                proc_method_status = #{procMethodStatus},
+            </if >
+            <if test="procMethodDesc != null and procMethodDesc != ''">
+                proc_method_desc = #{procMethodDesc},
+            </if >
+            <if test="procMethodIsBack != null ">
+                proc_method_is_back = #{procMethodIsBack},
+            </if >
+            <if test="procMethodIsSend != null ">
+                proc_method_is_send = #{procMethodIsSend},
+            </if >
+        </set >
+        where proc_method_id= #{procMethodId}
+    </update>
+</mapper>

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

@@ -0,0 +1,78 @@
+<?xml version="1.0" encoding="UTF-8" ?>
+<!DOCTYPE mapper PUBLIC "-//mybatis.org//DTD Mapper 3.0//EN" "http://mybatis.org/dtd/mybatis-3-mapper.dtd">
+<mapper namespace="com.iamberry.rst.service.cm.mapper.ProcTypeMapper">
+    <resultMap  id="BaseResultMap" type="ProcType" >
+        <result    column="proc_type_id"    property="procTypeId" />
+        <result    column="proc_type_name"    property="procTypeName" />
+        <result    column="proc_type_status"    property="procTypeStatus" />
+        <result    column="proc_type_desc"    property="procTypeDesc" />
+        <result    column="proc_type_create_time"    property="procTypeCreateTime" />
+        <result    column="proc_type_update_time"    property="procTypeUpdateTime" />
+    </resultMap>
+    <sql    id="Base_List" >
+        t.proc_type_id,
+        t.proc_type_name,
+        t.proc_type_status,
+        t.proc_type_desc,
+        t.proc_type_create_time,
+        t.proc_type_update_time
+    </sql>
+    <select id="getProcTypeList" resultMap="BaseResultMap" parameterType="ProcType" >
+        select
+        <include refid="Base_List" />
+        from tb_rst_cm_proc_type t
+        <where>
+            <if test="procTypeId != null ">
+                AND t.proc_type_id = #{procTypeId}
+            </if >
+            <if test="procTypeName != null and procTypeName != ''">
+                AND t.proc_type_name  like  CONCAT ('%',#{procTypeName},'%')
+            </if >
+            <if test="procTypeStatus != null ">
+                AND t.proc_type_status = #{procTypeStatus}
+            </if >
+        </where>
+    </select>
+    <select id="getProcTypeById" resultMap="BaseResultMap" parameterType="Integer" >
+        select
+        <include refid="Base_List" />
+        from tb_rst_cm_proc_type t
+        where t.proc_type_id= #{procTypeId}
+    </select>
+    <insert id="save" parameterType="ProcType" >
+        insert into
+        tb_rst_cm_proc_type
+        (
+        proc_type_name,
+        proc_type_status,
+        proc_type_desc
+        )
+        values
+        (
+        #{procTypeName},
+        #{procTypeStatus},
+        #{procTypeDesc}
+        )
+    </insert>
+    <update id="update" parameterType="ProcType" >
+        update
+        tb_rst_cm_proc_type
+        <set >
+            <if test="procTypeName != null and procTypeName != ''">
+                proc_type_name = #{procTypeName},
+            </if >
+            <if test="procTypeStatus != null ">
+                proc_type_status = #{procTypeStatus},
+            </if >
+            <if test="procTypeDesc != null and procTypeDesc != ''">
+                proc_type_desc = #{procTypeDesc},
+            </if >
+        </set >
+        where proc_type_id= #{procTypeId}
+    </update>
+    <delete id="delete" parameterType="Integer" >
+        delete FROM
+        tb_rst_cm_proc_type
+        where proc_type_id=#{procTypeId}
+    </delete>
+</mapper>

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

@@ -17,37 +17,37 @@
   <select id="selectByPrimaryKey" resultMap="BaseResultMap" parameterType="java.lang.Integer" >
     select 
     <include refid="Base_Column_List" />
-    from tb_rst_question_describe
+    from tb_rst_cm_question_describe
     where describe_id = #{describeId,jdbcType=INTEGER}
   </select>
 
   <!-- 查询问题集合 -->
   <select id="listQuestionDescribe" parameterType="QuestionDescribe" resultType="QuestionDescribe">
     select
-    tb_rst_question_describe.*,
-    tb_rst_customer_info.customer_desc,
-    tb_rst_customer_info.customer_create_time
-    from tb_rst_question_describe
-    LEFT JOIN tb_rst_customer_info on tb_rst_customer_info.customer_id = tb_rst_question_describe.customer_id
+    tb_rst_cm_question_describe.*,
+    tb_rst_cm_customer_info.customer_desc,
+    tb_rst_cm_customer_info.customer_create_time
+    from tb_rst_cm_question_describe
+    LEFT JOIN tb_rst_cm_customer_info on tb_rst_cm_customer_info.customer_id = tb_rst_cm_question_describe.customer_id
     <where>
       <if test="customerId">
-        tb_rst_question_describe.customer_id = #{customerId}
+        tb_rst_cm_question_describe.customer_id = #{customerId}
       </if>
     </where>
   </select>
 
   <delete id="deleteByPrimaryKey" parameterType="java.lang.Integer" >
-    delete from tb_rst_question_describe
+    delete from tb_rst_cm_question_describe
     where describe_id = #{describeId,jdbcType=INTEGER}
   </delete>
 
   <insert id="insert" parameterType="QuestionDescribe" >
-    insert into tb_rst_question_describe (describe_id, describe_content, customer_id,describe_title,describe_handle_desc)
+    insert into tb_rst_cm_question_describe (describe_id, describe_content, customer_id,describe_title,describe_handle_desc)
     values (#{describeId,jdbcType=INTEGER}, #{describeContent,jdbcType=VARCHAR}, #{customerId,jdbcType=INTEGER}, #{describeTitle}, #{describeHandleDesc})
   </insert>
 
   <insert id="insertSelective" parameterType="QuestionDescribe" >
-    insert into tb_rst_question_describe
+    insert into tb_rst_cm_question_describe
     <trim prefix="(" suffix=")" suffixOverrides="," >
       <if test="describeId != null" >
         describe_id,
@@ -72,7 +72,7 @@
     </trim>
   </insert>
   <update id="updateByPrimaryKeySelective" parameterType="QuestionDescribe" >
-    update tb_rst_question_describe
+    update tb_rst_cm_question_describe
     <set >
       <if test="describeContent != null" >
         describe_content = #{describeContent,jdbcType=VARCHAR},
@@ -90,7 +90,7 @@
     where describe_id = #{describeId,jdbcType=INTEGER}
   </update>
   <update id="updateByPrimaryKey" parameterType="QuestionDescribe" >
-    update tb_rst_question_describe
+    update tb_rst_cm_question_describe
     set describe_content = #{describeContent,jdbcType=VARCHAR},
       customer_id = #{customerId,jdbcType=INTEGER}
     where describe_id = #{describeId,jdbcType=INTEGER}

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

@@ -16,7 +16,7 @@
     <select id="getRelationOrderList" resultMap="BaseResultMap" parameterType="RelationOrder" >
         select
         <include refid="Base_List" />
-        from tb_rst_relation_order t
+        from tb_rst_cm_relation_order t
         <where>
             <if test="relationOrderId != null ">
                 AND t.relation_order_id = #{relationOrderId}
@@ -38,12 +38,12 @@
     <select id="getRelationOrderById" resultMap="BaseResultMap" parameterType="Integer" >
         select
         <include refid="Base_List" />
-        from tb_rst_relation_order t
+        from tb_rst_cm_relation_order t
         where t.relation_order_id= #{relationOrderId}
     </select>
     <insert id="save" parameterType="RelationOrder" >
         insert into
-        tb_rst_relation_order
+        tb_rst_cm_relation_order
         (
         relation_order_id,
         relation_customer_id,
@@ -62,7 +62,7 @@
     </insert>
     <update id="update" parameterType="RelationOrder" >
         update
-        tb_rst_relation_order
+        tb_rst_cm_relation_order
         <set >
             <if test="relationCustomerId != null ">
                 relation_customer_id = #{relationCustomerId},
@@ -82,19 +82,19 @@
 
     <delete id="delete" parameterType="Integer" >
         delete FROM
-        tb_rst_relation_order
+        tb_rst_cm_relation_order
         where relation_order_id=#{relationOrderId}
     </delete>
 
     <delete id="deleteByRelationId" parameterType="Integer" >
         delete FROM
-          tb_rst_relation_order
+          tb_rst_cm_relation_order
         where relation_id=#{relationId}
     </delete>
 
     <insert id="saveList" parameterType="java.util.List" >
         insert into
-        tb_rst_relation_order
+        tb_rst_cm_relation_order
         (
         relation_order_id,
         relation_customer_id,

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

@@ -54,7 +54,7 @@
     LEFT JOIN tb_rst_sales_company trsc ON t.sales_company_id = trsc.company_id
     LEFT JOIN tb_rst_store_info trsi ON t.sales_store_id = trsi.store_id
      LEFT JOIN tb_rst_order_batch od ON t.sales_batch_id = od.batch_id
-    LEFT JOIN tb_rst_customer_info ci ON t.sales_customer_id = ci.customer_id
+    LEFT JOIN tb_rst_cm_customer_info ci ON t.sales_customer_id = ci.customer_id
     where sales_id = #{salesId}
   </select>
 
@@ -160,7 +160,7 @@
         LEFT JOIN tb_rst_sales_company trsc ON temp.sales_company_id = trsc.company_id
         LEFT JOIN tb_rst_store_info trsi ON temp.sales_store_id = trsi.store_id
         LEFT JOIN tb_rst_order_batch od ON temp.sales_batch_id = od.batch_id
-        LEFT JOIN tb_rst_customer_info ci ON temp.sales_customer_id = ci.customer_id
+        LEFT JOIN tb_rst_cm_customer_info ci ON temp.sales_customer_id = ci.customer_id
         LEFT JOIN tb_rst_sys_admin ao ON temp.sales_admin_id = ao.admin_id
     </select>
 
@@ -177,7 +177,7 @@
     LEFT JOIN tb_rst_sales_company trsc ON tb_rst_sales_order_info.sales_company_id = trsc.company_id
     LEFT JOIN tb_rst_store_info trsi ON tb_rst_sales_order_info.sales_store_id = trsi.store_id
     LEFT JOIN tb_rst_order_batch od ON tb_rst_sales_order_info.sales_batch_id = od.batch_id
-    LEFT JOIN tb_rst_customer_info ci ON tb_rst_sales_order_info.sales_customer_id = ci.customer_id
+    LEFT JOIN tb_rst_cm_customer_info ci ON tb_rst_sales_order_info.sales_customer_id = ci.customer_id
     LEFT JOIN tb_rst_sales_order_item oi ON tb_rst_sales_order_info.sales_id = oi.item_order_id
     LEFT JOIN tb_rst_sys_admin ao ON tb_rst_sales_order_info.sales_admin_id = ao.admin_id
     <where>
@@ -268,7 +268,7 @@
         LEFT JOIN tb_rst_sales_company trsc ON tb_rst_sales_order_info.sales_company_id = trsc.company_id
         LEFT JOIN tb_rst_store_info trsi ON tb_rst_sales_order_info.sales_store_id = trsi.store_id
         LEFT JOIN tb_rst_order_batch od ON tb_rst_sales_order_info.sales_batch_id = od.batch_id
-        LEFT JOIN tb_rst_customer_info ci ON tb_rst_sales_order_info.sales_customer_id = ci.customer_id
+        LEFT JOIN tb_rst_cm_customer_info ci ON tb_rst_sales_order_info.sales_customer_id = ci.customer_id
         LEFT JOIN tb_rst_sales_order_item oi ON tb_rst_sales_order_info.sales_id = oi.item_order_id
         <where>
             tb_rst_sales_order_info.sales_batch_id != 'KS00000000000001'
@@ -1132,7 +1132,7 @@
         LEFT JOIN tb_rst_sales_company trsc ON t.sales_company_id = trsc.company_id
         LEFT JOIN tb_rst_store_info si ON t.sales_store_id = si.store_id
         LEFT JOIN tb_rst_sales_order_item soi ON t.sales_id = soi.item_order_id
-        LEFT JOIN tb_rst_customer_info ci ON t.sales_customer_id = ci.customer_id
+        LEFT JOIN tb_rst_cm_customer_info ci ON t.sales_customer_id = ci.customer_id
       <where>
             t.sales_batch_id != 'KS00000000000001'
           <if test="salesIsDownload !=null ">

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

@@ -15,7 +15,7 @@
   <select id="selectByPrimaryKey" resultMap="BaseResultMap" parameterType="java.lang.Integer" >
     select 
     <include refid="Base_Column_List" />
-    from tb_rst_send_prodcue
+    from tb_rst_cm_send_prodcue
     where send_prodcue_id = #{sendProdcueId,jdbcType=INTEGER}
   </select>
 
@@ -26,7 +26,7 @@
       pi.product_name sendProduceName,
       po.color_name sendColorName
     from
-      tb_rst_send_prodcue sp
+      tb_rst_cm_send_prodcue sp
     LEFT JOIN tb_rst_product_info pi ON sp.product_id = pi.product_id
     LEFT JOIN tb_rst_product_color po ON sp.color_id = po.color_id
     <where>
@@ -40,7 +40,7 @@
   </select>
 
   <delete id="deleteByPrimaryKey" parameterType="SendProdcue" >
-    delete from tb_rst_send_prodcue
+    delete from tb_rst_cm_send_prodcue
     <where>
       <if test="sendProdcueId != null and sendProdcueId != ''">
         send_prodcue_id = #{sendProdcueId}
@@ -52,7 +52,7 @@
   </delete>
 
   <insert id="insert" parameterType="SendProdcue" >
-    insert into tb_rst_send_prodcue ( relation_id, product_id,
+    insert into tb_rst_cm_send_prodcue ( relation_id, product_id,
       color_id, send_prodcue_number,send_produce_type,color_bar)
     values
     <foreach collection="list" item="node" index="index" separator="," open="" close="">
@@ -65,7 +65,7 @@
   </insert>
 
   <insert id="insertSelective" parameterType="SendProdcue" >
-    insert into tb_rst_send_prodcue
+    insert into tb_rst_cm_send_prodcue
     <trim prefix="(" suffix=")" suffixOverrides="," >
       <if test="sendProdcueId != null" >
         send_prodcue_id,
@@ -108,7 +108,7 @@
     </trim>
   </insert>
   <update id="updateByPrimaryKeySelective" parameterType="SendProdcue" >
-    update tb_rst_send_prodcue
+    update tb_rst_cm_send_prodcue
     <set >
       <if test="relationId != null" >
         relation_id = #{relationId,jdbcType=INTEGER},

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

@@ -38,7 +38,7 @@
   <select id="getVisit" resultMap="BaseResultMap" parameterType="Visit" >
     select 
     <include refid="Base_Column_List" />
-    from tb_rst_visit
+    from tb_rst_cm_visit
     <where>
       <if test="visitId != null" >
         AND visit_id = #{visitId}
@@ -56,7 +56,7 @@
       a.admin_name designatedAdminName,
       sa.admin_name adminName
     FROM
-      tb_rst_visit v
+      tb_rst_cm_visit v
     LEFT JOIN tb_rst_sys_admin a ON v.designated_admin_id = a.admin_id
     LEFT JOIN tb_rst_sys_admin sa ON v.admin_id = sa.admin_id
     <where>
@@ -65,7 +65,7 @@
   </select>
 
   <delete id="deleteByPrimaryKey" parameterType="java.lang.Integer" >
-    delete from tb_rst_visit
+    delete from tb_rst_cm_visit
     <where>
       customer_id = #{customerId}
     </where>
@@ -73,7 +73,7 @@
 
   <!-- 添加客诉回访信息 -->
   <insert id="addVisitInfo" parameterType="Visit" useGeneratedKeys="true"  keyProperty="visitId" >
-    insert into tb_rst_visit (visit_id, customer_id, admin_id, designated_admin_id,
+    insert into tb_rst_cm_visit (visit_id, customer_id, admin_id, designated_admin_id,
       visit_name, visit_tel, visit_date, 
       visit_time_select, visit_status, visit_complete_date, 
       visit_complete_name, visit_complete_tel, visit_complete_remark, 
@@ -86,7 +86,7 @@
   </insert>
   <!-- 修改回访信息内容 -->
   <update id="updateVisit" parameterType="Visit" >
-    update tb_rst_visit
+    update tb_rst_cm_visit
     <set >
       <if test="adminId != null" >
         admin_id = #{adminId},

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

@@ -1,9 +1,9 @@
-package com.iamberry.rst.service.cm;
+package com.iamberry.rst.service.fm;
 
 
-import com.iamberry.rst.core.cm.AwaitingSignclosedProductInfo;
-import com.iamberry.rst.faces.cm.AwaitingSignclosedProductInfoService;
-import com.iamberry.rst.service.cm.mapper.AwaitingSignclosedProductMapper;
+import com.iamberry.rst.core.fm.AwaitingSignclosedProductInfo;
+import com.iamberry.rst.faces.fm.AwaitingSignclosedProductInfoService;
+import com.iamberry.rst.service.fm.mapper.AwaitingSignclosedProductMapper;
 import org.springframework.beans.factory.annotation.Autowired;
 import org.springframework.stereotype.Service;
 

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

@@ -1,23 +1,19 @@
-package com.iamberry.rst.service.cm;
+package com.iamberry.rst.service.fm;
 
 
 import com.github.pagehelper.PageHelper;
-import com.iamberry.rst.core.cm.ComplaintDetectInfo;
-import com.iamberry.rst.core.cm.ComplaintDetectItem;
-import com.iamberry.rst.core.cm.ComplaintMaintenanceInfo;
-import com.iamberry.rst.core.cm.DetectionBasis;
-import com.iamberry.rst.core.order.Order;
+import com.iamberry.rst.core.fm.ComplaintDetectInfo;
+import com.iamberry.rst.core.fm.ComplaintDetectItem;
+import com.iamberry.rst.core.fm.DetectionBasis;
 import com.iamberry.rst.core.page.PageRequest;
 import com.iamberry.rst.core.page.PagedResult;
-import com.iamberry.rst.faces.cm.ComplaintDetectInfoService;
-import com.iamberry.rst.service.cm.mapper.AwaitingSignclosedProductMapper;
-import com.iamberry.rst.service.cm.mapper.ComplaintDetectInfoMapper;
-import com.iamberry.rst.service.cm.mapper.ComplaintMaintenanceInfoMapper;
+import com.iamberry.rst.faces.fm.ComplaintDetectInfoService;
+import com.iamberry.rst.service.fm.mapper.ComplaintDetectInfoMapper;
+import com.iamberry.rst.service.fm.mapper.ComplaintMaintenanceInfoMapper;
 import com.iamberry.rst.util.PageUtil;
 import org.springframework.beans.factory.annotation.Autowired;
 import org.springframework.stereotype.Service;
 
-import java.util.Date;
 import java.util.List;
 
 @Service

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

@@ -1,16 +1,12 @@
-package com.iamberry.rst.service.cm;
+package com.iamberry.rst.service.fm;
 
 
 import com.github.pagehelper.PageHelper;
-import com.iamberry.rst.core.cm.ComplaintDetectInfo;
-import com.iamberry.rst.core.cm.ComplaintMaintenanceInfo;
-import com.iamberry.rst.core.cm.ComplaintSignclosedInfo;
+import com.iamberry.rst.core.fm.ComplaintMaintenanceInfo;
 import com.iamberry.rst.core.page.PageRequest;
 import com.iamberry.rst.core.page.PagedResult;
-import com.iamberry.rst.faces.cm.ComplaintDetectInfoService;
-import com.iamberry.rst.faces.cm.ComplaintMaintenanceInfoService;
-import com.iamberry.rst.service.cm.mapper.ComplaintDetectInfoMapper;
-import com.iamberry.rst.service.cm.mapper.ComplaintMaintenanceInfoMapper;
+import com.iamberry.rst.faces.fm.ComplaintMaintenanceInfoService;
+import com.iamberry.rst.service.fm.mapper.ComplaintMaintenanceInfoMapper;
 import com.iamberry.rst.util.PageUtil;
 import org.springframework.beans.factory.annotation.Autowired;
 import org.springframework.stereotype.Service;

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

@@ -1,24 +1,28 @@
-package com.iamberry.rst.service.cm;
+package com.iamberry.rst.service.fm;
 
 
 import com.github.pagehelper.PageHelper;
 import com.iamberry.rst.core.cm.*;
+import com.iamberry.rst.core.fm.AwaitingSignclosedProductInfo;
+import com.iamberry.rst.core.fm.ComplaintSignclosedInfo;
+import com.iamberry.rst.core.fm.SignclosedProductInfo;
 import com.iamberry.rst.core.order.Product;
 import com.iamberry.rst.core.order.ProductColor;
 import com.iamberry.rst.core.page.PageRequest;
 import com.iamberry.rst.core.page.PagedResult;
-import com.iamberry.rst.faces.cm.ComplaintQuestionInfoService;
-import com.iamberry.rst.faces.cm.ComplaintSignclosedInfoService;
+import com.iamberry.rst.faces.fm.ComplaintSignclosedInfoService;
 import com.iamberry.rst.service.cm.mapper.*;
+import com.iamberry.rst.service.fm.mapper.AwaitingSignclosedProductMapper;
+import com.iamberry.rst.service.fm.mapper.ComplaintDetectInfoMapper;
+import com.iamberry.rst.service.fm.mapper.ComplaintSignclosedInfoMapper;
+import com.iamberry.rst.service.fm.mapper.ComplaintSignclosedProductInfoMapper;
 import com.iamberry.rst.service.product.mapper.ProductMapper;
 import com.iamberry.rst.util.PageUtil;
-import com.iamberry.wechat.tools.ResponseJson;
 import net.sf.json.JSONArray;
 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.Date;
 import java.util.List;
 import java.util.Map;
@@ -208,26 +212,26 @@ public class ComplaintSignclosedInfoServiceImpl implements ComplaintSignclosedIn
 
                 }
             }
-            if(alreadyFittingsMap != null || alreadyFittingsMap.size() != 0){
-                for (Map.Entry<String,Integer> entry : alreadyFittingsMap.entrySet()) {
-                    SignclosedProductInfo signclosedProductInfo = new SignclosedProductInfo();
-                    //根据配件id获取配件信息
-                    FittingsInfo fittingsInfo = fittingsInfoMapper.getFittingsById(Integer.valueOf(entry.getKey()));
-                    if(fittingsInfo == null){
-                        return false;
-                    }
-                    for (int j = 0;j<entry.getValue();j++){
-                        signclosedProductInfo.setSignclosedId(record.getSignclosedId());
-                        signclosedProductInfo.setProductName(fittingsInfo.getFittingsName());
-                        signclosedProductInfo.setProductNum(1);
-                        signclosedProductInfo.setSignclosedProductType(2);
-                        signclosedProductInfo.setSignclosedProductId(fittingsInfo.getFittingsId());
-                        signclosedProductInfo.setSignclosedProductColor(null);
-                        signclosedProductInfo.setSignclosedCreateTime(new Date());
-                        complaintSignclosedProductInfoMapper.insert(signclosedProductInfo);
-                    }
-                }
-            }
+//            if(alreadyFittingsMap != null || alreadyFittingsMap.size() != 0){
+//                for (Map.Entry<String,Integer> entry : alreadyFittingsMap.entrySet()) {
+//                    SignclosedProductInfo signclosedProductInfo = new SignclosedProductInfo();
+//                    //根据配件id获取配件信息
+//                    FittingsInfo fittingsInfo = fittingsInfoMapper.getFittingsById(Integer.valueOf(entry.getKey()));
+//                    if(fittingsInfo == null){
+//                        return false;
+//                    }
+//                    for (int j = 0;j<entry.getValue();j++){
+//                        signclosedProductInfo.setSignclosedId(record.getSignclosedId());
+//                        signclosedProductInfo.setProductName(fittingsInfo.getFittingsName());
+//                        signclosedProductInfo.setProductNum(1);
+//                        signclosedProductInfo.setSignclosedProductType(2);
+//                        signclosedProductInfo.setSignclosedProductId(fittingsInfo.getFittingsId());
+//                        signclosedProductInfo.setSignclosedProductColor(null);
+//                        signclosedProductInfo.setSignclosedCreateTime(new Date());
+//                        complaintSignclosedProductInfoMapper.insert(signclosedProductInfo);
+//                    }
+//                }
+//            }
         }
         return msg;
     }

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

@@ -1,12 +1,9 @@
-package com.iamberry.rst.service.cm;
+package com.iamberry.rst.service.fm;
 
 
-import com.iamberry.rst.core.cm.ComplaintSignclosedInfo;
-import com.iamberry.rst.core.cm.SignclosedProductInfo;
-import com.iamberry.rst.faces.cm.ComplaintSignclosedInfoService;
-import com.iamberry.rst.faces.cm.ComplaintSignclosedProductInfoService;
-import com.iamberry.rst.service.cm.mapper.ComplaintSignclosedInfoMapper;
-import com.iamberry.rst.service.cm.mapper.ComplaintSignclosedProductInfoMapper;
+import com.iamberry.rst.core.fm.SignclosedProductInfo;
+import com.iamberry.rst.faces.fm.ComplaintSignclosedProductInfoService;
+import com.iamberry.rst.service.fm.mapper.ComplaintSignclosedProductInfoMapper;
 import org.springframework.beans.factory.annotation.Autowired;
 import org.springframework.stereotype.Service;
 

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

@@ -1,9 +1,9 @@
-package com.iamberry.rst.service.cm;
+package com.iamberry.rst.service.fm;
 
 
-import com.iamberry.rst.core.cm.ComplaintSmallClassInfo;
-import com.iamberry.rst.faces.cm.ComplaintSmallClassInfoService;
-import com.iamberry.rst.service.cm.mapper.ComplaintSmallClassInfoMapper;
+import com.iamberry.rst.core.fm.ComplaintSmallClassInfo;
+import com.iamberry.rst.faces.fm.ComplaintSmallClassInfoService;
+import com.iamberry.rst.service.fm.mapper.ComplaintSmallClassInfoMapper;
 import org.springframework.beans.factory.annotation.Autowired;
 import org.springframework.stereotype.Service;
 

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

@@ -1,6 +1,6 @@
-package com.iamberry.rst.service.cm.mapper;
+package com.iamberry.rst.service.fm.mapper;
 
-import com.iamberry.rst.core.cm.AwaitingSignclosedProductInfo;
+import com.iamberry.rst.core.fm.AwaitingSignclosedProductInfo;
 
 import java.util.List;
 

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

@@ -1,8 +1,8 @@
-package com.iamberry.rst.service.cm.mapper;
+package com.iamberry.rst.service.fm.mapper;
 
-import com.iamberry.rst.core.cm.ComplaintDetectInfo;
-import com.iamberry.rst.core.cm.ComplaintDetectItem;
-import com.iamberry.rst.core.cm.DetectionBasis;
+import com.iamberry.rst.core.fm.ComplaintDetectInfo;
+import com.iamberry.rst.core.fm.ComplaintDetectItem;
+import com.iamberry.rst.core.fm.DetectionBasis;
 
 import java.util.List;
 

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

@@ -1,7 +1,6 @@
-package com.iamberry.rst.service.cm.mapper;
+package com.iamberry.rst.service.fm.mapper;
 
-import com.iamberry.rst.core.cm.ComplaintMaintenanceInfo;
-import com.iamberry.rst.core.cm.ComplaintSignclosedInfo;
+import com.iamberry.rst.core.fm.ComplaintMaintenanceInfo;
 
 import java.util.List;
 

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

@@ -1,7 +1,7 @@
-package com.iamberry.rst.service.cm.mapper;
+package com.iamberry.rst.service.fm.mapper;
 
-import com.iamberry.rst.core.cm.ComplaintSignclosedInfo;
-import com.iamberry.rst.core.cm.SignclosedProductInfo;
+import com.iamberry.rst.core.fm.ComplaintSignclosedInfo;
+import com.iamberry.rst.core.fm.SignclosedProductInfo;
 
 import java.util.List;
 

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

@@ -1,7 +1,7 @@
-package com.iamberry.rst.service.cm.mapper;
+package com.iamberry.rst.service.fm.mapper;
 
-import com.iamberry.rst.core.cm.AwaitingSignclosedProductInfo;
-import com.iamberry.rst.core.cm.SignclosedProductInfo;
+import com.iamberry.rst.core.fm.AwaitingSignclosedProductInfo;
+import com.iamberry.rst.core.fm.SignclosedProductInfo;
 
 import java.util.List;
 

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

@@ -1,7 +1,6 @@
-package com.iamberry.rst.service.cm.mapper;
+package com.iamberry.rst.service.fm.mapper;
 
-import com.iamberry.rst.core.cm.ComplaintSmallClassInfo;
-import com.iamberry.rst.core.cm.ComplaintTypeInfo;
+import com.iamberry.rst.core.fm.ComplaintSmallClassInfo;
 
 import java.util.List;
 

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

@@ -1,7 +1,7 @@
-package com.iamberry.rst.service.cm.mapper;
+package com.iamberry.rst.service.fm.mapper;
 
-import com.iamberry.rst.core.cm.InventoryLog;
-import com.iamberry.rst.core.cm.WarehouseInfo;
+import com.iamberry.rst.core.fm.InventoryLog;
+import com.iamberry.rst.core.fm.WarehouseInfo;
 
 import java.util.List;
 

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

@@ -1,6 +1,6 @@
-package com.iamberry.rst.service.cm.mapper;
+package com.iamberry.rst.service.fm.mapper;
 
-import com.iamberry.rst.core.cm.InventoryInfo;
+import com.iamberry.rst.core.fm.InventoryInfo;
 
 import java.util.List;
 

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

@@ -1,6 +1,6 @@
 <?xml version="1.0" encoding="UTF-8" ?>
 <!DOCTYPE mapper PUBLIC "-//mybatis.org//DTD Mapper 3.0//EN" "http://mybatis.org/dtd/mybatis-3-mapper.dtd" >
-<mapper namespace="com.iamberry.rst.service.cm.mapper.AwaitingSignclosedProductMapper" >
+<mapper namespace="com.iamberry.rst.service.fm.mapper.AwaitingSignclosedProductMapper" >
   <resultMap id="BaseResultMap" type="AwaitingSignclosedProductInfo" >
     <id column="product_id" property="productId" jdbcType="INTEGER" />
     <result column="signclosed_id" property="signclosedId" jdbcType="INTEGER" />

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

@@ -1,6 +1,6 @@
 <?xml version="1.0" encoding="UTF-8" ?>
 <!DOCTYPE mapper PUBLIC "-//mybatis.org//DTD Mapper 3.0//EN" "http://mybatis.org/dtd/mybatis-3-mapper.dtd" >
-<mapper namespace="com.iamberry.rst.service.cm.mapper.ComplaintDetectInfoMapper" >
+<mapper namespace="com.iamberry.rst.service.fm.mapper.ComplaintDetectInfoMapper" >
   <resultMap id="BaseResultMap" type="ComplaintDetectInfo" >
   <id column="detect_id" property="detectId" jdbcType="INTEGER" />
   <result column="customer_id" property="customerId" jdbcType="INTEGER" />
@@ -73,7 +73,7 @@
     ci.color_name colorName
     from tb_rst_complaint_detect_item cd
     LEFT JOIN tb_rst_product_info pi ON cd.product_id = pi.product_id
-    LEFT JOIN tb_rst_question_describe qd on cd.customer_id = qd.customer_id
+    LEFT JOIN tb_rst_cm_question_describe qd on cd.customer_id = qd.customer_id
     LEFT JOIN tb_rst_product_type pt on pi.product_type = pt.type_id
     LEFT JOIN tb_rst_product_color ci on cd.product_color_id = ci.color_id
     <where>

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

@@ -1,6 +1,6 @@
 <?xml version="1.0" encoding="UTF-8" ?>
 <!DOCTYPE mapper PUBLIC "-//mybatis.org//DTD Mapper 3.0//EN" "http://mybatis.org/dtd/mybatis-3-mapper.dtd" >
-<mapper namespace="com.iamberry.rst.service.cm.mapper.ComplaintMaintenanceInfoMapper" >
+<mapper namespace="com.iamberry.rst.service.fm.mapper.ComplaintMaintenanceInfoMapper" >
   <resultMap id="BaseResultMap" type="ComplaintMaintenanceInfo" >
     <id column="maintenance_id" property="maintenanceId" jdbcType="INTEGER" />
     <result column="detect_id" property="detectId" jdbcType="INTEGER" />
@@ -83,7 +83,7 @@
     from tb_rst_complaint_maintenance cm
     LEFT JOIN tb_rst_product_info pi on cm.product_id = pi.product_id
     LEFT JOIN	tb_rst_complaint_detect cd on cm.detect_id = cd.detect_id
-    LEFT JOIN tb_rst_question_describe qd on cm.maintenance_customer_id = qd.customer_id
+    LEFT JOIN tb_rst_cm_question_describe qd on cm.maintenance_customer_id = qd.customer_id
     <where>
       <if test="maintenanceId != null and maintenanceId != ''" >
         AND maintenance_id = #{maintenanceId}

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

@@ -1,6 +1,6 @@
 <?xml version="1.0" encoding="UTF-8" ?>
 <!DOCTYPE mapper PUBLIC "-//mybatis.org//DTD Mapper 3.0//EN" "http://mybatis.org/dtd/mybatis-3-mapper.dtd" >
-<mapper namespace="com.iamberry.rst.service.cm.mapper.ComplaintSignclosedInfoMapper" >
+<mapper namespace="com.iamberry.rst.service.fm.mapper.ComplaintSignclosedInfoMapper" >
   <resultMap id="BaseResultMap" type="ComplaintSignclosedInfo" >
     <id column="signclosed_id" property="signclosedId" jdbcType="INTEGER" />
     <result column="signclosed_type" property="signclosedType" jdbcType="BIT" />
@@ -29,9 +29,9 @@
   <select id="getSignclosedById" resultMap="BaseResultMap" parameterType="java.lang.Integer" >
     select
     <include refid="Base_Column_List" />,
-    tb_rst_question_describe.describe_handle_desc describeHandleDesc
+    tb_rst_cm_question_describe.describe_handle_desc describeHandleDesc
     from tb_rst_complaint_signclosed
-    LEFT JOIN tb_rst_question_describe on tb_rst_question_describe.customer_id = tb_rst_complaint_signclosed.signclosed_customer_id
+    LEFT JOIN tb_rst_cm_question_describe on tb_rst_cm_question_describe.customer_id = tb_rst_complaint_signclosed.signclosed_customer_id
     where signclosed_id = #{signclosedId,jdbcType=INTEGER}
   </select>
 
@@ -123,7 +123,7 @@
     tb_rst_complaint_signclosed cs
     LEFT JOIN tb_rst_address_province ap ON cs.signclosed_addr_provinces = ap.province_id
     LEFT JOIN tb_rst_address_city ac ON cs.signclosed_addr_city = ac.city_id
-    LEFT JOIN tb_rst_question_describe qd on cs.signclosed_customer_id = qd.customer_id
+    LEFT JOIN tb_rst_cm_question_describe qd on cs.signclosed_customer_id = qd.customer_id
     <where>
       <if test="signclosedSendName != null and signclosedSendName != ''" >
         cs.signclosed_send_name = #{signclosedSendName}

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

@@ -1,6 +1,6 @@
 <?xml version="1.0" encoding="UTF-8" ?>
 <!DOCTYPE mapper PUBLIC "-//mybatis.org//DTD Mapper 3.0//EN" "http://mybatis.org/dtd/mybatis-3-mapper.dtd" >
-<mapper namespace="com.iamberry.rst.service.cm.mapper.ComplaintSignclosedProductInfoMapper" >
+<mapper namespace="com.iamberry.rst.service.fm.mapper.ComplaintSignclosedProductInfoMapper" >
   <resultMap id="BaseResultMap" type="SignclosedProductInfo" >
     <id column="product_id" property="productId" jdbcType="INTEGER" />
     <result column="signclosed_id" property="signclosedId" jdbcType="INTEGER" />

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

@@ -1,6 +1,6 @@
 <?xml version="1.0" encoding="UTF-8" ?>
 <!DOCTYPE mapper PUBLIC "-//mybatis.org//DTD Mapper 3.0//EN" "http://mybatis.org/dtd/mybatis-3-mapper.dtd" >
-<mapper namespace="com.iamberry.rst.service.cm.mapper.ComplaintSmallClassInfoMapper" >
+<mapper namespace="com.iamberry.rst.service.fm.mapper.ComplaintSmallClassInfoMapper" >
   <resultMap id="BaseResultMap" type="ComplaintSmallClassInfo" >
     <id column="small_class_id" property="smallClassId" jdbcType="INTEGER" />
     <result column="complaint_id" property="complaintId" jdbcType="INTEGER" />
@@ -18,14 +18,14 @@
   <select id="getSmallClassById" resultMap="BaseResultMap" parameterType="java.lang.Integer" >
     select 
     <include refid="Base_Column_List" />
-    from tb_rst_complaint_small_class
+    from tb_rst_cm_complaint_small_class
     where small_class_id = #{smallClassId,jdbcType=INTEGER}
   </select>
 
   <select id="listComplaintSmallClassInfo" resultMap="BaseResultMap" parameterType="ComplaintSmallClassInfo" >
     select
     <include refid="Base_Column_List" />
-    from tb_rst_complaint_small_class
+    from tb_rst_cm_complaint_small_class
     <where>
       <if test="complaintId !=null">
         AND complaint_id = #{complaintId}
@@ -35,7 +35,7 @@
   </select>
 
   <insert id="insert" parameterType="ComplaintSmallClassInfo" >
-    insert into tb_rst_complaint_small_class (small_class_id, complaint_id, small_class_name, 
+    insert into tb_rst_cm_complaint_small_class (small_class_id, complaint_id, small_class_name,
       small_class_profile, small_class_state, small_question_num, 
       small_class_create_time, small_class_update_time
       )
@@ -46,7 +46,7 @@
   </insert>
 
   <update id="updateSmallClassById" parameterType="ComplaintSmallClassInfo" >
-    update tb_rst_complaint_small_class
+    update tb_rst_cm_complaint_small_class
     <set >
       <if test="complaintId != null" >
         complaint_id = #{complaintId,jdbcType=INTEGER},

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

@@ -1,6 +1,6 @@
 <?xml version="1.0" encoding="UTF-8" ?>
 <!DOCTYPE mapper PUBLIC "-//mybatis.org//DTD Mapper 3.0//EN" "http://mybatis.org/dtd/mybatis-3-mapper.dtd" >
-<mapper namespace="com.iamberry.rst.service.cm.mapper.InventoryLogMapper" >
+<mapper namespace="com.iamberry.rst.service.fm.mapper.InventoryLogMapper" >
   <resultMap id="BaseResultMap" type="InventoryLog" >
     <id column="log_id" property="logId" jdbcType="INTEGER" />
     <result column="log_product_name" property="logProductName" jdbcType="VARCHAR" />

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

@@ -1,6 +1,6 @@
 <?xml version="1.0" encoding="UTF-8" ?>
 <!DOCTYPE mapper PUBLIC "-//mybatis.org//DTD Mapper 3.0//EN" "http://mybatis.org/dtd/mybatis-3-mapper.dtd" >
-<mapper namespace="com.iamberry.rst.service.cm.mapper.InventoryMapper" >
+<mapper namespace="com.iamberry.rst.service.fm.mapper.InventoryMapper" >
   <resultMap id="BaseResultMap" type="InventoryInfo" >
     <id column="inventory_id" property="inventoryId" jdbcType="INTEGER" />
     <result column="inventory_product_name" property="inventoryProductName" jdbcType="VARCHAR" />

watero-rst-service/src/main/java/com/iamberry/rst/service/product/mapper/productMapper.xml

@@ -222,7 +222,7 @@
 
     <select id="getProductType" resultType="ProductType" parameterType="Integer">
         select * from tb_rst_product_type pt
-        LEFT JOIN tb_rst_customer_info ci on ci.type_id = pt.type_id
+        LEFT JOIN tb_rst_cm_customer_info ci on ci.type_id = pt.type_id
         WHERE ci.customer_id = #{customerId}
     </select>
     <!--根据sku查询配件信息 -->

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

@@ -1,14 +1,17 @@
 package com.iamberry.rst.controllers.cm;
 
 import com.iamberry.rst.core.cm.*;
+import com.iamberry.rst.core.fm.ComplaintSignclosedInfo;
+import com.iamberry.rst.core.fm.ComplaintSmallClassInfo;
 import com.iamberry.rst.core.order.Product;
 import com.iamberry.rst.core.order.ProductColor;
 import com.iamberry.rst.core.order.ProductType;
 import com.iamberry.rst.core.page.PagedResult;
-import com.iamberry.rst.core.pts.Produce;
 import com.iamberry.rst.core.sys.Admin;
 import com.iamberry.rst.faces.address.AddressService;
 import com.iamberry.rst.faces.cm.*;
+import com.iamberry.rst.faces.fm.ComplaintSignclosedInfoService;
+import com.iamberry.rst.faces.fm.ComplaintSmallClassInfoService;
 import com.iamberry.rst.faces.order.EfastOrderService;
 import com.iamberry.rst.faces.product.ProductService;
 import com.iamberry.rst.faces.sms.SmsService;

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

@@ -1,8 +1,8 @@
 package com.iamberry.rst.controllers.cm;
 
 import com.iamberry.rst.core.cm.*;
+import com.iamberry.rst.core.fm.ComplaintSmallClassInfo;
 import com.iamberry.rst.core.order.ProductType;
-import com.iamberry.rst.faces.cm.ComplaintSmallClassInfoService;
 import com.iamberry.rst.faces.cm.ComplaintTypeInfoService;
 import com.iamberry.rst.faces.cm.CustomerService;
 import com.iamberry.rst.faces.product.ProductService;
@@ -17,8 +17,6 @@ import org.springframework.web.bind.annotation.ResponseBody;
 import org.springframework.web.servlet.ModelAndView;
 
 import javax.servlet.http.HttpServletRequest;
-import javax.xml.crypto.Data;
-import java.text.ParseException;
 import java.text.SimpleDateFormat;
 import java.util.*;