******* 移除老版客诉所使用的类，service，mapper，xml等文件，对代码进行清理 ******

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

@@ -1,264 +0,0 @@
-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;
-import java.util.ArrayList;
-import java.util.Date;
-import java.util.List;
-
-/**
- * 退货
- */
-@Deprecated
-public class BackGoods  implements Serializable {
-    private static final long serialVersionUID = -6844954322262497132L;
-//    private Integer backGoodsId;
-//
-//    private Integer customerId;
-//
-//    private Integer orderId;
-//
-//    private Integer signclosedId;
-//
-//    // TODO: 2018/3/23  寄回状态变更顺序： 1 -> 2  -> 4  -> 3
-//    //寄回状态  1：未寄回  2：已寄回  3：已收货  4:已签收待确认
-//    private Integer backGoodsBackStatus;
-//
-//    private String backGoodsBackName;
-//
-//    private String backGoodsBackTel;
-//
-//    private String backGoodsBackLogisticsCompany;
-//
-//    private String backGoodsBackLogisticsNo;
-//
-//    private Integer backGoodsBackPostage;       //寄回邮费 单位为分
-//
-//    private String backGoodsBackMachineNo;
-//
-//    private String backGoodsDesc;
-//
-//    private Integer backGoodsState;
-//
-//    private String backGoodsAlipay;             //转账账户
-//
-//    private String backGoodsAlipayName;             //转账账户姓名
-//
-//    //20180327 当前邮费默认为  0 不需要
-//    //是否已转账邮费  0:不需要 10:需要转账
-//    private Integer backGoodsIsTransfer;        //是否已转账邮费  0:不需要 1:已转  2:已申请待转  3:未申请 -- 作废
-//
-//    private Date backGoodsCreateTime;
-//
-//    private Date backGoodsUpdateTime;
-//
-//    @DateTimeFormat(pattern="yyyy-MM-dd HH:mm:ss")
-//    @JsonFormat(pattern="yyyy-MM-dd",timezone = "GMT+8")
-//    private Date salesPayTime;                  //支付时间
-//
-//    private Integer detectState;                //品质检测状态
-//    @DateTimeFormat(pattern="yyyy-MM-dd")
-//    private Date backGoodsBackReceiptDate;      //签收日期
-//
-//    //QC质检集合
-//    private List<ComplaintDetectInfo> complaintDetectList = new ArrayList<ComplaintDetectInfo>();
-//
-//    private List<ClosedFitting> closedFittings = new ArrayList<ClosedFitting>();//寄回配件集合
-//
-//    private List<ClosedProdcue> closedProdcues = new ArrayList<ClosedProdcue>();//机会产品集合
-//
-//    public List<ComplaintDetectInfo> getComplaintDetectList() {
-//        return complaintDetectList;
-//    }
-//
-//    public void setComplaintDetectList(List<ComplaintDetectInfo> complaintDetectList) {
-//        this.complaintDetectList = complaintDetectList;
-//    }
-//
-//    public Integer getDetectState() {
-//        return detectState;
-//    }
-//
-//    public void setDetectState(Integer detectState) {
-//        this.detectState = detectState;
-//    }
-//
-//    public Date getSalesPayTime() {
-//        return salesPayTime;
-//    }
-//
-//    public void setSalesPayTime(Date salesPayTime) {
-//        this.salesPayTime = salesPayTime;
-//    }
-//
-//    public List<ClosedFitting> getClosedFittings() {
-//        return closedFittings;
-//    }
-//
-//    public void setClosedFittings(List<ClosedFitting> closedFittings) {
-//        this.closedFittings = closedFittings;
-//    }
-//
-//    public List<ClosedProdcue> getClosedProdcues() {
-//        return closedProdcues;
-//    }
-//
-//    public void setClosedProdcues(List<ClosedProdcue> closedProdcues) {
-//        this.closedProdcues = closedProdcues;
-//    }
-//
-//    public Integer getBackGoodsBackStatus() {
-//        return backGoodsBackStatus;
-//    }
-//
-//    public void setBackGoodsBackStatus(Integer backGoodsBackStatus) {
-//        this.backGoodsBackStatus = backGoodsBackStatus;
-//    }
-//
-//    public Integer getBackGoodsState() {
-//        return backGoodsState;
-//    }
-//
-//    public void setBackGoodsState(Integer backGoodsState) {
-//        this.backGoodsState = backGoodsState;
-//    }
-//
-//    public Integer getBackGoodsIsTransfer() {
-//        return backGoodsIsTransfer;
-//    }
-//
-//    public void setBackGoodsIsTransfer(Integer backGoodsIsTransfer) {
-//        this.backGoodsIsTransfer = backGoodsIsTransfer;
-//    }
-//
-//    public Integer getBackGoodsId() {
-//        return backGoodsId;
-//    }
-//
-//    public void setBackGoodsId(Integer backGoodsId) {
-//        this.backGoodsId = backGoodsId;
-//    }
-//
-//    public Integer getCustomerId() {
-//        return customerId;
-//    }
-//
-//    public void setCustomerId(Integer customerId) {
-//        this.customerId = customerId;
-//    }
-//
-//    public Integer getOrderId() {
-//        return orderId;
-//    }
-//
-//    public void setOrderId(Integer orderId) {
-//        this.orderId = orderId;
-//    }
-//
-//    public Integer getSignclosedId() {
-//        return signclosedId;
-//    }
-//
-//    public void setSignclosedId(Integer signclosedId) {
-//        this.signclosedId = signclosedId;
-//    }
-//
-//    public String getBackGoodsBackName() {
-//        return backGoodsBackName;
-//    }
-//
-//    public void setBackGoodsBackName(String backGoodsBackName) {
-//        this.backGoodsBackName = backGoodsBackName == null ? null : backGoodsBackName.trim();
-//    }
-//
-//    public String getBackGoodsBackTel() {
-//        return backGoodsBackTel;
-//    }
-//
-//    public void setBackGoodsBackTel(String backGoodsBackTel) {
-//        this.backGoodsBackTel = backGoodsBackTel == null ? null : backGoodsBackTel.trim();
-//    }
-//
-//    public String getBackGoodsBackLogisticsCompany() {
-//        return backGoodsBackLogisticsCompany;
-//    }
-//
-//    public void setBackGoodsBackLogisticsCompany(String backGoodsBackLogisticsCompany) {
-//        this.backGoodsBackLogisticsCompany = backGoodsBackLogisticsCompany == null ? null : backGoodsBackLogisticsCompany.trim();
-//    }
-//
-//    public String getBackGoodsBackLogisticsNo() {
-//        return backGoodsBackLogisticsNo;
-//    }
-//
-//    public void setBackGoodsBackLogisticsNo(String backGoodsBackLogisticsNo) {
-//        this.backGoodsBackLogisticsNo = backGoodsBackLogisticsNo == null ? null : backGoodsBackLogisticsNo.trim();
-//    }
-//
-//    public Integer getBackGoodsBackPostage() {
-//        return backGoodsBackPostage;
-//    }
-//
-//    public void setBackGoodsBackPostage(Integer backGoodsBackPostage) {
-//        this.backGoodsBackPostage = backGoodsBackPostage;
-//    }
-//
-//    public String getBackGoodsBackMachineNo() {
-//        return backGoodsBackMachineNo;
-//    }
-//
-//    public void setBackGoodsBackMachineNo(String backGoodsBackMachineNo) {
-//        this.backGoodsBackMachineNo = backGoodsBackMachineNo == null ? null : backGoodsBackMachineNo.trim();
-//    }
-//
-//    public String getBackGoodsDesc() {
-//        return backGoodsDesc;
-//    }
-//
-//    public void setBackGoodsDesc(String backGoodsDesc) {
-//        this.backGoodsDesc = backGoodsDesc == null ? null : backGoodsDesc.trim();
-//    }
-//
-//    public String getBackGoodsAlipay() {
-//        return backGoodsAlipay;
-//    }
-//
-//    public void setBackGoodsAlipay(String backGoodsAlipay) {
-//        this.backGoodsAlipay = backGoodsAlipay == null ? null : backGoodsAlipay.trim();
-//    }
-//
-//    public Date getBackGoodsCreateTime() {
-//        return backGoodsCreateTime;
-//    }
-//
-//    public void setBackGoodsCreateTime(Date backGoodsCreateTime) {
-//        this.backGoodsCreateTime = backGoodsCreateTime;
-//    }
-//
-//    public Date getBackGoodsUpdateTime() {
-//        return backGoodsUpdateTime;
-//    }
-//
-//    public void setBackGoodsUpdateTime(Date backGoodsUpdateTime) {
-//        this.backGoodsUpdateTime = backGoodsUpdateTime;
-//    }
-//
-//    public String getBackGoodsAlipayName() {
-//        return backGoodsAlipayName;
-//    }
-//
-//    public void setBackGoodsAlipayName(String backGoodsAlipayName) {
-//        this.backGoodsAlipayName = backGoodsAlipayName;
-//    }
-//
-//    public Date getBackGoodsBackReceiptDate() {
-//        return backGoodsBackReceiptDate;
-//    }
-//
-//    public void setBackGoodsBackReceiptDate(Date backGoodsBackReceiptDate) {
-//        this.backGoodsBackReceiptDate = backGoodsBackReceiptDate;
-//    }
-}

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

@@ -1,107 +0,0 @@
-package com.iamberry.rst.core.cm;
-
-import java.io.Serializable;
-
-@Deprecated
-public class ClosedFitting  implements Serializable {
-    private static final long serialVersionUID = 8778123739128123226L;
-//    private Integer closedFittingId;
-//
-//    private Integer relationId;
-//
-//    private Integer productId;
-//
-//    private Integer fittingsId;
-//
-//    private Integer closedFittingNumber;
-//
-//    private Integer closedFittingType;  //售后类型  3：换新;4：维修;5：补发;6：退货;7：无理由退货
-//
-//    private String closedFittingsName;     //配件名称
-//
-//    private String closedProductName;       //产品名称
-//
-//    private String closedFittingsBar;     //配件sku
-//
-//    private String colorBar;        //69码
-//
-//    public Integer getClosedFittingType() {
-//        return closedFittingType;
-//    }
-//
-//    public void setClosedFittingType(Integer closedFittingType) {
-//        this.closedFittingType = closedFittingType;
-//    }
-//
-//    public String getClosedFittingsName() {
-//        return closedFittingsName;
-//    }
-//
-//    public void setClosedFittingsName(String closedFittingsName) {
-//        this.closedFittingsName = closedFittingsName;
-//    }
-//
-//    public String getClosedFittingsBar() {
-//        return closedFittingsBar;
-//    }
-//
-//    public void setClosedFittingsBar(String closedFittingsBar) {
-//        this.closedFittingsBar = closedFittingsBar;
-//    }
-//
-//    public Integer getClosedFittingId() {
-//        return closedFittingId;
-//    }
-//
-//    public void setClosedFittingId(Integer closedFittingId) {
-//        this.closedFittingId = closedFittingId;
-//    }
-//
-//    public Integer getRelationId() {
-//        return relationId;
-//    }
-//
-//    public void setRelationId(Integer relationId) {
-//        this.relationId = relationId;
-//    }
-//
-//    public Integer getProductId() {
-//        return productId;
-//    }
-//
-//    public void setProductId(Integer productId) {
-//        this.productId = productId;
-//    }
-//
-//    public Integer getFittingsId() {
-//        return fittingsId;
-//    }
-//
-//    public void setFittingsId(Integer fittingsId) {
-//        this.fittingsId = fittingsId;
-//    }
-//
-//    public Integer getClosedFittingNumber() {
-//        return closedFittingNumber;
-//    }
-//
-//    public void setClosedFittingNumber(Integer closedFittingNumber) {
-//        this.closedFittingNumber = closedFittingNumber;
-//    }
-//
-//    public String getClosedProductName() {
-//        return closedProductName;
-//    }
-//
-//    public void setClosedProductName(String closedProductName) {
-//        this.closedProductName = closedProductName;
-//    }
-//
-//    public String getColorBar() {
-//        return colorBar;
-//    }
-//
-//    public void setColorBar(String colorBar) {
-//        this.colorBar = colorBar;
-//    }
-}

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

@@ -1,86 +0,0 @@
-package com.iamberry.rst.core.cm;
-
-import java.io.Serializable;
-import java.util.Date;
-
-/**
- * 客诉配件实体类
- * Created by liuzhiwei on 2017/10/31.
- */
-@Deprecated
-public class FittingsInfo implements Serializable {
-
-//    private static final long serialVersionUID = -1370229485119071783L;
-//    private Integer fittingsId;         //主键
-//    private Integer productId;          //产品id
-//    private String fittingsName;        //配件名称
-//    private Integer fittingsDiscount;   //配件折扣价
-//    private Integer fittingsPrice;      //配件市场价
-//    private String fittingsBar;         //产品条码(SKU)
-//    private Integer fittingsStatus;     //状态
-//    private Date fittingsCretaeTime;    //创建时间
-//
-//    public Integer getFittingsId() {
-//        return fittingsId;
-//    }
-//
-//    public void setFittingsId(Integer fittingsId) {
-//        this.fittingsId = fittingsId;
-//    }
-//
-//    public Integer getProductId() {
-//        return productId;
-//    }
-//
-//    public void setProductId(Integer productId) {
-//        this.productId = productId;
-//    }
-//
-//    public String getFittingsName() {
-//        return fittingsName;
-//    }
-//
-//    public void setFittingsName(String fittingsName) {
-//        this.fittingsName = fittingsName;
-//    }
-//
-//    public Integer getFittingsDiscount() {
-//        return fittingsDiscount;
-//    }
-//
-//    public void setFittingsDiscount(Integer fittingsDiscount) {
-//        this.fittingsDiscount = fittingsDiscount;
-//    }
-//
-//    public Integer getFittingsPrice() {
-//        return fittingsPrice;
-//    }
-//
-//    public void setFittingsPrice(Integer fittingsPrice) {
-//        this.fittingsPrice = fittingsPrice;
-//    }
-//
-//    public String getFittingsBar() {
-//        return fittingsBar;
-//    }
-//
-//    public void setFittingsBar(String fittingsBar) {
-//        this.fittingsBar = fittingsBar;
-//    }
-//
-//    public Integer getFittingsStatus() {
-//        return fittingsStatus;
-//    }
-//
-//    public void setFittingsStatus(Integer fittingsStatus) {
-//        this.fittingsStatus = fittingsStatus;
-//    }
-//
-//    public Date getFittingsCretaeTime() {
-//        return fittingsCretaeTime;
-//    }
-//
-//    public void setFittingsCretaeTime(Date fittingsCretaeTime) {
-//        this.fittingsCretaeTime = fittingsCretaeTime;
-//    }
-}

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

@@ -1,264 +0,0 @@
-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;
-import java.util.ArrayList;
-import java.util.Date;
-import java.util.List;
-
-/**
- * 无理由退货
- */
-@Deprecated
-public class NoreasonBack  implements Serializable {
-//    private static final long serialVersionUID = -8771772978569981906L;
-//    private Integer noreasonBackId;
-//
-//    private Integer customerId;
-//
-//    private Integer orderId;
-//
-//    private Integer signclosedId;
-//
-//    // TODO: 2018/3/23  寄回状态变更顺序： 1 -> 2  -> 4  -> 3
-//    //寄回状态  1：未寄回  2：已寄回  3：已收货  4:已签收待确认
-//    private Integer noreasonBackBackStatus;
-//
-//    private String noreasonBackBackName;
-//
-//    private String noreasonBackBackTel;
-//
-//    private String noreasonBackBackLogisticsCompany;
-//
-//    private String noreasonBackBackLogisticsNo;
-//
-//    private Integer noreasonBackBackPostage;    //寄回邮费 单位为分
-//
-//    private String noreasonBackBackMachineNo;
-//
-//    private String noreasonBackDesc;
-//
-//    private Integer noreasonBackState;
-//
-//    private String noreasonBackAlipay;          //转账账户
-//    private String noreasonBackAlipayName;          //转账账户姓名
-//
-//    //20180327 当前邮费默认为  0 不需要
-//    //是否已转账邮费  0:不需要 10:需要转账
-//    private Integer noreasonBackIsTransfer;     //是否已转账邮费  0:不需要 1:已转  2:已申请待转  3:未申请 -- 作废
-//
-//    private Date noreasonBackCreateTime;
-//
-//    private Date noreasonBackUpdateTime;
-//    //签收日期
-//    @DateTimeFormat(pattern="yyyy-MM-dd")
-//    private Date noreasonBackReceiptDate;
-//
-//    @DateTimeFormat(pattern="yyyy-MM-dd HH:mm:ss")
-//    @JsonFormat(pattern="yyyy-MM-dd",timezone = "GMT+8")
-//    private Date salesPayTime;                  //支付时间
-//
-//    private Integer detectState;                //品质检测状态
-//
-//    //QC质检集合
-//    private List<ComplaintDetectInfo> complaintDetectList = new ArrayList<ComplaintDetectInfo>();
-//
-//    private List<ClosedFitting> closedFittings = new ArrayList<ClosedFitting>();//寄回配件集合
-//
-//    private List<ClosedProdcue> closedProdcues = new ArrayList<ClosedProdcue>();//机会产品集合
-//
-//    public List<ComplaintDetectInfo> getComplaintDetectList() {
-//        return complaintDetectList;
-//    }
-//
-//    public void setComplaintDetectList(List<ComplaintDetectInfo> complaintDetectList) {
-//        this.complaintDetectList = complaintDetectList;
-//    }
-//
-//    public Integer getDetectState() {
-//        return detectState;
-//    }
-//
-//    public void setDetectState(Integer detectState) {
-//        this.detectState = detectState;
-//    }
-//
-//    public Date getSalesPayTime() {
-//        return salesPayTime;
-//    }
-//
-//    public void setSalesPayTime(Date salesPayTime) {
-//        this.salesPayTime = salesPayTime;
-//    }
-//
-//    public List<ClosedFitting> getClosedFittings() {
-//        return closedFittings;
-//    }
-//
-//    public void setClosedFittings(List<ClosedFitting> closedFittings) {
-//        this.closedFittings = closedFittings;
-//    }
-//
-//    public List<ClosedProdcue> getClosedProdcues() {
-//        return closedProdcues;
-//    }
-//
-//    public void setClosedProdcues(List<ClosedProdcue> closedProdcues) {
-//        this.closedProdcues = closedProdcues;
-//    }
-//
-//    public Integer getNoreasonBackId() {
-//        return noreasonBackId;
-//    }
-//
-//    public void setNoreasonBackId(Integer noreasonBackId) {
-//        this.noreasonBackId = noreasonBackId;
-//    }
-//
-//    public Integer getCustomerId() {
-//        return customerId;
-//    }
-//
-//    public void setCustomerId(Integer customerId) {
-//        this.customerId = customerId;
-//    }
-//
-//    public Integer getOrderId() {
-//        return orderId;
-//    }
-//
-//    public void setOrderId(Integer orderId) {
-//        this.orderId = orderId;
-//    }
-//
-//    public Integer getSignclosedId() {
-//        return signclosedId;
-//    }
-//
-//    public void setSignclosedId(Integer signclosedId) {
-//        this.signclosedId = signclosedId;
-//    }
-//
-//    public String getNoreasonBackBackName() {
-//        return noreasonBackBackName;
-//    }
-//
-//    public void setNoreasonBackBackName(String noreasonBackBackName) {
-//        this.noreasonBackBackName = noreasonBackBackName == null ? null : noreasonBackBackName.trim();
-//    }
-//
-//    public String getNoreasonBackBackTel() {
-//        return noreasonBackBackTel;
-//    }
-//
-//    public void setNoreasonBackBackTel(String noreasonBackBackTel) {
-//        this.noreasonBackBackTel = noreasonBackBackTel == null ? null : noreasonBackBackTel.trim();
-//    }
-//
-//    public String getNoreasonBackBackLogisticsCompany() {
-//        return noreasonBackBackLogisticsCompany;
-//    }
-//
-//    public void setNoreasonBackBackLogisticsCompany(String noreasonBackBackLogisticsCompany) {
-//        this.noreasonBackBackLogisticsCompany = noreasonBackBackLogisticsCompany == null ? null : noreasonBackBackLogisticsCompany.trim();
-//    }
-//
-//    public String getNoreasonBackBackLogisticsNo() {
-//        return noreasonBackBackLogisticsNo;
-//    }
-//
-//    public void setNoreasonBackBackLogisticsNo(String noreasonBackBackLogisticsNo) {
-//        this.noreasonBackBackLogisticsNo = noreasonBackBackLogisticsNo == null ? null : noreasonBackBackLogisticsNo.trim();
-//    }
-//
-//    public Integer getNoreasonBackBackPostage() {
-//        return noreasonBackBackPostage;
-//    }
-//
-//    public void setNoreasonBackBackPostage(Integer noreasonBackBackPostage) {
-//        this.noreasonBackBackPostage = noreasonBackBackPostage;
-//    }
-//
-//    public String getNoreasonBackBackMachineNo() {
-//        return noreasonBackBackMachineNo;
-//    }
-//
-//    public void setNoreasonBackBackMachineNo(String noreasonBackBackMachineNo) {
-//        this.noreasonBackBackMachineNo = noreasonBackBackMachineNo == null ? null : noreasonBackBackMachineNo.trim();
-//    }
-//
-//    public String getNoreasonBackDesc() {
-//        return noreasonBackDesc;
-//    }
-//
-//    public void setNoreasonBackDesc(String noreasonBackDesc) {
-//        this.noreasonBackDesc = noreasonBackDesc == null ? null : noreasonBackDesc.trim();
-//    }
-//
-//    public String getNoreasonBackAlipay() {
-//        return noreasonBackAlipay;
-//    }
-//
-//    public void setNoreasonBackAlipay(String noreasonBackAlipay) {
-//        this.noreasonBackAlipay = noreasonBackAlipay == null ? null : noreasonBackAlipay.trim();
-//    }
-//
-//    public Date getNoreasonBackCreateTime() {
-//        return noreasonBackCreateTime;
-//    }
-//
-//    public void setNoreasonBackCreateTime(Date noreasonBackCreateTime) {
-//        this.noreasonBackCreateTime = noreasonBackCreateTime;
-//    }
-//
-//    public Date getNoreasonBackUpdateTime() {
-//        return noreasonBackUpdateTime;
-//    }
-//
-//    public void setNoreasonBackUpdateTime(Date noreasonBackUpdateTime) {
-//        this.noreasonBackUpdateTime = noreasonBackUpdateTime;
-//    }
-//
-//    public Integer getNoreasonBackBackStatus() {
-//        return noreasonBackBackStatus;
-//    }
-//
-//    public void setNoreasonBackBackStatus(Integer noreasonBackBackStatus) {
-//        this.noreasonBackBackStatus = noreasonBackBackStatus;
-//    }
-//
-//    public Integer getNoreasonBackState() {
-//        return noreasonBackState;
-//    }
-//
-//    public void setNoreasonBackState(Integer noreasonBackState) {
-//        this.noreasonBackState = noreasonBackState;
-//    }
-//
-//    public Integer getNoreasonBackIsTransfer() {
-//        return noreasonBackIsTransfer;
-//    }
-//
-//    public void setNoreasonBackIsTransfer(Integer noreasonBackIsTransfer) {
-//        this.noreasonBackIsTransfer = noreasonBackIsTransfer;
-//    }
-//
-//    public String getNoreasonBackAlipayName() {
-//        return noreasonBackAlipayName;
-//    }
-//
-//    public void setNoreasonBackAlipayName(String noreasonBackAlipayName) {
-//        this.noreasonBackAlipayName = noreasonBackAlipayName;
-//    }
-//
-//    public Date getNoreasonBackReceiptDate() {
-//        return noreasonBackReceiptDate;
-//    }
-//
-//    public void setNoreasonBackReceiptDate(Date noreasonBackReceiptDate) {
-//        this.noreasonBackReceiptDate = noreasonBackReceiptDate;
-//    }
-}

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

@@ -1,255 +0,0 @@
-package com.iamberry.rst.core.cm;
-
-import com.fasterxml.jackson.annotation.JsonFormat;
-import org.springframework.format.annotation.DateTimeFormat;
-
-import java.io.Serializable;
-import java.util.ArrayList;
-import java.util.Date;
-import java.util.List;
-
-/**
- * 售后补发
- */
-@Deprecated
-public class Reissue  implements Serializable {
-
-    private static final long serialVersionUID = 6552482836665728058L;
-//    //  售后补发主键
-//    private Integer reissueId;
-//    //  客诉基本信息主键
-//    private Integer customerId;
-//    //  订单id
-//    private Integer orderId;
-//    //  发出Efast订单号
-//    private String reissueBackEfastOrderId;
-//    //  寄送状态  1：未寄送  2：已寄送  3：已收货
-//    private Integer reissueSendStatus;
-//    //  寄送人姓名
-//    private String reissueSendName;
-//    //  寄送人电话
-//    private String reissueSendTel;
-//    //  寄送地址-省
-//    private Integer provinceNumber;
-//    //  寄送地址-市
-//    private Integer cityNumber;
-//    //  寄送地址-区
-//    private Integer areaNumber;
-//    //  寄送地址-省市区
-//    private String reissueSendMergeAddress;
-//    //  寄送地址-详细地址
-//    private String reissueSendAddress;
-//    //  寄送物流公司
-//    private String reissueSendLogisticsCompany;
-//    //  寄送物流单号
-//    private String reissueSendLogisticsNo;
-//    //  备注
-//    private String reissueDesc;
-//    //  状态    1：使用中  2：停用中
-//    private Integer reissueState;
-//    //  创建时间
-//    private Date reissueCreateTime;
-//    //  CURRENT_TIMESTAMP ,
-//    private Date reissueUpdateTime;
-//    @DateTimeFormat(pattern="yyyy-MM-dd HH:mm:ss")
-//    @JsonFormat(pattern="yyyy-MM-dd",timezone = "GMT+8")
-//    private Date salesPayTime;                  //支付时间
-//    private String salesDealCode;               //交易号
-//
-//    private List<ClosedFitting> closedFittings = new ArrayList<ClosedFitting>();//寄回配件集合
-//    private List<ClosedProdcue> closedProdcues = new ArrayList<ClosedProdcue>();//机会产品集合
-//    private List<SendProdcue> sendProdcues = new ArrayList<SendProdcue>();//寄送产品集合
-//    private List<SendFitting> sendFittings = new ArrayList<SendFitting>();//寄送配件集合
-//
-//    public List<SendProdcue> getSendProdcues() {
-//        return sendProdcues;
-//    }
-//
-//    public void setSendProdcues(List<SendProdcue> sendProdcues) {
-//        this.sendProdcues = sendProdcues;
-//    }
-//
-//    public List<SendFitting> getSendFittings() {
-//        return sendFittings;
-//    }
-//
-//    public void setSendFittings(List<SendFitting> sendFittings) {
-//        this.sendFittings = sendFittings;
-//    }
-//
-//    public Date getSalesPayTime() {
-//        return salesPayTime;
-//    }
-//
-//    public void setSalesPayTime(Date salesPayTime) {
-//        this.salesPayTime = salesPayTime;
-//    }
-//
-//    public List<ClosedFitting> getClosedFittings() {
-//        return closedFittings;
-//    }
-//
-//    public void setClosedFittings(List<ClosedFitting> closedFittings) {
-//        this.closedFittings = closedFittings;
-//    }
-//
-//    public List<ClosedProdcue> getClosedProdcues() {
-//        return closedProdcues;
-//    }
-//
-//    public void setClosedProdcues(List<ClosedProdcue> closedProdcues) {
-//        this.closedProdcues = closedProdcues;
-//    }
-//
-//    public Integer getReissueId() {
-//        return reissueId;
-//    }
-//
-//    public void setReissueId(Integer reissueId) {
-//        this.reissueId = reissueId;
-//    }
-//
-//    public Integer getCustomerId() {
-//        return customerId;
-//    }
-//
-//    public void setCustomerId(Integer customerId) {
-//        this.customerId = customerId;
-//    }
-//
-//    public Integer getOrderId() {
-//        return orderId;
-//    }
-//
-//    public void setOrderId(Integer orderId) {
-//        this.orderId = orderId;
-//    }
-//
-//    public String getReissueBackEfastOrderId() {
-//        return reissueBackEfastOrderId;
-//    }
-//
-//    public void setReissueBackEfastOrderId(String reissueBackEfastOrderId) {
-//        this.reissueBackEfastOrderId = reissueBackEfastOrderId;
-//    }
-//
-//    public Integer getReissueSendStatus() {
-//        return reissueSendStatus;
-//    }
-//
-//    public void setReissueSendStatus(Integer reissueSendStatus) {
-//        this.reissueSendStatus = reissueSendStatus;
-//    }
-//
-//    public String getReissueSendName() {
-//        return reissueSendName;
-//    }
-//
-//    public void setReissueSendName(String reissueSendName) {
-//        this.reissueSendName = reissueSendName;
-//    }
-//
-//    public String getReissueSendTel() {
-//        return reissueSendTel;
-//    }
-//
-//    public void setReissueSendTel(String reissueSendTel) {
-//        this.reissueSendTel = reissueSendTel;
-//    }
-//
-//    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 getReissueSendMergeAddress() {
-//        return reissueSendMergeAddress;
-//    }
-//
-//    public void setReissueSendMergeAddress(String reissueSendMergeAddress) {
-//        this.reissueSendMergeAddress = reissueSendMergeAddress;
-//    }
-//
-//    public String getReissueSendAddress() {
-//        return reissueSendAddress;
-//    }
-//
-//    public void setReissueSendAddress(String reissueSendAddress) {
-//        this.reissueSendAddress = reissueSendAddress;
-//    }
-//
-//    public String getReissueSendLogisticsCompany() {
-//        return reissueSendLogisticsCompany;
-//    }
-//
-//    public void setReissueSendLogisticsCompany(String reissueSendLogisticsCompany) {
-//        this.reissueSendLogisticsCompany = reissueSendLogisticsCompany;
-//    }
-//
-//    public String getReissueSendLogisticsNo() {
-//        return reissueSendLogisticsNo;
-//    }
-//
-//    public void setReissueSendLogisticsNo(String reissueSendLogisticsNo) {
-//        this.reissueSendLogisticsNo = reissueSendLogisticsNo;
-//    }
-//
-//    public String getReissueDesc() {
-//        return reissueDesc;
-//    }
-//
-//    public void setReissueDesc(String reissueDesc) {
-//        this.reissueDesc = reissueDesc;
-//    }
-//
-//    public Integer getReissueState() {
-//        return reissueState;
-//    }
-//
-//    public void setReissueState(Integer reissueState) {
-//        this.reissueState = reissueState;
-//    }
-//
-//    public Date getReissueCreateTime() {
-//        return reissueCreateTime;
-//    }
-//
-//    public void setReissueCreateTime(Date reissueCreateTime) {
-//        this.reissueCreateTime = reissueCreateTime;
-//    }
-//
-//    public Date getReissueUpdateTime() {
-//        return reissueUpdateTime;
-//    }
-//
-//    public void setReissueUpdateTime(Date reissueUpdateTime) {
-//        this.reissueUpdateTime = reissueUpdateTime;
-//    }
-//
-//    public String getSalesDealCode() {
-//        return salesDealCode;
-//    }
-//
-//    public void setSalesDealCode(String salesDealCode) {
-//        this.salesDealCode = salesDealCode;
-//    }
-}

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

@@ -1,509 +0,0 @@
-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;
-import java.util.ArrayList;
-import java.util.Date;
-import java.util.List;
-
-/**
- * 售后换新主键
- */
-@Deprecated
-public class Renewed  implements Serializable {
-
-    private static final long serialVersionUID = -4562997728567506919L;
-    
-//     //售后换新主键
-//    private Integer renewedId;
-//     //客诉基本信息主键
-//    private Integer customerId;
-//     //订单id
-//    private Integer orderId;
-//     //仓储任务(签收id)
-//    private Integer signclosedId;
-//     //发出Efast订单号
-//    private String renewedBackEfastOrderId;
-//    // TODO: 2018/3/23  寄回状态变更顺序： 1 -> 2  -> 4  -> 3
-//     //寄回状态  1：未寄回  2：已寄回  3：已收货  4:已签收待确认
-//    private Integer renewedBackStatus;
-//     //寄回人姓名
-//    private String renewedBackName;
-//     //寄回人电话
-//    private String renewedBackTel;
-//     //寄回物流公司
-//    private String renewedBackLogisticsCompany;
-//     //寄回物流单号
-//    private String renewedBackLogisticsNo;
-//     //寄回邮费 单位为分
-//    private Integer renewedBackPostage;
-//     //寄回机器编号
-//    private String renewedBackMachineNo;
-//     //寄送状态  1：未寄送  2：已寄送  3：已收货
-//    private Integer renewedSendStatus;
-//     //寄送人姓名
-//    private String renewedSendName;
-//     //寄送人电话
-//    private String renewedSendTel;
-//     //寄送地址-省
-//    private Integer provinceNumber;
-//     //寄送地址-市
-//    private Integer cityNumber;
-//     //寄送地址-区
-//    private Integer areaNumber;
-//     //寄送地址-省市区
-//    private String renewedSendMergeAddress;
-//     //寄送地址-详细地址
-//    private String renewedSendAddress;
-//     //寄送物流公司
-//    private String renewedSendLogisticsCompany;
-//     //寄送物流单号
-//    private String renewedSendLogisticsNo;
-//     //备注
-//    private String renewedDesc;
-//     //状态    1：使用中  2：停用中
-//    private Integer renewedState;
-//     //转账账户 (支付宝账户)
-//    private String renewedAlipay;
-//    //转账账户 (账户姓名)
-//    private String renewedAlipayName;
-//    //20180327 当前邮费默认为  0 不需要
-//     //是否已转账邮费  0:不需要 10:需要转账
-//    private Integer renewedIsTransfer;
-//     //创建时间
-//    private Date renewedCreateTime;
-//    // 修改时间,
-//    private Date renewedUpdateTime;
-//    // 签收日期,
-//    @DateTimeFormat(pattern="yyyy-MM-dd")
-//    private Date renewedBackReceiptDate;
-//
-//    private String detectPhenomenon;            //工厂检测现象
-//    private String detectFailureClassification; //故障分类
-//    private String detectFailureCause;          //故障原因
-//    private String detectResults;               //判定结果
-//    private String detectPoint;                 //故障指向
-//    private String detectAnalysis;              //原因分析
-//    private Integer detectRevolutionProduced;   //是否转入生产部门
-//    private Integer maintenanceIsRepair;        //是否可返修
-//    private String maintenanceContent;          //返修内容
-//    private Date maintenanceContentDate;        //返修日期
-//    private Integer closedProdcueNumber;        //寄回产品数量
-//    private String productName;                 //产品名称
-//    private Integer detectState;                //品质检测状态
-//    @DateTimeFormat(pattern="yyyy-MM-dd HH:mm:ss")
-//    @JsonFormat(pattern="yyyy-MM-dd",timezone = "GMT+8")
-//    private Date salesPayTime;                  //支付时间
-//    private String salesDealCode;               //交易号
-//
-//    //QC质检集合
-//    private List<ComplaintDetectInfo> complaintDetectList = new ArrayList<ComplaintDetectInfo>();
-//
-//    private List<ClosedFitting> closedFittings = new ArrayList<ClosedFitting>();//寄回配件集合
-//    private List<ClosedProdcue> closedProdcues = new ArrayList<ClosedProdcue>();//寄回产品集合
-//    private List<SendProdcue> sendProdcues = new ArrayList<SendProdcue>();//寄送产品集合
-//    private List<SendFitting> sendFittings = new ArrayList<SendFitting>();//寄送配件集合
-//
-//    public List<ComplaintDetectInfo> getComplaintDetectList() {
-//        return complaintDetectList;
-//    }
-//
-//    public void setComplaintDetectList(List<ComplaintDetectInfo> complaintDetectList) {
-//        this.complaintDetectList = complaintDetectList;
-//    }
-//
-//    public List<SendProdcue> getSendProdcues() {
-//        return sendProdcues;
-//    }
-//
-//    public void setSendProdcues(List<SendProdcue> sendProdcues) {
-//        this.sendProdcues = sendProdcues;
-//    }
-//
-//    public List<SendFitting> getSendFittings() {
-//        return sendFittings;
-//    }
-//
-//    public void setSendFittings(List<SendFitting> sendFittings) {
-//        this.sendFittings = sendFittings;
-//    }
-//
-//    public Date getSalesPayTime() {
-//        return salesPayTime;
-//    }
-//
-//    public void setSalesPayTime(Date salesPayTime) {
-//        this.salesPayTime = salesPayTime;
-//    }
-//
-//    public List<ClosedProdcue> getClosedProdcues() {
-//        return closedProdcues;
-//    }
-//
-//    public void setClosedProdcues(List<ClosedProdcue> closedProdcues) {
-//        this.closedProdcues = closedProdcues;
-//    }
-//
-//    public Integer getDetectState() {
-//        return detectState;
-//    }
-//
-//    public void setDetectState(Integer detectState) {
-//        this.detectState = detectState;
-//    }
-//
-//    public Integer getClosedProdcueNumber() {
-//        return closedProdcueNumber;
-//    }
-//
-//    public void setClosedProdcueNumber(Integer closedProdcueNumber) {
-//        this.closedProdcueNumber = closedProdcueNumber;
-//    }
-//
-//    public String getProductName() {
-//        return productName;
-//    }
-//
-//    public void setProductName(String productName) {
-//        this.productName = productName;
-//    }
-//
-//    public List<ClosedFitting> getClosedFittings() {
-//        return closedFittings;
-//    }
-//
-//    public void setClosedFittings(List<ClosedFitting> closedFittings) {
-//        this.closedFittings = closedFittings;
-//    }
-//
-//    public String getDetectPhenomenon() {
-//        return detectPhenomenon;
-//    }
-//
-//    public void setDetectPhenomenon(String detectPhenomenon) {
-//        this.detectPhenomenon = detectPhenomenon;
-//    }
-//
-//    public String getDetectFailureClassification() {
-//        return detectFailureClassification;
-//    }
-//
-//    public void setDetectFailureClassification(String detectFailureClassification) {
-//        this.detectFailureClassification = detectFailureClassification;
-//    }
-//
-//    public String getDetectFailureCause() {
-//        return detectFailureCause;
-//    }
-//
-//    public void setDetectFailureCause(String detectFailureCause) {
-//        this.detectFailureCause = detectFailureCause;
-//    }
-//
-//    public String getDetectResults() {
-//        return detectResults;
-//    }
-//
-//    public void setDetectResults(String detectResults) {
-//        this.detectResults = detectResults;
-//    }
-//
-//    public String getDetectPoint() {
-//        return detectPoint;
-//    }
-//
-//    public void setDetectPoint(String detectPoint) {
-//        this.detectPoint = detectPoint;
-//    }
-//
-//    public String getDetectAnalysis() {
-//        return detectAnalysis;
-//    }
-//
-//    public void setDetectAnalysis(String detectAnalysis) {
-//        this.detectAnalysis = detectAnalysis;
-//    }
-//
-//    public Integer getDetectRevolutionProduced() {
-//        return detectRevolutionProduced;
-//    }
-//
-//    public void setDetectRevolutionProduced(Integer detectRevolutionProduced) {
-//        this.detectRevolutionProduced = detectRevolutionProduced;
-//    }
-//
-//    public Integer getMaintenanceIsRepair() {
-//        return maintenanceIsRepair;
-//    }
-//
-//    public void setMaintenanceIsRepair(Integer maintenanceIsRepair) {
-//        this.maintenanceIsRepair = maintenanceIsRepair;
-//    }
-//
-//    public String getMaintenanceContent() {
-//        return maintenanceContent;
-//    }
-//
-//    public void setMaintenanceContent(String maintenanceContent) {
-//        this.maintenanceContent = maintenanceContent;
-//    }
-//
-//    public Date getMaintenanceContentDate() {
-//        return maintenanceContentDate;
-//    }
-//
-//    public void setMaintenanceContentDate(Date maintenanceContentDate) {
-//        this.maintenanceContentDate = maintenanceContentDate;
-//    }
-//
-//    public Integer getRenewedId() {
-//        return renewedId;
-//    }
-//
-//    public void setRenewedId(Integer renewedId) {
-//        this.renewedId = renewedId;
-//    }
-//
-//    public Integer getCustomerId() {
-//        return customerId;
-//    }
-//
-//    public void setCustomerId(Integer customerId) {
-//        this.customerId = customerId;
-//    }
-//
-//    public Integer getOrderId() {
-//        return orderId;
-//    }
-//
-//    public void setOrderId(Integer orderId) {
-//        this.orderId = orderId;
-//    }
-//
-//    public Integer getSignclosedId() {
-//        return signclosedId;
-//    }
-//
-//    public void setSignclosedId(Integer signclosedId) {
-//        this.signclosedId = signclosedId;
-//    }
-//
-//    public String getRenewedBackEfastOrderId() {
-//        return renewedBackEfastOrderId;
-//    }
-//
-//    public void setRenewedBackEfastOrderId(String renewedBackEfastOrderId) {
-//        this.renewedBackEfastOrderId = renewedBackEfastOrderId;
-//    }
-//
-//    public Integer getRenewedBackStatus() {
-//        return renewedBackStatus;
-//    }
-//
-//    public void setRenewedBackStatus(Integer renewedBackStatus) {
-//        this.renewedBackStatus = renewedBackStatus;
-//    }
-//
-//    public String getRenewedBackName() {
-//        return renewedBackName;
-//    }
-//
-//    public void setRenewedBackName(String renewedBackName) {
-//        this.renewedBackName = renewedBackName;
-//    }
-//
-//    public String getRenewedBackTel() {
-//        return renewedBackTel;
-//    }
-//
-//    public void setRenewedBackTel(String renewedBackTel) {
-//        this.renewedBackTel = renewedBackTel;
-//    }
-//
-//    public String getRenewedBackLogisticsCompany() {
-//        return renewedBackLogisticsCompany;
-//    }
-//
-//    public void setRenewedBackLogisticsCompany(String renewedBackLogisticsCompany) {
-//        this.renewedBackLogisticsCompany = renewedBackLogisticsCompany;
-//    }
-//
-//    public String getRenewedBackLogisticsNo() {
-//        return renewedBackLogisticsNo;
-//    }
-//
-//    public void setRenewedBackLogisticsNo(String renewedBackLogisticsNo) {
-//        this.renewedBackLogisticsNo = renewedBackLogisticsNo;
-//    }
-//
-//    public Integer getRenewedBackPostage() {
-//        return renewedBackPostage;
-//    }
-//
-//    public void setRenewedBackPostage(Integer renewedBackPostage) {
-//        this.renewedBackPostage = renewedBackPostage;
-//    }
-//
-//    public String getRenewedBackMachineNo() {
-//        return renewedBackMachineNo;
-//    }
-//
-//    public void setRenewedBackMachineNo(String renewedBackMachineNo) {
-//        this.renewedBackMachineNo = renewedBackMachineNo;
-//    }
-//
-//    public Integer getRenewedSendStatus() {
-//        return renewedSendStatus;
-//    }
-//
-//    public void setRenewedSendStatus(Integer renewedSendStatus) {
-//        this.renewedSendStatus = renewedSendStatus;
-//    }
-//
-//    public String getRenewedSendName() {
-//        return renewedSendName;
-//    }
-//
-//    public void setRenewedSendName(String renewedSendName) {
-//        this.renewedSendName = renewedSendName;
-//    }
-//
-//    public String getRenewedSendTel() {
-//        return renewedSendTel;
-//    }
-//
-//    public void setRenewedSendTel(String renewedSendTel) {
-//        this.renewedSendTel = renewedSendTel;
-//    }
-//
-//    public String getRenewedSendMergeAddress() {
-//        return renewedSendMergeAddress;
-//    }
-//
-//    public void setRenewedSendMergeAddress(String renewedSendMergeAddress) {
-//        this.renewedSendMergeAddress = renewedSendMergeAddress;
-//    }
-//
-//    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 getRenewedSendAddress() {
-//        return renewedSendAddress;
-//    }
-//
-//    public void setRenewedSendAddress(String renewedSendAddress) {
-//        this.renewedSendAddress = renewedSendAddress;
-//    }
-//
-//    public String getRenewedSendLogisticsCompany() {
-//        return renewedSendLogisticsCompany;
-//    }
-//
-//    public void setRenewedSendLogisticsCompany(String renewedSendLogisticsCompany) {
-//        this.renewedSendLogisticsCompany = renewedSendLogisticsCompany;
-//    }
-//
-//    public String getRenewedSendLogisticsNo() {
-//        return renewedSendLogisticsNo;
-//    }
-//
-//    public void setRenewedSendLogisticsNo(String renewedSendLogisticsNo) {
-//        this.renewedSendLogisticsNo = renewedSendLogisticsNo;
-//    }
-//
-//    public String getRenewedDesc() {
-//        return renewedDesc;
-//    }
-//
-//    public void setRenewedDesc(String renewedDesc) {
-//        this.renewedDesc = renewedDesc;
-//    }
-//
-//    public Integer getRenewedState() {
-//        return renewedState;
-//    }
-//
-//    public void setRenewedState(Integer renewedState) {
-//        this.renewedState = renewedState;
-//    }
-//
-//    public String getRenewedAlipay() {
-//        return renewedAlipay;
-//    }
-//
-//    public void setRenewedAlipay(String renewedAlipay) {
-//        this.renewedAlipay = renewedAlipay;
-//    }
-//
-//    public Integer getRenewedIsTransfer() {
-//        return renewedIsTransfer;
-//    }
-//
-//    public void setRenewedIsTransfer(Integer renewedIsTransfer) {
-//        this.renewedIsTransfer = renewedIsTransfer;
-//    }
-//
-//    public Date getRenewedCreateTime() {
-//        return renewedCreateTime;
-//    }
-//
-//    public void setRenewedCreateTime(Date renewedCreateTime) {
-//        this.renewedCreateTime = renewedCreateTime;
-//    }
-//
-//    public Date getRenewedUpdateTime() {
-//        return renewedUpdateTime;
-//    }
-//
-//    public void setRenewedUpdateTime(Date renewedUpdateTime) {
-//        this.renewedUpdateTime = renewedUpdateTime;
-//    }
-//
-//    public String getSalesDealCode() {
-//        return salesDealCode;
-//    }
-//
-//    public void setSalesDealCode(String salesDealCode) {
-//        this.salesDealCode = salesDealCode;
-//    }
-//
-//    public String getRenewedAlipayName() {
-//        return renewedAlipayName;
-//    }
-//
-//    public void setRenewedAlipayName(String renewedAlipayName) {
-//        this.renewedAlipayName = renewedAlipayName;
-//    }
-//
-//    public Date getRenewedBackReceiptDate() {
-//        return renewedBackReceiptDate;
-//    }
-//
-//    public void setRenewedBackReceiptDate(Date renewedBackReceiptDate) {
-//        this.renewedBackReceiptDate = renewedBackReceiptDate;
-//    }
-}

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

@@ -1,529 +0,0 @@
-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;
-import java.util.ArrayList;
-import java.util.Date;
-import java.util.List;
-
-/**
- * 售后维修表
- */
-@Deprecated
-public class Repair implements Serializable {
-
-    private static final long serialVersionUID = 6499911867888249040L;
-//
-//    //  售后维修主键
-//    private Integer repairId;
-//    //  客诉基本信息主键
-//    private Integer customerId;
-//    //  订单id
-//    private Integer orderId;
-//    //  仓储任务(签收id)
-//    private Integer signclosedId;
-//    //  发出Efast订单号
-//    private String repairBackEfastOrderId;
-//    // TODO: 2018/3/23  寄回状态变更顺序： 1 -> 2  -> 4  -> 3
-//    //寄回状态  1：未寄回  2：已寄回  3：已收货  4:已签收待确认
-//    private Integer repairBackStatus;
-//    //  寄回人姓名
-//    private String repairBackName;
-//    //  寄回人电话
-//    private String repairBackTel;
-//    //  寄回物流公司
-//    private String repairBackLogisticsCompany;
-//    //  寄回物流单号
-//    private String repairBackLogisticsNo;
-//    //  寄回邮费 单位为分
-//    private Integer repairBackPostage;
-//    //  寄回机器编号
-//    private String repairBackMachineNo;
-//    //  寄送状态  1：未寄送  2：已寄送  3：已收货
-//    private Integer repairSendStatus;
-//    //  寄送人姓名
-//    private String repairSendName;
-//    //  寄送人电话
-//    private String repairSendTel;
-//    //  寄送地址-省
-//    private Integer provinceNumber;
-//    //  寄送地址-市
-//    private Integer cityNumber;
-//    //  寄送地址-区
-//    private Integer areaNumber;
-//    //  寄送地址-省市区
-//    private String repairSendMergeAddress;
-//    //  寄送地址-详细地址
-//    private String repairSendAddress;
-//    //  寄送物流公司
-//    private String repairSendLogisticsCompany;
-//    //  寄送物流单号
-//    private String repairSendLogisticsNo;
-//    //  备注
-//    private String repairDesc;
-//    //  状态    1：使用中  2：停用中
-//    private Integer repairState;
-//    //  转账账户
-//    private String repairAlipay;
-//    //  转账账户 姓名
-//    private String repairAlipayName;
-//    //20180327 当前邮费默认为  0 不需要
-//    //是否已转账邮费  0:不需要 10:需要转账
-//    private Integer repairIsTransfer;
-//    //  创建时间
-//    private Date repairCreateTime;
-//    //  修改时间 ,
-//    private Date repairUpdateTime;
-//    //工厂维修报价
-//    private Integer repairFactoryCosts;
-//    //客户报价
-//    private Integer repairCustomerCosts;
-//    //  签收日期 ,
-//    @DateTimeFormat(pattern="yyyy-MM-dd")
-//    private Date repairBackReceiptDate;
-//
-//    private String detectPhenomenon;            //工厂检测现象
-//    private String detectFailureClassification; //故障分类
-//    private String detectFailureCause;          //故障原因
-//    private String detectResults;               //判定结果
-//    private String detectPoint;                 //故障指向
-//    private String detectAnalysis;              //原因分析
-//    private Integer detectRevolutionProduced;   //是否转入生产部门
-//    private Integer maintenanceIsRepair;        //是否可返修
-//    private String maintenanceContent;          //返修内容
-//    private Date maintenanceContentDate;        //返修日期
-//    private Integer closedProdcueNumber;        //寄回产品数量
-//    private String productName;                 //产品名称
-//    private Integer detectState;                //品质检测状态
-//    @DateTimeFormat(pattern="yyyy-MM-dd HH:mm:ss")
-//    @JsonFormat(pattern="yyyy-MM-dd",timezone = "GMT+8")
-//    private Date salesPayTime;                  //支付时间
-//    private String salesDealCode;               //交易号
-//
-//    //QC质检集合
-//    private List<ComplaintDetectInfo> complaintDetectList = new ArrayList<ComplaintDetectInfo>();
-//
-//    private List<ClosedFitting> closedFittings = new ArrayList<ClosedFitting>();//寄回配件集合
-//    private List<ClosedProdcue> closedProdcues = new ArrayList<ClosedProdcue>();//机会产品集合
-//    private List<SendProdcue> sendProdcues = new ArrayList<SendProdcue>();//寄送产品集合
-//    private List<SendFitting> sendFittings = new ArrayList<SendFitting>();//寄送配件集合
-//
-//    public List<ComplaintDetectInfo> getComplaintDetectList() {
-//        return complaintDetectList;
-//    }
-//
-//    public void setComplaintDetectList(List<ComplaintDetectInfo> complaintDetectList) {
-//        this.complaintDetectList = complaintDetectList;
-//    }
-//
-//    public List<SendProdcue> getSendProdcues() {
-//        return sendProdcues;
-//    }
-//
-//    public void setSendProdcues(List<SendProdcue> sendProdcues) {
-//        this.sendProdcues = sendProdcues;
-//    }
-//
-//    public List<SendFitting> getSendFittings() {
-//        return sendFittings;
-//    }
-//
-//    public void setSendFittings(List<SendFitting> sendFittings) {
-//        this.sendFittings = sendFittings;
-//    }
-//
-//    public Date getSalesPayTime() {
-//        return salesPayTime;
-//    }
-//
-//    public void setSalesPayTime(Date salesPayTime) {
-//        this.salesPayTime = salesPayTime;
-//    }
-//
-//    public List<ClosedProdcue> getClosedProdcues() {
-//        return closedProdcues;
-//    }
-//
-//    public void setClosedProdcues(List<ClosedProdcue> closedProdcues) {
-//        this.closedProdcues = closedProdcues;
-//    }
-//
-//    public List<ClosedFitting> getClosedFittings() {
-//        return closedFittings;
-//    }
-//
-//    public void setClosedFittings(List<ClosedFitting> closedFittings) {
-//        this.closedFittings = closedFittings;
-//    }
-//
-//    public String getDetectPhenomenon() {
-//        return detectPhenomenon;
-//    }
-//
-//    public void setDetectPhenomenon(String detectPhenomenon) {
-//        this.detectPhenomenon = detectPhenomenon;
-//    }
-//
-//    public String getDetectFailureClassification() {
-//        return detectFailureClassification;
-//    }
-//
-//    public void setDetectFailureClassification(String detectFailureClassification) {
-//        this.detectFailureClassification = detectFailureClassification;
-//    }
-//
-//    public String getDetectFailureCause() {
-//        return detectFailureCause;
-//    }
-//
-//    public void setDetectFailureCause(String detectFailureCause) {
-//        this.detectFailureCause = detectFailureCause;
-//    }
-//
-//    public String getDetectResults() {
-//        return detectResults;
-//    }
-//
-//    public void setDetectResults(String detectResults) {
-//        this.detectResults = detectResults;
-//    }
-//
-//    public String getDetectPoint() {
-//        return detectPoint;
-//    }
-//
-//    public void setDetectPoint(String detectPoint) {
-//        this.detectPoint = detectPoint;
-//    }
-//
-//    public String getDetectAnalysis() {
-//        return detectAnalysis;
-//    }
-//
-//    public void setDetectAnalysis(String detectAnalysis) {
-//        this.detectAnalysis = detectAnalysis;
-//    }
-//
-//    public Integer getDetectRevolutionProduced() {
-//        return detectRevolutionProduced;
-//    }
-//
-//    public void setDetectRevolutionProduced(Integer detectRevolutionProduced) {
-//        this.detectRevolutionProduced = detectRevolutionProduced;
-//    }
-//
-//    public Integer getMaintenanceIsRepair() {
-//        return maintenanceIsRepair;
-//    }
-//
-//    public void setMaintenanceIsRepair(Integer maintenanceIsRepair) {
-//        this.maintenanceIsRepair = maintenanceIsRepair;
-//    }
-//
-//    public String getMaintenanceContent() {
-//        return maintenanceContent;
-//    }
-//
-//    public void setMaintenanceContent(String maintenanceContent) {
-//        this.maintenanceContent = maintenanceContent;
-//    }
-//
-//    public Date getMaintenanceContentDate() {
-//        return maintenanceContentDate;
-//    }
-//
-//    public void setMaintenanceContentDate(Date maintenanceContentDate) {
-//        this.maintenanceContentDate = maintenanceContentDate;
-//    }
-//
-//    public Integer getClosedProdcueNumber() {
-//        return closedProdcueNumber;
-//    }
-//
-//    public void setClosedProdcueNumber(Integer closedProdcueNumber) {
-//        this.closedProdcueNumber = closedProdcueNumber;
-//    }
-//
-//    public String getProductName() {
-//        return productName;
-//    }
-//
-//    public void setProductName(String productName) {
-//        this.productName = productName;
-//    }
-//
-//    public Integer getDetectState() {
-//        return detectState;
-//    }
-//
-//    public void setDetectState(Integer detectState) {
-//        this.detectState = detectState;
-//    }
-//
-//    public Integer getRepairId() {
-//        return repairId;
-//    }
-//
-//    public void setRepairId(Integer repairId) {
-//        this.repairId = repairId;
-//    }
-//
-//    public Integer getCustomerId() {
-//        return customerId;
-//    }
-//
-//    public void setCustomerId(Integer customerId) {
-//        this.customerId = customerId;
-//    }
-//
-//    public Integer getOrderId() {
-//        return orderId;
-//    }
-//
-//    public void setOrderId(Integer orderId) {
-//        this.orderId = orderId;
-//    }
-//
-//    public Integer getSignclosedId() {
-//        return signclosedId;
-//    }
-//
-//    public void setSignclosedId(Integer signclosedId) {
-//        this.signclosedId = signclosedId;
-//    }
-//
-//    public String getRepairBackEfastOrderId() {
-//        return repairBackEfastOrderId;
-//    }
-//
-//    public void setRepairBackEfastOrderId(String repairBackEfastOrderId) {
-//        this.repairBackEfastOrderId = repairBackEfastOrderId;
-//    }
-//
-//    public Integer getRepairBackStatus() {
-//        return repairBackStatus;
-//    }
-//
-//    public void setRepairBackStatus(Integer repairBackStatus) {
-//        this.repairBackStatus = repairBackStatus;
-//    }
-//
-//    public String getRepairBackName() {
-//        return repairBackName;
-//    }
-//
-//    public void setRepairBackName(String repairBackName) {
-//        this.repairBackName = repairBackName;
-//    }
-//
-//    public String getRepairBackTel() {
-//        return repairBackTel;
-//    }
-//
-//    public void setRepairBackTel(String repairBackTel) {
-//        this.repairBackTel = repairBackTel;
-//    }
-//
-//    public String getRepairBackLogisticsCompany() {
-//        return repairBackLogisticsCompany;
-//    }
-//
-//    public void setRepairBackLogisticsCompany(String repairBackLogisticsCompany) {
-//        this.repairBackLogisticsCompany = repairBackLogisticsCompany;
-//    }
-//
-//    public String getRepairBackLogisticsNo() {
-//        return repairBackLogisticsNo;
-//    }
-//
-//    public void setRepairBackLogisticsNo(String repairBackLogisticsNo) {
-//        this.repairBackLogisticsNo = repairBackLogisticsNo;
-//    }
-//
-//    public Integer getRepairBackPostage() {
-//        return repairBackPostage;
-//    }
-//
-//    public void setRepairBackPostage(Integer repairBackPostage) {
-//        this.repairBackPostage = repairBackPostage;
-//    }
-//
-//    public String getRepairBackMachineNo() {
-//        return repairBackMachineNo;
-//    }
-//
-//    public void setRepairBackMachineNo(String repairBackMachineNo) {
-//        this.repairBackMachineNo = repairBackMachineNo;
-//    }
-//
-//    public Integer getRepairSendStatus() {
-//        return repairSendStatus;
-//    }
-//
-//    public void setRepairSendStatus(Integer repairSendStatus) {
-//        this.repairSendStatus = repairSendStatus;
-//    }
-//
-//    public String getRepairSendName() {
-//        return repairSendName;
-//    }
-//
-//    public void setRepairSendName(String repairSendName) {
-//        this.repairSendName = repairSendName;
-//    }
-//
-//    public String getRepairSendTel() {
-//        return repairSendTel;
-//    }
-//
-//    public void setRepairSendTel(String repairSendTel) {
-//        this.repairSendTel = repairSendTel;
-//    }
-//
-//    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 getRepairSendMergeAddress() {
-//        return repairSendMergeAddress;
-//    }
-//
-//    public void setRepairSendMergeAddress(String repairSendMergeAddress) {
-//        this.repairSendMergeAddress = repairSendMergeAddress;
-//    }
-//
-//    public String getRepairSendAddress() {
-//        return repairSendAddress;
-//    }
-//
-//    public void setRepairSendAddress(String repairSendAddress) {
-//        this.repairSendAddress = repairSendAddress;
-//    }
-//
-//    public String getRepairSendLogisticsCompany() {
-//        return repairSendLogisticsCompany;
-//    }
-//
-//    public void setRepairSendLogisticsCompany(String repairSendLogisticsCompany) {
-//        this.repairSendLogisticsCompany = repairSendLogisticsCompany;
-//    }
-//
-//    public String getRepairSendLogisticsNo() {
-//        return repairSendLogisticsNo;
-//    }
-//
-//    public void setRepairSendLogisticsNo(String repairSendLogisticsNo) {
-//        this.repairSendLogisticsNo = repairSendLogisticsNo;
-//    }
-//
-//    public String getRepairDesc() {
-//        return repairDesc;
-//    }
-//
-//    public void setRepairDesc(String repairDesc) {
-//        this.repairDesc = repairDesc;
-//    }
-//
-//    public Integer getRepairState() {
-//        return repairState;
-//    }
-//
-//    public void setRepairState(Integer repairState) {
-//        this.repairState = repairState;
-//    }
-//
-//    public String getRepairAlipay() {
-//        return repairAlipay;
-//    }
-//
-//    public void setRepairAlipay(String repairAlipay) {
-//        this.repairAlipay = repairAlipay;
-//    }
-//
-//    public Integer getRepairIsTransfer() {
-//        return repairIsTransfer;
-//    }
-//
-//    public void setRepairIsTransfer(Integer repairIsTransfer) {
-//        this.repairIsTransfer = repairIsTransfer;
-//    }
-//
-//    public Date getRepairCreateTime() {
-//        return repairCreateTime;
-//    }
-//
-//    public void setRepairCreateTime(Date repairCreateTime) {
-//        this.repairCreateTime = repairCreateTime;
-//    }
-//
-//    public Date getRepairUpdateTime() {
-//        return repairUpdateTime;
-//    }
-//
-//    public void setRepairUpdateTime(Date repairUpdateTime) {
-//        this.repairUpdateTime = repairUpdateTime;
-//    }
-//
-//    public String getSalesDealCode() {
-//        return salesDealCode;
-//    }
-//
-//    public void setSalesDealCode(String salesDealCode) {
-//        this.salesDealCode = salesDealCode;
-//    }
-//
-//    public String getRepairAlipayName() {
-//        return repairAlipayName;
-//    }
-//
-//    public void setRepairAlipayName(String repairAlipayName) {
-//        this.repairAlipayName = repairAlipayName;
-//    }
-//
-//    public Date getRepairBackReceiptDate() {
-//        return repairBackReceiptDate;
-//    }
-//
-//    public void setRepairBackReceiptDate(Date repairBackReceiptDate) {
-//        this.repairBackReceiptDate = repairBackReceiptDate;
-//    }
-//
-//    public Integer getRepairFactoryCosts() {
-//        return repairFactoryCosts;
-//    }
-//
-//    public void setRepairFactoryCosts(Integer repairFactoryCosts) {
-//        this.repairFactoryCosts = repairFactoryCosts;
-//    }
-//
-//    public Integer getRepairCustomerCosts() {
-//        return repairCustomerCosts;
-//    }
-//
-//    public void setRepairCustomerCosts(Integer repairCustomerCosts) {
-//        this.repairCustomerCosts = repairCustomerCosts;
-//    }
-}

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

@@ -1,96 +0,0 @@
-package com.iamberry.rst.core.cm;
-
-import java.io.Serializable;
-@Deprecated
-public class SendFitting  implements Serializable {
-    private static final long serialVersionUID = 5406750622369507409L;
-//    private Integer sendFittingId;
-//
-//    private Integer relationId;
-//
-//    private Integer productId;
-//
-//    private Integer fittingsId;
-//
-//    private Integer sendFittingNumber;
-//
-//    private Integer sendFittingType;    //售后类型  3：换新;4：维修;5：补发;6：退货;7：无理由退货
-//
-//    private String sendFittingsName; //配件名称
-//
-//    private String sendProductName;         //商品名称
-//
-//    private String colorBar;        //69码
-//
-//    public String getSendFittingsName() {
-//        return sendFittingsName;
-//    }
-//
-//    public void setSendFittingsName(String sendFittingsName) {
-//        this.sendFittingsName = sendFittingsName;
-//    }
-//
-//    public Integer getSendFittingType() {
-//        return sendFittingType;
-//    }
-//
-//    public void setSendFittingType(Integer sendFittingType) {
-//        this.sendFittingType = sendFittingType;
-//    }
-//
-//    public Integer getSendFittingId() {
-//        return sendFittingId;
-//    }
-//
-//    public void setSendFittingId(Integer sendFittingId) {
-//        this.sendFittingId = sendFittingId;
-//    }
-//
-//    public Integer getRelationId() {
-//        return relationId;
-//    }
-//
-//    public void setRelationId(Integer relationId) {
-//        this.relationId = relationId;
-//    }
-//
-//    public Integer getProductId() {
-//        return productId;
-//    }
-//
-//    public void setProductId(Integer productId) {
-//        this.productId = productId;
-//    }
-//
-//    public Integer getFittingsId() {
-//        return fittingsId;
-//    }
-//
-//    public void setFittingsId(Integer fittingsId) {
-//        this.fittingsId = fittingsId;
-//    }
-//
-//    public Integer getSendFittingNumber() {
-//        return sendFittingNumber;
-//    }
-//
-//    public void setSendFittingNumber(Integer sendFittingNumber) {
-//        this.sendFittingNumber = sendFittingNumber;
-//    }
-//
-//    public String getSendProductName() {
-//        return sendProductName;
-//    }
-//
-//    public void setSendProductName(String sendProductName) {
-//        this.sendProductName = sendProductName;
-//    }
-//
-//    public String getColorBar() {
-//        return colorBar;
-//    }
-//
-//    public void setColorBar(String colorBar) {
-//        this.colorBar = colorBar;
-//    }
-}

watero-rst-core/src/main/java/com.iamberry.rst.core/customer/BillingInfo.java

@@ -1,92 +0,0 @@
-package com.iamberry.rst.core.customer;
-
-import java.io.Serializable;
-import java.util.Date;
-
-/**
- * Created by Administrator on 2018/4/19.
- */
-public class BillingInfo implements Serializable {
-    private static final long serialVersionUID = 1005879663545392938L;
-    private Integer billingId;//主键
-    private Integer customerId;//主键客户id（外键）
-    private String accountOpeningBranch;//开户支行
-    private String accountName;//账号名称
-    private String accountNum;//账号
-    private String receivablesName;//收款人姓名
-    private String receivablesPhone;//收款人电话
-    private Date createDate;//创建时间
-    private Integer accountType;//账户类型 1:公司 2：个人
-
-    public Integer getBillingId() {
-        return billingId;
-    }
-
-    public void setBillingId(Integer billingId) {
-        this.billingId = billingId;
-    }
-
-    public Integer getCustomerId() {
-        return customerId;
-    }
-
-    public void setCustomerId(Integer customerId) {
-        this.customerId = customerId;
-    }
-
-    public String getAccountOpeningBranch() {
-        return accountOpeningBranch;
-    }
-
-    public void setAccountOpeningBranch(String accountOpeningBranch) {
-        this.accountOpeningBranch = accountOpeningBranch;
-    }
-
-    public String getAccountName() {
-        return accountName;
-    }
-
-    public void setAccountName(String accountName) {
-        this.accountName = accountName;
-    }
-
-    public String getAccountNum() {
-        return accountNum;
-    }
-
-    public void setAccountNum(String accountNum) {
-        this.accountNum = accountNum;
-    }
-
-    public String getReceivablesName() {
-        return receivablesName;
-    }
-
-    public void setReceivablesName(String receivablesName) {
-        this.receivablesName = receivablesName;
-    }
-
-    public String getReceivablesPhone() {
-        return receivablesPhone;
-    }
-
-    public void setReceivablesPhone(String receivablesPhone) {
-        this.receivablesPhone = receivablesPhone;
-    }
-
-    public Date getCreateDate() {
-        return createDate;
-    }
-
-    public void setCreateDate(Date createDate) {
-        this.createDate = createDate;
-    }
-
-    public Integer getAccountType() {
-        return accountType;
-    }
-
-    public void setAccountType(Integer accountType) {
-        this.accountType = accountType;
-    }
-}

watero-rst-core/src/main/java/com.iamberry.rst.core/customer/ChannelDivisionInfo.java

@@ -1,75 +0,0 @@
-package com.iamberry.rst.core.customer;
-
-import java.io.Serializable;
-import java.util.Date;
-import java.util.List;
-
-/**
- * Created by Administrator on 2018/4/19.
- */
-public class ChannelDivisionInfo implements Serializable{
-    private static final long serialVersionUID = -5067289140425572665L;
-    private Integer channelDivisionId;//渠道id（主键）
-    private Integer channelCategory;//渠道类别 1：电商 2：特殊渠道 3：线下 4：海外
-    private String channelType;//渠道类型
-    private String channelCode;//渠道编码
-    private String channelName;//渠道、平台名称
-    private Date createDate;//创建时间
-    private List<ChannelSaleInfo> listChannelSaleInfo;//销售信息集合
-
-    public Integer getChannelDivisionId() {
-        return channelDivisionId;
-    }
-
-    public void setChannelDivisionId(Integer channelDivisionId) {
-        this.channelDivisionId = channelDivisionId;
-    }
-
-    public Integer getChannelCategory() {
-        return channelCategory;
-    }
-
-    public void setChannelCategory(Integer channelCategory) {
-        this.channelCategory = channelCategory;
-    }
-
-    public String getChannelType() {
-        return channelType;
-    }
-
-    public void setChannelType(String channelType) {
-        this.channelType = channelType;
-    }
-
-    public String getChannelCode() {
-        return channelCode;
-    }
-
-    public void setChannelCode(String channelCode) {
-        this.channelCode = channelCode;
-    }
-
-    public Date getCreateDate() {
-        return createDate;
-    }
-
-    public void setCreateDate(Date createDate) {
-        this.createDate = createDate;
-    }
-
-    public List<ChannelSaleInfo> getListChannelSaleInfo() {
-        return listChannelSaleInfo;
-    }
-
-    public void setListChannelSaleInfo(List<ChannelSaleInfo> listChannelSaleInfo) {
-        this.listChannelSaleInfo = listChannelSaleInfo;
-    }
-
-    public String getChannelName() {
-        return channelName;
-    }
-
-    public void setChannelName(String channelName) {
-        this.channelName = channelName;
-    }
-}

watero-rst-core/src/main/java/com.iamberry.rst.core/customer/ChannelSaleInfo.java

@@ -1,110 +0,0 @@
-package com.iamberry.rst.core.customer;
-
-import java.io.Serializable;
-import java.util.Date;
-
-/**
- * 客户渠道销售信息备案
- * Created by Administrator on 2018/4/19.
- */
-public class ChannelSaleInfo implements Serializable{
-    private static final long serialVersionUID = -3955769129591845971L;
-    private Integer channelSaleId;//主键
-    private Integer customerId;//客户id（外键）
-    private Integer channelDivisionId;//渠道id（外键）
-    private String promotingProducts;//销售产品
-    private Integer supplyPrice;//供货价格
-    private Integer accountPeriod;//账期 1：先款 2：月结 3：两个月
-    private Date createDate;//创建时间
-    private Integer channelCategory;//渠道类别 1：电商 2：特殊渠道 3：线下 4：海外
-    private String channelType;//渠道类型
-    private String channelName;//渠道名称
-    private String channelCode;//渠道编码
-
-    public String getChannelCode() {
-        return channelCode;
-    }
-
-    public void setChannelCode(String channelCode) {
-        this.channelCode = channelCode;
-    }
-
-    public String getChannelName() {
-        return channelName;
-    }
-
-    public void setChannelName(String channelName) {
-        this.channelName = channelName;
-    }
-    public Integer getChannelSaleId() {
-        return channelSaleId;
-    }
-
-    public void setChannelSaleId(Integer channelSaleId) {
-        this.channelSaleId = channelSaleId;
-    }
-
-    public Integer getCustomerId() {
-        return customerId;
-    }
-
-    public void setCustomerId(Integer customerId) {
-        this.customerId = customerId;
-    }
-
-    public Integer getChannelDivisionId() {
-        return channelDivisionId;
-    }
-
-    public void setChannelDivisionId(Integer channelDivisionId) {
-        this.channelDivisionId = channelDivisionId;
-    }
-
-    public String getPromotingProducts() {
-        return promotingProducts;
-    }
-
-    public void setPromotingProducts(String promotingProducts) {
-        this.promotingProducts = promotingProducts;
-    }
-
-    public Integer getSupplyPrice() {
-        return supplyPrice;
-    }
-
-    public void setSupplyPrice(Integer supplyPrice) {
-        this.supplyPrice = supplyPrice;
-    }
-
-    public Integer getAccountPeriod() {
-        return accountPeriod;
-    }
-
-    public void setAccountPeriod(Integer accountPeriod) {
-        this.accountPeriod = accountPeriod;
-    }
-
-    public Date getCreateDate() {
-        return createDate;
-    }
-
-    public void setCreateDate(Date createDate) {
-        this.createDate = createDate;
-    }
-
-    public Integer getChannelCategory() {
-        return channelCategory;
-    }
-
-    public void setChannelCategory(Integer channelCategory) {
-        this.channelCategory = channelCategory;
-    }
-
-    public String getChannelType() {
-        return channelType;
-    }
-
-    public void setChannelType(String channelType) {
-        this.channelType = channelType;
-    }
-}

watero-rst-core/src/main/java/com.iamberry.rst.core/customer/CustomerBasicInfo.java

@@ -1,201 +0,0 @@
-package com.iamberry.rst.core.customer;
-
-import java.io.Serializable;
-import java.util.Date;
-
-/**
- * Created by Administrator on 2018/4/19.
- */
-public class CustomerBasicInfo implements Serializable{
-    private static final long serialVersionUID = 4003986770939403758L;
-    private Integer customerId;//客户id(主键)
-    private String customerName;//客户名称
-    private String customerIndustry;//客户行业
-    private Integer customerType;//客户类型 1:个人 2：企业
-    private Integer cooperativeState;//合作进度1:意向合作 2：已经合作 3：停止合作
-    private String customerProvinceCode;//客户所在省份代号
-    private String customerCityCode;//客户所在城市代号
-    private String customerAddress;//客户详细地址
-    private Integer customerStatus;//状态 1:已删除 2：正常
-    private Date createDate;//创建时间
-    private Date updateDate;//修改时间
-    private Integer idCreateBy;//创建人Id
-    private String customerRemarks;//备注信息
-    private String adminName;//管理员姓名
-    private String provinceName;//客户所在省份名称
-    private String cityName;//客户所在城市姓名
-    private Integer isLookAll;//是否查看全部客户 1：查看全部 2：查看自己的
-    private String contactName;//联系人姓名
-    private String contactPhone;//联系人电话
-    private String contactEmail;//联系人邮箱
-    private Integer isSelectAll;//是否查看包括删除的客户信息 1 是 2 否
-
-    public Integer getCustomerId() {
-        return customerId;
-    }
-
-    public void setCustomerId(Integer customerId) {
-        this.customerId = customerId;
-    }
-
-    public String getCustomerName() {
-        return customerName;
-    }
-
-    public void setCustomerName(String customerName) {
-        this.customerName = customerName;
-    }
-
-    public String getCustomerIndustry() {
-        return customerIndustry;
-    }
-
-    public void setCustomerIndustry(String customerIndustry) {
-        this.customerIndustry = customerIndustry;
-    }
-
-    public Integer getCustomerType() {
-        return customerType;
-    }
-
-    public void setCustomerType(Integer customerType) {
-        this.customerType = customerType;
-    }
-
-    public Integer getCooperativeState() {
-        return cooperativeState;
-    }
-
-    public void setCooperativeState(Integer cooperativeState) {
-        this.cooperativeState = cooperativeState;
-    }
-
-    public String getCustomerProvinceCode() {
-        return customerProvinceCode;
-    }
-
-    public void setCustomerProvinceCode(String customerProvinceCode) {
-        this.customerProvinceCode = customerProvinceCode;
-    }
-
-    public String getCustomerCityCode() {
-        return customerCityCode;
-    }
-
-    public void setCustomerCityCode(String customerCityCode) {
-        this.customerCityCode = customerCityCode;
-    }
-
-    public String getCustomerAddress() {
-        return customerAddress;
-    }
-
-    public void setCustomerAddress(String customerAddress) {
-        this.customerAddress = customerAddress;
-    }
-
-    public Integer getCustomerStatus() {
-        return customerStatus;
-    }
-
-    public void setCustomerStatus(Integer customerStatus) {
-        this.customerStatus = customerStatus;
-    }
-
-    public Date getCreateDate() {
-        return createDate;
-    }
-
-    public void setCreateDate(Date createDate) {
-        this.createDate = createDate;
-    }
-
-    public Date getUpdateDate() {
-        return updateDate;
-    }
-
-    public void setUpdateDate(Date updateDate) {
-        this.updateDate = updateDate;
-    }
-
-    public Integer getIdCreateBy() {
-        return idCreateBy;
-    }
-
-    public void setIdCreateBy(Integer idCreateBy) {
-        this.idCreateBy = idCreateBy;
-    }
-
-    public String getCustomerRemarks() {
-        return customerRemarks;
-    }
-
-    public void setCustomerRemarks(String customerRemarks) {
-        this.customerRemarks = customerRemarks;
-    }
-
-    public String getAdminName() {
-        return adminName;
-    }
-
-    public void setAdminName(String adminName) {
-        this.adminName = adminName;
-    }
-
-
-    public String getCityName() {
-        return cityName;
-    }
-
-    public void setCityName(String cityName) {
-        this.cityName = cityName;
-    }
-
-    public String getContactPhone() {
-        return contactPhone;
-    }
-
-    public void setContactPhone(String contactPhone) {
-        this.contactPhone = contactPhone;
-    }
-
-    public String getContactEmail() {
-        return contactEmail;
-    }
-
-    public void setContactEmail(String contactEmail) {
-        this.contactEmail = contactEmail;
-    }
-
-    public Integer getIsLookAll() {
-        return isLookAll;
-    }
-
-    public void setIsLookAll(Integer isLookAll) {
-        this.isLookAll = isLookAll;
-    }
-
-    public Integer getIsSelectAll() {
-        return isSelectAll;
-    }
-
-    public void setIsSelectAll(Integer isSelectAll) {
-        this.isSelectAll = isSelectAll;
-    }
-
-    public String getProvinceName() {
-        return provinceName;
-    }
-
-    public void setProvinceName(String provinceName) {
-        this.provinceName = provinceName;
-    }
-
-    public String getContactName() {
-        return contactName;
-    }
-
-    public void setContactName(String contactName) {
-        this.contactName = contactName;
-    }
-}

watero-rst-core/src/main/java/com.iamberry.rst.core/customer/DockedContactInfo.java

@@ -1,75 +0,0 @@
-package com.iamberry.rst.core.customer;
-
-import java.io.Serializable;
-import java.util.Date;
-
-/**
- * 对接联系人信息
- * Created by Administrator on 2018/4/19.
- */
-public class DockedContactInfo implements Serializable {
-    private static final long serialVersionUID = -7996562007908492949L;
-    private Integer dockedContactId;//主键
-    private Integer customerId;//客户id（外键）
-    private String contactName;//联系人姓名
-    private String contactPhone;//联系人电话
-    private String contactType;//职位/身份
-    private String contactEmail;//联系邮箱
-    private Date createDate;//创建时间
-
-    public Integer getDockedContactId() {
-        return dockedContactId;
-    }
-
-    public void setDockedContactId(Integer dockedContactId) {
-        this.dockedContactId = dockedContactId;
-    }
-
-    public Integer getCustomerId() {
-        return customerId;
-    }
-
-    public void setCustomerId(Integer customerId) {
-        this.customerId = customerId;
-    }
-
-    public String getContactName() {
-        return contactName;
-    }
-
-    public void setContactName(String contactName) {
-        this.contactName = contactName;
-    }
-
-    public String getContactPhone() {
-        return contactPhone;
-    }
-
-    public void setContactPhone(String contactPhone) {
-        this.contactPhone = contactPhone;
-    }
-
-    public String getContactType() {
-        return contactType;
-    }
-
-    public void setContactType(String contactType) {
-        this.contactType = contactType;
-    }
-
-    public String getContactEmail() {
-        return contactEmail;
-    }
-
-    public void setContactEmail(String contactEmail) {
-        this.contactEmail = contactEmail;
-    }
-
-    public Date getCreateDate() {
-        return createDate;
-    }
-
-    public void setCreateDate(Date createDate) {
-        this.createDate = createDate;
-    }
-}

watero-rst-core/src/main/java/com.iamberry.rst.core/customer/LowestPriceInfo.java

@@ -1,56 +0,0 @@
-package com.iamberry.rst.core.customer;
-
-import java.io.Serializable;
-import java.util.Date;
-
-/**
- * Created by Administrator on 2018/5/15.
- */
-public class LowestPriceInfo implements Serializable {
-    private static final long serialVersionUID = -8005905099621784835L;
-    private Integer lowestPriceId;//
-    private Integer productId;
-    private Integer channelDivisionId;
-    private Integer lowestPrice;
-    private Date createDate;
-
-    public Integer getLowestPriceId() {
-        return lowestPriceId;
-    }
-
-    public void setLowestPriceId(Integer lowestPriceId) {
-        this.lowestPriceId = lowestPriceId;
-    }
-
-    public Integer getProductId() {
-        return productId;
-    }
-
-    public void setProductId(Integer productId) {
-        this.productId = productId;
-    }
-
-    public Integer getChannelDivisionId() {
-        return channelDivisionId;
-    }
-
-    public void setChannelDivisionId(Integer channelDivisionId) {
-        this.channelDivisionId = channelDivisionId;
-    }
-
-    public Integer getLowestPrice() {
-        return lowestPrice;
-    }
-
-    public void setLowestPrice(Integer lowestPrice) {
-        this.lowestPrice = lowestPrice;
-    }
-
-    public Date getCreateDate() {
-        return createDate;
-    }
-
-    public void setCreateDate(Date createDate) {
-        this.createDate = createDate;
-    }
-}

watero-rst-core/src/main/java/com.iamberry.rst.core/customer/TicketOpeningInfo.java

@@ -1,101 +0,0 @@
-package com.iamberry.rst.core.customer;
-
-import java.io.Serializable;
-import java.util.Date;
-
-/**
- * Created by Administrator on 2018/4/19.
- */
-public class TicketOpeningInfo implements Serializable {
-    private static final long serialVersionUID = -4097354301734798174L;
-    private Integer ticketOpeningId;//主键
-    private Integer customerId;//客户id（外键）
-    private Integer ticketType;//发票类型1:专票 2：普票
-    private String accountOpeningBranch;//开户支行
-    private String ticketOpeningAccount;//开票账户
-    private String enterpriseName;//企业名称
-    private String taxpayerIdentificationNum;//纳税人识别号
-    private String ticketOpeningPhone;//开票电话
-    private String enterpriseAddress;//企业地址
-    private Date createDate;//创建时间
-
-    public Integer getTicketOpeningId() {
-        return ticketOpeningId;
-    }
-
-    public void setTicketOpeningId(Integer ticketOpeningId) {
-        this.ticketOpeningId = ticketOpeningId;
-    }
-
-    public Integer getCustomerId() {
-        return customerId;
-    }
-
-    public void setCustomerId(Integer customerId) {
-        this.customerId = customerId;
-    }
-
-    public Integer getTicketType() {
-        return ticketType;
-    }
-
-    public void setTicketType(Integer ticketType) {
-        this.ticketType = ticketType;
-    }
-
-    public String getAccountOpeningBranch() {
-        return accountOpeningBranch;
-    }
-
-    public void setAccountOpeningBranch(String accountOpeningBranch) {
-        this.accountOpeningBranch = accountOpeningBranch;
-    }
-
-    public String getTicketOpeningAccount() {
-        return ticketOpeningAccount;
-    }
-
-    public void setTicketOpeningAccount(String ticketOpeningAccount) {
-        this.ticketOpeningAccount = ticketOpeningAccount;
-    }
-
-    public String getEnterpriseName() {
-        return enterpriseName;
-    }
-
-    public void setEnterpriseName(String enterpriseName) {
-        this.enterpriseName = enterpriseName;
-    }
-
-    public String getTaxpayerIdentificationNum() {
-        return taxpayerIdentificationNum;
-    }
-
-    public void setTaxpayerIdentificationNum(String taxpayerIdentificationNum) {
-        this.taxpayerIdentificationNum = taxpayerIdentificationNum;
-    }
-
-    public String getTicketOpeningPhone() {
-        return ticketOpeningPhone;
-    }
-
-    public void setTicketOpeningPhone(String ticketOpeningPhone) {
-        this.ticketOpeningPhone = ticketOpeningPhone;
-    }
-
-    public String getEnterpriseAddress() {
-        return enterpriseAddress;
-    }
-
-    public void setEnterpriseAddress(String enterpriseAddress) {
-        this.enterpriseAddress = enterpriseAddress;
-    }
-
-    public Date getCreateDate() {
-        return createDate;
-    }
-
-    public void setCreateDate(Date createDate) {
-        this.createDate = createDate;
-    }
-}

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

@@ -83,7 +83,7 @@ public interface CustomerService {
      * @param isSolve
      * @return
      */
-    CustomerCommon selectProdcueAndFitting(CustomerCommon customerCommon, int isSolve);
+//    CustomerCommon selectProdcueAndFitting(CustomerCommon customerCommon, int isSolve);
 
     /**
      *  根据客诉id查询商品类型表

watero-rst-interface/src/main/java/com/iamberry/rst/faces/customer/CustomerBasicService.java

@@ -1,236 +0,0 @@
-package com.iamberry.rst.faces.customer;
-
-import com.iamberry.rst.core.address.City;
-import com.iamberry.rst.core.address.Country;
-import com.iamberry.rst.core.address.District;
-import com.iamberry.rst.core.address.Province;
-import com.iamberry.rst.core.customer.*;
-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 java.util.List;
-
-/**
- * Created by Administrator on 2018/4/20.
- */
-public interface CustomerBasicService {
-    /**
-     *  查询客户基本信息列表
-     */
-    PagedResult<CustomerBasicInfo> listCustomerBasic(PageRequest<CustomerBasicInfo> pageRequest);
-
-    /**
-     *  根据id查询客户基本信息
-     */
-    CustomerBasicInfo getCustomerBasic(CustomerBasicInfo customerBasicInfo);
-
-    /**
-     *  根据id修改客户状态
-     */
-    Integer updateState(CustomerBasicInfo customerBasicInfo);
-
-    /**
-     *  根据客户id查询付款/退款信息
-     */
-    BillingInfo getBillingInfo(BillingInfo billingInfo);
-    /**
-     *  根据客户id查询开票信息
-     */
-    TicketOpeningInfo getOpeningInfo(TicketOpeningInfo ticketOpeningInfo);
-
-    /**
-     *  根据客户id查询联系人集合
-     */
-    List<DockedContactInfo> listDockedContactInfo(DockedContactInfo dockedContactInfo);
-
-    /**
-     *  根据客户id渠道销售信息集合
-     */
-    List<ChannelSaleInfo> listChannelSaleInfo(ChannelSaleInfo channelSaleInfo);
-
-    /**
-     *  根据客户id渠道划分信息集合
-     */
-    List<ChannelDivisionInfo> listChannelDivisionInfo(Integer coustomerId);
-
-    /**
-     * 根据客户id查询客户基本信息
-     * @param queryCustomerId
-     * @return
-     */
-    public CustomerBasicInfo queryCustomerBasicInfoByCustomerId(int queryCustomerId);
-
-    /**
-     * 根据客户id查询对接联系人信息
-     * @param queryCustomerId
-     * @return
-     */
-    public List<DockedContactInfo> queryDockedContactInfoListByCustomerId(int queryCustomerId);
-
-    /**
-     * 根据客户id查询客户销售渠道备案信息
-     * @param queryCustomerId
-     * @return
-     */
-    public List<ChannelSaleInfo> queryChannelSaleInfoListByCustomerId(int queryCustomerId);
-
-    /**
-     * 根据客户id查询客户付款/退款信息
-     * @param queryCustomerId
-     * @return
-     */
-    public BillingInfo queryBillingInfoByCustomerId(int queryCustomerId);
-
-    /**
-     * 根据客户id查询客户开票信息
-     * @param queryCustomerId
-     * @return
-     */
-    public TicketOpeningInfo queryTicketOpeningInfoByCustomerId(int queryCustomerId);
-
-    /**
-     * 添加客户基本信息
-     *
-     * @param customerBasicInfo
-     * @return
-     */
-    public void saveCustomerBasicInfo(CustomerBasicInfo customerBasicInfo,List<DockedContactInfo> dockedContactInfoList, List<ChannelSaleInfo> channelSaleInfoList,
-                                      BillingInfo billingInfo, TicketOpeningInfo ticketOpeningInfo) throws Exception;
-
-    /**
-     * 修改客户基本信息
-     *
-     * @param customerBasicInfo
-     * @return
-     */
-    public void updateCustomerBasicInfo(CustomerBasicInfo customerBasicInfo,List<DockedContactInfo> dockedContactInfoList, List<ChannelSaleInfo> channelSaleInfoList,
-                                      BillingInfo billingInfo, TicketOpeningInfo ticketOpeningInfo) throws Exception;
-    /**
-     * 查询所有省份
-     * @param provinceId
-     * @return
-     */
-    public List<Province> queryProvinceList(String provinceId);
-
-    /**
-     * 根据省份代号查询所有城市
-     * @param provinceId
-     * @return
-     */
-    public List<City> queryCityList(String provinceId);
-
-    /**
-     * 根据城市代号查询所有区/县
-     * @param cityId
-     * @return
-     */
-    public List<District> queryDistrictList(String cityId);
-    /**
-     * 查询所有渠道类别
-     * @param channelCategoryId
-     * @return
-     */
-    public List<ChannelDivisionInfo> queryChannelCategoryList(String channelCategoryId);
-
-    /**
-     * 根据渠道类别查询渠道类型
-     * @param channelCategoryId
-     * @return
-     */
-    public List<ChannelDivisionInfo> queryChannelTypeList(String channelCategoryId);
-
-    /**
-     * 查询销售产品
-     * @param promotingProductsInfo
-     * @return
-     */
-    public List<Product> queryPromotingProductsList(String promotingProductsInfo);
-
-    /**
-     * 根据产品初始化价格
-     * @param promotingProductsId
-     * @return
-     */
-    public List<ProductColor> querySupplyPriceList(String promotingProductsId);
-
-
-    /**
-     * 添加对接联系人信息
-     *
-     * @param dockedContactInfo
-     * @return
-     */
-    /*public void saveDockedContactInfo(DockedContactInfo dockedContactInfo);*/
-
-    /**
-     * 添加客户销售渠道备案信息
-     *
-     * @param channelSaleInfo
-     * @return
-     */
-    /*public void saveChannelSaleInfo(ChannelSaleInfo channelSaleInfo);*/
-
-    /**
-     * 添加付款/退款信息
-     *
-     * @param billingInfo
-     * @return
-     */
-    /*public void saveBillingInfo(BillingInfo billingInfo);*/
-
-    /**
-     * 添加对开票信息
-     *
-     * @param ticketOpeningInfo
-     * @return
-     */
-    /*public void saveTicketOpeningInfo(TicketOpeningInfo ticketOpeningInfo);*/
-
-    /**
-     * 修改客户基本信息
-     * @param customerBasicInfo
-     * @return
-     */
-    Integer updateCustomerBasic(CustomerBasicInfo customerBasicInfo);
-
-    /**
-     * 修改付款/退款信息
-     * @return
-     */
-    Integer updateBillingInfo(BillingInfo billingInfo);
-
-    /**
-     * 修改开票信息
-     * @return
-     */
-    Integer updateOpeningInfo(TicketOpeningInfo ticketOpeningInfo);
-
-    /**
-     * 删除联系人信息
-     * @return
-     */
-    Integer deleteContactInfo(Integer customerId);
-
-    /**
-     * 删除渠道销售信息
-     * @return
-     */
-    Integer deleteSaleInfo(Integer customerId);
-
-    /**
-     * 删除渠道划分信息
-     * @return
-     */
-    Integer deleteDivisionInfo(Integer channelDivisionId);
-
-    /**
-     * 获取产品最低价格信息
-     * @param lowestPriceInfo
-     * @return
-     */
-    LowestPriceInfo getLowestPrice(LowestPriceInfo lowestPriceInfo);
-
-
-}

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

@@ -14,25 +14,12 @@ import java.util.List;
 @Service
 public class CustomerCommonServiceImpl{
 
-    @Autowired
-    private RepairMapper repairMapper;
-    @Autowired
-    private BackGoodsMapper backGoodsMapper;
-    @Autowired
-    private NoreasonBackMapper noreasonBackMapper;
-    @Autowired
-    private ReissueMapper reissueMapper;
-    @Autowired
-    private RenewedMapper renewedMapper;
-    @Autowired
-    private ClosedFittingMapper closedFittingMapper;
+
     @Autowired
     private ClosedProdcueMapper closedProdcueMapper;
     @Autowired
     private SendProdcueMapper sendProdcueMapper;
     @Autowired
-    private SendFittingMapper sendFittingMapper;
-    @Autowired
     private CustomerCommonMapper customerCommonMapper;
     @Autowired
     private CustomerInfoMapper customerInfoMapper;

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

@@ -2,13 +2,14 @@ package com.iamberry.rst.service.cm;
 
 import com.github.pagehelper.PageHelper;
 import com.iamberry.rst.core.cm.*;
-import com.iamberry.rst.core.fm.AwaitingSignclosedProductInfo;
 import com.iamberry.rst.core.fm.ComplaintDetectInfo;
 import com.iamberry.rst.core.fm.ComplaintSignclosedInfo;
 import com.iamberry.rst.core.fm.SignclosedProductInfo;
 import com.iamberry.rst.core.order.*;
 import com.iamberry.rst.core.page.PagedResult;
-import com.iamberry.rst.faces.cm.*;
+import com.iamberry.rst.faces.cm.CustomerService;
+import com.iamberry.rst.faces.cm.ProcMethodService;
+import com.iamberry.rst.faces.cm.RelationOrderService;
 import com.iamberry.rst.faces.order.EfastOrderService;
 import com.iamberry.rst.service.address.mapper.AddressMapper;
 import com.iamberry.rst.service.cm.mapper.*;
@@ -18,7 +19,6 @@ import com.iamberry.rst.service.fm.mapper.ComplaintSignclosedProductInfoMapper;
 import com.iamberry.rst.service.product.mapper.ProductMapper;
 import com.iamberry.rst.util.CustomerCommonUtil;
 import com.iamberry.rst.util.PageUtil;
-import com.iamberry.wechat.tools.ResponseJson;
 import net.sf.json.JSONArray;
 import net.sf.json.JSONObject;
 import org.slf4j.Logger;
@@ -27,7 +27,10 @@ import org.springframework.beans.factory.annotation.Autowired;
 import org.springframework.stereotype.Service;
 import org.springframework.transaction.annotation.Transactional;
 
-import java.util.*;
+import java.util.ArrayList;
+import java.util.HashMap;
+import java.util.List;
+import java.util.Map;
 
 @Service
 public class CustomerServiceImpl implements CustomerService {
@@ -37,24 +40,10 @@ public class CustomerServiceImpl implements CustomerService {
     @Autowired
     private CustomerInfoMapper customerInfoMapper;
     @Autowired
-    private RepairMapper repairMapper;
-    @Autowired
-    private BackGoodsMapper backGoodsMapper;
-    @Autowired
-    private NoreasonBackMapper noreasonBackMapper;
-    @Autowired
-    private ReissueMapper reissueMapper;
-    @Autowired
-    private RenewedMapper renewedMapper;
-    @Autowired
-    private ClosedFittingMapper closedFittingMapper;
-    @Autowired
     private ClosedProdcueMapper closedProdcueMapper;
     @Autowired
     private SendProdcueMapper sendProdcueMapper;
     @Autowired
-    private SendFittingMapper sendFittingMapper;
-    @Autowired
     private SalesOrderMapper salesOrderMapper;
     @Autowired
     private CustomerService customerService;
@@ -71,8 +60,6 @@ public class CustomerServiceImpl implements CustomerService {
     @Autowired
     private ProductMapper productMapper;  //产品
     @Autowired
-    private FittingsInfoMapper fittingsInfoMapper;
-    @Autowired
     private EfastOrderService efastOrderService;
     @Autowired
     private StoreInfoMapper storeInfoMapper;
@@ -1119,7 +1106,7 @@ public class CustomerServiceImpl implements CustomerService {
         return map;
     }
 
-    @Override
+   /* @Override
     public CustomerCommon selectProdcueAndFitting(CustomerCommon customerCommon, int isSolve) {
         if (customerCommon == null || customerCommon.getRelationId() == null) {
             return customerCommon;
@@ -1206,180 +1193,13 @@ public class CustomerServiceImpl implements CustomerService {
         customerCommon.setSendFittings(sendFittings);
         return customerCommon;
     }
-
+*/
     @Override
     public ProductType getcompanyAffiliation(Integer customerId) {
         return customerInfoMapper.getcompanyAffiliation(customerId);
     }
 
     @Override
-    public BackGoods getBackGoods(BackGoods backGoods) {
-        //获取退货集合
-//        List<BackGoods> backList = backGoodsMapper.listBackGoods(backGoods);
-//        if (backList == null || backList.size() == 0) {
-//            return null;
-//        }
-//        BackGoods goods = backList.get(0);
-//        ClosedProdcue closedProdcue = new ClosedProdcue();
-//        closedProdcue.setRelationId(goods.getBackGoodsId());
-//        closedProdcue.setClosedProdcueType(6);
-//        //查询寄回产品集合
-//        List<ClosedProdcue> prodcueList = closedProdcueMapper.listclosedProdcue(closedProdcue);
-//        ClosedFitting fitting = new ClosedFitting();
-//        fitting.setRelationId(goods.getBackGoodsId());
-//        fitting.setClosedFittingType(6);
-//        //查询寄回配件集合
-//        List<ClosedFitting> fittingList = closedFittingMapper.listClosedFitting(fitting);
-//        if (prodcueList != null && prodcueList.size() > 0) {
-//            goods.setClosedProdcues(prodcueList);
-//        }
-//        if (fittingList != null && fittingList.size() > 0) {
-//            goods.setClosedFittings(fittingList);
-//        }
-//        return goods;
-        return null;
-    }
-
-//    @Override
-//    public NoreasonBack getNoreasonBack(NoreasonBack noreasonBack) {
-//        //获取无理由退货
-//        List<NoreasonBack> backList = noreasonBackMapper.listNoreasonBack(noreasonBack);
-//        if (backList == null || backList.size() == 0) {
-//            return null;
-//        }
-//        NoreasonBack noreasonBackInfo = backList.get(0);
-//        ClosedProdcue closedProdcue = new ClosedProdcue();
-//        closedProdcue.setRelationId(noreasonBackInfo.getNoreasonBackId());
-//        closedProdcue.setClosedProdcueType(7);
-//        //查询寄回产品集合
-//        List<ClosedProdcue> prodcueList = closedProdcueMapper.listclosedProdcue(closedProdcue);
-//        ClosedFitting fitting = new ClosedFitting();
-//        fitting.setRelationId(noreasonBackInfo.getNoreasonBackId());
-//        fitting.setClosedFittingType(7);
-//        //查询寄回配件集合
-//
-//        if (prodcueList != null && prodcueList.size() > 0) {
-//            noreasonBackInfo.setClosedProdcues(prodcueList);
-//        }
-//        return noreasonBackInfo;
-//    }
-
-    @Override
-    public Reissue getReissue(Reissue reissue) {
-        //查询售后补发信息
-//        List<Reissue> reissueList = reissueMapper.listReissue(reissue);
-//        if (reissueList == null || reissueList.size() == 0) {
-//            return null;
-//        }
-//        Reissue reissueInfo = reissueList.get(0);
-//        SendProdcue sendProdcue = new SendProdcue();
-//        sendProdcue.setRelationId(reissueInfo.getReissueId());
-//        sendProdcue.setSendProduceType(5);
-//        //查询寄送产品集合
-//        List<SendProdcue> sendProdcueList = sendProdcueMapper.listSendProdcue(sendProdcue);
-//        SendFitting sendFitting = new SendFitting();
-//        sendFitting.setRelationId(reissueInfo.getReissueId());
-//        sendFitting.setSendFittingType(5);
-//        //查询寄送配件集合
-//        List<SendFitting> sendFittingList = sendFittingMapper.listSendFitting(sendFitting);
-//
-//        if (sendProdcueList != null && sendProdcueList.size() > 0) {
-//            reissueInfo.setSendProdcues(sendProdcueList);
-//        }
-//        if (sendFittingList != null && sendFittingList.size() > 0) {
-//            reissueInfo.setSendFittings(sendFittingList);
-//        }
-//        return reissueInfo;
-        return null;
-    }
-
-    @Override
-    public Renewed getRenewedInfo(Renewed renewed) {
-//        renewed = renewedMapper.getRenewedInfo(renewed);
-//        if (renewed == null){
-//            return null;
-//        }
-//        ClosedProdcue closedProdcue = new ClosedProdcue();
-//        closedProdcue.setRelationId(renewed.getRenewedId());
-//        closedProdcue.setClosedProdcueType(3);
-//        //查询寄回产品集合
-//        List<ClosedProdcue> prodcueList = closedProdcueMapper.listclosedProdcue(closedProdcue);
-//        ClosedFitting fitting = new ClosedFitting();
-//        fitting.setRelationId(renewed.getRenewedId());
-//        fitting.setClosedFittingType(3);
-//        //查询寄回配件集合
-//        List<ClosedFitting> fittingList = closedFittingMapper.listClosedFitting(fitting);
-//        SendProdcue sendProdcue = new SendProdcue();
-//        sendProdcue.setRelationId(renewed.getRenewedId());
-//        sendProdcue.setSendProduceType(3);
-//        //查询寄送产品集合
-//        List<SendProdcue> sendProdcueList = sendProdcueMapper.listSendProdcue(sendProdcue);
-//        SendFitting sendFitting = new SendFitting();
-//        sendFitting.setRelationId(renewed.getRenewedId());
-//        sendFitting.setSendFittingType(3);
-//        //查询寄送配件集合
-//        List<SendFitting> sendFittingList = sendFittingMapper.listSendFitting(sendFitting);
-//
-//        if (prodcueList != null && prodcueList.size() > 0) {
-//            renewed.setClosedProdcues(prodcueList);
-//        }
-//        if (fittingList != null && fittingList.size() > 0) {
-//            renewed.setClosedFittings(fittingList);
-//        }
-//        if (sendProdcueList != null && sendProdcueList.size() > 0) {
-//            renewed.setSendProdcues(sendProdcueList);
-//        }
-//        if (sendFittingList != null && sendFittingList.size() > 0) {
-//            renewed.setSendFittings(sendFittingList);
-//        }
-        return null;
-    }
-
-    @Override
-    public Repair getRepairInfo(Repair repair) {
-//        repair = repairMapper.getRepairInfo(repair);
-//        if (repair == null) {
-//            return null;
-//        }
-//        ClosedProdcue closedProdcue = new ClosedProdcue();
-//        closedProdcue.setRelationId(repair.getRepairId());
-//        closedProdcue.setClosedProdcueType(4);
-//        //查询寄回产品集合
-//        List<ClosedProdcue> prodcueList = closedProdcueMapper.listclosedProdcue(closedProdcue);
-//        ClosedFitting fitting = new ClosedFitting();
-//        fitting.setRelationId(repair.getRepairId());
-//        fitting.setClosedFittingType(4);
-//        //查询寄回配件集合
-//        List<ClosedFitting> fittingList = closedFittingMapper.listClosedFitting(fitting);
-//        SendProdcue sendProdcue = new SendProdcue();
-//        sendProdcue.setRelationId(repair.getRepairId());
-//        sendProdcue.setSendProduceType(4);
-//        //查询寄送产品集合
-//        List<SendProdcue> sendProdcueList = sendProdcueMapper.listSendProdcue(sendProdcue);
-//        SendFitting sendFitting = new SendFitting();
-//        sendFitting.setRelationId(repair.getRepairId());
-//        sendFitting.setSendFittingType(4);
-//        //查询寄送配件集合
-//        List<SendFitting> sendFittingList = sendFittingMapper.listSendFitting(sendFitting);
-//
-//        if (prodcueList != null && prodcueList.size() > 0) {
-//            repair.setClosedProdcues(prodcueList);
-//        }
-//        if (fittingList != null && fittingList.size() > 0) {
-//            repair.setClosedFittings(fittingList);
-//        }
-//        if (sendProdcueList != null && sendProdcueList.size() > 0) {
-//            repair.setSendProdcues(sendProdcueList);
-//        }
-//        if (sendFittingList != null && sendFittingList.size() > 0) {
-//            repair.setSendFittings(sendFittingList);
-//        }
-//        return repair;
-        return null;
-    }
-
-
-    @Override
     @Transactional
     public Integer updateRelation(CustomerInfo customerInfo) {
          /*

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

@@ -2,8 +2,6 @@ package com.iamberry.rst.service.cm;
 
 import com.github.pagehelper.PageHelper;
 import com.iamberry.redis.RedisUtils;
-import com.iamberry.rst.core.address.Province;
-import com.iamberry.rst.core.cm.FittingsInfo;
 import com.iamberry.rst.core.cm.SalesOrder;
 import com.iamberry.rst.core.cm.SalesOrderItem;
 import com.iamberry.rst.core.cm.StoreInfo;
@@ -22,18 +20,15 @@ import com.iamberry.rst.faces.cm.StoreInfoService;
 import com.iamberry.rst.faces.order.EfastOrderService;
 import com.iamberry.rst.faces.order.OrderWarehouseService;
 import com.iamberry.rst.faces.product.ProductService;
-import com.iamberry.rst.service.cm.mapper.FittingsInfoMapper;
 import com.iamberry.rst.service.cm.mapper.SalesOrderMapper;
 import com.iamberry.rst.service.fm.mapper.ComplaintDetectInfoMapper;
 import com.iamberry.rst.service.fm.mapper.InventoryLogMapper;
 import com.iamberry.rst.service.fm.mapper.InventoryMapper;
-import com.iamberry.rst.service.order.mapper.LogisticsInfoMapper;
 import com.iamberry.rst.service.order.mapper.ProvincesLogisticsMapper;
 import com.iamberry.rst.service.product.mapper.ProductMapper;
 import com.iamberry.rst.service.sys.mapper.SysConfigMapper;
 import com.iamberry.rst.util.PageUtil;
 import com.iamberry.wechat.tools.DateTimeUtil;
-import com.iamberry.wechat.tools.payUtil.DatetimeUtil;
 import net.sf.json.JSONArray;
 import net.sf.json.JSONObject;
 import org.slf4j.Logger;
@@ -43,7 +38,6 @@ import org.springframework.beans.factory.annotation.Autowired;
 import org.springframework.stereotype.Service;
 import org.springframework.transaction.annotation.Transactional;
 
-import java.beans.Transient;
 import java.sql.SQLException;
 import java.text.SimpleDateFormat;
 import java.util.*;
@@ -67,8 +61,6 @@ public class SalesOrderServiceImpl implements SalesOrderService {
     @Autowired
     private SalesOrderService salesOrderService;
     @Autowired
-    private FittingsInfoMapper fittingsInfoMapper;
-    @Autowired
     private SysConfigMapper sysConfigMapper;
     @Autowired
     private AddressService addressService;

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

@@ -1,37 +0,0 @@
-package com.iamberry.rst.service.cm.mapper;
-
-import com.iamberry.rst.core.cm.BackGoods;
-
-import java.util.List;
-
-
-public interface BackGoodsMapper {
- /*   int deleteByPrimaryKey(BackGoods record);
-
-    int insert(BackGoods record);
-
-    int insertSelective(BackGoods record);
-
-    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);*/
-}

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

@@ -1,30 +0,0 @@
-package com.iamberry.rst.service.cm.mapper;
-
-import com.iamberry.rst.core.cm.ClosedFitting;
-
-import java.util.List;
-
-public interface ClosedFittingMapper {
-   /* int deleteByPrimaryKey(ClosedFitting record);
-
-    int insert(List<ClosedFitting> record);
-
-    ClosedFitting selectByPrimaryKey(Integer closedFittingId);
-
-    int updateByPrimaryKeySelective(ClosedFitting record);
-
-
-    *//**
-     * 获取寄回配件集合
-     * @param record
-     * @return
-     *//*
-    List<ClosedFitting> listClosedFitting(ClosedFitting record);
-
-    *//**
-     * 删除寄回配件
-     * @param record
-     * @return
-     *//*
-    Integer deleteFitting(ClosedFitting record);*/
-}

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

@@ -1,34 +0,0 @@
-package com.iamberry.rst.service.cm.mapper;
-
-import com.iamberry.rst.core.cm.FittingsInfo;
-
-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);*/
-}

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

@@ -1,6 +0,0 @@
-package com.iamberry.rst.service.cm.mapper;
-
-
-public interface NoreasonBackMapper {
-
-}

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

@@ -1,44 +0,0 @@
-package com.iamberry.rst.service.cm.mapper;
-
-import com.iamberry.rst.core.cm.Reissue;
-
-import java.util.List;
-
-public interface ReissueMapper {
-    /*int deleteByPrimaryKey(Reissue record);
-
-    int insert(Reissue record);
-
-    int insertSelective(Reissue record);
-
-    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);*/
-
-
-}

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

@@ -1,51 +0,0 @@
-package com.iamberry.rst.service.cm.mapper;
-
-import com.iamberry.rst.core.cm.ClosedFitting;
-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

@@ -1,42 +0,0 @@
-package com.iamberry.rst.service.cm.mapper;
-
-import com.iamberry.rst.core.cm.Repair;
-
-import java.util.List;
-
-public interface RepairMapper {
-    /*int deleteByPrimaryKey(Repair record);
-
-    int insert(Repair record);
-
-    Repair selectByPrimaryKey(Integer repairId);
-
-    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);*/
-}

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

@@ -1,25 +0,0 @@
-package com.iamberry.rst.service.cm.mapper;
-
-import com.iamberry.rst.core.cm.SendFitting;
-
-import java.util.List;
-
-public interface SendFittingMapper {
-   /* int deleteByPrimaryKey(SendFitting record);
-
-    int insert(List<SendFitting> record);
-
-    int insertSelective(SendFitting record);
-
-    SendFitting selectByPrimaryKey(Integer sendFittingId);
-
-    int updateByPrimaryKeySelective(SendFitting record);
-
-
-    *//**
-     * 查询寄送的配件集合
-     * @param record
-     * @return
-     *//*
-    List<SendFitting> listSendFitting(SendFitting record);*/
-}

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

@@ -1,337 +0,0 @@
-<?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.BackGoodsMapper" >
-  <resultMap id="BaseResultMap" type="BackGoods" >
-    <id column="back_goods_id" property="backGoodsId" jdbcType="INTEGER" />
-    <result column="customer_id" property="customerId" jdbcType="INTEGER" />
-    <result column="order_id" property="orderId" jdbcType="INTEGER" />
-    <result column="signclosed_id" property="signclosedId" jdbcType="INTEGER" />
-    <result column="back_goods_back_status" property="backGoodsBackStatus" jdbcType="BIT" />
-    <result column="back_goods_back_name" property="backGoodsBackName" jdbcType="VARCHAR" />
-    <result column="back_goods_back_tel" property="backGoodsBackTel" jdbcType="CHAR" />
-    <result column="back_goods_back_logistics_company" property="backGoodsBackLogisticsCompany" jdbcType="VARCHAR" />
-    <result column="back_goods_back_logistics_no" property="backGoodsBackLogisticsNo" jdbcType="VARCHAR" />
-    <result column="back_goods_back_postage" property="backGoodsBackPostage" jdbcType="INTEGER" />
-    <result column="back_goods_back_machine_no" property="backGoodsBackMachineNo" jdbcType="VARCHAR" />
-    <result column="back_goods_desc" property="backGoodsDesc" jdbcType="VARCHAR" />
-    <result column="back_goods_state" property="backGoodsState" jdbcType="BIT" />
-    <result column="back_goods_alipay" property="backGoodsAlipay" jdbcType="VARCHAR" />
-    <result column="back_goods_is_transfer" property="backGoodsIsTransfer" jdbcType="BIT" />
-    <result column="back_goods_create_time" property="backGoodsCreateTime" jdbcType="TIMESTAMP" />
-    <result column="back_goods_update_time" property="backGoodsUpdateTime" jdbcType="TIMESTAMP" />
-    <result column="back_goods_alipay_name" property="backGoodsAlipayName" jdbcType="VARCHAR" />
-    <result column="back_goods_back_receipt_date" property="backGoodsBackReceiptDate" jdbcType="TIMESTAMP" />
-  </resultMap>
-  <sql id="Base_Column_List" >
-    back_goods_id, customer_id, order_id, signclosed_id, back_goods_back_status, back_goods_back_name, 
-    back_goods_back_tel, back_goods_back_logistics_company, back_goods_back_logistics_no, 
-    back_goods_back_postage, back_goods_back_machine_no, back_goods_desc, back_goods_state, 
-    back_goods_alipay, back_goods_alipay_name, back_goods_is_transfer, back_goods_create_time, back_goods_update_time,back_goods_back_receipt_date
-  </sql>
-  <select id="selectByPrimaryKey" resultMap="BaseResultMap" parameterType="java.lang.Integer" >
-    select 
-    <include refid="Base_Column_List" />
-    from tb_rst_back_goods
-    where back_goods_id = #{backGoodsId,jdbcType=INTEGER}
-  </select>
-
-  <select id="getBackGoods" resultMap="BaseResultMap" parameterType="BackGoods" >
-    select
-    <include refid="Base_Column_List" />
-    from tb_rst_back_goods
-   <where>
-       <if test="backGoodsId != null" >
-           back_goods_id = #{backGoodsId}
-       </if>
-       <if test="customerId != null">
-           AND  customer_id = #{customerId}
-       </if>
-   </where>
-  </select>
-
-  <!-- 查询售后退货集合 -->
-  <select id="listBackGoods" resultMap="goodsMap" parameterType="BackGoods">
-    select
-      g.back_goods_id,
-      g.customer_id,
-      g.order_id,
-      g.signclosed_id,
-      g.back_goods_back_status,
-      g.back_goods_back_name,
-      g.back_goods_back_tel,
-      g.back_goods_back_logistics_company,
-      g.back_goods_back_logistics_no,
-      g.back_goods_back_postage,
-      g.back_goods_back_machine_no,
-      g.back_goods_desc,
-      g.back_goods_state,
-      g.back_goods_alipay,
-      g.back_goods_is_transfer,
-      g.back_goods_create_time,
-      g.back_goods_update_time,
-      g.back_goods_alipay_name,
-      g.back_goods_back_receipt_date,
-      o.sales_pay_time salesPayTime
-    from
-      tb_rst_back_goods g
-    LEFT JOIN tb_rst_sales_order_info o ON g.order_id = o.sales_id
-    <where>
-      <if test="customerId != null and customerId != ''">
-        g.customer_id = #{customerId}
-      </if>
-      <if test="backGoodsState != null and backGoodsState != ''">
-        and g.back_goods_state = #{backGoodsState}
-      </if>
-    </where>
-  </select>
-
-  <resultMap id="goodsMap" type="BackGoods">
-    <id column="back_goods_id" property="backGoodsId"/>
-    <result column="customer_id" property="customerId"/>
-    <result column="order_id" property="orderId"/>
-    <result column="signclosed_id" property="signclosedId"/>
-    <result column="back_goods_back_status" property="backGoodsBackStatus"/>
-    <result column="back_goods_back_name" property="backGoodsBackName"/>
-    <result column="back_goods_back_tel" property="backGoodsBackTel"/>
-    <result column="back_goods_back_logistics_company" property="backGoodsBackLogisticsCompany"/>
-    <result column="back_goods_back_logistics_no" property="backGoodsBackLogisticsNo"/>
-    <result column="back_goods_back_postage" property="backGoodsBackPostage"/>
-    <result column="back_goods_back_machine_no" property="backGoodsBackMachineNo"/>
-    <result column="back_goods_desc" property="backGoodsDesc"/>
-    <result column="back_goods_state" property="backGoodsState"/>
-    <result column="back_goods_alipay" property="backGoodsAlipay"/>
-    <result column="back_goods_alipay_name" property="backGoodsAlipayName"/>
-    <result column="back_goods_is_transfer" property="backGoodsIsTransfer"/>
-    <result column="back_goods_create_time" property="backGoodsCreateTime"/>
-    <result column="back_goods_update_time" property="backGoodsUpdateTime"/>
-    <result column="back_goods_back_receipt_date" property="backGoodsBackReceiptDate"/>
-    <!--<collection property="complaintDetectList" column="customer_id" ofType="ComplaintDetectInfo" select="listComplaintDetect"/>-->
-  </resultMap>
-
-  <select id="listComplaintDetect" parameterType="Integer" resultType="ComplaintDetectInfo">
-    SELECT
-      d.detect_state detectState,
-      d.detect_phenomenon detectPhenomenon,
-      d.detect_failure_classification detectFailureClassification,
-      d.detect_failure_cause detectFailureCause,
-      d.detect_results detectResults,
-      d.detect_point detectPoint,
-      d.detect_analysis detectAnalysis,
-      d.detect_revolution_produced detectRevolutionProduced,
-      m.maintenance_is_repair maintenanceIsRepair,
-      m.maintenance_content maintenanceContent,
-      m.maintenance_content_date maintenanceContentDate
-    FROM
-      tb_rst_complaint_detect d
-    LEFT JOIN tb_rst_complaint_maintenance m ON d.detect_id = m.detect_id
-    WHERE
-      d.customer_id = #{customerId}
-    ORDER BY d.detect_id ASC
-  </select>
-
-  <delete id="deleteByPrimaryKey" parameterType="BackGoods" >
-    delete from tb_rst_back_goods
-    <where>
-      <if test="backGoodsId != null" >
-        back_goods_id = #{backGoodsId}
-      </if>
-      <if test="customerId != null">
-        AND  customer_id = #{customerId}
-      </if>
-    </where>
-  </delete>
-  <insert id="insert" parameterType="BackGoods" useGeneratedKeys="true"  keyProperty="backGoodsId">
-    insert into tb_rst_back_goods (customer_id, order_id,
-      signclosed_id, back_goods_back_status, back_goods_back_name, 
-      back_goods_back_tel, back_goods_back_logistics_company, 
-      back_goods_back_logistics_no, back_goods_back_postage, 
-      back_goods_back_machine_no, back_goods_desc, 
-      back_goods_state, back_goods_alipay, back_goods_alipay_name, back_goods_is_transfer,back_goods_back_receipt_date
-      )
-    values ( #{customerId,jdbcType=INTEGER}, #{orderId,jdbcType=INTEGER},
-      #{signclosedId,jdbcType=INTEGER}, #{backGoodsBackStatus,jdbcType=BIT}, #{backGoodsBackName,jdbcType=VARCHAR}, 
-      #{backGoodsBackTel,jdbcType=CHAR}, #{backGoodsBackLogisticsCompany,jdbcType=VARCHAR}, 
-      #{backGoodsBackLogisticsNo,jdbcType=VARCHAR}, #{backGoodsBackPostage,jdbcType=INTEGER}, 
-      #{backGoodsBackMachineNo,jdbcType=VARCHAR}, #{backGoodsDesc,jdbcType=VARCHAR}, 
-      #{backGoodsState,jdbcType=BIT}, #{backGoodsAlipay,jdbcType=VARCHAR},  #{backGoodsAlipayName,jdbcType=VARCHAR}, #{backGoodsIsTransfer,jdbcType=BIT},
-      #{backGoodsBackReceiptDate,jdbcType=TIMESTAMP}
-      )
-  </insert>
-  <insert id="insertSelective" parameterType="BackGoods" >
-    insert into tb_rst_back_goods
-    <trim prefix="(" suffix=")" suffixOverrides="," >
-      <if test="backGoodsId != null" >
-        back_goods_id,
-      </if>
-      <if test="customerId != null" >
-        customer_id,
-      </if>
-      <if test="orderId != null" >
-        order_id,
-      </if>
-      <if test="signclosedId != null" >
-        signclosed_id,
-      </if>
-      <if test="backGoodsBackStatus != null" >
-        back_goods_back_status,
-      </if>
-      <if test="backGoodsBackName != null" >
-        back_goods_back_name,
-      </if>
-      <if test="backGoodsBackTel != null" >
-        back_goods_back_tel,
-      </if>
-      <if test="backGoodsBackLogisticsCompany != null" >
-        back_goods_back_logistics_company,
-      </if>
-      <if test="backGoodsBackLogisticsNo != null" >
-        back_goods_back_logistics_no,
-      </if>
-      <if test="backGoodsBackPostage != null" >
-        back_goods_back_postage,
-      </if>
-      <if test="backGoodsBackMachineNo != null" >
-        back_goods_back_machine_no,
-      </if>
-      <if test="backGoodsDesc != null" >
-        back_goods_desc,
-      </if>
-      <if test="backGoodsState != null" >
-        back_goods_state,
-      </if>
-      <if test="backGoodsAlipay != null" >
-        back_goods_alipay,
-      </if>
-      <if test="backGoodsAlipayName != null" >
-        back_goods_alipay_name,
-      </if>
-      <if test="backGoodsIsTransfer != null" >
-        back_goods_is_transfer,
-      </if>
-      <if test="backGoodsCreateTime != null" >
-        back_goods_create_time,
-      </if>
-      <if test="backGoodsUpdateTime != null" >
-        back_goods_update_time,
-      </if>
-    </trim>
-    <trim prefix="values (" suffix=")" suffixOverrides="," >
-      <if test="backGoodsId != null" >
-        #{backGoodsId,jdbcType=INTEGER},
-      </if>
-      <if test="customerId != null" >
-        #{customerId,jdbcType=INTEGER},
-      </if>
-      <if test="orderId != null" >
-        #{orderId,jdbcType=INTEGER},
-      </if>
-      <if test="signclosedId != null" >
-        #{signclosedId,jdbcType=INTEGER},
-      </if>
-      <if test="backGoodsBackStatus != null" >
-        #{backGoodsBackStatus,jdbcType=BIT},
-      </if>
-      <if test="backGoodsBackName != null" >
-        #{backGoodsBackName,jdbcType=VARCHAR},
-      </if>
-      <if test="backGoodsBackTel != null" >
-        #{backGoodsBackTel,jdbcType=CHAR},
-      </if>
-      <if test="backGoodsBackLogisticsCompany != null" >
-        #{backGoodsBackLogisticsCompany,jdbcType=VARCHAR},
-      </if>
-      <if test="backGoodsBackLogisticsNo != null" >
-        #{backGoodsBackLogisticsNo,jdbcType=VARCHAR},
-      </if>
-      <if test="backGoodsBackPostage != null" >
-        #{backGoodsBackPostage,jdbcType=INTEGER},
-      </if>
-      <if test="backGoodsBackMachineNo != null" >
-        #{backGoodsBackMachineNo,jdbcType=VARCHAR},
-      </if>
-      <if test="backGoodsDesc != null" >
-        #{backGoodsDesc,jdbcType=VARCHAR},
-      </if>
-      <if test="backGoodsState != null" >
-        #{backGoodsState,jdbcType=BIT},
-      </if>
-      <if test="backGoodsAlipay != null" >
-        #{backGoodsAlipay,jdbcType=VARCHAR},
-      </if>
-      <if test="backGoodsAlipayName != null" >
-        #{backGoodsAlipayName,jdbcType=VARCHAR},
-      </if>
-      <if test="backGoodsIsTransfer != null" >
-        #{backGoodsIsTransfer,jdbcType=BIT},
-      </if>
-      <if test="backGoodsCreateTime != null" >
-        #{backGoodsCreateTime,jdbcType=TIMESTAMP},
-      </if>
-      <if test="backGoodsUpdateTime != null" >
-        #{backGoodsUpdateTime,jdbcType=TIMESTAMP},
-      </if>
-    </trim>
-  </insert>
-
-  <!-- 修改售后退货信息 -->
-  <update id="updateBackGoods" parameterType="BackGoods" >
-    update tb_rst_back_goods
-    <set >
-      <if test="customerId != null" >
-        customer_id = #{customerId,jdbcType=INTEGER},
-      </if>
-      <if test="orderId != null" >
-        order_id = #{orderId,jdbcType=INTEGER},
-      </if>
-      <if test="signclosedId != null" >
-        signclosed_id = #{signclosedId,jdbcType=INTEGER},
-      </if>
-      <if test="backGoodsBackStatus != null" >
-        back_goods_back_status = #{backGoodsBackStatus,jdbcType=BIT},
-      </if>
-      <if test="backGoodsBackName != null" >
-        back_goods_back_name = #{backGoodsBackName,jdbcType=VARCHAR},
-      </if>
-      <if test="backGoodsBackTel != null" >
-        back_goods_back_tel = #{backGoodsBackTel,jdbcType=CHAR},
-      </if>
-      <if test="backGoodsBackLogisticsCompany != null" >
-        back_goods_back_logistics_company = #{backGoodsBackLogisticsCompany,jdbcType=VARCHAR},
-      </if>
-      <if test="backGoodsBackLogisticsNo != null" >
-        back_goods_back_logistics_no = #{backGoodsBackLogisticsNo,jdbcType=VARCHAR},
-      </if>
-      <if test="backGoodsBackPostage != null" >
-        back_goods_back_postage = #{backGoodsBackPostage,jdbcType=INTEGER},
-      </if>
-      <if test="backGoodsBackMachineNo != null" >
-        back_goods_back_machine_no = #{backGoodsBackMachineNo,jdbcType=VARCHAR},
-      </if>
-      <if test="backGoodsDesc != null" >
-        back_goods_desc = #{backGoodsDesc,jdbcType=VARCHAR},
-      </if>
-      <if test="backGoodsState != null" >
-        back_goods_state = #{backGoodsState,jdbcType=BIT},
-      </if>
-      <if test="backGoodsAlipay != null" >
-        back_goods_alipay = #{backGoodsAlipay,jdbcType=VARCHAR},
-      </if>
-      <if test="backGoodsIsTransfer != null" >
-        back_goods_is_transfer = #{backGoodsIsTransfer,jdbcType=BIT},
-      </if>
-      <if test="backGoodsCreateTime != null" >
-        back_goods_create_time = #{backGoodsCreateTime,jdbcType=TIMESTAMP},
-      </if>
-      <if test="backGoodsUpdateTime != null" >
-        back_goods_update_time = #{backGoodsUpdateTime,jdbcType=TIMESTAMP},
-      </if>
-      <if test="backGoodsAlipayName != null" >
-        back_goods_alipay_name = #{backGoodsAlipayName,jdbcType=VARCHAR},
-      </if>
-      <if test="backGoodsBackReceiptDate != null" >
-        back_goods_back_receipt_date = #{backGoodsBackReceiptDate,jdbcType=TIMESTAMP},
-      </if>
-    </set>
-    where back_goods_id = #{backGoodsId,jdbcType=INTEGER}
-  </update>
-</mapper>

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

@@ -1,97 +0,0 @@
-<?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.ClosedFittingMapper" >
-  <resultMap id="BaseResultMap" type="ClosedFitting" >
-    <id column="closed_fitting_id" property="closedFittingId" jdbcType="INTEGER" />
-    <result column="relation_id" property="relationId" jdbcType="INTEGER" />
-    <result column="product_id" property="productId" jdbcType="INTEGER" />
-    <result column="fittings_id" property="fittingsId" jdbcType="INTEGER" />
-    <result column="closed_fitting_number" property="closedFittingNumber" jdbcType="INTEGER" />
-    <result column="color_bar" property="colorBar" />
-  </resultMap>
-  <sql id="Base_Column_List" >
-    closed_fitting_id, relation_id, product_id, fittings_id, closed_fitting_number,color_bar
-  </sql>
-  <select id="selectByPrimaryKey" resultMap="BaseResultMap" parameterType="java.lang.Integer" >
-    select 
-    <include refid="Base_Column_List" />
-    from tb_rst_closed_fitting
-    where closed_fitting_id = #{closedFittingId,jdbcType=INTEGER}
-  </select>
-  <insert id="insert" parameterType="ClosedFitting" >
-    insert into tb_rst_closed_fitting
-    (
-      relation_id, product_id,fittings_id, closed_fitting_number,closed_fitting_type,color_bar
-    )
-    values
-    <foreach collection="list" item="node" index="index" separator="," open="" close="">
-      ( #{node.relationId}, #{node.productId}, #{node.fittingsId}, #{node.closedFittingNumber},#{node.closedFittingType},#{node.colorBar})
-    </foreach>
-  </insert>
-
-  <!-- 删除寄回配件 -->
-  <delete id="deleteFitting" parameterType="ClosedFitting">
-    delete from
-      tb_rst_closed_fitting
-    WHERE
-      relation_id = #{relationId}
-    AND
-      closed_fitting_type = #{closedFittingType}
-  </delete>
-  <!-- 删除寄回配件 -->
-  <delete id="deleteByPrimaryKey" parameterType="ClosedFitting">
-    delete from
-    tb_rst_closed_fitting
-    <where>
-      <if test="relationId != null and relationId != ''">
-        relation_id = #{relationId}
-      </if>
-      <if test="closedFittingId != null and closedFittingId != ''">
-        and closed_fitting_id = #{closedFittingId}
-      </if>
-    </where>
-  </delete>
-
-  <!-- 获取寄回配件集合 -->
-  <select id="listClosedFitting" parameterType="ClosedFitting" resultType="ClosedFitting">
-    select
-      /*cf.closed_fitting_number closedFittingNumber,*/
-      cf.*,
-      pf.fittings_name closedFittingsName,
-      pi.product_name closedProductName
-    from
-      tb_rst_closed_fitting cf
-    LEFT JOIN tb_rst_product_fittings pf ON cf.fittings_id = pf.fittings_id
-    LEFT JOIN tb_rst_product_info pi ON cf.product_id = pi.product_id
-    <where>
-      <if test="relationId != null and relationId != ''">
-        relation_id = #{relationId}
-      </if>
-      <if test="closedFittingType != null and closedFittingType != ''">
-        and closed_fitting_type = #{closedFittingType}
-      </if>
-    </where>
-  </select>
-
-  <update id="updateByPrimaryKeySelective" parameterType="ClosedFitting" >
-    update tb_rst_closed_fitting
-    <set >
-      <if test="relationId != null" >
-        relation_id = #{relationId,jdbcType=INTEGER},
-      </if>
-      <if test="productId != null" >
-        product_id = #{productId,jdbcType=INTEGER},
-      </if>
-      <if test="fittingsId != null" >
-        fittings_id = #{fittingsId,jdbcType=INTEGER},
-      </if>
-      <if test="closedFittingNumber != null" >
-        closed_fitting_number = #{closedFittingNumber,jdbcType=INTEGER},
-      </if>
-      <if test="colorBar != null" >
-        color_bar = #{colorBar},
-      </if>
-    </set>
-    where closed_fitting_id = #{closedFittingId,jdbcType=INTEGER}
-  </update>
-</mapper>

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

@@ -1,80 +0,0 @@
-<?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.FittingsInfoMapper" >
-  <resultMap id="BaseResultMap" type="FittingsInfo" >
-    <id column="fittings_id" property="fittingsId" jdbcType="INTEGER" />
-    <result column="product_id" property="productId" jdbcType="INTEGER" />
-    <result column="fittings_name" property="fittingsName" jdbcType="VARCHAR" />
-    <result column="fittings_discount" property="fittingsDiscount" jdbcType="INTEGER" />
-    <result column="fittings_price" property="fittingsPrice" jdbcType="INTEGER" />
-    <result column="fittings_bar" property="fittingsBar" jdbcType="VARCHAR" />
-    <result column="fittings_status" property="fittingsStatus" jdbcType="INTEGER" />
-    <result column="fittings_cretae_time" property="fittingsCretaeTime" jdbcType="TIMESTAMP" />
-  </resultMap>
-  <sql id="fittingsInfo" >
-    fittings_id, product_id, fittings_name, fittings_discount, fittings_price, fittings_bar, 
-    fittings_status, fittings_cretae_time
-  </sql>
-
-  <!-- 根据id查询配件信息 -->
-  <select id="getFittingsById" resultType="FittingsInfo" parameterType="java.lang.Integer" >
-    select 
-    <include refid="fittingsInfo" />
-    from tb_rst_product_fittings
-    where fittings_id = #{fittingsId,jdbcType=INTEGER}
-  </select>
-
-  <!-- 查询所有配件信息 -->
-  <select id="listFittings" resultType="FittingsInfo" parameterType="FittingsInfo">
-    select
-    <include refid="fittingsInfo" />
-    from tb_rst_product_fittings
-    <where>
-      <if test="productId != null">
-        product_id = #{productId}
-      </if>
-      <if test="fittingsBar != null">
-        and fittings_bar = #{fittingsBar}
-      </if>
-    </where>
-  </select>
-
-  <!-- 添加配件信息 -->
-  <insert id="addFittingsInfo" parameterType="FittingsInfo" keyProperty="fittingsId" useGeneratedKeys="true" >
-    insert into tb_rst_product_fittings (fittings_id, product_id, fittings_name, 
-      fittings_discount, fittings_price, fittings_bar, 
-      fittings_status, fittings_cretae_time)
-    values (#{fittingsId,jdbcType=INTEGER}, #{productId,jdbcType=INTEGER}, #{fittingsName,jdbcType=VARCHAR}, 
-      #{fittingsDiscount,jdbcType=INTEGER}, #{fittingsPrice,jdbcType=INTEGER}, #{fittingsBar,jdbcType=VARCHAR}, 
-      #{fittingsStatus,jdbcType=INTEGER}, NOW())
-  </insert>
-
-  <!-- 修改配件信息 -->
-  <update id="updateFittingsInfo" parameterType="FittingsInfo" >
-    update tb_rst_product_fittings
-    <set >
-      <if test="productId != null" >
-        product_id = #{productId,jdbcType=INTEGER},
-      </if>
-      <if test="fittingsName != null" >
-        fittings_name = #{fittingsName,jdbcType=VARCHAR},
-      </if>
-      <if test="fittingsDiscount != null" >
-        fittings_discount = #{fittingsDiscount,jdbcType=INTEGER},
-      </if>
-      <if test="fittingsPrice != null" >
-        fittings_price = #{fittingsPrice,jdbcType=INTEGER},
-      </if>
-      <if test="fittingsBar != null" >
-        fittings_bar = #{fittingsBar,jdbcType=VARCHAR},
-      </if>
-      <if test="fittingsStatus != null" >
-        fittings_status = #{fittingsStatus,jdbcType=INTEGER},
-      </if>
-      <if test="fittingsCretaeTime != null" >
-        fittings_cretae_time = #{fittingsCretaeTime,jdbcType=TIMESTAMP},
-      </if>
-    </set>
-    where fittings_id = #{fittingsId,jdbcType=INTEGER}
-  </update>
-</mapper>

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

@@ -1,245 +0,0 @@
-<?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.NoreasonBackMapper" >
-  <resultMap id="BaseResultMap" type="NoreasonBack" >
-    <id column="noreason_back_id" property="noreasonBackId" jdbcType="INTEGER" />
-    <result column="customer_id" property="customerId" jdbcType="INTEGER" />
-    <result column="order_id" property="orderId" jdbcType="INTEGER" />
-    <result column="signclosed_id" property="signclosedId" jdbcType="INTEGER" />
-    <result column="noreason_back_back_status" property="noreasonBackBackStatus" jdbcType="BIT" />
-    <result column="noreason_back_back_name" property="noreasonBackBackName" jdbcType="VARCHAR" />
-    <result column="noreason_back_back_tel" property="noreasonBackBackTel" jdbcType="CHAR" />
-    <result column="noreason_back_back_logistics_company" property="noreasonBackBackLogisticsCompany" jdbcType="VARCHAR" />
-    <result column="noreason_back_back_logistics_no" property="noreasonBackBackLogisticsNo" jdbcType="VARCHAR" />
-    <result column="noreason_back_back_postage" property="noreasonBackBackPostage" jdbcType="INTEGER" />
-    <result column="noreason_back_back_machine_no" property="noreasonBackBackMachineNo" jdbcType="VARCHAR" />
-    <result column="noreason_back_desc" property="noreasonBackDesc" jdbcType="VARCHAR" />
-    <result column="noreason_back_state" property="noreasonBackState" jdbcType="BIT" />
-    <result column="noreason_back_alipay" property="noreasonBackAlipay" jdbcType="VARCHAR" />
-    <result column="noreason_back_alipay_name" property="noreasonBackAlipayName" jdbcType="VARCHAR" />
-    <result column="noreason_back_is_transfer" property="noreasonBackIsTransfer" jdbcType="BIT" />
-    <result column="noreason_back_create_time" property="noreasonBackCreateTime" jdbcType="TIMESTAMP" />
-    <result column="noreason_back_update_time" property="noreasonBackUpdateTime" jdbcType="TIMESTAMP" />
-    <result column="noreason_back_alipay_name" property="noreasonBackAlipayName" jdbcType="VARCHAR" />
-    <result column="noreason_back_receipt_date" property="noreasonBackReceiptDate" jdbcType="TIMESTAMP" />
-  </resultMap>
-  <sql id="Base_Column_List" >
-    noreason_back_id, customer_id, order_id, signclosed_id, noreason_back_back_status, 
-    noreason_back_back_name, noreason_back_back_tel, noreason_back_back_logistics_company, 
-    noreason_back_back_logistics_no, noreason_back_back_postage, noreason_back_back_machine_no, 
-    noreason_back_desc, noreason_back_state, noreason_back_alipay, noreason_back_is_transfer, 
-    noreason_back_create_time, noreason_back_update_time,noreason_back_alipay_name,noreason_back_receipt_date
-  </sql>
-  <select id="selectByPrimaryKey" resultMap="BaseResultMap" parameterType="java.lang.Integer" >
-    select 
-    <include refid="Base_Column_List" />
-    from tb_rst_noreason_back
-    where noreason_back_id = #{noreasonBackId,jdbcType=INTEGER}
-  </select>
-
-  <select id="getNoreasonBack" resultMap="BaseResultMap" parameterType="NoreasonBack" >
-    select
-    <include refid="Base_Column_List" />
-    from tb_rst_noreason_back
-    <where>
-      <if test="customerId != null">
-        customer_id = #{customerId}
-      </if>
-      <if test="noreasonBackId != null">
-        and noreason_back_id = #{noreasonBackId}
-      </if>
-    </where>
-  </select>
-
-  <!-- 查询售后无理由退货集合 -->
-  <select id="listNoreasonBack" resultMap="noreasonBackMap" parameterType="NoreasonBack">
-    select
-      b.noreason_back_id,
-      b.customer_id,
-      b.order_id,
-      b.signclosed_id,
-      b.noreason_back_back_status,
-      b.noreason_back_back_name,
-      b.noreason_back_back_tel,
-      b.noreason_back_back_logistics_company,
-      b.noreason_back_back_logistics_no,
-      b.noreason_back_back_postage,
-      b.noreason_back_back_machine_no,
-      b.noreason_back_desc,
-      b.noreason_back_state,
-      b.noreason_back_alipay,
-      b.noreason_back_is_transfer,
-      b.noreason_back_create_time,
-      b.noreason_back_update_time,
-      b.noreason_back_alipay_name,
-      b.noreason_back_receipt_date,
-      o.sales_pay_time salesPayTime
-    from
-      tb_rst_noreason_back b
-    LEFT JOIN tb_rst_sales_order_info o ON b.order_id = o.sales_id
-    <where>
-      <if test="customerId != null and customerId != ''">
-        b.customer_id = #{customerId}
-      </if>
-      <if test="noreasonBackState != null and noreasonBackState != ''">
-        and b.noreason_back_state = #{noreasonBackState}
-      </if>
-    </where>
-  </select>
-
-  <resultMap id="noreasonBackMap" type="NoreasonBack" >
-    <id column="noreason_back_id" property="noreasonBackId" jdbcType="INTEGER" />
-    <result column="customer_id" property="customerId" jdbcType="INTEGER" />
-    <result column="order_id" property="orderId" jdbcType="INTEGER" />
-    <result column="signclosed_id" property="signclosedId" jdbcType="INTEGER" />
-    <result column="noreason_back_back_status" property="noreasonBackBackStatus" jdbcType="BIT" />
-    <result column="noreason_back_back_name" property="noreasonBackBackName" jdbcType="VARCHAR" />
-    <result column="noreason_back_back_tel" property="noreasonBackBackTel" jdbcType="CHAR" />
-    <result column="noreason_back_back_logistics_company" property="noreasonBackBackLogisticsCompany" jdbcType="VARCHAR" />
-    <result column="noreason_back_back_logistics_no" property="noreasonBackBackLogisticsNo" jdbcType="VARCHAR" />
-    <result column="noreason_back_back_postage" property="noreasonBackBackPostage" jdbcType="INTEGER" />
-    <result column="noreason_back_back_machine_no" property="noreasonBackBackMachineNo" jdbcType="VARCHAR" />
-    <result column="noreason_back_desc" property="noreasonBackDesc" jdbcType="VARCHAR" />
-    <result column="noreason_back_state" property="noreasonBackState" jdbcType="BIT" />
-    <result column="noreason_back_alipay" property="noreasonBackAlipay" jdbcType="VARCHAR" />
-    <result column="noreason_back_is_transfer" property="noreasonBackIsTransfer" jdbcType="BIT" />
-    <result column="noreason_back_create_time" property="noreasonBackCreateTime" jdbcType="TIMESTAMP" />
-    <result column="noreason_back_update_time" property="noreasonBackUpdateTime" jdbcType="TIMESTAMP" />
-    <result column="noreason_back_alipay_name" property="noreasonBackAlipayName" jdbcType="VARCHAR" />
-    <result column="noreason_back_receipt_date" property="noreasonBackReceiptDate" jdbcType="TIMESTAMP" />
-    <!--<collection property="complaintDetectList" column="customer_id" ofType="ComplaintDetectInfo" select="listComplaintDetect"/>-->
-  </resultMap>
-
-  <select id="listComplaintDetect" parameterType="Integer" resultType="ComplaintDetectInfo">
-    SELECT
-      d.detect_state detectState,
-      d.detect_phenomenon detectPhenomenon,
-      d.detect_failure_classification detectFailureClassification,
-      d.detect_failure_cause detectFailureCause,
-      d.detect_results detectResults,
-      d.detect_point detectPoint,
-      d.detect_analysis detectAnalysis,
-      d.detect_revolution_produced detectRevolutionProduced,
-      m.maintenance_is_repair maintenanceIsRepair,
-      m.maintenance_content maintenanceContent,
-      m.maintenance_content_date maintenanceContentDate
-    FROM
-      tb_rst_complaint_detect d
-    LEFT JOIN tb_rst_complaint_maintenance m ON d.detect_id = m.detect_id
-    WHERE
-      d.customer_id = #{customerId}
-    ORDER BY d.detect_id ASC
-  </select>
-
-  <delete id="deleteByPrimaryKey" parameterType="NoreasonBack" >
-    delete from tb_rst_noreason_back
-    <where>
-      <if test="customerId != null">
-        customer_id = #{customerId}
-      </if>
-      <if test="noreasonBackId != null">
-        and noreason_back_id = #{noreasonBackId}
-      </if>
-    </where>
-  </delete>
-  <insert id="insert" parameterType="NoreasonBack" useGeneratedKeys="true"  keyProperty="noreasonBackId">
-    insert into tb_rst_noreason_back (customer_id, order_id,
-      signclosed_id, noreason_back_back_status, noreason_back_back_name, 
-      noreason_back_back_tel, noreason_back_back_logistics_company, 
-      noreason_back_back_logistics_no, noreason_back_back_postage, 
-      noreason_back_back_machine_no, noreason_back_desc, 
-      noreason_back_state, noreason_back_alipay,noreason_back_alipay_name, noreason_back_is_transfer,noreason_back_receipt_date
-      )
-    values ( #{customerId,jdbcType=INTEGER}, #{orderId,jdbcType=INTEGER},
-      #{signclosedId,jdbcType=INTEGER}, #{noreasonBackBackStatus,jdbcType=BIT}, #{noreasonBackBackName,jdbcType=VARCHAR}, 
-      #{noreasonBackBackTel,jdbcType=CHAR}, #{noreasonBackBackLogisticsCompany,jdbcType=VARCHAR}, 
-      #{noreasonBackBackLogisticsNo,jdbcType=VARCHAR}, #{noreasonBackBackPostage,jdbcType=INTEGER}, 
-      #{noreasonBackBackMachineNo,jdbcType=VARCHAR}, #{noreasonBackDesc,jdbcType=VARCHAR}, 
-      #{noreasonBackState,jdbcType=BIT}, #{noreasonBackAlipay,jdbcType=VARCHAR},#{noreasonBackAlipayName,jdbcType=VARCHAR}, #{noreasonBackIsTransfer,jdbcType=BIT},
-       #{noreasonBackReceiptDate,jdbcType=TIMESTAMP}
-      )
-  </insert>
-
-  <!-- 修改无理由退货信息 -->
-  <update id="updateNoreasonBack" parameterType="NoreasonBack" >
-    update tb_rst_noreason_back
-    <set >
-      <if test="customerId != null" >
-        customer_id = #{customerId},
-      </if>
-      <if test="orderId != null" >
-        order_id = #{orderId},
-      </if>
-      <if test="signclosedId != null" >
-        signclosed_id = #{signclosedId},
-      </if>
-      <if test="noreasonBackBackStatus != null" >
-        noreason_back_back_status = #{noreasonBackBackStatus},
-      </if>
-      <if test="noreasonBackBackName != null" >
-        noreason_back_back_name = #{noreasonBackBackName},
-      </if>
-      <if test="noreasonBackBackTel != null" >
-        noreason_back_back_tel = #{noreasonBackBackTel},
-      </if>
-      <if test="noreasonBackBackLogisticsCompany != null" >
-        noreason_back_back_logistics_company = #{noreasonBackBackLogisticsCompany},
-      </if>
-      <if test="noreasonBackBackLogisticsNo != null" >
-        noreason_back_back_logistics_no = #{noreasonBackBackLogisticsNo},
-      </if>
-      <if test="noreasonBackBackPostage != null" >
-        noreason_back_back_postage = #{noreasonBackBackPostage},
-      </if>
-      <if test="noreasonBackBackMachineNo != null" >
-        noreason_back_back_machine_no = #{noreasonBackBackMachineNo},
-      </if>
-      <if test="noreasonBackDesc != null" >
-        noreason_back_desc = #{noreasonBackDesc},
-      </if>
-      <if test="noreasonBackState != null" >
-        noreason_back_state = #{noreasonBackState},
-      </if>
-      <if test="noreasonBackAlipay != null" >
-        noreason_back_alipay = #{noreasonBackAlipay},
-      </if>
-      <if test="noreasonBackIsTransfer != null" >
-        noreason_back_is_transfer = #{noreasonBackIsTransfer},
-      </if>
-      <if test="noreasonBackCreateTime != null" >
-        noreason_back_create_time = #{noreasonBackCreateTime},
-      </if>
-      <if test="noreasonBackUpdateTime != null" >
-        noreason_back_update_time = #{noreasonBackUpdateTime},
-      </if>
-      <if test="noreasonBackAlipayName != null" >
-        noreason_back_alipay_name = #{noreasonBackAlipayName},
-      </if>
-      <if test="noreasonBackReceiptDate != null" >
-        noreason_back_receipt_date = #{noreasonBackReceiptDate},
-      </if>
-    </set>
-    where noreason_back_id = #{noreasonBackId}
-  </update>
-  <update id="updateByPrimaryKey" parameterType="NoreasonBack" >
-    update tb_rst_noreason_back
-    set customer_id = #{customerId,jdbcType=INTEGER},
-      order_id = #{orderId,jdbcType=INTEGER},
-      signclosed_id = #{signclosedId,jdbcType=INTEGER},
-      noreason_back_back_status = #{noreasonBackBackStatus,jdbcType=BIT},
-      noreason_back_back_name = #{noreasonBackBackName,jdbcType=VARCHAR},
-      noreason_back_back_tel = #{noreasonBackBackTel,jdbcType=CHAR},
-      noreason_back_back_logistics_company = #{noreasonBackBackLogisticsCompany,jdbcType=VARCHAR},
-      noreason_back_back_logistics_no = #{noreasonBackBackLogisticsNo,jdbcType=VARCHAR},
-      noreason_back_back_postage = #{noreasonBackBackPostage,jdbcType=INTEGER},
-      noreason_back_back_machine_no = #{noreasonBackBackMachineNo,jdbcType=VARCHAR},
-      noreason_back_desc = #{noreasonBackDesc,jdbcType=VARCHAR},
-      noreason_back_state = #{noreasonBackState,jdbcType=BIT},
-      noreason_back_alipay = #{noreasonBackAlipay,jdbcType=VARCHAR},
-      noreason_back_is_transfer = #{noreasonBackIsTransfer,jdbcType=BIT},
-      noreason_back_create_time = #{noreasonBackCreateTime,jdbcType=TIMESTAMP},
-      noreason_back_update_time = #{noreasonBackUpdateTime,jdbcType=TIMESTAMP},
-      noreason_back_alipay_name = #{noreasonBackAlipayName,jdbcType=VARCHAR}
-    where noreason_back_id = #{noreasonBackId,jdbcType=INTEGER}
-  </update>
-</mapper>

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

@@ -1,310 +0,0 @@
-<?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.ReissueMapper" >
-  <resultMap id="BaseResultMap" type="Reissue" >
-    <id column="reissue_id" property="reissueId" jdbcType="INTEGER" />
-    <result column="customer_id" property="customerId" jdbcType="INTEGER" />
-    <result column="order_id" property="orderId" jdbcType="INTEGER" />
-    <result column="reissue_back_efast_order_id" property="reissueBackEfastOrderId" jdbcType="VARCHAR" />
-    <result column="reissue_send_status" property="reissueSendStatus" jdbcType="BIT" />
-    <result column="reissue_send_name" property="reissueSendName" jdbcType="VARCHAR" />
-    <result column="reissue_send_tel" property="reissueSendTel" jdbcType="CHAR" />
-    <result column="province_number" property="provinceNumber" jdbcType="VARCHAR" />
-    <result column="city_number" property="cityNumber" jdbcType="VARCHAR" />
-    <result column="area_number" property="areaNumber" jdbcType="VARCHAR" />
-    <result column="reissue_send_merge_address" property="reissueSendMergeAddress" jdbcType="VARCHAR" />
-    <result column="reissue_send_address" property="reissueSendAddress" jdbcType="VARCHAR" />
-    <result column="reissue_send_logistics_company" property="reissueSendLogisticsCompany" jdbcType="VARCHAR" />
-    <result column="reissue_send_logistics_no" property="reissueSendLogisticsNo" jdbcType="VARCHAR" />
-    <result column="reissue_desc" property="reissueDesc" jdbcType="VARCHAR" />
-    <result column="reissue_state" property="reissueState" jdbcType="BIT" />
-    <result column="reissue_create_time" property="reissueCreateTime" jdbcType="TIMESTAMP" />
-    <result column="reissue_update_time" property="reissueUpdateTime" jdbcType="TIMESTAMP" />
-  </resultMap>
-  <sql id="Base_Column_List" >
-    reissue_id, customer_id, order_id, reissue_back_efast_order_id, reissue_send_status, 
-    reissue_send_name, reissue_send_tel, province_number, city_number, area_number, reissue_send_merge_address, 
-    reissue_send_address, reissue_send_logistics_company, reissue_send_logistics_no, 
-    reissue_desc, reissue_state, reissue_create_time, reissue_update_time
-  </sql>
-  <select id="selectByPrimaryKey" resultMap="BaseResultMap" parameterType="java.lang.Integer" >
-    select 
-    <include refid="Base_Column_List" />
-    from tb_rst_reissue
-    where reissue_id = #{reissueId,jdbcType=INTEGER}
-  </select>
-
-  <select id="getReissue" resultMap="BaseResultMap" parameterType="Reissue" >
-    select
-    <include refid="Base_Column_List" />
-    from tb_rst_reissue
-    <where>
-      <if test="reissueId != null" >
-         reissue_id = #{reissueId}
-      </if>
-      <if test="customerId != null" >
-        AND  customer_id = #{customerId}
-      </if>
-    </where>
-  </select>
-
-
-
-  <!-- 查询售后补发集合 -->
-  <select id="listReissue" resultType="Reissue" parameterType="Reissue">
-    select
-      r.*,
-      o.sales_pay_time salesPayTime
-    from
-      tb_rst_reissue r
-    LEFT JOIN tb_rst_sales_order_info o ON r.order_id = o.sales_id
-    <where>
-      <if test="customerId != null and customerId != ''">
-        r.customer_id = #{customerId}
-      </if>
-      <if test="reissueState != null and reissueState != ''">
-        and r.reissue_state = #{reissueState}
-      </if>
-    </where>
-  </select>
-
-  <delete id="deleteByPrimaryKey" parameterType="Reissue" >
-    delete from tb_rst_reissue
-    <where>
-      <if test="reissueId != null" >
-        reissue_id = #{reissueId}
-      </if>
-      <if test="customerId != null" >
-        AND  customer_id = #{customerId}
-      </if>
-    </where>
-  </delete>
-  <insert id="insert" parameterType="Reissue"   useGeneratedKeys="true"  keyProperty="reissueId">
-    insert into tb_rst_reissue (customer_id, order_id,
-      reissue_back_efast_order_id, reissue_send_status, 
-      reissue_send_name, reissue_send_tel, province_number, 
-      city_number, area_number, reissue_send_merge_address, 
-      reissue_send_address, reissue_send_logistics_company, 
-      reissue_send_logistics_no, reissue_desc, reissue_state
-      )
-    values ( #{customerId,jdbcType=INTEGER}, #{orderId,jdbcType=INTEGER},
-      #{reissueBackEfastOrderId,jdbcType=VARCHAR}, #{reissueSendStatus,jdbcType=BIT}, 
-      #{reissueSendName,jdbcType=VARCHAR}, #{reissueSendTel,jdbcType=CHAR}, #{provinceNumber,jdbcType=VARCHAR}, 
-      #{cityNumber,jdbcType=VARCHAR}, #{areaNumber,jdbcType=VARCHAR}, #{reissueSendMergeAddress,jdbcType=VARCHAR}, 
-      #{reissueSendAddress,jdbcType=VARCHAR}, #{reissueSendLogisticsCompany,jdbcType=VARCHAR}, 
-      #{reissueSendLogisticsNo,jdbcType=VARCHAR}, #{reissueDesc,jdbcType=VARCHAR}, #{reissueState,jdbcType=BIT}
-      )
-  </insert>
-  <insert id="insertSelective" parameterType="Reissue" >
-    insert into tb_rst_reissue
-    <trim prefix="(" suffix=")" suffixOverrides="," >
-      <if test="reissueId != null" >
-        reissue_id,
-      </if>
-      <if test="customerId != null" >
-        customer_id,
-      </if>
-      <if test="orderId != null" >
-        order_id,
-      </if>
-      <if test="reissueBackEfastOrderId != null" >
-        reissue_back_efast_order_id,
-      </if>
-      <if test="reissueSendStatus != null" >
-        reissue_send_status,
-      </if>
-      <if test="reissueSendName != null" >
-        reissue_send_name,
-      </if>
-      <if test="reissueSendTel != null" >
-        reissue_send_tel,
-      </if>
-      <if test="provinceNumber != null" >
-        province_number,
-      </if>
-      <if test="cityNumber != null" >
-        city_number,
-      </if>
-      <if test="areaNumber != null" >
-        area_number,
-      </if>
-      <if test="reissueSendMergeAddress != null" >
-        reissue_send_merge_address,
-      </if>
-      <if test="reissueSendAddress != null" >
-        reissue_send_address,
-      </if>
-      <if test="reissueSendLogisticsCompany != null" >
-        reissue_send_logistics_company,
-      </if>
-      <if test="reissueSendLogisticsNo != null" >
-        reissue_send_logistics_no,
-      </if>
-      <if test="reissueDesc != null" >
-        reissue_desc,
-      </if>
-      <if test="reissueState != null" >
-        reissue_state,
-      </if>
-      <if test="reissueCreateTime != null" >
-        reissue_create_time,
-      </if>
-      <if test="reissueUpdateTime != null" >
-        reissue_update_time,
-      </if>
-    </trim>
-    <trim prefix="values (" suffix=")" suffixOverrides="," >
-      <if test="reissueId != null" >
-        #{reissueId,jdbcType=INTEGER},
-      </if>
-      <if test="customerId != null" >
-        #{customerId,jdbcType=INTEGER},
-      </if>
-      <if test="orderId != null" >
-        #{orderId,jdbcType=INTEGER},
-      </if>
-      <if test="reissueBackEfastOrderId != null" >
-        #{reissueBackEfastOrderId,jdbcType=VARCHAR},
-      </if>
-      <if test="reissueSendStatus != null" >
-        #{reissueSendStatus,jdbcType=BIT},
-      </if>
-      <if test="reissueSendName != null" >
-        #{reissueSendName,jdbcType=VARCHAR},
-      </if>
-      <if test="reissueSendTel != null" >
-        #{reissueSendTel,jdbcType=CHAR},
-      </if>
-      <if test="provinceNumber != null" >
-        #{provinceNumber,jdbcType=VARCHAR},
-      </if>
-      <if test="cityNumber != null" >
-        #{cityNumber,jdbcType=VARCHAR},
-      </if>
-      <if test="areaNumber != null" >
-        #{areaNumber,jdbcType=VARCHAR},
-      </if>
-      <if test="reissueSendMergeAddress != null" >
-        #{reissueSendMergeAddress,jdbcType=VARCHAR},
-      </if>
-      <if test="reissueSendAddress != null" >
-        #{reissueSendAddress,jdbcType=VARCHAR},
-      </if>
-      <if test="reissueSendLogisticsCompany != null" >
-        #{reissueSendLogisticsCompany,jdbcType=VARCHAR},
-      </if>
-      <if test="reissueSendLogisticsNo != null" >
-        #{reissueSendLogisticsNo,jdbcType=VARCHAR},
-      </if>
-      <if test="reissueDesc != null" >
-        #{reissueDesc,jdbcType=VARCHAR},
-      </if>
-      <if test="reissueState != null" >
-        #{reissueState,jdbcType=BIT},
-      </if>
-      <if test="reissueCreateTime != null" >
-        #{reissueCreateTime,jdbcType=TIMESTAMP},
-      </if>
-      <if test="reissueUpdateTime != null" >
-        #{reissueUpdateTime,jdbcType=TIMESTAMP},
-      </if>
-    </trim>
-  </insert>
-
-  <!-- 修改售后补寄信息 -->
-  <update id="updateReissueInfo" parameterType="Reissue" >
-    update tb_rst_reissue
-    <set >
-      <if test="customerId != null" >
-        customer_id = #{customerId},
-      </if>
-      <if test="orderId != null" >
-        order_id = #{orderId},
-      </if>
-      <if test="reissueBackEfastOrderId != null" >
-        reissue_back_efast_order_id = #{reissueBackEfastOrderId},
-      </if>
-      <if test="reissueSendStatus != null" >
-        reissue_send_status = #{reissueSendStatus},
-      </if>
-      <if test="reissueSendName != null" >
-        reissue_send_name = #{reissueSendName},
-      </if>
-      <if test="reissueSendTel != null" >
-        reissue_send_tel = #{reissueSendTel},
-      </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="reissueSendMergeAddress != null" >
-        reissue_send_merge_address = #{reissueSendMergeAddress},
-      </if>
-      <if test="reissueSendAddress != null" >
-        reissue_send_address = #{reissueSendAddress},
-      </if>
-      <if test="reissueSendLogisticsCompany != null" >
-        reissue_send_logistics_company = #{reissueSendLogisticsCompany},
-      </if>
-      <if test="reissueSendLogisticsNo != null" >
-        reissue_send_logistics_no = #{reissueSendLogisticsNo},
-      </if>
-      <if test="reissueDesc != null" >
-        reissue_desc = #{reissueDesc},
-      </if>
-      <if test="reissueState != null" >
-        reissue_state = #{reissueState},
-      </if>
-      <if test="reissueCreateTime != null" >
-        reissue_create_time = #{reissueCreateTime},
-      </if>
-      <if test="reissueUpdateTime != null" >
-        reissue_update_time = #{reissueUpdateTime},
-      </if>
-    </set>
-    where reissue_id = #{reissueId}
-  </update>
-  <update id="updateByPrimaryKey" parameterType="Reissue" >
-    update tb_rst_reissue
-    set customer_id = #{customerId,jdbcType=INTEGER},
-      order_id = #{orderId,jdbcType=INTEGER},
-      reissue_back_efast_order_id = #{reissueBackEfastOrderId,jdbcType=VARCHAR},
-      reissue_send_status = #{reissueSendStatus,jdbcType=BIT},
-      reissue_send_name = #{reissueSendName,jdbcType=VARCHAR},
-      reissue_send_tel = #{reissueSendTel,jdbcType=CHAR},
-      province_number = #{provinceNumber,jdbcType=VARCHAR},
-      city_number = #{cityNumber,jdbcType=VARCHAR},
-      area_number = #{areaNumber,jdbcType=VARCHAR},
-      reissue_send_merge_address = #{reissueSendMergeAddress,jdbcType=VARCHAR},
-      reissue_send_address = #{reissueSendAddress,jdbcType=VARCHAR},
-      reissue_send_logistics_company = #{reissueSendLogisticsCompany,jdbcType=VARCHAR},
-      reissue_send_logistics_no = #{reissueSendLogisticsNo,jdbcType=VARCHAR},
-      reissue_desc = #{reissueDesc,jdbcType=VARCHAR},
-      reissue_state = #{reissueState,jdbcType=BIT},
-      reissue_create_time = #{reissueCreateTime,jdbcType=TIMESTAMP},
-      reissue_update_time = #{reissueUpdateTime,jdbcType=TIMESTAMP}
-    where reissue_id = #{reissueId,jdbcType=INTEGER}
-  </update>
-
-  <!-- 查询售后补发需要同步订单的数据集合 -->
-  <select id="listSynchronizingReissue" resultType="Reissue" parameterType="Reissue">
-    select
-    r.*
-    from
-    tb_rst_reissue r
-    <where>
-      <if test="reissueSendStatus != null and reissueSendStatus != ''">
-        and reissue_send_status = #{reissueSendStatus}
-      </if>
-      AND r.reissue_back_efast_order_id is not NULL
-      AND trim(r.reissue_back_efast_order_id) != ''
-      AND (r.reissue_send_logistics_company is null
-      or trim(r.reissue_send_logistics_company)='')
-    </where>
-  </select>
-</mapper>

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

@@ -1,332 +0,0 @@
-<?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.RenewedMapper" >
-  <resultMap id="BaseResultMap" type="Renewed" >
-    <id column="renewed_id" property="renewedId" jdbcType="INTEGER" />
-    <result column="customer_id" property="customerId" jdbcType="INTEGER" />
-    <result column="order_id" property="orderId" jdbcType="INTEGER" />
-    <result column="signclosed_id" property="signclosedId" jdbcType="INTEGER" />
-    <result column="renewed_back_efast_order_id" property="renewedBackEfastOrderId" jdbcType="VARCHAR" />
-    <result column="renewed_back_status" property="renewedBackStatus" jdbcType="BIT" />
-    <result column="renewed_back_name" property="renewedBackName" jdbcType="VARCHAR" />
-    <result column="renewed_back_tel" property="renewedBackTel" jdbcType="CHAR" />
-    <result column="renewed_back_logistics_company" property="renewedBackLogisticsCompany" jdbcType="VARCHAR" />
-    <result column="renewed_back_logistics_no" property="renewedBackLogisticsNo" jdbcType="VARCHAR" />
-    <result column="renewed_back_postage" property="renewedBackPostage" jdbcType="INTEGER" />
-    <result column="renewed_back_machine_no" property="renewedBackMachineNo" jdbcType="VARCHAR" />
-    <result column="renewed_send_status" property="renewedSendStatus" jdbcType="BIT" />
-    <result column="renewed_send_name" property="renewedSendName" jdbcType="VARCHAR" />
-    <result column="renewed_send_tel" property="renewedSendTel" jdbcType="CHAR" />
-    <result column="province_number" property="provinceNumber" jdbcType="VARCHAR" />
-    <result column="city_number" property="cityNumber" jdbcType="VARCHAR" />
-    <result column="area_number" property="areaNumber" jdbcType="VARCHAR" />
-    <result column="renewed_send_merge_address" property="renewedSendMergeAddress" jdbcType="VARCHAR" />
-    <result column="renewed_send_address" property="renewedSendAddress" jdbcType="VARCHAR" />
-    <result column="renewed_send_logistics_company" property="renewedSendLogisticsCompany" jdbcType="VARCHAR" />
-    <result column="renewed_send_logistics_no" property="renewedSendLogisticsNo" jdbcType="VARCHAR" />
-    <result column="renewed_desc" property="renewedDesc" jdbcType="VARCHAR" />
-    <result column="renewed_state" property="renewedState" jdbcType="BIT" />
-    <result column="renewed_alipay" property="renewedAlipay" jdbcType="VARCHAR" />
-    <result column="renewed_is_transfer" property="renewedIsTransfer" jdbcType="BIT" />
-    <result column="renewed_create_time" property="renewedCreateTime" jdbcType="TIMESTAMP" />
-    <result column="renewed_update_time" property="renewedUpdateTime" jdbcType="TIMESTAMP" />
-    <result column="renewed_back_receipt_date" property="renewedBackReceiptDate" jdbcType="TIMESTAMP" />
-  </resultMap>
-  <sql id="Base_Column_List" >
-    renewed_id, customer_id, order_id, signclosed_id, renewed_back_efast_order_id, renewed_back_status, 
-    renewed_back_name, renewed_back_tel, renewed_back_logistics_company, renewed_back_logistics_no, 
-    renewed_back_postage, renewed_back_machine_no, renewed_send_status, renewed_send_name, 
-    renewed_send_tel, province_number, city_number, area_number, renewed_send_merge_address, 
-    renewed_send_address, renewed_send_logistics_company, renewed_send_logistics_no, 
-    renewed_desc, renewed_state, renewed_alipay, renewed_is_transfer, renewed_create_time, 
-    renewed_update_time,renewed_back_receipt_date
-  </sql>
-
-  <!-- 获取换新详情和品质检测信息 -->
-  <select id="getRenewedInfo" parameterType="Renewed" resultMap="renewedMap">
-    select
-      renewed_id,
-      customer_id,
-      order_id,
-      signclosed_id,
-      renewed_back_efast_order_id,
-      renewed_back_status,
-      renewed_back_name,
-      renewed_back_tel,
-      renewed_back_logistics_company,
-      renewed_back_logistics_no,
-      renewed_back_postage,
-      renewed_back_machine_no,
-      renewed_send_status,
-      renewed_send_name,
-      renewed_send_tel,
-      province_number,
-      city_number,
-      area_number,
-      renewed_send_merge_address,
-      renewed_send_address,
-      renewed_send_logistics_company,
-      renewed_send_logistics_no,
-      renewed_desc,
-      renewed_state,
-      renewed_alipay,
-      renewed_is_transfer,
-      renewed_create_time,
-      renewed_update_time,
-      renewed_alipay_name,
-      renewed_back_receipt_date
-    from
-      tb_rst_renewed
-    <where>
-      <if test="renewedId != null and renewedId != ''">
-        renewed_id = #{renewedId}
-      </if>
-      <if test="customerId != null and customerId != ''">
-        and customer_id = #{customerId}
-      </if>
-      <if test="renewedState != null and renewedState != ''">
-        and renewed_state = #{renewedState}
-      </if>
-    </where>
-  </select>
-
-  <resultMap id="renewedMap" type="Renewed">
-    <id column="renewed_id" property="renewedId"/>
-    <result column="customer_id" property="customerId"/>
-    <result column="order_id" property="orderId"/>
-    <result column="signclosed_id" property="signclosedId"/>
-    <result column="renewed_back_efast_order_id" property="renewedBackEfastOrderId"/>
-    <result column="renewed_back_status" property="renewedBackStatus"/>
-    <result column="renewed_back_name" property="renewedBackName"/>
-    <result column="renewed_back_tel" property="renewedBackTel"/>
-    <result column="renewed_back_logistics_company" property="renewedBackLogisticsCompany"/>
-    <result column="renewed_back_logistics_no" property="renewedBackLogisticsNo"/>
-    <result column="renewed_back_postage" property="renewedBackPostage"/>
-    <result column="renewed_back_machine_no" property="renewedBackMachineNo"/>
-    <result column="renewed_send_status" property="renewedSendStatus"/>
-    <result column="renewed_send_name" property="renewedSendName"/>
-    <result column="renewed_send_tel" property="renewedSendTel"/>
-    <result column="province_number" property="provinceNumber"/>
-    <result column="city_number" property="cityNumber"/>
-    <result column="area_number" property="areaNumber"/>
-    <result column="renewed_send_merge_address" property="renewedSendMergeAddress"/>
-    <result column="renewed_send_address" property="renewedSendAddress"/>
-    <result column="renewed_send_logistics_company" property="renewedSendLogisticsCompany"/>
-    <result column="renewed_send_logistics_no" property="renewedSendLogisticsNo"/>
-    <result column="renewed_desc" property="renewedDesc"/>
-    <result column="renewed_state" property="renewedState"/>
-    <result column="renewed_alipay" property="renewedAlipay"/>
-    <result column="renewed_is_transfer" property="renewedIsTransfer"/>
-    <result column="renewed_create_time" property="renewedCreateTime"/>
-    <result column="renewed_update_time" property="renewedUpdateTime"/>
-    <result column="renewed_back_receipt_date" property="renewedBackReceiptDate"/>
-    <!--<collection property="complaintDetectList" column="customer_id" ofType="ComplaintDetectInfo" select="listComplaintDetect"/>-->
-  </resultMap>
-
-  <select id="listComplaintDetect" parameterType="Integer" resultType="ComplaintDetectInfo">
-    SELECT
-      d.detect_state detectState,
-      d.detect_phenomenon detectPhenomenon,
-      d.detect_failure_classification detectFailureClassification,
-      d.detect_failure_cause detectFailureCause,
-      d.detect_results detectResults,
-      d.detect_point detectPoint,
-      d.detect_analysis detectAnalysis,
-      d.detect_revolution_produced detectRevolutionProduced,
-      m.maintenance_is_repair maintenanceIsRepair,
-      m.maintenance_content maintenanceContent,
-      m.maintenance_content_date maintenanceContentDate
-    FROM
-      tb_rst_complaint_detect d
-    LEFT JOIN tb_rst_complaint_maintenance m ON d.detect_id = m.detect_id
-    WHERE
-      d.customer_id = #{customerId}
-    ORDER BY d.detect_id ASC
-  </select>
-
-  <!-- 获取寄回配件集合 -->
-  <select id="listClosedFitting" parameterType="ClosedFitting" resultType="ClosedFitting">
-    select
-      cf.closed_fitting_number closedFittingNumber,
-      pf.fittings_name fittingName
-    from
-      tb_rst_closed_fitting cf
-    LEFT JOIN tb_rst_product_fittings pf ON cf.fittings_id = pf.fittings_id
-    <where>
-      <if test="relationId != null and relationId != ''">
-        relation_id = #{relationId}
-      </if>
-    </where>
-  </select>
-
-  <!-- 查询售后换新集合 -->
-  <select id="listRenewed" resultType="Renewed" parameterType="Renewed">
-    select
-      r.*,
-      o.sales_pay_time salesPayTime
-    from
-      tb_rst_renewed r
-    LEFT JOIN tb_rst_sales_order_info o ON r.order_id = o.sales_id
-    <where>
-      <if test="customerId != null and customerId != ''">
-        customer_id = #{customerId}
-      </if>
-      <if test="renewedState != null and renewedState != ''">
-        and renewed_state = #{renewedState}
-      </if>
-    </where>
-  </select>
-
-  <delete id="deleteByPrimaryKey" parameterType="Renewed" >
-    delete from tb_rst_renewed
-    <where>
-      <if test="renewedId != null and renewedId != ''">
-        renewed_id = #{renewedId}
-      </if>
-      <if test="customerId != null and customerId != ''">
-        and customer_id = #{customerId}
-      </if>
-    </where>
-
-  </delete>
-  <insert id="insert" parameterType="Renewed"  useGeneratedKeys="true"  keyProperty="renewedId">
-    insert into tb_rst_renewed (customer_id, order_id,
-      signclosed_id, renewed_back_efast_order_id, 
-      renewed_back_status, renewed_back_name, renewed_back_tel, 
-      renewed_back_logistics_company, renewed_back_logistics_no, 
-      renewed_back_postage, renewed_back_machine_no, 
-      renewed_send_status, renewed_send_name, renewed_send_tel, 
-      province_number, city_number, area_number, 
-      renewed_send_merge_address, renewed_send_address, 
-      renewed_send_logistics_company, renewed_send_logistics_no, 
-      renewed_desc, renewed_state, renewed_alipay, renewed_alipay_name,
-      renewed_is_transfer
-      )
-    values ( #{customerId,jdbcType=INTEGER}, #{orderId,jdbcType=INTEGER},
-      #{signclosedId,jdbcType=INTEGER}, #{renewedBackEfastOrderId,jdbcType=VARCHAR}, 
-      #{renewedBackStatus,jdbcType=BIT}, #{renewedBackName,jdbcType=VARCHAR}, #{renewedBackTel,jdbcType=CHAR}, 
-      #{renewedBackLogisticsCompany,jdbcType=VARCHAR}, #{renewedBackLogisticsNo,jdbcType=VARCHAR}, 
-      #{renewedBackPostage,jdbcType=INTEGER}, #{renewedBackMachineNo,jdbcType=VARCHAR}, 
-      #{renewedSendStatus,jdbcType=BIT}, #{renewedSendName,jdbcType=VARCHAR}, #{renewedSendTel,jdbcType=CHAR}, 
-      #{provinceNumber,jdbcType=VARCHAR}, #{cityNumber,jdbcType=VARCHAR}, #{areaNumber,jdbcType=VARCHAR}, 
-      #{renewedSendMergeAddress,jdbcType=VARCHAR}, #{renewedSendAddress,jdbcType=VARCHAR}, 
-      #{renewedSendLogisticsCompany,jdbcType=VARCHAR}, #{renewedSendLogisticsNo,jdbcType=VARCHAR}, 
-      #{renewedDesc,jdbcType=VARCHAR}, #{renewedState,jdbcType=BIT}, #{renewedAlipay,jdbcType=VARCHAR},
-      #{renewedAlipayName,jdbcType=VARCHAR},
-      #{renewedIsTransfer,jdbcType=BIT}
-      )
-  </insert>
-
-  <!-- 修改换新信息 -->
-  <update id="updateRenewedInfo" parameterType="Renewed" >
-    update tb_rst_renewed
-    <set >
-      <if test="customerId != null" >
-        customer_id = #{customerId},
-      </if>
-      <if test="orderId != null" >
-        order_id = #{orderId},
-      </if>
-      <if test="signclosedId != null" >
-        signclosed_id = #{signclosedId},
-      </if>
-      <if test="renewedBackEfastOrderId != null" >
-        renewed_back_efast_order_id = #{renewedBackEfastOrderId},
-      </if>
-      <if test="renewedBackStatus != null" >
-        renewed_back_status = #{renewedBackStatus},
-      </if>
-      <if test="renewedBackName != null" >
-        renewed_back_name = #{renewedBackName},
-      </if>
-      <if test="renewedBackTel != null" >
-        renewed_back_tel = #{renewedBackTel},
-      </if>
-      <if test="renewedBackLogisticsCompany != null" >
-        renewed_back_logistics_company = #{renewedBackLogisticsCompany},
-      </if>
-      <if test="renewedBackLogisticsNo != null" >
-        renewed_back_logistics_no = #{renewedBackLogisticsNo},
-      </if>
-      <if test="renewedBackPostage != null" >
-        renewed_back_postage = #{renewedBackPostage},
-      </if>
-      <if test="renewedBackMachineNo != null" >
-        renewed_back_machine_no = #{renewedBackMachineNo},
-      </if>
-      <if test="renewedSendStatus != null" >
-        renewed_send_status = #{renewedSendStatus},
-      </if>
-      <if test="renewedSendName != null" >
-        renewed_send_name = #{renewedSendName},
-      </if>
-      <if test="renewedSendTel != null" >
-        renewed_send_tel = #{renewedSendTel},
-      </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="renewedSendMergeAddress != null" >
-        renewed_send_merge_address = #{renewedSendMergeAddress},
-      </if>
-      <if test="renewedSendAddress != null" >
-        renewed_send_address = #{renewedSendAddress},
-      </if>
-      <if test="renewedSendLogisticsCompany != null" >
-        renewed_send_logistics_company = #{renewedSendLogisticsCompany},
-      </if>
-      <if test="renewedSendLogisticsNo != null" >
-        renewed_send_logistics_no = #{renewedSendLogisticsNo},
-      </if>
-      <if test="renewedDesc != null" >
-        renewed_desc = #{renewedDesc},
-      </if>
-      <if test="renewedState != null" >
-        renewed_state = #{renewedState},
-      </if>
-      <if test="renewedAlipay != null" >
-        renewed_alipay = #{renewedAlipay},
-      </if>
-      <if test="renewedIsTransfer != null" >
-        renewed_is_transfer = #{renewedIsTransfer},
-      </if>
-      <if test="renewedCreateTime != null" >
-        renewed_create_time = #{renewedCreateTime},
-      </if>
-      <if test="renewedUpdateTime != null" >
-        renewed_update_time = #{renewedUpdateTime},
-      </if>
-      <if test="renewedAlipayName != null" >
-        renewed_alipay_name = #{renewedAlipayName},
-      </if>
-      <if test="renewedBackReceiptDate != null" >
-        renewed_back_receipt_date = #{renewedBackReceiptDate},
-      </if>
-    </set>
-    where renewed_id = #{renewedId}
-  </update>
-
-
-  <!-- 查询售后换新需要同步订单的数据集合 -->
-  <select id="listSynchronizingRenewed" resultType="Renewed" parameterType="Renewed">
-    select
-    r.*
-    from
-    tb_rst_renewed r
-    <where>
-      <if test="renewedSendStatus != null and renewedSendStatus != ''">
-        and r.renewed_send_status = #{renewedSendStatus}
-      </if>
-      AND r.renewed_back_efast_order_id is not NULL
-      AND trim(r.renewed_back_efast_order_id) != ''
-      AND (r.renewed_send_logistics_company is null
-      or trim(r.renewed_send_logistics_company)='')
-    </where>
-  </select>
-</mapper>

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

@@ -1,371 +0,0 @@
-<?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.RepairMapper" >
-  <resultMap id="BaseResultMap" type="Repair" >
-    <id column="repair_id" property="repairId" jdbcType="INTEGER" />
-    <result column="customer_id" property="customerId" jdbcType="INTEGER" />
-    <result column="order_id" property="orderId" jdbcType="INTEGER" />
-    <result column="signclosed_id" property="signclosedId" jdbcType="INTEGER" />
-    <result column="repair_back_efast_order_id" property="repairBackEfastOrderId" jdbcType="VARCHAR" />
-    <result column="repair_back_status" property="repairBackStatus" jdbcType="BIT" />
-    <result column="repair_back_name" property="repairBackName" jdbcType="VARCHAR" />
-    <result column="repair_back_tel" property="repairBackTel" jdbcType="CHAR" />
-    <result column="repair_back_logistics_company" property="repairBackLogisticsCompany" jdbcType="VARCHAR" />
-    <result column="repair_back_logistics_no" property="repairBackLogisticsNo" jdbcType="VARCHAR" />
-    <result column="repair_back_postage" property="repairBackPostage" jdbcType="INTEGER" />
-    <result column="repair_back_machine_no" property="repairBackMachineNo" jdbcType="VARCHAR" />
-    <result column="repair_send_status" property="repairSendStatus" jdbcType="BIT" />
-    <result column="repair_send_name" property="repairSendName" jdbcType="VARCHAR" />
-    <result column="repair_send_tel" property="repairSendTel" jdbcType="CHAR" />
-    <result column="province_number" property="provinceNumber" jdbcType="VARCHAR" />
-    <result column="city_number" property="cityNumber" jdbcType="VARCHAR" />
-    <result column="area_number" property="areaNumber" jdbcType="VARCHAR" />
-    <result column="repair_send_merge_address" property="repairSendMergeAddress" jdbcType="VARCHAR" />
-    <result column="repair_send_address" property="repairSendAddress" jdbcType="VARCHAR" />
-    <result column="repair_send_logistics_company" property="repairSendLogisticsCompany" jdbcType="VARCHAR" />
-    <result column="repair_send_logistics_no" property="repairSendLogisticsNo" jdbcType="VARCHAR" />
-    <result column="repair_desc" property="repairDesc" jdbcType="VARCHAR" />
-    <result column="repair_state" property="repairState" jdbcType="BIT" />
-    <result column="repair_alipay" property="repairAlipay" jdbcType="VARCHAR" />
-    <result column="repair_alipay_name" property="repairAlipayName" jdbcType="VARCHAR" />
-    <result column="repair_is_transfer" property="repairIsTransfer" jdbcType="BIT" />
-    <result column="repair_create_time" property="repairCreateTime" jdbcType="TIMESTAMP" />
-    <result column="repair_update_time" property="repairUpdateTime" jdbcType="TIMESTAMP" />
-    <result column="repair_back_receipt_date" property="repairBackReceiptDate" jdbcType="TIMESTAMP" />
-  </resultMap>
-  <sql id="Base_Column_List" >
-    repair_id, customer_id, order_id, signclosed_id, repair_back_efast_order_id, repair_back_status, 
-    repair_back_name, repair_back_tel, repair_back_logistics_company, repair_back_logistics_no, 
-    repair_back_postage, repair_back_machine_no, repair_send_status, repair_send_name, 
-    repair_send_tel, province_number, city_number, area_number, repair_send_merge_address, 
-    repair_send_address, repair_send_logistics_company, repair_send_logistics_no, repair_desc, 
-    repair_state, repair_alipay,repair_alipay_name, repair_is_transfer, repair_create_time, repair_update_time,repair_back_receipt_date
-  </sql>
-  <select id="selectByPrimaryKey" resultMap="BaseResultMap" parameterType="java.lang.Integer" >
-    select 
-    <include refid="Base_Column_List" />
-    from tb_rst_repair
-    where repair_id = #{repairId,jdbcType=INTEGER}
-  </select>
-
-  <!-- 查询售后维修集合 -->
-  <select id="listRepair" resultType="Repair" parameterType="Repair">
-    select
-      r.*,
-      o.sales_pay_time salesPayTime
-    from
-      tb_rst_repair r
-    LEFT JOIN tb_rst_sales_order_info o ON r.order_id = o.sales_id
-    <where>
-      <if test="repairState != null">
-        repair_state = #{repairState}
-      </if>
-      <if test="customerId != null and customerId != ''">
-        and customer_id = #{customerId}
-      </if>
-      <if test="repairSendStatus != null and repairSendStatus != ''">
-        and repair_send_status = #{repairSendStatus}
-      </if>
-    </where>
-  </select>
-
-  <!-- 获取维修详情和品质检测信息 -->
-  <select id="getRepairInfo" parameterType="Repair" resultMap="repairMap">
-    select
-      repair_id,
-      customer_id,
-      order_id,
-      signclosed_id,
-      repair_back_efast_order_id,
-      repair_back_status,
-      repair_back_name,
-      repair_back_tel,
-      repair_back_logistics_company,
-      repair_back_logistics_no,
-      repair_back_postage,
-      repair_back_machine_no,
-      repair_send_status,
-      repair_send_name,
-      repair_send_tel,
-      province_number,
-      city_number,
-      area_number,
-      repair_send_merge_address,
-      repair_send_address,
-      repair_send_logistics_company,
-      repair_send_logistics_no,
-      repair_desc,
-      repair_state,
-      repair_alipay,
-      repair_is_transfer,
-      repair_create_time,
-      repair_update_time,
-      repair_alipay_name,
-      repair_back_receipt_date,
-      repair_factory_costs,
-      repair_customer_costs
-    from
-      tb_rst_repair
-    <where>
-      <if test="repairId != null and repairId != ''">
-        repair_id = #{repairId}
-      </if>
-      <if test="customerId != null and customerId != ''">
-        and customer_id = #{customerId}
-      </if>
-      <if test="repairState != null and repairState != ''">
-        and repair_state = #{repairState}
-      </if>
-    </where>
-  </select>
-
-  <resultMap id="repairMap" type="Repair" >
-    <id column="repair_id" property="repairId"/>
-    <result column="customer_id" property="customerId"/>
-    <result column="order_id" property="orderId"/>
-    <result column="signclosed_id" property="signclosedId"/>
-    <result column="repair_back_efast_order_id" property="repairBackEfastOrderId"/>
-    <result column="repair_back_status" property="repairBackStatus"/>
-    <result column="repair_back_name" property="repairBackName"/>
-    <result column="repair_back_tel" property="repairBackTel"/>
-    <result column="repair_back_logistics_company" property="repairBackLogisticsCompany"/>
-    <result column="repair_back_logistics_no" property="repairBackLogisticsNo"/>
-    <result column="repair_back_postage" property="repairBackPostage"/>
-    <result column="repair_back_machine_no" property="repairBackMachineNo"/>
-    <result column="repair_send_status" property="repairSendStatus"/>
-    <result column="repair_send_name" property="repairSendName"/>
-    <result column="repair_send_tel" property="repairSendTel"/>
-    <result column="province_number" property="provinceNumber"/>
-    <result column="city_number" property="cityNumber"/>
-    <result column="area_number" property="areaNumber"/>
-    <result column="repair_send_merge_address" property="repairSendMergeAddress"/>
-    <result column="repair_send_address" property="repairSendAddress"/>
-    <result column="repair_send_logistics_company" property="repairSendLogisticsCompany"/>
-    <result column="repair_send_logistics_no" property="repairSendLogisticsNo"/>
-    <result column="repair_desc" property="repairDesc"/>
-    <result column="repair_state" property="repairState"/>
-    <result column="repair_alipay" property="repairAlipay"/>
-    <result column="repair_alipay_name" property="repairAlipayName"/>
-    <result column="repair_is_transfer" property="repairIsTransfer"/>
-    <result column="repair_create_time" property="repairCreateTime"/>
-    <result column="repair_update_time" property="repairUpdateTime"/>
-    <result column="repair_back_receipt_date" property="repairBackReceiptDate"/>
-    <result column="repair_factory_costs" property="repairFactoryCosts"/>
-    <result column="repair_customer_costs " property="repairCustomerCosts"/>
-    <!--<collection property="complaintDetectList" column="customer_id" ofType="ComplaintDetectInfo" select="listComplaintDetect"/>-->
-  </resultMap>
-
-  <select id="listComplaintDetect" parameterType="Integer" resultType="ComplaintDetectInfo">
-    SELECT
-      d.detect_state detectState,
-      d.detect_phenomenon detectPhenomenon,
-      d.detect_failure_classification detectFailureClassification,
-      d.detect_failure_cause detectFailureCause,
-      d.detect_results detectResults,
-      d.detect_point detectPoint,
-      d.detect_analysis detectAnalysis,
-      d.detect_revolution_produced detectRevolutionProduced,
-      m.maintenance_is_repair maintenanceIsRepair,
-      m.maintenance_content maintenanceContent,
-      m.maintenance_content_date maintenanceContentDate
-    FROM
-      tb_rst_complaint_detect d
-    LEFT JOIN tb_rst_complaint_maintenance m ON d.detect_id = m.detect_id
-    WHERE
-      d.customer_id = #{customerId}
-    ORDER BY d.detect_id ASC
-  </select>
-
-  <delete id="deleteByPrimaryKey" parameterType="Repair" >
-    delete from tb_rst_repair
-    <where>
-      <if test="repairId != null and repairId != ''">
-        repair_id = #{repairId}
-      </if>
-      <if test="customerId != null and customerId != ''">
-        and customer_id = #{customerId}
-      </if>
-    </where>
-  </delete>
-  <insert id="insert" parameterType="Repair" useGeneratedKeys="true"  keyProperty="repairId">
-    insert into tb_rst_repair (customer_id, order_id,
-      signclosed_id, repair_back_efast_order_id, repair_back_status, 
-      repair_back_name, repair_back_tel, repair_back_logistics_company, 
-      repair_back_logistics_no, repair_back_postage, 
-      repair_back_machine_no, repair_send_status, repair_send_name, 
-      repair_send_tel, province_number, city_number, 
-      area_number, repair_send_merge_address, repair_send_address, 
-      repair_send_logistics_company, repair_send_logistics_no, 
-      repair_desc, repair_state, repair_alipay, repair_alipay_name,
-      repair_is_transfer,repair_factory_costs,repair_customer_costs
-      )
-    values (#{customerId,jdbcType=INTEGER}, #{orderId,jdbcType=INTEGER},
-      #{signclosedId,jdbcType=INTEGER}, #{repairBackEfastOrderId,jdbcType=VARCHAR}, #{repairBackStatus,jdbcType=BIT}, 
-      #{repairBackName,jdbcType=VARCHAR}, #{repairBackTel,jdbcType=CHAR}, #{repairBackLogisticsCompany,jdbcType=VARCHAR}, 
-      #{repairBackLogisticsNo,jdbcType=VARCHAR}, #{repairBackPostage,jdbcType=INTEGER}, 
-      #{repairBackMachineNo,jdbcType=VARCHAR}, #{repairSendStatus,jdbcType=BIT}, #{repairSendName,jdbcType=VARCHAR}, 
-      #{repairSendTel,jdbcType=CHAR}, #{provinceNumber,jdbcType=VARCHAR}, #{cityNumber,jdbcType=VARCHAR}, 
-      #{areaNumber,jdbcType=VARCHAR}, #{repairSendMergeAddress,jdbcType=VARCHAR}, #{repairSendAddress,jdbcType=VARCHAR}, 
-      #{repairSendLogisticsCompany,jdbcType=VARCHAR}, #{repairSendLogisticsNo,jdbcType=VARCHAR}, 
-      #{repairDesc,jdbcType=VARCHAR}, #{repairState,jdbcType=BIT}, #{repairAlipay,jdbcType=VARCHAR}, #{repairAlipayName,jdbcType=VARCHAR},
-      #{repairIsTransfer,jdbcType=BIT},#{repairFactoryCosts,jdbcType=INTEGER},#{repairCustomerCosts,jdbcType=INTEGER}
-      )
-  </insert>
-
-  <!-- 修改维修信息 -->
-  <update id="updateRepairInfo" parameterType="Repair" >
-    update tb_rst_repair
-    <set >
-      <if test="customerId != null" >
-        customer_id = #{customerId},
-      </if>
-      <if test="orderId != null" >
-        order_id = #{orderId},
-      </if>
-      <if test="signclosedId != null" >
-        signclosed_id = #{signclosedId},
-      </if>
-      <if test="repairBackEfastOrderId != null" >
-        repair_back_efast_order_id = #{repairBackEfastOrderId},
-      </if>
-      <if test="repairBackStatus != null" >
-        repair_back_status = #{repairBackStatus},
-      </if>
-      <if test="repairBackName != null" >
-        repair_back_name = #{repairBackName},
-      </if>
-      <if test="repairBackTel != null" >
-        repair_back_tel = #{repairBackTel},
-      </if>
-      <if test="repairBackLogisticsCompany != null" >
-        repair_back_logistics_company = #{repairBackLogisticsCompany},
-      </if>
-      <if test="repairBackLogisticsNo != null" >
-        repair_back_logistics_no = #{repairBackLogisticsNo},
-      </if>
-      <if test="repairBackPostage != null" >
-        repair_back_postage = #{repairBackPostage},
-      </if>
-      <if test="repairBackMachineNo != null" >
-        repair_back_machine_no = #{repairBackMachineNo},
-      </if>
-      <if test="repairSendStatus != null" >
-        repair_send_status = #{repairSendStatus},
-      </if>
-      <if test="repairSendName != null" >
-        repair_send_name = #{repairSendName},
-      </if>
-      <if test="repairSendTel != null" >
-        repair_send_tel = #{repairSendTel},
-      </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="repairSendMergeAddress != null" >
-        repair_send_merge_address = #{repairSendMergeAddress},
-      </if>
-      <if test="repairSendAddress != null" >
-        repair_send_address = #{repairSendAddress},
-      </if>
-      <if test="repairSendLogisticsCompany != null" >
-        repair_send_logistics_company = #{repairSendLogisticsCompany},
-      </if>
-      <if test="repairSendLogisticsNo != null" >
-        repair_send_logistics_no = #{repairSendLogisticsNo},
-      </if>
-      <if test="repairDesc != null" >
-        repair_desc = #{repairDesc},
-      </if>
-      <if test="repairState != null" >
-        repair_state = #{repairState},
-      </if>
-      <if test="repairAlipay != null" >
-        repair_alipay = #{repairAlipay},
-      </if>
-      <if test="repairIsTransfer != null" >
-        repair_is_transfer = #{repairIsTransfer},
-      </if>
-      <if test="repairCreateTime != null" >
-        repair_create_time = #{repairCreateTime},
-      </if>
-      <if test="repairUpdateTime != null" >
-        repair_update_time = #{repairUpdateTime},
-      </if>
-      <if test="repairAlipayName != null" >
-        repair_alipay_name = #{repairAlipayName},
-      </if>
-      <if test="repairBackReceiptDate != null" >
-        repair_back_receipt_date = #{repairBackReceiptDate},
-      </if>
-      <if test="repairFactoryCosts != null" >
-        repair_factory_costs = #{repairFactoryCosts},
-      </if>
-      <if test="repairCustomerCosts != null" >
-        repair_customer_costs  = #{repairCustomerCosts}
-      </if>
-    </set>
-    where repair_id = #{repairId}
-  </update>
-  <update id="updateByPrimaryKey" parameterType="Repair" >
-    update tb_rst_repair
-    set customer_id = #{customerId,jdbcType=INTEGER},
-      order_id = #{orderId,jdbcType=INTEGER},
-      signclosed_id = #{signclosedId,jdbcType=INTEGER},
-      repair_back_efast_order_id = #{repairBackEfastOrderId,jdbcType=VARCHAR},
-      repair_back_status = #{repairBackStatus,jdbcType=BIT},
-      repair_back_name = #{repairBackName,jdbcType=VARCHAR},
-      repair_back_tel = #{repairBackTel,jdbcType=CHAR},
-      repair_back_logistics_company = #{repairBackLogisticsCompany,jdbcType=VARCHAR},
-      repair_back_logistics_no = #{repairBackLogisticsNo,jdbcType=VARCHAR},
-      repair_back_postage = #{repairBackPostage,jdbcType=INTEGER},
-      repair_back_machine_no = #{repairBackMachineNo,jdbcType=VARCHAR},
-      repair_send_status = #{repairSendStatus,jdbcType=BIT},
-      repair_send_name = #{repairSendName,jdbcType=VARCHAR},
-      repair_send_tel = #{repairSendTel,jdbcType=CHAR},
-      province_number = #{provinceNumber,jdbcType=VARCHAR},
-      city_number = #{cityNumber,jdbcType=VARCHAR},
-      area_number = #{areaNumber,jdbcType=VARCHAR},
-      repair_send_merge_address = #{repairSendMergeAddress,jdbcType=VARCHAR},
-      repair_send_address = #{repairSendAddress,jdbcType=VARCHAR},
-      repair_send_logistics_company = #{repairSendLogisticsCompany,jdbcType=VARCHAR},
-      repair_send_logistics_no = #{repairSendLogisticsNo,jdbcType=VARCHAR},
-      repair_desc = #{repairDesc,jdbcType=VARCHAR},
-      repair_state = #{repairState,jdbcType=BIT},
-      repair_alipay = #{repairAlipay,jdbcType=VARCHAR},
-      repair_is_transfer = #{repairIsTransfer,jdbcType=BIT},
-      repair_create_time = #{repairCreateTime,jdbcType=TIMESTAMP},
-      repair_update_time = #{repairUpdateTime,jdbcType=TIMESTAMP},
-      repair_back_receipt_date = #{repairBackReceiptDate,jdbcType=TIMESTAMP}
-    where repair_id = #{repairId,jdbcType=INTEGER}
-  </update>
-
-
-  <!-- 查询售后维修需要同步订单的数据集合 -->
-  <select id="listSynchronizingRepair" resultType="Repair" parameterType="Repair">
-    select
-    r.*
-    from
-    tb_rst_repair r
-    <where>
-      <if test="repairState != null">
-        repair_state = #{repairState}
-      </if>
-      <if test="customerId != null and customerId != ''">
-        and customer_id = #{customerId}
-      </if>
-      <if test="repairSendStatus != null and repairSendStatus != ''">
-        and repair_send_status = #{repairSendStatus}
-      </if>
-        AND r.repair_back_efast_order_id is not NULL
-        AND trim(r.repair_back_efast_order_id) != ''
-        AND (r.repair_send_logistics_company is null
-        or trim(r.repair_send_logistics_company)='')
-    </where>
-  </select>
-</mapper>

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

@@ -1,130 +0,0 @@
-<?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.SendFittingMapper" >
-  <resultMap id="BaseResultMap" type="SendFitting" >
-    <id column="send_fitting_id" property="sendFittingId" jdbcType="INTEGER" />
-    <result column="relation_id" property="relationId" jdbcType="INTEGER" />
-    <result column="product_id" property="productId" jdbcType="INTEGER" />
-    <result column="fittings_id" property="fittingsId" jdbcType="INTEGER" />
-    <result column="send_fitting_number" property="sendFittingNumber" jdbcType="INTEGER" />
-    <result column="color_bar" property="colorBar" />
-  </resultMap>
-  <sql id="Base_Column_List" >
-    send_fitting_id, relation_id, product_id, fittings_id, send_fitting_number,color_bar
-  </sql>
-  <select id="selectByPrimaryKey" resultMap="BaseResultMap" parameterType="java.lang.Integer" >
-    select 
-    <include refid="Base_Column_List" />
-    from tb_rst_send_fitting
-    where send_fitting_id = #{sendFittingId,jdbcType=INTEGER}
-  </select>
-
-  <!-- 查询寄送的配件集合 -->
-  <select id="listSendFitting" parameterType="SendFitting" resultType="SendFitting">
-    select
-      sf.*,
-      pf.fittings_name sendFittingsName,
-      pi.product_name sendProductName
-    from tb_rst_send_fitting sf
-    LEFT JOIN tb_rst_product_fittings pf ON sf.fittings_id = pf.fittings_id
-    LEFT JOIN tb_rst_product_info pi ON sf.product_id = pi.product_id
-    <where>
-      <if test="relationId != null and relationId != ''">
-        sf.relation_id = #{relationId}
-      </if>
-      <if test="sendFittingType != null and sendFittingType != ''">
-        and sf.send_fitting_type = #{sendFittingType}
-      </if>
-    </where>
-  </select>
-
-  <delete id="deleteByPrimaryKey" parameterType="SendFitting" >
-    delete from tb_rst_send_fitting
-    <where>
-      <if test="sendFittingId != null and sendFittingId != ''">
-        send_fitting_id = #{sendFittingId}
-      </if>
-      <if test="relationId != null and relationId != ''">
-        and relation_id = #{relationId}
-      </if>
-    </where>
-  </delete>
-
-
-  <insert id="insert" parameterType="SendFitting" >
-    insert into tb_rst_send_fitting ( relation_id, product_id,
-      fittings_id, send_fitting_number,send_fitting_type,color_bar)
-    values
-    <foreach collection="list" item="node" index="index" separator="," open="" close="">
-      (#{node.relationId}, #{node.productId},
-      #{node.fittingsId}, #{node.sendFittingNumber}, #{node.sendFittingType}, #{node.colorBar})
-    </foreach>
-  </insert>
-
-
-  <insert id="insertSelective" parameterType="SendFitting" >
-    insert into tb_rst_send_fitting
-    <trim prefix="(" suffix=")" suffixOverrides="," >
-      <if test="sendFittingId != null" >
-        send_fitting_id,
-      </if>
-      <if test="relationId != null" >
-        relation_id,
-      </if>
-      <if test="productId != null" >
-        product_id,
-      </if>
-      <if test="fittingsId != null" >
-        fittings_id,
-      </if>
-      <if test="sendFittingNumber != null" >
-        send_fitting_number,
-      </if>
-      <if test="colorBar != null" >
-        color_bar,
-      </if>
-    </trim>
-    <trim prefix="values (" suffix=")" suffixOverrides="," >
-      <if test="sendFittingId != null" >
-        #{sendFittingId,jdbcType=INTEGER},
-      </if>
-      <if test="relationId != null" >
-        #{relationId,jdbcType=INTEGER},
-      </if>
-      <if test="productId != null" >
-        #{productId,jdbcType=INTEGER},
-      </if>
-      <if test="fittingsId != null" >
-        #{fittingsId,jdbcType=INTEGER},
-      </if>
-      <if test="sendFittingNumber != null" >
-        #{sendFittingNumber,jdbcType=INTEGER},
-      </if>
-      <if test="colorBar != null" >
-        #{colorBar},
-      </if>
-    </trim>
-  </insert>
-  <update id="updateByPrimaryKeySelective" parameterType="SendFitting" >
-    update tb_rst_send_fitting
-    <set >
-      <if test="relationId != null" >
-        relation_id = #{relationId,jdbcType=INTEGER},
-      </if>
-      <if test="productId != null" >
-        product_id = #{productId,jdbcType=INTEGER},
-      </if>
-      <if test="fittingsId != null" >
-        fittings_id = #{fittingsId,jdbcType=INTEGER},
-      </if>
-      <if test="sendFittingNumber != null" >
-        send_fitting_number = #{sendFittingNumber,jdbcType=INTEGER},
-      </if>
-      <if test="colorBar != null" >
-        color_bar = #{colorBar},
-      </if>
-    </set>
-    where send_fitting_id = #{sendFittingId,jdbcType=INTEGER}
-  </update>
-
-</mapper>

watero-rst-service/src/main/java/com/iamberry/rst/service/customer/CustomerBasicServiceImpl.java

@@ -1,332 +0,0 @@
-package com.iamberry.rst.service.customer;
-
-import com.github.pagehelper.PageHelper;
-import com.iamberry.rst.core.address.City;
-
-import com.iamberry.rst.core.address.District;
-import com.iamberry.rst.core.address.Province;
-import com.iamberry.rst.core.customer.*;
-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.customer.CustomerBasicService;
-import com.iamberry.rst.service.customer.mapper.CustomerBasicMapper;
-import com.iamberry.rst.util.PageUtil;
-import com.iamberry.wechat.tools.payUtil.StringUtil;
-import org.slf4j.Logger;
-import org.slf4j.LoggerFactory;
-import org.springframework.beans.factory.annotation.Autowired;
-import org.springframework.stereotype.Service;
-import org.springframework.transaction.annotation.Transactional;
-
-import java.util.List;
-
-/**
- * Created by Administrator on 2018/4/20.
- */
-@Service
-public class CustomerBasicServiceImpl implements CustomerBasicService{
-    @Autowired
-    private CustomerBasicMapper customerBasicMapper;
-
-    @Override
-    public PagedResult<CustomerBasicInfo> listCustomerBasic(PageRequest<CustomerBasicInfo> pageRequest) {
-        PageHelper.startPage(pageRequest.getPageNO(), pageRequest.getPageSize(), pageRequest.isPageTotal());
-        List<CustomerBasicInfo> customerBasicList = customerBasicMapper.listCustomerBasic(pageRequest.getData());
-        return PageUtil.getPage(customerBasicList);
-    }
-
-    @Override
-    public CustomerBasicInfo getCustomerBasic(CustomerBasicInfo customerBasicInfo) {
-        return customerBasicMapper.getCustomerBasic(customerBasicInfo);
-    }
-
-    @Override
-    public Integer updateState(CustomerBasicInfo customerBasicInfo) {
-        return customerBasicMapper.updateState(customerBasicInfo);
-    }
-
-    @Override
-    public BillingInfo getBillingInfo(BillingInfo billingInfo) {
-        return customerBasicMapper.getBillingInfo(billingInfo);
-    }
-
-    @Override
-    public TicketOpeningInfo getOpeningInfo(TicketOpeningInfo ticketOpeningInfo) {
-        return customerBasicMapper.getOpeningInfo(ticketOpeningInfo);
-    }
-
-    @Override
-    public List<DockedContactInfo> listDockedContactInfo(DockedContactInfo dockedContactInfo) {
-        return customerBasicMapper.listDockedContactInfo(dockedContactInfo);
-    }
-
-    @Override
-    public List<ChannelSaleInfo> listChannelSaleInfo(ChannelSaleInfo channelSaleInfo) {
-        return customerBasicMapper.listChannelSaleInfo(channelSaleInfo);
-    }
-
-    @Override
-    public List<ChannelDivisionInfo> listChannelDivisionInfo(Integer coustomerId) {
-        return customerBasicMapper.listChannelDivisionInfo(coustomerId);
-    }
-
-    private Logger logger = LoggerFactory.getLogger(CustomerBasicServiceImpl.class);
-
-    @Override
-    public CustomerBasicInfo queryCustomerBasicInfoByCustomerId(int queryCustomerId) {
-        return customerBasicMapper.queryCustomerBasicInfoByCustomerId(queryCustomerId);
-    }
-
-    @Override
-    public List<DockedContactInfo> queryDockedContactInfoListByCustomerId(int queryCustomerId) {
-        return customerBasicMapper.queryDockedContactInfoListByCustomerId(queryCustomerId);
-    }
-
-    @Override
-    public List<ChannelSaleInfo> queryChannelSaleInfoListByCustomerId(int queryCustomerId) {
-        return customerBasicMapper.queryChannelSaleInfoListByCustomerId(queryCustomerId);
-    }
-
-    @Override
-    public BillingInfo queryBillingInfoByCustomerId(int queryCustomerId) {
-        return customerBasicMapper.queryBillingInfoByCustomerId(queryCustomerId);
-    }
-
-    @Override
-    public TicketOpeningInfo queryTicketOpeningInfoByCustomerId(int queryCustomerId) {
-        return customerBasicMapper.queryTicketOpeningInfoByCustomerId(queryCustomerId);
-    }
-
-    @Override
-    @Transactional
-    public void saveCustomerBasicInfo(CustomerBasicInfo customerBasicInfo,List<DockedContactInfo> dockedContactInfoList, List<ChannelSaleInfo> channelSaleInfoList,
-                                      BillingInfo billingInfo, TicketOpeningInfo ticketOpeningInfo) throws Exception{
-        logger.info("saveCustomerBasicInfo start...");
-        int customerId = -1;
-        String channelDivisionId = "";
-        int cooperativeState = customerBasicInfo.getCooperativeState();
-        try {
-            customerBasicMapper.saveCustomerBasicInfo(customerBasicInfo);
-            customerId = customerBasicInfo.getCustomerId();
-            if(customerId != -1){
-                if(dockedContactInfoList != null && dockedContactInfoList.size()>1){
-                    dockedContactInfoList.remove(0);
-                    for (DockedContactInfo dockedContactInfo: dockedContactInfoList) {
-                        dockedContactInfo.setCustomerId(customerId);
-                        customerBasicMapper.saveDockedContactInfo(dockedContactInfo);
-                    }
-                }
-                if(channelSaleInfoList != null && channelSaleInfoList.size()>1){
-                    channelSaleInfoList.remove(0);
-                    for (ChannelSaleInfo channelSaleInfo: channelSaleInfoList) {
-                        channelSaleInfo.setCustomerId(customerId);
-                        String channelName = channelSaleInfo.getChannelName();
-                        channelDivisionId = customerBasicMapper.queryIsExsitChannelNameChannelName(channelSaleInfo);
-                        if(StringUtil.isNotEmpty(channelDivisionId)){
-                            if(Integer.valueOf(channelDivisionId)>0){
-                                channelSaleInfo.setChannelDivisionId(Integer.valueOf(channelDivisionId));
-                                customerBasicMapper.saveChannelSaleInfo(channelSaleInfo);
-                            }else{
-                                customerBasicMapper.saveChannelDivisionInfo(channelSaleInfo);
-                                customerBasicMapper.saveChannelSaleInfo(channelSaleInfo);
-                            }
-                        }else{
-                            customerBasicMapper.saveChannelDivisionInfo(channelSaleInfo);
-                            customerBasicMapper.saveChannelSaleInfo(channelSaleInfo);
-                        }
-                    }
-                }
-                if(cooperativeState == 2 || cooperativeState ==3){
-                    billingInfo.setCustomerId(customerId);
-                    customerBasicMapper.saveBillingInfo(billingInfo);
-                    if(ticketOpeningInfo != null){
-                        ticketOpeningInfo.setCustomerId(customerId);
-                        String enterpriseName = ticketOpeningInfo.getEnterpriseName();
-                        if(StringUtil.isNotEmpty(enterpriseName)){
-                            customerBasicMapper.saveTicketOpeningInfo(ticketOpeningInfo);
-                        }
-                    }
-                }
-            }
-            logger.info("saveCustomerBasicInfo end...");
-        }catch (Exception e){
-            logger.error("添加客户信息失败"+e.getMessage());
-            throw new RuntimeException("添加客户信息失败..."+e.getMessage());
-        }
-
-    }
-
-    @Override
-    @Transactional
-    public void updateCustomerBasicInfo(CustomerBasicInfo customerBasicInfo,List<DockedContactInfo> dockedContactInfoList, List<ChannelSaleInfo> channelSaleInfoList,
-                                      BillingInfo billingInfo, TicketOpeningInfo ticketOpeningInfo) throws Exception{
-        int customerId = -1;
-        String channelDivisionId = "";
-        int cooperativeState = customerBasicInfo.getCooperativeState();
-        try {
-            customerBasicMapper.updateCustomerBasic(customerBasicInfo);
-            customerId = customerBasicInfo.getCustomerId();
-
-            //删除旧联系人数据和渠道销售信息
-            customerBasicMapper.deleteContactInfo(customerId);
-            List<ChannelSaleInfo> listChannelSale = customerBasicMapper.queryChannelSaleInfoListByCustomerId(customerId);
-            if(listChannelSale.size() > 0){
-                for(ChannelSaleInfo channelSaleInfo : listChannelSale){
-                    customerBasicMapper.deleteDivisionInfo(channelSaleInfo.getChannelDivisionId());
-                }
-                customerBasicMapper.deleteSaleInfo(customerId);
-            }
-
-            if(customerId != -1){
-                if(dockedContactInfoList != null && dockedContactInfoList.size()>1){
-                    dockedContactInfoList.remove(0);
-                    for (DockedContactInfo dockedContactInfo: dockedContactInfoList) {
-                        dockedContactInfo.setCustomerId(customerId);
-                        customerBasicMapper.saveDockedContactInfo(dockedContactInfo);
-                    }
-                }
-                if(channelSaleInfoList != null && channelSaleInfoList.size()>1){
-                    channelSaleInfoList.remove(0);
-                    for (ChannelSaleInfo channelSaleInfo: channelSaleInfoList) {
-                        channelSaleInfo.setCustomerId(customerId);
-                        channelDivisionId = customerBasicMapper.queryIsExsitChannelNameChannelName(channelSaleInfo);
-                        if(StringUtil.isNotEmpty(channelDivisionId)){
-                            if(Integer.valueOf(channelDivisionId)>0){
-                                channelSaleInfo.setChannelDivisionId(Integer.valueOf(channelDivisionId));
-                                customerBasicMapper.saveChannelSaleInfo(channelSaleInfo);
-                            }else{
-                                customerBasicMapper.saveChannelDivisionInfo(channelSaleInfo);
-                                customerBasicMapper.saveChannelSaleInfo(channelSaleInfo);
-                            }
-                        }else{
-                            customerBasicMapper.saveChannelDivisionInfo(channelSaleInfo);
-                            customerBasicMapper.saveChannelSaleInfo(channelSaleInfo);
-                        }
-                    }
-                }
-                if(cooperativeState == 2 || cooperativeState ==3){
-                    if(billingInfo != null){
-                        billingInfo.setCustomerId(customerId);
-                        if(billingInfo.getBillingId()!=null){
-                            customerBasicMapper.updateBillingInfo(billingInfo);
-                        }else{
-                            customerBasicMapper.saveBillingInfo(billingInfo);
-                        }
-                    }
-                    if(ticketOpeningInfo != null){
-                        ticketOpeningInfo.setCustomerId(customerId);
-                        if(ticketOpeningInfo.getTicketOpeningId()!=null){
-                            customerBasicMapper.updateOpeningInfo(ticketOpeningInfo);
-                        }else{
-                            customerBasicMapper.saveTicketOpeningInfo(ticketOpeningInfo);
-                        }
-                    }
-                }
-            }
-        }catch (Exception e){
-            logger.error("修改客户信息失败"+e.getMessage());
-            throw new RuntimeException("修改客户信息失败");
-        }
-
-    }
-    public List<Province> queryProvinceList(String provinceId){
-        return (List<Province>)customerBasicMapper.queryProvinceList(provinceId);
-    }
-
-    public List<City> queryCityList(String provinceId){
-        return (List<City>)customerBasicMapper.queryCityList(provinceId);
-    }
-    public List<District> queryDistrictList(String cityId){
-        return (List<District>)customerBasicMapper.queryDistrictList(cityId);
-    }
-    public List<ChannelDivisionInfo> queryChannelCategoryList(String channelCategoryId){
-        return (List<ChannelDivisionInfo>)customerBasicMapper.queryChannelCategoryList(channelCategoryId);
-    }
-
-    public List<ChannelDivisionInfo> queryChannelTypeList(String channelCategoryId){
-        return (List<ChannelDivisionInfo>)customerBasicMapper.queryChannelTypeList(channelCategoryId);
-    }
-
-    public List<Product> queryPromotingProductsList(String promotingProductsInfo){
-        return (List<Product>)customerBasicMapper.queryPromotingProductsList(promotingProductsInfo);
-    }
-
-    public List<ProductColor> querySupplyPriceList(String promotingProductsId){
-        return (List<ProductColor>)customerBasicMapper.querySupplyPriceList(promotingProductsId);
-    }
-    /*@Override
-    public void saveDockedContactInfo(DockedContactInfo dockedContactInfo) {
-        customerBasicInfoSaveMapper.saveDockedContactInfo(dockedContactInfo);
-    }
-
-    @Override
-    public void saveChannelSaleInfo(ChannelSaleInfo channelSaleInfo) {
-        customerBasicInfoSaveMapper.saveChannelSaleInfo(channelSaleInfo);
-    }
-
-    @Override
-    public void saveBillingInfo(BillingInfo billingInfo) {
-        customerBasicInfoSaveMapper.saveBillingInfo(billingInfo);
-    }
-
-    @Override
-    public void saveTicketOpeningInfo(TicketOpeningInfo ticketOpeningInfo) {
-        customerBasicInfoSaveMapper.saveTicketOpeningInfo(ticketOpeningInfo);
-    }*/
-
-    @Override
-    public Integer updateCustomerBasic(CustomerBasicInfo customerBasicInfo) {
-        return customerBasicMapper.updateCustomerBasic(customerBasicInfo);
-    }
-
-    @Override
-    public Integer updateBillingInfo(BillingInfo billingInfo) {
-        return customerBasicMapper.updateBillingInfo(billingInfo);
-    }
-
-    @Override
-    public Integer updateOpeningInfo(TicketOpeningInfo ticketOpeningInfo) {
-        return customerBasicMapper.updateOpeningInfo(ticketOpeningInfo);
-    }
-
-    @Override
-    public Integer deleteContactInfo(Integer customerId) {
-        return customerBasicMapper.deleteContactInfo(customerId);
-    }
-
-    @Override
-    public Integer deleteSaleInfo(Integer customerId) {
-        return customerBasicMapper.deleteSaleInfo(customerId);
-    }
-
-    @Override
-    public Integer deleteDivisionInfo(Integer channelDivisionId) {
-        return customerBasicMapper.deleteDivisionInfo(channelDivisionId);
-    }
-
-    @Override
-    public LowestPriceInfo getLowestPrice(LowestPriceInfo lowestPriceInfo) {
-        return customerBasicMapper.getLowestPrice(lowestPriceInfo);
-    }
-    /*@Override
-    public void saveDockedContactInfo(DockedContactInfo dockedContactInfo) {
-        customerBasicInfoSaveMapper.saveDockedContactInfo(dockedContactInfo);
-    }
-
-    @Override
-    public void saveChannelSaleInfo(ChannelSaleInfo channelSaleInfo) {
-        customerBasicInfoSaveMapper.saveChannelSaleInfo(channelSaleInfo);
-    }
-
-    @Override
-    public void saveBillingInfo(BillingInfo billingInfo) {
-        customerBasicInfoSaveMapper.saveBillingInfo(billingInfo);
-    }
-
-    @Override
-    public void saveTicketOpeningInfo(TicketOpeningInfo ticketOpeningInfo) {
-        customerBasicInfoSaveMapper.saveTicketOpeningInfo(ticketOpeningInfo);
-    }*/
-}

watero-rst-service/src/main/java/com/iamberry/rst/service/customer/mapper/CustomerBasicMapper.java

@@ -1,217 +0,0 @@
-package com.iamberry.rst.service.customer.mapper;
-
-import com.iamberry.rst.core.address.City;
-import com.iamberry.rst.core.address.District;
-import com.iamberry.rst.core.address.Province;
-import com.iamberry.rst.core.customer.*;
-import com.iamberry.rst.core.order.Product;
-import com.iamberry.rst.core.order.ProductColor;
-
-import java.util.List;
-
-/**
- * Created by Administrator on 2018/4/20.
- */
-public interface CustomerBasicMapper {
-    /*查询客户基本信息列表*/
-    List<CustomerBasicInfo> listCustomerBasic(CustomerBasicInfo customerBasicInfo);
-    /*根据id查询客户基本信息*/
-    CustomerBasicInfo getCustomerBasic(CustomerBasicInfo customerBasicInfo);
-    /*根据id修改客户状态*/
-    Integer updateState(CustomerBasicInfo customerBasicInfo);
-    /*根据客户id查询付款/退款信息*/
-    BillingInfo getBillingInfo(BillingInfo billingInfo);
-    /*根据客户id查询开票信息*/
-    TicketOpeningInfo getOpeningInfo(TicketOpeningInfo ticketOpeningInfo);
-    /*根据客户id查询联系人集合*/
-    List<DockedContactInfo> listDockedContactInfo(DockedContactInfo dockedContactInfo);
-    /*根据客户id渠道销售信息集合*/
-    List<ChannelSaleInfo> listChannelSaleInfo(ChannelSaleInfo channelSaleInfo);
-    /*根据客户id渠道划分信息集合*/
-    List<ChannelDivisionInfo> listChannelDivisionInfo(Integer coustomerId);
-    /**
-     * 添加客户基本信息
-     *
-     * @param customerBasicInfo
-     * @return
-     */
-    public void saveCustomerBasicInfo(CustomerBasicInfo customerBasicInfo);
-
-    /**
-     * 添加对接联系人信息
-     *
-     * @param dockedContactInfo
-     * @return
-     */
-    public void saveDockedContactInfo(DockedContactInfo dockedContactInfo);
-
-    /**
-     * 添加客户销售渠道备案信息-销售产品表
-     *
-     * @param channelSaleInfo
-     * @return
-     */
-    public void saveChannelSaleInfo(ChannelSaleInfo channelSaleInfo);
-
-    /**
-     * 添加客户销售渠道备案信息-渠道表
-     *
-     * @param channelSaleInfo
-     * @return
-     */
-    public void saveChannelDivisionInfo(ChannelSaleInfo channelSaleInfo);
-
-    /**
-     * 添加付款/退款信息
-     *
-     * @param billingInfo
-     * @return
-     */
-    public void saveBillingInfo(BillingInfo billingInfo);
-
-    /**
-     * 添加开票信息
-     *
-     * @param ticketOpeningInfo
-     * @return
-     */
-    public void saveTicketOpeningInfo(TicketOpeningInfo ticketOpeningInfo);
-
-    //查询部分 start
-    /**
-     * 根据客户id查询客户基本信息
-     * @param queryCustomerId
-     * @return
-     */
-    public CustomerBasicInfo queryCustomerBasicInfoByCustomerId(int queryCustomerId);
-
-    /**
-     * 根据客户id查询对接联系人信息
-     * @param queryCustomerId
-     * @return
-     */
-    public List<DockedContactInfo> queryDockedContactInfoListByCustomerId(int queryCustomerId);
-
-    /**
-     * 根据客户id查询客户销售渠道备案信息
-     * @param queryCustomerId
-     * @return
-     */
-    public List<ChannelSaleInfo> queryChannelSaleInfoListByCustomerId(int queryCustomerId);
-
-    /**
-     * 根据客户id查询客户付款/退款信息
-     * @param queryCustomerId
-     * @return
-     */
-    public BillingInfo queryBillingInfoByCustomerId(int queryCustomerId);
-
-    /**
-     * 根据客户id查询客户开票信息
-     * @param queryCustomerId
-     * @return
-     */
-    public TicketOpeningInfo queryTicketOpeningInfoByCustomerId(int queryCustomerId);
-    //查询部分 end
-
-    /**
-     * 查询所有省份
-     * @param provinceId
-     * @return
-     */
-    public List<Province> queryProvinceList(String provinceId);
-
-    /**
-     * 根据省份代号查询所有城市
-     * @param provinceId
-     * @return
-     */
-    public List<City> queryCityList(String provinceId);
-    /**
-     * 根据城市代号查询所有区/县
-     * @param cityId
-     * @return
-     */
-    public List<District> queryDistrictList(String cityId);
-    /**
-     * 查询所有渠道类别
-     * @param channelCategoryId
-     * @return
-     */
-    public List<ChannelDivisionInfo> queryChannelCategoryList(String channelCategoryId);
-
-    /**
-     * 根据渠道类别查询渠道类型
-     * @param channelCategoryId
-     * @return
-     */
-    public List<ChannelDivisionInfo> queryChannelTypeList(String channelCategoryId);
-
-    /**
-     * 查询销售产品
-     * @param promotingProductsInfo
-     * @return
-     */
-    public List<Product> queryPromotingProductsList(String promotingProductsInfo);
-
-    /**
-     * 查询销售产品价格
-     * @param promotingProductsId
-     * @return
-     */
-    public List<ProductColor> querySupplyPriceList(String promotingProductsId);
-
-
-    /**
-     * 修改客户基本信息
-     * @param customerBasicInfo
-     * @return
-     */
-    Integer updateCustomerBasic(CustomerBasicInfo customerBasicInfo);
-
-    /**
-     * 修改付款/退款信息
-     * @return
-     */
-    Integer updateBillingInfo(BillingInfo billingInfo);
-
-    /**
-     * 修改开票信息
-     * @return
-     */
-    Integer updateOpeningInfo(TicketOpeningInfo ticketOpeningInfo);
-
-    /**
-     * 删除联系人信息
-     * @return
-     */
-    Integer deleteContactInfo(Integer customerId);
-
-    /**
-     * 删除渠道销售信息
-     * @return
-     */
-    Integer deleteSaleInfo(Integer customerId);
-
-    /**
-     * 删除渠道划分信息
-     * @return
-     */
-    Integer deleteDivisionInfo(Integer channelDivisionId);
-
-    /**
-     * 判断是否存在渠道名称
-     * @param channelSaleInfo
-     * @return
-     */
-    String queryIsExsitChannelNameChannelName(ChannelSaleInfo channelSaleInfo);
-
-    /**
-     * 获取产品最低价格信息
-     * @param lowestPriceInfo
-     * @return
-     */
-    LowestPriceInfo getLowestPrice(LowestPriceInfo lowestPriceInfo);
-
-
-}

watero-rst-service/src/main/java/com/iamberry/rst/service/customer/mapper/CustomerBasicMapper.xml

@@ -1,704 +0,0 @@
-<?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.customer.mapper.CustomerBasicMapper" >
-  <select id="listCustomerBasic" resultType="CustomerBasicInfo" parameterType="CustomerBasicInfo">
-      SELECT
-      bi.customer_id customerId,
-      bi.customer_name customerName,
-      bi.customer_industry customerIndustry,
-      bi.customer_type customerType,
-      bi.cooperative_state cooperativeState,
-      bi.customer_province_code customerProvinceCode,
-      bi.customer_city_code customerCityCode,
-      bi.customer_address customerAddress,
-      bi.customer_status customerStatus,
-      bi.create_date createDate,
-      bi.update_date updateDate,
-      bi.id_create_by idCreateBy,
-      bi.customer_remarks customerRemarks,
-      sa.admin_name adminName,
-      ap.province provinceName,
-      ac.city cityName
-      from tb_rst_customer_basic_info bi
-      LEFT JOIN tb_rst_sys_admin sa on bi.id_create_by = sa.admin_id
-      LEFT JOIN tb_rst_address_province ap on ap.division_code = bi.customer_province_code
-      LEFT JOIN tb_rst_address_city ac on ac.division_code = bi.customer_city_code
-      LEFT JOIN tb_rst_docked_contact_info ci on ci.customer_id = bi.customer_id
-      <where>
-        <if test="customerName != null and customerName!='' ">
-            bi.customer_name like CONCAT('%',#{customerName},'%')
-        </if>
-        <if test="customerIndustry != null and customerIndustry!='' ">
-          AND bi.customer_industry = #{customerIndustry}
-        </if>
-        <if test="customerType != null and customerType!='' ">
-          AND bi.customer_type = #{customerType}
-        </if>
-        <if test="cooperativeState != null and cooperativeState!='' ">
-          AND bi.cooperative_state = #{cooperativeState}
-        </if>
-        <if test="customerProvinceCode != null and customerProvinceCode!='' ">
-          AND bi.customer_province_code = #{customerProvinceCode}
-        </if>
-        <if test="customerCityCode != null and customerCityCode!='' ">
-          AND bi.customer_city_code = #{customerCityCode}
-        </if>
-        <if test="customerAddress != null and customerAddress!='' ">
-          AND bi.customer_address = #{customerAddress}
-        </if>
-        <if test="customerStatus != null and customerStatus!='' ">
-          AND bi.customer_status = #{customerStatus}
-        </if>
-        <if test="isLookAll != null and isLookAll!='' and isLookAll == 2 ">
-          AND bi.id_create_by = #{idCreateBy}
-        </if>
-        <if test="contactPhone != null and contactPhone!='' ">
-          AND ci.contact_phone = #{contactPhone}
-        </if>
-        <if test="contactName != null and contactName!='' ">
-          AND ci.contact_name = #{contactName}
-        </if>
-        <if test="contactEmail != null and contactEmail!='' ">
-          AND ci.contact_email = #{contactEmail}
-        </if>
-        <if test="isSelectAll != null and isSelectAll == 2 ">
-          AND bi.customer_status = #{isSelectAll}
-        </if>
-      </where>
-        GROUP BY bi.customer_id
-        ORDER BY bi.create_date DESC
-  </select>
-
-
-    <select id="getCustomerBasic" resultType="CustomerBasicInfo" parameterType="CustomerBasicInfo">
-        SELECT
-        bi.customer_id customerId,
-        bi.customer_name customerName,
-        bi.customer_industry customerIndustry,
-        bi.customer_type customerType,
-        bi.cooperative_state cooperativeState,
-        bi.customer_province_code customerProvinceCode,
-        bi.customer_city_code customerCityCode,
-        bi.customer_address customerAddress,
-        bi.customer_status customerStatus,
-        bi.create_date createDate,
-        bi.update_date updateDate,
-        bi.id_create_by idCreateBy,
-        bi.customer_remarks customerRemarks,
-        ap.province provinceName,
-        ac.city cityName
-        from tb_rst_customer_basic_info bi
-        LEFT JOIN tb_rst_address_province ap on ap.division_code = bi.customer_province_code
-        LEFT JOIN tb_rst_address_city ac on ac.division_code = bi.customer_city_code
-        <where>
-            <if test="customerId != null and customerId!='' ">
-                bi.customer_id  = #{customerId}
-            </if>
-        </where>
-    </select>
-
-    <update id="updateState" parameterType="CustomerBasicInfo">
-        UPDATE tb_rst_customer_basic_info
-        <set >
-            <if test="customerStatus != null" >
-                customer_status = #{customerStatus,jdbcType=INTEGER}
-            </if>
-        </set>
-        where customer_id = #{customerId,jdbcType=INTEGER}
-    </update>
-
-
-    <select id="getBillingInfo" resultType="BillingInfo" parameterType="BillingInfo">
-        SELECT
-        billing_id as billingId,
-        customer_id as customerId,
-        account_opening_branch as accountOpeningBranch,
-        account_name as accountName,
-        account_num as accountNum,
-        receivables_name as receivablesName,
-        receivables_phone as receivablesPhone,
-        create_date as createDate,
-        account_type as accountType
-        from tb_rst_billing_info
-        <where>
-            <if test="customerId != null and customerId !='' ">
-                customer_id  = #{customerId}
-            </if>
-        </where>
-    </select>
-
-    <select id="getOpeningInfo" resultType="TicketOpeningInfo" parameterType="TicketOpeningInfo">
-        SELECT
-        ticket_opening_id as ticketOpeningId,
-        customer_id as customerId,
-        ticket_type as ticketType,
-        account_opening_branch as accountOpeningBranch,
-        ticket_opening_account as ticketOpeningAccount,
-        enterprise_name as enterpriseName,
-        taxpayer_identification_num as taxpayerIdentificationNum,
-        ticket_opening_phone as ticketOpeningPhone,
-        enterprise_address as enterpriseAddress,
-        create_date as createDate
-        from tb_rst_ticket_opening_info
-        <where>
-            <if test="customerId != null and customerId !='' ">
-                customer_id  = #{customerId}
-            </if>
-        </where>
-    </select>
-
-    <select id="listDockedContactInfo" resultType="DockedContactInfo" parameterType="DockedContactInfo">
-        SELECT
-        docked_contact_id as dockedContactId,
-        customer_id as customerId,
-        contact_name as contactName,
-        contact_phone as contactPhone,
-        contact_type as contactType,
-        contact_email as contactEmail,
-        create_date as createDate
-        from tb_rst_docked_contact_info
-        <where>
-            <if test="customerId != null and customerId !='' ">
-                customer_id  = #{customerId}
-            </if>
-        </where>
-    </select>
-
-    <select id="listChannelSaleInfo" resultType="ChannelSaleInfo" parameterType="ChannelSaleInfo">
-        SELECT
-        si.channel_sale_id as channelSaleId,
-        si.customer_id as customerId,
-        si.channel_division_id as channelDivisionId,
-        si.promoting_products as promotingProducts,
-        si.supply_price as supplyPrice,
-        si.account_period as account_period,
-        si.create_date as createDate,
-		di.channel_category as channelCategory,
-		di.channel_type as channelType,
-		di.channel_name as channelName
-        from tb_rst_channel_sale_info si
-		LEFT JOIN tb_rst_channel_division_info di ON si.channel_division_id = di.channel_division_id
-        where
-            si.customer_id  = #{customerId}
-    </select>
-
-    <resultMap type="ChannelDivisionInfo" id="listChannelDivisionMap">
-        <id property="channelDivisionId" column="channel_division_id"/>
-        <result property="channelCategory" column="channel_category" />
-        <result property="channelType" column="channel_type" />
-        <result property="channelName" column="channel_name" />
-        <result property="channelCode" column="channel_code" />
-        <result property="receivablesPhone" column="receivables_phone" />
-        <result property="createDate" column="create_date" />
-        <collection property="listChannelSaleInfo" column="channel_division_id" ofType="ChannelDivisionInfo" select="listSaleInfoByChannelDivisionId"/>
-    </resultMap>
-    <select id="listChannelDivisionInfo" resultMap="listChannelDivisionMap" parameterType="ChannelDivisionInfo">
-        SELECT
-        channel_division_id,
-        channel_category,
-        channel_type,
-        channel_name,
-        channel_code,
-        create_date
-        FROM tb_rst_channel_division_info
-        WHERE
-        customer_id = #{customerId}
-    </select>
-    <select id="listSaleInfoByChannelDivisionId" resultType="ChannelSaleInfo" parameterType="java.lang.Integer">
-        SELECT
-            si.channel_sale_id AS channelSaleId,
-            si.customer_id AS customerId,
-            si.channel_division_id AS channelDivisionId,
-            si.promoting_products AS promotingProducts,
-            si.supply_price AS supplyPrice,
-            si.account_period AS account_period,
-            si.create_date AS createDate
-        FROM
-            tb_rst_channel_sale_info si
-        WHERE
-            si.channel_division_id= #{channelDivisionId}
-    </select>
-
-
-    <!--映射结果集 start-->
-    <!--客户基本信息结果映射-->
-    <resultMap type="com.iamberry.rst.core.customer.CustomerBasicInfo" id="customerBasicInfoResult">
-        <id property="customerId" column="customer_id"/>
-        <result property="customerName" column="customer_name" />
-        <result property="customerIndustry" column="customer_industry" />
-        <result property="customerType" column="customer_type" />
-        <result property="cooperativeState" column="cooperative_state" />
-        <result property="customerProvinceCode" column="customer_province_code" />
-        <result property="customerCityCode" column="customer_city_code" />
-        <result property="customerAddress" column="customer_address" />
-        <result property="customerStatus" column="customer_status" />
-        <result property="createDate" column="create_date" />
-        <result property="updateDate" column="update_date" />
-        <result property="idCreateBy" column="id_create_by" />
-        <result property="customerRemarks" column="customer_remarks" />
-    </resultMap>
-    <!--对接联系人信息结果映射-->
-    <resultMap type="com.iamberry.rst.core.customer.DockedContactInfo" id="dockedContactInfoResult">
-        <id property="dockedContactId" column="docked_contact_id"/>
-        <result property="contactName" column="contact_name" />
-        <result property="contactPhone" column="contact_phone" />
-        <result property="contactType" column="contact_type" />
-        <result property="contactEmail" column="contact_email" />
-        <result property="createDate" column="create_date" />
-    </resultMap>
-    <!--客户渠道销售信息结果映射-->
-    <resultMap type="com.iamberry.rst.core.customer.ChannelSaleInfo" id="channelSaleInfoResult">
-        <id property="channelSaleId" column="channel_sale_id"/>
-        <result property="channelName" column="channel_name" />
-        <result property="channelDivisionId" column="channel_division_id" />
-        <result property="promotingProducts" column="promoting_products" />
-        <result property="supplyPrice" column="supply_price" />
-        <result property="accountPeriod" column="account_period" />
-        <result property="createDate" column="create_date" />
-    </resultMap>
-    <!--付款/退款信息结果映射-->
-    <resultMap type="com.iamberry.rst.core.customer.BillingInfo" id="billingInfoResult">
-        <id property="billingId" column="billing_id"/>
-        <result property="accountOpeningBranch" column="account_opening_branch" />
-        <result property="accountName" column="account_name" />
-        <result property="accountNum" column="account_num" />
-        <result property="receivablesName" column="receivables_name" />
-        <result property="receivablesPhone" column="receivables_phone" />
-        <result property="createDate" column="create_date" />
-    </resultMap>
-    <!--开票信息结果映射-->
-    <resultMap type="com.iamberry.rst.core.customer.TicketOpeningInfo" id="ticketOpeningInfoResult">
-        <id property="ticketOpeningId" column="ticket_opening_id"/>
-        <result property="ticketType" column="ticket_type" />
-        <result property="accountOpeningBranch" column="account_opening_branch" />
-        <result property="ticketOpeningAccount" column="ticket_opening_account" />
-        <result property="enterpriseName" column="enterprise_name" />
-        <result property="taxpayerIdentificationNum" column="taxpayer_identification_num" />
-        <result property="ticketOpeningPhone" column="ticket_opening_phone" />
-        <result property="enterpriseAddress" column="enterprise_address" />
-        <result property="createDate" column="create_date" />
-    </resultMap>
-    <!--查询所有省份映射-->
-    <resultMap type="com.iamberry.rst.core.address.Province" id="queryProvinceResult">
-        <id property="provinceId" column="province_id"/>
-        <!--<result property="provinceNum" column="divisionCode" />-->
-        <result property="province" column="province" />
-    </resultMap>
-    <!--根据省份代号查询所有城市映射-->
-    <resultMap type="com.iamberry.rst.core.address.City" id="queryCityResult">
-        <id property="cityId" column="city_id"/>
-        <!--<result property="cityNum" column="city_number" />-->
-        <result property="city" column="city" />
-        <!--<result property="provinceNum" column="provinceid" />-->
-    </resultMap>
-    <!--根据城市代号查询所有区/县映射-->
-    <resultMap type="com.iamberry.rst.core.address.District" id="queryDistrictResult">
-        <id property="districtId" column="district_id"/>
-        <!--<result property="cityNum" column="city_number" />-->
-        <result property="district" column="district" />
-        <!--<result property="provinceNum" column="provinceid" />-->
-    </resultMap>
-    <!--查询所有渠道类别-->
-    <resultMap type="com.iamberry.rst.core.customer.ChannelDivisionInfo" id="queryChannelCategoryResult">
-        <result property="channelCategory" column="channel_category" />
-        <result property="channelName" column="channel_categoryId" />
-    </resultMap>
-    <!--根据渠道类别查询渠道类型-->
-    <resultMap type="com.iamberry.rst.core.customer.ChannelDivisionInfo" id="queryChannelTypeResult">
-        <!--<id property="channelDivisionId" column="channel_division_id"/>-->
-        <result property="channelType" column="channel_type" />
-        <result property="channelName" column="channel_categoryId" />
-    </resultMap>
-    <!--查询销售产品-->
-    <resultMap type="com.iamberry.rst.core.order.Product" id="queryPromotingProductsResult">
-        <id property="productId" column="product_id"/>
-        <result property="productName" column="product_name" />
-    </resultMap>
-    <!--查询销售产品价格-->
-    <resultMap type="com.iamberry.rst.core.order.ProductColor" id="querySupplyPriceResult">
-        <result property="colorId" column="supply_product_id" />
-        <result property="colorPrice" column="supply_product_price" />
-    </resultMap>
-    <!--映射结果集 end-->
-
-    <!--新增部分 start-->
-    <!-- 添加客户基本信息 -->
-    <insert id="saveCustomerBasicInfo" parameterType="CustomerBasicInfo" useGeneratedKeys="true"  keyProperty="customerId">
-        INSERT INTO
-        tb_rst_customer_basic_info
-        (
-        customer_name, customer_industry, customer_type, cooperative_state, customer_province_code,customer_city_code,
-        customer_address, customer_status, create_date, update_date,id_create_by,customer_remarks
-        )
-        VALUES
-        (
-        #{customerName},#{customerIndustry},#{customerType},#{cooperativeState},#{customerProvinceCode},#{customerCityCode},
-        #{customerAddress},#{customerStatus},NOW(),NOW(),#{idCreateBy},#{customerRemarks}
-        )
-    </insert>
-
-    <!-- 添加对接联系人信息 -->
-    <insert id="saveDockedContactInfo" parameterType="DockedContactInfo">
-        INSERT INTO
-        tb_rst_docked_contact_info
-        (
-        customer_id, contact_name, contact_phone, contact_type, contact_email,create_date
-        )
-        VALUES
-        (
-        #{customerId},#{contactName},#{contactPhone},#{contactType},#{contactEmail},NOW()
-        )
-    </insert>
-
-    <!-- 添加客户销售渠道备案信息（渠道表） -->
-    <insert id="saveChannelDivisionInfo" parameterType="ChannelSaleInfo" useGeneratedKeys="true"  keyProperty="channelDivisionId">
-        INSERT INTO
-        tb_rst_channel_division_info
-        (
-        customer_id, channel_category, channel_type, channel_name, channel_code,create_date
-        )
-        VALUES
-        (
-        #{customerId},#{channelCategory},#{channelType},#{channelName},#{channelCode},NOW()
-        )
-    </insert>
-
-    <!-- 添加客户销售渠道备案信息（产品表） -->
-    <insert id="saveChannelSaleInfo" parameterType="ChannelSaleInfo">
-        INSERT INTO
-        tb_rst_channel_sale_info
-        (
-        customer_id, channel_division_id, channel_name, promoting_products, supply_price,account_period,create_date
-        )
-        VALUES
-        (
-        #{customerId},#{channelDivisionId},#{channelName},#{promotingProducts},#{supplyPrice},#{accountPeriod},NOW()
-        )
-    </insert>
-
-    <!-- 添加付款/退款信息 -->
-    <insert id="saveBillingInfo" parameterType="BillingInfo">
-        INSERT INTO
-        tb_rst_billing_info
-        (
-        customer_id, account_opening_branch, account_name, account_num, receivables_name,receivables_phone,create_date,account_type
-        )
-        VALUES
-        (
-        #{customerId},#{accountOpeningBranch},#{accountName},#{accountNum},#{receivablesName},#{receivablesPhone},NOW(),#{accountType}
-        )
-    </insert>
-
-    <!-- 添加对开票信息 -->
-    <insert id="saveTicketOpeningInfo" parameterType="TicketOpeningInfo">
-        INSERT INTO
-        tb_rst_ticket_opening_info
-        (
-        customer_id, ticket_type, account_opening_branch, ticket_opening_account, enterprise_name,
-        taxpayer_identification_num,ticket_opening_phone, enterprise_address, create_date
-        )
-        VALUES
-        (
-        #{customerId},#{ticketType},#{accountOpeningBranch},#{ticketOpeningAccount},#{enterpriseName},
-        #{taxpayerIdentificationNum},#{ticketOpeningPhone},#{enterpriseAddress},NOW()
-        )
-    </insert>
-    <!--新增部分 end-->
-
-    <!--查询客户信息部分 start-->
-    <!-- 根据客户id查询客户基本信息 -->
-    <select id="queryCustomerBasicInfoByCustomerId" parameterType="Integer" resultMap="customerBasicInfoResult">
-        SELECT * FROM tb_rst_customer_basic_info t WHERE t.customer_id = #{id}
-    </select>
-    <!-- 根据客户id查询对接联系人信息 -->
-    <select id="queryDockedContactInfoListByCustomerId" parameterType="Integer" resultMap="dockedContactInfoResult">
-        SELECT
-        t.docked_contact_id,
-        t.contact_name,
-        t.contact_phone,
-        t.contact_type,
-        t.contact_email,
-        t.create_date
-        FROM
-        tb_rst_docked_contact_info t
-        WHERE
-        t.customer_id = #{id}
-    </select>
-    <!-- 根据客户id查询客户销售渠道备案信息 -->
-    <!--查询渠道名称是否存在-->
-    <select id="queryIsExsitChannelNameChannelName" parameterType="ChannelSaleInfo" resultType="java.lang.String">
-        SELECT
-        IFNULL(max(t.channel_division_id),0)
-        FROM
-        tb_rst_channel_division_info t
-        WHERE
-        t.channel_name = #{channelName}
-        AND
-        t.channel_category = #{channelCategory}
-        AND
-        t.channel_type = #{channelType}
-        AND
-        t.customer_id = #{customerId}
-    </select>
-    <select id="queryChannelSaleInfoListByCustomerId" parameterType="Integer" resultMap="channelSaleInfoResult">
-        SELECT
-        t.channel_sale_id,
-        t.channel_name,
-        t.channel_division_id,
-        t.promoting_products,
-        t.supply_price,
-        t.account_period,
-        t.create_date
-        FROM
-        tb_rst_channel_sale_info t
-        WHERE
-        t.customer_id = #{id}
-    </select>
-    <!-- 根据客户id查询客户付款/退款信息 -->
-    <select id="queryBillingInfoByCustomerId" parameterType="Integer" resultMap="billingInfoResult">
-        SELECT
-        t.billing_id,
-        t.account_opening_branch,
-        t.account_name,
-        t.account_num,
-        t.receivables_name,
-        t.receivables_phone,
-        t.create_date,
-        t.account_type
-        FROM
-        tb_rst_billing_info t
-        WHERE
-        t.customer_id = #{id}
-    </select>
-    <!-- 根据客户id查询客户开票信息 -->
-    <select id="queryTicketOpeningInfoByCustomerId" parameterType="Integer" resultMap="ticketOpeningInfoResult">
-        SELECT
-        t.ticket_opening_id,
-        t.ticket_type,
-        t.account_opening_branch,
-        t.ticket_opening_account,
-        t.enterprise_name,
-        t.taxpayer_identification_num,
-        t.ticket_opening_phone,
-        t.enterprise_address,
-        t.create_date
-        FROM
-        tb_rst_ticket_opening_info t
-        WHERE
-        t.customer_id = #{id}
-    </select>
-    <!--查询客户信息部分 end-->
-    <!--查询所有省份-->
-    <select id="queryProvinceList" parameterType="java.lang.String" resultMap="queryProvinceResult">
-        SELECT
-        t.province_id,
-        t.province,
-        t.division_code
-        FROM
-        tb_rst_address_province t
-        ORDER BY
-        t.province_id ASC
-    </select>
-    <!--根据省份代号查询所有城市-->
-    <select id="queryCityList" parameterType="java.lang.String" resultMap="queryCityResult">
-        SELECT
-        t.city_id,
-        t.city,
-        t.division_code
-        FROM
-        tb_rst_address_city t
-        WHERE
-        t.province_id = #{id}
-        ORDER BY
-        t.city_id ASC
-    </select>
-    <!--根据省份代号查询所有区/县-->
-    <select id="queryDistrictList" parameterType="java.lang.String" resultMap="queryDistrictResult">
-        SELECT
-        t.district_id,
-        t.district,
-        t.division_code
-        FROM
-        tb_rst_address_district t
-        WHERE
-        t.city_id = #{id}
-        ORDER BY
-        t.district_id ASC
-    </select>
-    <!--查询所有渠道类别-->
-    <select id="queryChannelCategoryList" parameterType="java.lang.String" resultMap="queryChannelCategoryResult">
-        SELECT
-        DISTINCT (t.channel_category),
-        CASE
-        WHEN t.channel_category = 1 THEN '电商'
-        WHEN t.channel_category = 2 THEN '特殊渠道'
-        WHEN t.channel_category = 3 THEN '线下'
-        WHEN t.channel_category = 4 THEN '海外'
-        END AS 'channel_categoryId'
-        FROM
-        tb_rst_channel_division_info t
-        ORDER BY
-        t.channel_division_id ASC
-    </select>
-    <!--根据渠道类别查询渠道类型-->
-    <select id="queryChannelTypeList" parameterType="java.lang.String" resultMap="queryChannelTypeResult">
-        SELECT
-        /*t.channel_division_id,*/
-        DISTINCT (t.channel_type),
-        CASE
-        WHEN t.channel_category = 1 THEN '电商'
-        WHEN t.channel_category = 2 THEN '特殊渠道'
-        WHEN t.channel_category = 3 THEN '线下'
-        ELSE '海外'
-        END AS 'channel_categoryId'
-        FROM
-        tb_rst_channel_division_info t
-        WHERE
-        t.channel_category = #{id}
-        ORDER BY
-        t.channel_division_id ASC
-    </select>
-    <!--查询销售产品-->
-    <select id="queryPromotingProductsList" parameterType="java.lang.String" resultMap="queryPromotingProductsResult">
-        SELECT
-        t.product_id,
-        t.product_name
-        FROM
-        tb_rst_product_info t
-        WHERE
-        t.product_wholesale = '1'
-        ORDER BY
-        t.product_id ASC
-    </select>
-    <!--查询销售产品价格-->
-    <!--   /*SELECT
-        t.color_id,
-        t.color_price
-        FROM
-        tb_rst_product_color t
-        WHERE
-        t.color_product_id = #{id}
-        ORDER BY
-        t.color_id ASC*/-->
-    <select id="querySupplyPriceList" parameterType="java.lang.String" resultMap="querySupplyPriceResult">
-        SELECT
-        t.supply_product_id,
-        t.supply_product_price
-        FROM
-        tb_rst_supply_product_info t
-        WHERE
-        t.supply_product_id = #{id}
-        AND
-        t.supply_price_status = '1'
-        ORDER BY
-        t.supply_product_id ASC
-    </select>
-
-    <update id="updateCustomerBasic" parameterType="CustomerBasicInfo">
-        UPDATE tb_rst_customer_basic_info
-        <set >
-            <if test="customerName != null and customerName !='' " >
-                customer_name = #{customerName},
-            </if>
-            <if test="customerIndustry != null and customerIndustry !='' " >
-                customer_industry = #{customerIndustry},
-            </if>
-            <if test="customerType != null and customerType !='' " >
-                customer_type = #{customerType},
-            </if>
-            <if test="cooperativeState != null and cooperativeState !='' " >
-                cooperative_state = #{cooperativeState},
-            </if>
-            <if test="customerProvinceCode != null and customerProvinceCode !='' " >
-                customer_province_code = #{customerProvinceCode},
-            </if>
-            <if test="customerCityCode != null and customerCityCode !='' " >
-                customer_city_code = #{customerCityCode},
-            </if>
-            <if test="customerAddress != null and customerAddress !='' " >
-                customer_address = #{customerAddress},
-            </if>
-            <if test="customerStatus != null and customerStatus !='' " >
-                customer_status = #{customerStatus},
-            </if>
-            <if test="updateDate != null and updateDate !='' " >
-                update_date = #{updateDate},
-            </if>
-            <if test="customerRemarks != null and customerRemarks !='' " >
-                customer_remarks = #{customerRemarks}
-            </if>
-        </set>
-        where customer_id = #{customerId}
-    </update>
-
-    <update id="updateBillingInfo" parameterType="BillingInfo">
-        UPDATE tb_rst_billing_info
-        <set >
-            <if test="accountOpeningBranch != null and accountOpeningBranch !='' " >
-                account_opening_branch = #{accountOpeningBranch},
-            </if>
-            <if test="accountName != null and accountName !='' " >
-                account_name = #{accountName},
-            </if>
-            <if test="accountNum != null and accountNum !='' " >
-                account_num = #{accountNum},
-            </if>
-            <if test="receivablesName != null and receivablesName !='' " >
-                receivables_name = #{receivablesName},
-            </if>
-            <if test="receivablesPhone != null and receivablesPhone !='' " >
-                receivables_phone = #{receivablesPhone},
-            </if>
-            <if test="accountType != null and accountType !='' " >
-                account_type = #{accountType}
-            </if>
-        </set>
-        where customer_id = #{customerId}
-    </update>
-
-    <update id="updateOpeningInfo" parameterType="TicketOpeningInfo">
-        UPDATE tb_rst_ticket_opening_info
-        <set>
-            <if test="ticketType != null and ticketType !='' " >
-                ticket_type = #{ticketType},
-            </if>
-            <if test="accountOpeningBranch != null and accountOpeningBranch !='' " >
-                account_opening_branch = #{accountOpeningBranch},
-            </if>
-            <if test="ticketOpeningAccount != null and ticketOpeningAccount !='' " >
-                ticket_opening_account = #{ticketOpeningAccount},
-            </if>
-            <if test="enterpriseName != null and enterpriseName !='' " >
-                enterprise_name = #{enterpriseName},
-            </if>
-            <if test="taxpayerIdentificationNum != null and taxpayerIdentificationNum !='' " >
-                taxpayer_identification_num = #{taxpayerIdentificationNum},
-            </if>
-            <if test="ticketOpeningPhone != null and ticketOpeningPhone !='' " >
-                ticket_opening_phone = #{ticketOpeningPhone},
-            </if>
-            <if test="enterpriseAddress != null and enterpriseAddress !='' " >
-                enterprise_address = #{enterpriseAddress}
-            </if>
-        </set>
-        where customer_id = #{customerId}
-    </update>
-
-    <delete id="deleteContactInfo" parameterType="Integer">
-        DELETE FROM tb_rst_docked_contact_info WHERE customer_id = #{customerId}
-    </delete>
-    <delete id="deleteSaleInfo" parameterType="Integer">
-        DELETE FROM tb_rst_channel_sale_info WHERE customer_id = #{customerId}
-    </delete>
-    <delete id="deleteDivisionInfo" parameterType="Integer">
-        DELETE FROM tb_rst_channel_division_info WHERE channel_division_id = #{channelDivisionId}
-    </delete>
-
-    <select id="getLowestPrice" parameterType="LowestPriceInfo" resultType="LowestPriceInfo">
-      select * from tb_rst_lowest_price_info
-      where
-      product_id = #{productId}
-      AND
-      channel_division_id = #{channelDivisionId}
-    </select>
-</mapper>

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

@@ -42,8 +42,6 @@ public class ComplaintSignclosedInfoServiceImpl implements ComplaintSignclosedIn
     @Autowired
     private ComplaintSignclosedProductInfoMapper complaintSignclosedProductInfoMapper;
     @Autowired
-    private FittingsInfoMapper fittingsInfoMapper;
-    @Autowired
     private ComplaintDetectInfoMapper complaintDetectInfoMapper;
     @Autowired
     private CustomerInfoMapper customerInfoMapper;

watero-rst-service/src/main/java/com/iamberry/rst/service/product/ProductServiceImpl.java

@@ -1,7 +1,6 @@
 package com.iamberry.rst.service.product;
 
 import com.github.pagehelper.PageHelper;
-import com.iamberry.rst.core.cm.FittingsInfo;
 import com.iamberry.rst.core.order.Product;
 import com.iamberry.rst.core.order.ProductAreaRela;
 import com.iamberry.rst.core.order.ProductColor;
@@ -164,10 +163,6 @@ public class ProductServiceImpl implements ProductService {
         return productMapper.getProductType(customerId);
     }
 
-    @Override
-    public FittingsInfo getFittingsBySku(String colorBar) {
-        return productMapper.getFittingsBySku(colorBar);
-    }
 
     @Override
     public ProductColor getColorByBar(String colorBar) {

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

@@ -178,7 +178,6 @@
         <result column="product_type" property="productType"/>
         <result column="product_number" property="productNumber"/>
         <collection property="colorList" column="PRODUCT_ID" ofType="ProductColor" select="listProduceColorById"/>
-        <collection property="fittingsList" column="PRODUCT_ID" ofType="FittingsInfo" select="listProduceFittingsById"/>
     </resultMap>
 
     <select id="listProduceColorById" parameterType="String" resultType="ProductColor">
@@ -199,22 +198,6 @@
         c.color_product_id  = #{productId}
     </select>
 
-    <select id="listProduceFittingsById" parameterType="String" resultType="FittingsInfo">
-        select
-        fittings_id fittingsId,
-        product_id productId,
-        fittings_name fittingsName,
-        fittings_discount fittingsDiscount,
-        fittings_price fittingsPrice,
-        fittings_bar fittingsBar,
-        fittings_status fittingsStatus,
-        fittings_cretae_time fittingsCretaeTime
-        from
-        tb_rst_product_fittings
-        WHERE
-        product_id  = #{productId}
-    </select>
-
     <!--根据颜色查询产品信息 -->
     <select id="getProductById" resultType="Product" parameterType="Integer">
         SELECT
@@ -240,15 +223,7 @@
         LEFT JOIN tb_rst_cm_customer_info ci on ci.type_id = pt.type_id
         WHERE ci.customer_id = #{customerId}
     </select>
-    <!--根据sku查询配件信息 -->
-    <select id="getFittingsBySku" resultType="FittingsInfo" parameterType="String">
-        SELECT
-        *
-        FROM
-        tb_rst_product_fittings
-        WHERE
-        fittings_bar = #{fittingsBar}
-    </select>
+
     <!--根据sku查询配件信息 -->
     <select id="getProductBySku" resultType="ProductColor" parameterType="String">
         SELECT

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

@@ -1,21 +1,10 @@
 package com.iamberry.rst.controllers.cm;
 
-import com.iamberry.rst.core.cm.*;
-import com.iamberry.rst.core.order.ProductColor;
-import com.iamberry.rst.core.page.PagedResult;
-import com.iamberry.rst.faces.cm.*;
-import com.iamberry.rst.faces.kdn.KuaiDiNiaoService;
-import com.iamberry.rst.faces.order.EfastOrderService;
-import com.iamberry.rst.faces.product.ProductService;
+import com.iamberry.rst.core.cm.ComplaintQuestionInfo;
+import com.iamberry.rst.faces.cm.ComplaintQuestionInfoService;
+import com.iamberry.rst.faces.cm.CustomerService;
 import com.iamberry.rst.service.cm.CustomerServiceImpl;
-import com.iamberry.rst.service.cm.mapper.FittingsInfoMapper;
-import com.iamberry.rst.utils.KuaiDi100;
-import com.iamberry.rst.utils.SeleOrdeCompUtil;
-import com.iamberry.wechat.tools.DateTimeUtil;
 import com.iamberry.wechat.tools.ResponseJson;
-
-import net.sf.json.JSONArray;
-import net.sf.json.JSONObject;
 import org.slf4j.Logger;
 import org.slf4j.LoggerFactory;
 import org.springframework.beans.factory.annotation.Autowired;
@@ -26,9 +15,6 @@ import org.springframework.web.bind.annotation.ResponseBody;
 import org.springframework.web.servlet.ModelAndView;
 
 import javax.servlet.http.HttpServletRequest;
-import java.util.ArrayList;
-import java.util.Date;
-import java.util.List;
 
 /**
  * Created by wxm

watero-rst-web/src/main/java/com/iamberry/rst/controllers/customer/CustomerBasicController.java

@@ -1,577 +0,0 @@
-package com.iamberry.rst.controllers.customer;
-
-import com.iamberry.rst.core.address.City;
-import com.iamberry.rst.core.address.District;
-import com.iamberry.rst.core.address.Province;
-import com.iamberry.rst.core.customer.*;
-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.core.sys.Admin;
-import com.iamberry.rst.faces.customer.CustomerBasicService;
-import com.iamberry.rst.faces.sys.SysService;
-import com.iamberry.rst.utils.AdminUtils;
-import com.iamberry.rst.utils.StitchAttrUtil;
-import com.iamberry.wechat.tools.ResponseJson;
-import net.sf.json.JSONArray;
-import net.sf.json.JSONObject;
-import org.apache.commons.lang.StringUtils;
-import org.apache.shiro.authz.annotation.RequiresPermissions;
-import org.slf4j.Logger;
-import org.slf4j.LoggerFactory;
-import org.springframework.beans.factory.annotation.Autowired;
-import org.springframework.stereotype.Controller;
-import org.springframework.web.bind.annotation.RequestMapping;
-import org.springframework.web.bind.annotation.RequestParam;
-import org.springframework.web.bind.annotation.ResponseBody;
-import org.springframework.web.servlet.ModelAndView;
-
-import javax.servlet.http.HttpServletRequest;
-import java.util.ArrayList;
-import java.util.List;
-
-
-/**
- * Created by Administrator on 2018/4/20.
- */
-@Controller
-@RequestMapping("/admin/customerBasic")
-public class CustomerBasicController {
-
-    private Logger logger = LoggerFactory.getLogger(CustomerBasicController.class);
-    @Autowired
-    private CustomerBasicService customerBasicService;
-    @Autowired
-    private SysService sysService;
-    /**
-     * 查询客户基本信息列表
-     *
-     * @return
-     * @author LJK
-     * @date 时间
-     */
-    @RequiresPermissions("customerBasic:select_all:customerBasic")
-    @RequestMapping("/listCustomerBasic")
-    public ModelAndView listCustomerBasic(HttpServletRequest request, CustomerBasicInfo customerBasicInfo,
-                                       @RequestParam(value = "pageSize", defaultValue = "10", required = false) Integer pageSize,
-                                       @RequestParam(value = "pageNO", defaultValue = "1", required = false) Integer pageNO,
-                                       @RequestParam(value = "totalNum", defaultValue = "0", required = false) Integer totalNum) {
-        ModelAndView mv = new ModelAndView("customer/customer_basic_list");
-        //获取登录员工id
-        Integer adminId = AdminUtils.getLoginAdminId();
-        Admin admin = new Admin();
-        admin.setAdminId(adminId);
-        admin = sysService.get(admin);
-        if(admin.getAdminDept() == 7 || admin.getAdminDept() == 5){//管理部以及财务部
-            customerBasicInfo.setIsSelectAll(1);
-        }else if(admin.getAdminDept() == 2){//销售部（业务员）
-            customerBasicInfo.setIsSelectAll(2);
-        }
-        customerBasicInfo.setIdCreateBy(adminId);
-       /* if(customerBasicInfo.getIsLookAll() != null || !customerBasicInfo.getIsLookAll().equals("")){
-            customerBasicInfo.setIdCreateBy(adminId);
-        }*/
-        // 封装请求数据
-        PageRequest<CustomerBasicInfo> pageRequest = new PageRequest<>(customerBasicInfo, pageNO, pageSize, totalNum == 0);
-        // 查询订单列表
-        PagedResult<CustomerBasicInfo> result = customerBasicService.listCustomerBasic(pageRequest);
-        if (totalNum != 0) {
-            result.setTotal(totalNum);
-        }
-        mv.addObject("adminId",adminId);
-         StitchAttrUtil.getSa().setModelAndView(customerBasicInfo, mv, "/admin/customerBasic/listCustomerBasic", result);
-        return mv;
-    }
-
-
-    /**
-     * 修改客户状态为已删除
-     *
-     * @param request
-     * @return
-     */
-    @ResponseBody
-    @RequiresPermissions("customerBasic:update:customerBasic")
-    @RequestMapping("/update_customerState")
-    public ResponseJson updateCustomerIsSolve(HttpServletRequest request) throws Exception {
-        String customerId = request.getParameter("customerId");
-        if (!StringUtils.isNotEmpty(customerId)) {
-            return new ResponseJson(500, "该客户信息不存在!", 500);
-        }
-
-        //根据id获取客诉信息
-        CustomerBasicInfo customerBasicInfo = new CustomerBasicInfo();
-        customerBasicInfo.setCustomerId(Integer.valueOf(customerId));
-        customerBasicInfo.setCustomerStatus(1);
-        CustomerBasicInfo Info = customerBasicService.getCustomerBasic(customerBasicInfo);
-        if (Info == null) {
-            return new ResponseJson(500, "该客户信息不存在!", 500);
-        }
-        //修改客户状态
-        int num = customerBasicService.updateState(customerBasicInfo);
-        if (num > 0) {
-            return new ResponseJson(200, "删除成功!", 200);
-        } else {
-            return new ResponseJson(500, "删除失败!", 500);
-        }
-    }
-
-    /**
-     * 查询客户详情
-     * @param request
-     * @return
-     */
-    @ResponseBody
-    @RequiresPermissions("customerBasic:select:customerBasic")
-    @RequestMapping("/customer_Basic_Detail")
-    public ModelAndView customerBasicDetail(HttpServletRequest request){
-        ModelAndView mv = new ModelAndView("customer/custome_basic_detail");
-        String customerId = request.getParameter("customerId");
-        if (!StringUtils.isNotEmpty(customerId)) {
-            return mv;
-        }
-        /*查询基本信息*/
-        CustomerBasicInfo customerBasicInfo = new CustomerBasicInfo();
-        customerBasicInfo.setCustomerId(Integer.valueOf(customerId));
-        customerBasicInfo = customerBasicService.getCustomerBasic(customerBasicInfo);
-        /*对接联系人信息*/
-        DockedContactInfo dockedContactInfo = new DockedContactInfo();
-        dockedContactInfo.setCustomerId(Integer.valueOf(customerId));
-        List<DockedContactInfo> listDockedContactInfo = customerBasicService.listDockedContactInfo(dockedContactInfo);
-        /*付款/退款信息*/
-        BillingInfo billingInfo = new BillingInfo();
-        billingInfo.setCustomerId(Integer.valueOf(customerId));
-        billingInfo = customerBasicService.getBillingInfo(billingInfo);
-        /*开票信息*/
-        TicketOpeningInfo ticketOpeningInfo = new TicketOpeningInfo();
-        ticketOpeningInfo.setCustomerId(Integer.valueOf(customerId));
-        ticketOpeningInfo = customerBasicService.getOpeningInfo(ticketOpeningInfo);
-        /*渠道销售信息*/
-        /*ChannelSaleInfo channelSaleInfo = new ChannelSaleInfo();
-        channelSaleInfo.setCustomerId(Integer.valueOf(customerId));*/
-        List<ChannelDivisionInfo> listChannelDivisionInfo = customerBasicService.listChannelDivisionInfo(Integer.valueOf(customerId));
-        //渠道销售信息封装
-       /* List<ChannelDivisionInfo> listChannelDivisionInfo = new ArrayList<ChannelDivisionInfo>();
-        for (int i=0;i<listChannelSaleInfo.size();i++){
-            boolean isContinue = true;
-            if(listChannelDivisionInfo.size() > 0){
-                for(ChannelDivisionInfo channelDivisionInfo : listChannelDivisionInfo){
-                    List<ChannelSaleInfo> listChannel = channelDivisionInfo.getListChannelSaleInfo();
-                    for (ChannelSaleInfo Info : listChannel){
-                        if(Info.getChannelDivisionId().intValue() == listChannelSaleInfo.get(i).getChannelDivisionId().intValue()
-                                && Info.getChannelName().equals(listChannelSaleInfo.get(i).getChannelName())){
-                            isContinue = false;
-                        }
-                    }
-
-                }
-            }
-            if(!isContinue){
-                continue;//数据已保存不需要再循环
-            }
-            ChannelDivisionInfo channelDivisionInfo = new ChannelDivisionInfo();
-            channelDivisionInfo.setChannelCategory(listChannelSaleInfo.get(i).getChannelCategory());
-            channelDivisionInfo.setChannelType(listChannelSaleInfo.get(i).getChannelType());
-            channelDivisionInfo.setChannelName(listChannelSaleInfo.get(i).getChannelName());
-                List<ChannelSaleInfo> listChannelSale = new ArrayList<ChannelSaleInfo>();
-            for (int j=0;j<listChannelSaleInfo.size();j++){
-                if(listChannelSaleInfo.get(i).getChannelDivisionId().intValue() == listChannelSaleInfo.get(j).getChannelDivisionId().intValue()
-                  && listChannelSaleInfo.get(i).getChannelName().equals(listChannelSaleInfo.get(j).getChannelName())){
-                    listChannelSale.add(listChannelSaleInfo.get(j));
-                }
-                if(j == listChannelSaleInfo.size()-1){
-                    channelDivisionInfo.setListChannelSaleInfo(listChannelSale);
-                }
-
-            }
-            listChannelDivisionInfo.add(channelDivisionInfo);
-        }*/
-        mv.addObject("customerBasicInfo",customerBasicInfo);
-        mv.addObject("listDockedContactInfo",listDockedContactInfo);
-        mv.addObject("billingInfo",billingInfo);
-        mv.addObject("ticketOpeningInfo",ticketOpeningInfo);
-        mv.addObject("listChannelDivisionInfo",listChannelDivisionInfo);
-        return mv;
-    }
-
-
-    /**
-     * 进入修改客户信息页面
-     * @param request
-     * @return
-     */
-    @ResponseBody
-    @RequiresPermissions("customerBasic:update:customerBasic")
-    @RequestMapping("/to_update_customer_Basic")
-    public ModelAndView to_update_customerBasic(HttpServletRequest request){
-        ModelAndView mv = new ModelAndView("customer/update_customer_info");
-        String customerId = request.getParameter("customerId");
-        if (!StringUtils.isNotEmpty(customerId)) {
-            return mv;
-        }
-        /*查询基本信息*/
-        CustomerBasicInfo customerBasicInfo = new CustomerBasicInfo();
-        customerBasicInfo.setCustomerId(Integer.valueOf(customerId));
-        customerBasicInfo = customerBasicService.getCustomerBasic(customerBasicInfo);
-        /*对接联系人信息*/
-        DockedContactInfo dockedContactInfo = new DockedContactInfo();
-        dockedContactInfo.setCustomerId(Integer.valueOf(customerId));
-        List<DockedContactInfo> listDockedContactInfo = customerBasicService.listDockedContactInfo(dockedContactInfo);
-        /*付款/退款信息*/
-        BillingInfo billingInfo = new BillingInfo();
-        billingInfo.setCustomerId(Integer.valueOf(customerId));
-        billingInfo = customerBasicService.getBillingInfo(billingInfo);
-        /*开票信息*/
-        TicketOpeningInfo ticketOpeningInfo = new TicketOpeningInfo();
-        ticketOpeningInfo.setCustomerId(Integer.valueOf(customerId));
-        ticketOpeningInfo = customerBasicService.getOpeningInfo(ticketOpeningInfo);
-        /*渠道销售信息*/
-        ChannelSaleInfo channelSaleInfo = new ChannelSaleInfo();
-        channelSaleInfo.setCustomerId(Integer.valueOf(customerId));
-        //List<ChannelDivisionInfo> listChannelDivisionInfo = customerBasicService.listChannelDivisionInfo(Integer.valueOf(customerId));
-        List<ChannelSaleInfo> listChannelSaleInfo = customerBasicService.listChannelSaleInfo(channelSaleInfo);
-        mv.addObject("customerBasicInfo",customerBasicInfo);
-        mv.addObject("listDockedContactInfo",listDockedContactInfo);
-        mv.addObject("billingInfo",billingInfo);
-        mv.addObject("ticketOpeningInfo",ticketOpeningInfo);
-        mv.addObject("listChannelSaleInfo",listChannelSaleInfo);
-        return mv;
-    }
-
-    /**
-     * 跳转到添加客户信息页面
-     *
-     * @return
-     */
-    @RequiresPermissions("customerBasic:save:customerInfo")
-    @RequestMapping("/saveCustomerInfo")
-    public ModelAndView toAddCustomer(HttpServletRequest request) {
-        ModelAndView mv = new ModelAndView("customer/save_customer_info");
-        return mv;
-    }
-
-    /**
-     * 添加客户信息
-     * @param request
-     * @return
-     * @throws Exception
-     */
-    @ResponseBody
-    @RequiresPermissions("customerBasic:save:customerInfo")
-    @RequestMapping("/save_customer_info")
-    public ResponseJson saveCustomerBasicInfo(HttpServletRequest request,String customerInfoJson,String dockedContactInfoListJson,
-                                              String channelSaleInfoListJson,String billingInfoJson,String ticketOpeningInfoJson) throws Exception {
-        Integer adminId = AdminUtils.getLoginAdminId();
-        JSONArray jsonArray;
-        List<DockedContactInfo> dockedContactInfoList;
-        List<ChannelSaleInfo> channelSaleInfoList;
-        jsonArray = JSONArray.fromObject(dockedContactInfoListJson);
-        dockedContactInfoList = (List) JSONArray.toCollection(jsonArray, DockedContactInfo.class);
-
-        jsonArray = JSONArray.fromObject(channelSaleInfoListJson);
-        channelSaleInfoList = (List) JSONArray.toCollection(jsonArray, ChannelSaleInfo.class);
-        JSONObject customerJsonObject =  JSONObject.fromObject(customerInfoJson);
-        CustomerBasicInfo customerBasicInfo = (CustomerBasicInfo) customerJsonObject.toBean(customerJsonObject,CustomerBasicInfo.class);
-        customerBasicInfo.setIdCreateBy(adminId);
-
-        JSONObject billingInfoJsonObject =  JSONObject.fromObject(billingInfoJson);
-        BillingInfo billingInfo = (BillingInfo) billingInfoJsonObject.toBean(billingInfoJsonObject,BillingInfo.class);
-
-        JSONObject ticketOpeningInfoJsonObject =  JSONObject.fromObject(ticketOpeningInfoJson);
-        TicketOpeningInfo ticketOpeningInfo = (TicketOpeningInfo) ticketOpeningInfoJsonObject.toBean(ticketOpeningInfoJsonObject,TicketOpeningInfo.class);
-        logger.info("-----------------saveCustomerBasicInfo...Start----------------------");
-        ResponseJson rjx = this.isValiData(customerBasicInfo);
-        Boolean isSaveSuccess = false;//是否保存成功标识
-        if(rjx.getResultCode() == 500){
-            return rjx;
-        }
-        logger.info("-----------------添加客户信息开始----------------------");
-        try {
-            customerBasicService.saveCustomerBasicInfo(customerBasicInfo,dockedContactInfoList,channelSaleInfoList,billingInfo,ticketOpeningInfo);
-            isSaveSuccess = true;
-        } catch (RuntimeException e) {
-            isSaveSuccess = false;
-            return new ResponseJson(500, e.getMessage(), 500);
-        }
-        logger.info("-----------------添加客户信息结束----------------------");
-        if (!isSaveSuccess) {
-            return new ResponseJson(500, "添加客户信息失败!", 500);
-        }else{
-            return new ResponseJson(200, "添加客户信息成功!", 200);
-        }
-    }
-
-    /**
-     * 跳转到修改客户信息页面
-     *
-     * @return
-     */
-    @RequiresPermissions("customerBasic:update:customerInfo")
-    @RequestMapping(value = "/_update_customer_info")
-    public ModelAndView updateCustomerInfo(HttpServletRequest request) throws Exception{
-        ModelAndView mv = new ModelAndView("customerInfoAdmin/update_customer_info");
-        String customerId = request.getParameter("customerId");
-        boolean isSuccess = false;
-        if (!StringUtils.isNotEmpty(customerId)) {
-            return mv;
-        }
-        int queryCustomerId = Integer.valueOf(customerId);
-        CustomerBasicInfo customerBasicInfo = new CustomerBasicInfo();
-        List<DockedContactInfo> dockedContactInfoList = new ArrayList<DockedContactInfo>();
-        List<ChannelSaleInfo> channelSaleInfoList = new ArrayList<ChannelSaleInfo>();
-        BillingInfo billingInfo = new BillingInfo();
-        TicketOpeningInfo ticketOpeningInfo = new TicketOpeningInfo();
-        logger.info("-----------------修改客户信息开始----------------------");
-        try {
-            customerBasicInfo = customerBasicService.queryCustomerBasicInfoByCustomerId(queryCustomerId);
-            dockedContactInfoList = customerBasicService.queryDockedContactInfoListByCustomerId(queryCustomerId);
-            channelSaleInfoList = customerBasicService.queryChannelSaleInfoListByCustomerId(queryCustomerId);
-            billingInfo = customerBasicService.queryBillingInfoByCustomerId(queryCustomerId);
-            ticketOpeningInfo = customerBasicService.queryTicketOpeningInfoByCustomerId(queryCustomerId);
-            isSuccess = true;
-        }catch (Exception e){
-            isSuccess = false;
-            logger.error("跳转修改页面失败："+e.getMessage());
-        }
-        logger.info("----------------修改客户信息结束----------------------");
-        if(!isSuccess){
-            return mv;
-        }else{
-            mv.addObject("customerBasicInfo", customerBasicInfo);
-            mv.addObject("dockedContactInfoList", dockedContactInfoList);
-            mv.addObject("channelSaleInfoList", channelSaleInfoList);
-            mv.addObject("billingInfo", billingInfo);
-            mv.addObject("ticketOpeningInfo", ticketOpeningInfo);
-        }
-        return mv;
-    }
-
-    /**
-     * 修改客户信息
-     * @param request
-     * @return
-     * @throws Exception
-     */
-    @ResponseBody
-    @RequiresPermissions("customerBasic:update:customerBasic")
-    @RequestMapping("/update_customer_info")
-    public ResponseJson updateCustomerBasicInfo(HttpServletRequest request,String customerInfoJson,String dockedContactInfoListJson,
-                                              String channelSaleInfoListJson,String billingInfoJson,String ticketOpeningInfoJson) throws Exception {
-        Integer adminId = AdminUtils.getLoginAdminId();
-        JSONArray jsonArray;
-        List<DockedContactInfo> dockedContactInfoList;
-        List<ChannelSaleInfo> channelSaleInfoList;
-        jsonArray = JSONArray.fromObject(dockedContactInfoListJson);
-        dockedContactInfoList = (List) JSONArray.toCollection(jsonArray, DockedContactInfo.class);
-
-        jsonArray = JSONArray.fromObject(channelSaleInfoListJson);
-        channelSaleInfoList = (List) JSONArray.toCollection(jsonArray, ChannelSaleInfo.class);
-        JSONObject customerJsonObject =  JSONObject.fromObject(customerInfoJson);
-        CustomerBasicInfo customerBasicInfo = (CustomerBasicInfo) customerJsonObject.toBean(customerJsonObject,CustomerBasicInfo.class);
-        customerBasicInfo.setIdCreateBy(adminId);
-
-        JSONObject billingInfoJsonObject =  JSONObject.fromObject(billingInfoJson);
-        BillingInfo billingInfo = (BillingInfo) billingInfoJsonObject.toBean(billingInfoJsonObject,BillingInfo.class);
-
-        JSONObject ticketOpeningInfoJsonObject =  JSONObject.fromObject(ticketOpeningInfoJson);
-        TicketOpeningInfo ticketOpeningInfo = (TicketOpeningInfo) ticketOpeningInfoJsonObject.toBean(ticketOpeningInfoJsonObject,TicketOpeningInfo.class);
-        ResponseJson rjx = this.isValiData(customerBasicInfo);
-        Boolean isSaveSuccess = false;//是否保存成功标识
-        if(rjx.getResultCode() == 500){
-            return rjx;
-        }
-        logger.info("-----------------修改客户信息开始----------------------");
-            try {
-                customerBasicService.updateCustomerBasicInfo(customerBasicInfo,dockedContactInfoList,channelSaleInfoList,billingInfo,ticketOpeningInfo);
-                isSaveSuccess = true;
-            } catch (RuntimeException e) {
-            isSaveSuccess = false;
-            return new ResponseJson(500, e.getMessage(), 500);
-        }
-        logger.info("-----------------修改客户信息结束----------------------");
-        if (!isSaveSuccess) {
-            return new ResponseJson(500, "修改客户信息失败!", 500);
-        }else{
-            return new ResponseJson(200, "修改客户信息成功!", 200);
-        }
-    }
-
-
-    /**
-     * 查询所有省份
-     *
-     * @return
-     */
-    @ResponseBody
-    @RequestMapping(value = "/query_provinceList")
-    public ResponseJson queryProvinceList(HttpServletRequest request) {
-        //Province province = new Province();
-        String provinceId =  request.getParameter("provinceListInfo");
-        List<Province> provinceList = null;
-        provinceList = customerBasicService.queryProvinceList(provinceId);
-        if (provinceList != null || provinceList.size() > 0) {
-            ResponseJson rj =new ResponseJson(200, "查询成功", 200);
-            rj.addResponseKeyValue("provinceList", provinceList);
-            return rj;
-        } else {
-            return new ResponseJson(500, "查询失败", 500);
-        }
-    }
-
-    /**
-     * 根据省份代号查询所有城市
-     *
-     * @return
-     */
-    @ResponseBody
-    @RequestMapping(value = "/query_cityList")
-    public ResponseJson queryCityList(HttpServletRequest request) {
-        //Province province = new Province();
-        String provinceId =  request.getParameter("provinceId");
-        List<City> cityList = null;
-        cityList = customerBasicService.queryCityList(provinceId);
-        if (cityList != null || cityList.size() > 0) {
-            ResponseJson rj =new ResponseJson(200, "查询成功", 200);
-            rj.addResponseKeyValue("cityList", cityList);
-            return rj;
-        } else {
-            return new ResponseJson(500, "查询失败", 500);
-        }
-    }
-
-    /**
-     * 根据省份代号查询所有区/县
-     *
-     * @return
-     */
-    @ResponseBody
-    @RequestMapping(value = "/query_districtList")
-    public ResponseJson queryDistrictList(HttpServletRequest request) {
-        //Province province = new Province();
-        String cityId =  request.getParameter("cityId");
-        List<District> districtList = null;
-        districtList = customerBasicService.queryDistrictList(cityId);
-        if (districtList != null || districtList.size() > 0) {
-            ResponseJson rj =new ResponseJson(200, "查询成功", 200);
-            rj.addResponseKeyValue("districtList", districtList);
-            return rj;
-        } else {
-            return new ResponseJson(500, "查询失败", 500);
-        }
-    }
-
-    /**
-     * 查询所有渠道类别
-     *
-     * @return
-     */
-    @ResponseBody
-    @RequestMapping(value = "/query_channelCategoryList")
-    public ResponseJson queryChannelCategoryList(HttpServletRequest request) {
-        String channelCategoryId =  request.getParameter("channelCategoryId");
-        List<ChannelDivisionInfo> channelCategoryList = null;
-        channelCategoryList = customerBasicService.queryChannelCategoryList(channelCategoryId);
-        if (channelCategoryList != null || channelCategoryList.size() > 0) {
-            ResponseJson rj =new ResponseJson(200, "查询成功", 200);
-            rj.addResponseKeyValue("channelCategoryList", channelCategoryList);
-            return rj;
-        } else {
-            return new ResponseJson(500, "查询失败", 500);
-        }
-    }
-
-    /**
-     * 根据渠道类别查询渠道类型
-     *
-     * @return
-     */
-    @ResponseBody
-    @RequestMapping(value = "/query_channelTypeList")
-    public ResponseJson queryChannelTypeList(HttpServletRequest request) {
-        String channelCategoryId =  request.getParameter("channelCategoryId");
-        List<ChannelDivisionInfo> channelTypeList = null;
-        channelTypeList = customerBasicService.queryChannelTypeList(channelCategoryId);
-        if (channelTypeList != null || channelTypeList.size() > 0) {
-            ResponseJson rj =new ResponseJson(200, "查询成功", 200);
-            rj.addResponseKeyValue("channelTypeList", channelTypeList);
-            return rj;
-        } else {
-            return new ResponseJson(500, "查询失败", 500);
-        }
-    }
-
-    /**
-     * 初始化销售产品
-     *
-     * @return
-     */
-    @ResponseBody
-    @RequestMapping(value = "/query_promotingProductsList")
-    public ResponseJson queryPromotingProductsList(HttpServletRequest request) {
-        String promotingProductsInfo =  request.getParameter("promotingProductsInfo");
-        List<Product> promotingProductsList = null;
-        promotingProductsList = customerBasicService.queryPromotingProductsList(promotingProductsInfo);
-        if (promotingProductsList != null || promotingProductsList.size() > 0) {
-            ResponseJson rj =new ResponseJson(200, "查询成功", 200);
-            rj.addResponseKeyValue("promotingProductsList", promotingProductsList);
-            return rj;
-        } else {
-            return new ResponseJson(500, "查询失败", 500);
-        }
-    }
-
-    /**
-     * 根据销售产品初始化价格
-     *
-     * @return
-     */
-    @ResponseBody
-    @RequestMapping(value = "/query_supplyPriceList")
-    public ResponseJson querySupplyPriceList(HttpServletRequest request) {
-        String promotingProductsId =  request.getParameter("promotingProductsId");
-        List<ProductColor> supplyPriceList = null;
-        supplyPriceList = customerBasicService.querySupplyPriceList(promotingProductsId);
-        if (supplyPriceList != null || supplyPriceList.size() > 0) {
-            ResponseJson rj =new ResponseJson(200, "查询成功", 200);
-            rj.addResponseKeyValue("supplyPriceList", supplyPriceList);
-            return rj;
-        } else {
-            return new ResponseJson(500, "查询失败", 500);
-        }
-    }
-
-    /**
-     * 验证方法
-     *
-     * @param customerBasicInfo
-     * @return
-     */
-    public ResponseJson isValiData(CustomerBasicInfo customerBasicInfo) {
-        ResponseJson rj = new ResponseJson();
-        if(customerBasicInfo == null){
-            return new ResponseJson(500, "未填写客户基本信息", 500);
-        }
-        return rj;
-    }
-
-    /**
-     * 根据销售产品id和渠道id查询最低价
-     *
-     * @return
-     */
-    @ResponseBody
-    @RequestMapping(value = "/getLowestPrice")
-    public ResponseJson getLowestPrice(HttpServletRequest request,LowestPriceInfo lowestPriceInfo) {
-        if(lowestPriceInfo != null){
-            lowestPriceInfo = customerBasicService.getLowestPrice(lowestPriceInfo);
-        }
-        if (lowestPriceInfo != null) {
-            ResponseJson rj =new ResponseJson(200, "查询成功", 200);
-            rj.addResponseKeyValue("lowestPriceInfo", lowestPriceInfo);
-            return rj;
-        } else {
-            return new ResponseJson(500, "查询失败", 500);
-        }
-    }
-}

watero-rst-web/src/main/java/com/iamberry/rst/controllers/order/MallOrderController.java

@@ -1,8 +1,6 @@
 package com.iamberry.rst.controllers.order;
 
 import com.alibaba.fastjson.JSON;
-import com.iamberry.rst.controllers.sys.SysController;
-import com.iamberry.rst.core.cm.FittingsInfo;
 import com.iamberry.rst.core.cm.SalesOrder;
 import com.iamberry.rst.core.cm.SalesOrderItem;
 import com.iamberry.rst.core.cm.StoreInfo;
@@ -11,9 +9,7 @@ import com.iamberry.rst.core.order.ProductColor;
 import com.iamberry.rst.faces.cm.SalesOrderService;
 import com.iamberry.rst.faces.cm.StoreInfoService;
 import com.iamberry.rst.faces.product.ProductService;
-import com.iamberry.rst.utils.AdminUtils;
 import com.iamberry.rst.utils.GenerateKeyUtil;
-import com.iamberry.rst.utils.OrderNoUtil;
 import net.sf.json.JSONArray;
 import net.sf.json.JSONObject;
 import org.slf4j.Logger;

watero-rst-web/src/main/resources/watero-rst-orm.xml

@@ -77,6 +77,7 @@
 		<typeAlias type="com.iamberry.rst.core.cm.Reissue" alias="Reissue"/>
 		<typeAlias type="com.iamberry.rst.core.cm.Renewed" alias="Renewed"/>
 		<typeAlias type="com.iamberry.rst.core.cm.Repair" alias="Repair"/>
+		<typeAlias type="com.iamberry.rst.core.cm.SendFitting" alias="SendFitting"/>
 		<typeAlias type="com.iamberry.rst.core.cm.FittingsInfo" alias="FittingsInfo"/>-->
 
 
@@ -91,7 +92,7 @@
 		<typeAlias type="com.iamberry.rst.core.cm.QuestionDescribe" alias="QuestionDescribe"/>
 		<typeAlias type="com.iamberry.rst.core.cm.SalesOrder" alias="SalesOrder"/>
 		<typeAlias type="com.iamberry.rst.core.cm.SalesOrderItem" alias="SalesOrderItem"/>
-		<typeAlias type="com.iamberry.rst.core.cm.SendFitting" alias="SendFitting"/>
+
 		<typeAlias type="com.iamberry.rst.core.cm.SendProdcue" alias="SendProdcue"/>
 		<typeAlias type="com.iamberry.rst.core.cm.StoreInfo" alias="StoreInfo"/>
 		<typeAlias type="com.iamberry.rst.core.cm.Visit" alias="Visit"/>

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

@@ -1,457 +0,0 @@
-<!DOCTYPE HTML>
-<html>
-<head>
-    <meta charset="utf-8">
-    <meta name="renderer" content="webkit|ie-comp|ie-stand">
-    <meta http-equiv="X-UA-Compatible" content="IE=edge,chrome=1">
-    <meta name="viewport" content="width=device-width,initial-scale=1,minimum-scale=1.0,maximum-scale=1.0,user-scalable=no" />
-    <meta http-equiv="Cache-Control" content="no-siteapp" />
-<#include "/base/add_base.ftl">
-    <link href="${path}/common/lib/jquery.ui/jquery-ui.css" rel="stylesheet" type="text/css"/>
-    <link href="${path}/common/lib/webuploader/0.1.5/webuploader.css" rel="stylesheet" type="text/css"/>
-    <link href="${path}/common/lib/icheck/icheck.css" rel="stylesheet" type="text/css"/>
-    <style>
-        .tit{position: relative;text-align: left;font-size: 16px;padding-left: 10px;}
-        .tit:after{content: '';position: absolute;left: 0;top: 20%;height: 60%;width: 3px;background-color: #32a3d8;}
-        .tit-2{position: relative;text-align: left;font-size: 16px;padding-left: 10px;color: #50a2ea;}
-        .tit-2:after{content: '';position: absolute;left: 0;top: 50%;height: 6px;width: 6px;border-radius: 6px;margin-top: -3px; background-color: #32a3d8;}
-        #province select{margin-right:10px; width:100px;height: 31px;-webkit-appearance:none !important;appearance:none;background: url(${path}/common/images/cm/select-1.png) right center no-repeat;background-size: auto 100%;padding-left:3px;padding-right: 25px;}
-
-        #suggest, #suggest2 {width:200px}
-        .gray {color:gray}
-        .ac_results {background:#fff;border:1px solid #7f9db9;position: absolute;z-index: 10000;display: none}
-        .ac_results li a {white-space: nowrap;text-decoration:none;display:block;color:#05a;padding:1px 3px}
-        .ac_results li {border:1px solid #fff}
-        .ac_over, .ac_results li a:hover {background:#c8e3fc}
-        .ac_results li a span {float:right}
-        .ac_result_tip {border-bottom:1px dashed #666;padding:3px}
-
-        .select-box{background: url(${path}/common/images/cm/select-1.png) right center no-repeat;background-size: auto 100%;}
-        .select-box select{-webkit-appearance:none !important;background-color: transparent; appearance:none;padding-right: 15px;}
-        .dalog-ask{position: absolute;left:60%;top:0;-webkit-transform: translateY(-30%);transform: translateY(-30%);display: none;background-color: #fff;z-index: 10;}
-        .tag{ width:300px; min-height:300px; border:1px solid #32a3d8; position:relative;background-color: #fff;line-height: 1.5;padding: 10px 12px;}
-        .tag em{display:block; border-width:15px; position:absolute; top:30%; left:-30px;border-style:solid dashed dashed; border-color:transparent  #32a3d8 transparent transparent;font-size:0; line-height:0;}
-        .dalog-ask .ask{color: #000;margin: 10px 0 5px 0;}
-        .dalog-ask .answer{color: #666;margin-bottom: 10px;}
-        .dalog-ask .answer:hover{color: #32a3d8;cursor: pointer;}
-        .time-line-list{list-style: none;width: 100%;margin-left: -20px;}
-        .time-line-list>li{position: relative;float: left; text-align: center;width: 100px;overflow: hidden;white-space: nowrap;word-break: break-all;padding: 2px 0;}
-        .time-line-list .number{display: inline-block; padding: 2px; background: #32a3d8;border: 2px solid #fff;box-shadow:0 0 0 1px #32a3d8;width: 20px;height: 20px;color: #fff;line-height: 20px;border-radius: 50%;}
-        .time-line-list .red{display: inline-block; padding: 2px; background: red;border: 2px solid #fff;box-shadow:0 0 0 1px #32a3d8;width: 20px;height: 20px;color: #fff;line-height: 20px;border-radius: 50%;}
-        .time-line-list>li:before{content:'';position: absolute;height: 1px;width: 30%;right:0;top: 15px; background-color: #32a3d8;}
-        .time-line-list>li:after{content: '';position: absolute;height: 1px;width: 30%;left: 0;top: 15px;background:#32a3d8;}
-        .time-line-list>li:first-child:after,.time-line-list>li:last-child:before{display: none;}
-        .time-line-list .arrow{border-width:7px; position:absolute; left:25%; top:9px;border-style:solid dashed dashed; border-color:transparent  transparent  transparent #32a3d8;font-size:0; line-height:0;}
-        .time-line-list>li:first-child .arrow{display: none;}
-        .table-bg th{background-color: #e2f6ff;}
-        .update-parts>span{margin-right: 10px;padding: 3px 4px;background-color: #effaff;border: 1px solid #32a3d8;}
-        .my-search-input{padding-left: 30px;background: url(${path}/common/images/cm/search.png) 6px center no-repeat;background-size: auto 60%; }
-        .txt-red{color:red}
-        .my-btn-search{border: 1px solid #32a3d8;padding: 1px 25px;height: 32px;background-color: #32a3d8;color: #fff;}
-    </style>
-    <title>客诉基本信息</title>
-</head>
-<body>
-<article class="cl pd-20">
-    <form action="" method="post" class="form form-horizontal" id="form-article-add">
-        <div  class="row cl">
-                <span class="c-red"><button type="button"  class="my-btn-search" onclick="window.history.back()">返回</button></span>
-        </div>
-
-
-        <div class="row cl">
-            <label class="form-label col-2">
-                <div class="tit-2">客户基本信息</div>
-            </label>
-            <div class="formControls col-9">
-            </div>
-        </div>
-        <div style="margin-left: -27px;">
-        <div class="row cl">
-            <label class="form-label col-2 col-sm-2" style="padding:0 0;margin-top: 2px;">客户类型：</label>
-            <div class="formControls col-2 col-sm-2" style="padding:0 0;">
-				<label>
-                    <#if customerBasicInfo.customerType == 1>个人</#if>
-                    <#if customerBasicInfo.customerType == 2>企业</#if>
-                </label>
-            </div>
-            <label class="form-label col-2 col-sm-2"style="padding:0 0;margin-top: 2px;">合作进度：</label>
-            <div class="formControls col-2 col-sm-2"style="padding:0 0;">
-                <label>
-                    <#if customerBasicInfo.cooperativeState == 1>意向合作</#if>
-                    <#if customerBasicInfo.cooperativeState == 2>已经合作</#if>
-                    <#if customerBasicInfo.cooperativeState == 3>停止合作</#if>
-                </label>
-            </div>
-        </div>
-        <div class="row cl">
-            <label class="form-label col-2 col-sm-2"style="padding:0 0;margin-top: 2px;">客户名称：</label>
-            <div class="formControls col-2 col-sm-2"style="padding:0 0;">
-                <label>
-                    ${customerBasicInfo.customerName!''}
-                </label>
-            </div>
-            <label class="form-label col-2 col-sm-2"style="padding:0 0;margin-top: 2px;">客户行业：</label>
-            <div class="formControls col-2 col-sm-2"style="padding:0 0;">
-                <label>
-                    ${customerBasicInfo.customerIndustry!''}
-                </label>
-            </div>
-        </div>
-        <div class="row cl" style="position: relative;">
-            <label class="form-label col-2 col-sm-2"style="padding:0 0;margin-top: 2px;">客户地址：</label>
-            <div class="formControls col-2 col-sm-2"style="padding:0 0;">
-                <label>
-                ${customerBasicInfo.provinceName!''}-${customerBasicInfo.cityName!''}-${customerBasicInfo.customerAddress!''}
-                </label>
-            </div>
-        </div>
-
-    </div>
-        <div class="row cl">
-            <label class="form-label col-3">
-                <div class="tit-2">对接联系人信息</div>
-            </label>
-            <div class="formControls col-9">
-            </div>
-        </div>
-
-        <div class="row cl">
-            <label class="form-label col-1 col-sm-1"></label>
-            <div class="formControls col-7 col-sm-7 text-c" style="margin-left: -10px;">
-                <table class="table table-border table-bg table-bordered">
-                    <thead>
-                    <tr class="text-c">
-                        <th>联系人姓名</th>
-                        <th>联系电话</th>
-                        <th>职位/身份</th>
-                        <th>联系邮箱</th>
-                    </tr>
-                    </thead>
-                    <tbody id="salesOrderHtml">
-
-                    <#if listDockedContactInfo?? &&  (listDockedContactInfo?size > 0) >
-                        <#list listDockedContactInfo as list>
-                        <tr class="text-c">
-                            <td>${list.contactName!''}</td>
-                            <td>${list.contactPhone!''}</td>
-                            <td>${list.contactType!''}</td>
-                            <td>${list.contactEmail!''}</td>
-                        </tr>
-                        </#list>
-                    <#else>
-                    <tr><td colspan="4" class="td-manage text-c" >暂时没有对接人信息，请添加！</td></tr>
-                    </#if>
-
-                    </tbody>
-                </table>
-            </div>
-        </div>
-
-        <div class="row cl">
-            <label class="form-label col-3">
-                <div class="tit-2">客户销售渠道信息备案</div>
-            </label>
-            <div class="formControls col-9">
-            </div>
-        </div>
-
-        <div class="row cl">
-            <label class="form-label col-1 col-sm-1"></label>
-            <div class="formControls col-7 col-sm-7 text-c" style="margin-left: -10px;">
-                <table class="table table-border table-bg table-bordered">
-                    <thead>
-                    <tr class="text-c">
-                        <th>渠道类别</th>
-                        <th>渠道类型</th>
-                        <th>渠道/平台名称</th>
-                        <th>销售产品</th>
-                    </tr>
-                    </thead>
-                    <tbody>
-
-                        <#if listChannelDivisionInfo?? &&  (listChannelDivisionInfo?size > 0) >
-                            <#list listChannelDivisionInfo as list>
-                        <tr class="text-c">
-                        <td>
-                            <#if list.channelCategory == 1 >电商</#if>
-                            <#if list.channelCategory == 2 >特殊渠道</#if>
-                            <#if list.channelCategory == 3 >线下</#if>
-                            <#if list.channelCategory == 4 >海外</#if>
-                        </td>
-                        <td>${list.channelType}</td>
-                        <td>${list.channelName}</td>
-                        <td>
-
-                            <table class="table table-border table-bg table-bordered">
-                                <thead>
-                                <tr>
-                                    <th>销售产品型号</th>
-                                    <th>供货价(元,含17%税)</th>
-                                    <th>账期</th>
-                                </tr>
-                                </thead>
-                                <tbody>
-                                    <#if list.listChannelSaleInfo?? &&  (list.listChannelSaleInfo?size > 0) >
-                                        <#list list.listChannelSaleInfo as list>
-                                        <tr>
-                                            <td>${list.promotingProducts}</td>
-                                            <td>${list.supplyPrice/100}</td>
-                                            <td>
-                                            <#if list.accountPeriod == 1>先款</#if>
-                                            <#if list.accountPeriod == 2>月结 </#if>
-                                            <#if list.accountPeriod == 3>两个月</#if>
-                                            </td>
-                                        </tr>
-                                        </#list>
-                                    <#else>
-                                    <tr><td colspan="3" class="td-manage text-c" >暂时没有销售信息，请添加！</td></tr>
-                                    </#if>
-
-                                </tbody>
-                            </table>
-
-                        </td>
-                        </tr>
-                            </#list>
-                        <#else>
-                        <tr><td colspan="4" class="td-manage text-c" >暂时没有渠道信息，请添加！</td></tr>
-                        </#if>
-
-                    </tbody>
-                </table>
-            </div>
-        </div>
-        <div class="row cl">
-            <label class="form-label col-3">
-                <div class="tit-2">付款/退款信息</div>
-            </label>
-            <div class="formControls col-9">
-            </div>
-        </div>
-        <#--<div style="margin-left: -27px;">
-        <#if billingInfo??>
-            <div class="row cl">
-                <label class="form-label col-2 col-sm-2"style="padding:0 0;margin-top: 2px;">开户支行：</label>
-                <div class="formControls col-2 col-sm-2"style="padding:0 0;">
-                    <label>${billingInfo.accountOpeningBranch!''}</label>
-                </div>
-                <label class="form-label col-2 col-sm-2"style="padding:0 0;margin-top: 2px;">账户名称：</label>
-                <div class="formControls col-2 col-sm-2"style="padding:0 0;">
-                    <label>${billingInfo.accountName!''}</label>
-                </div>
-                <label class="form-label col-2 col-sm-2"style="padding:0 0;margin-top: 2px;">账号：</label>
-                <div class="formControls col-2 col-sm-2"style="padding:0 0;">
-                    <label>${billingInfo.accountNum!''}</label>
-                </div>
-            </div>
-        <#else>
-            <div class="row cl">
-                <label class="form-label col-1 col-sm-1"></label>
-            </div>
-            <div class="row cl">
-                <label class="form-label col-1 col-sm-1"></label>
-                <div class="formControls col-4 col-sm-4">
-                    <label>无付款/退款信息</label>
-                </div>
-            </div>
-        </#if>
-        </div>-->
-
-        <#--new billing start-->
-        <#--<div class="row cl">
-            <div class="mt-20" style="margin: 10px 20px 20px 20px;">
-                <table class="table table-border table-bordered table-bg table-hover table-sort" style="width: 960px;">
-                    <thead>
-                    <tr class="text-c">
-                        <th width="100">账户类型</th>
-                        <th width="100">开户支行</th>
-                        <th width="100">账户名称</th>
-                        <th width="100">账号</th>
-                    </tr>
-                    </thead>
-                    <tbody id="contactListId">
-                    <#if billingInfo??>
-                        <tr class="text-c">
-                            &lt;#&ndash;<td>${billingInfo.accountType!''}</td>&ndash;&gt;
-                            <#assign isStatus=(billingInfo.accountType == 1)/>
-                            <#if isStatus>
-                            <td>公司</td>
-                            <#else>
-                            <td>个人</td>
-                            </#if>
-                            <td>${billingInfo.accountOpeningBranch!''}</td>
-                            <td>${billingInfo.accountName!''}</td>
-                            <td>${billingInfo.accountNum!''}</td>
-                        </tr>
-                    <#else>
-                        <tr class="text-c"><td colspan="9">暂无数据</td></tr>
-                    </#if>
-                    </tbody>
-                </table>
-            </div>
-        </div>-->
-
-        <div class="row cl">
-            <label class="form-label col-1 col-sm-1"></label>
-            <div class="formControls col-7 col-sm-7 text-c" style="margin-left: -10px;">
-                <table class="table table-border table-bg table-bordered">
-                    <thead>
-                    <tr class="text-c">
-                        <th width="100">账户类型</th>
-                        <th width="100">开户支行</th>
-                        <th width="100">账户名称</th>
-                        <th width="100">账号</th>
-                    </tr>
-                    </thead>
-                    <tbody id="contactListId">
-                    <#if billingInfo??>
-                    <tr class="text-c">
-                    <#--<td>${billingInfo.accountType!''}</td>-->
-                            <#assign isStatus=(billingInfo.accountType == 1)/>
-                            <#if isStatus>
-                            <td>公司</td>
-                            <#else>
-                            <td>个人</td>
-                            </#if>
-                        <td>${billingInfo.accountOpeningBranch!''}</td>
-                        <td>${billingInfo.accountName!''}</td>
-                        <td>${billingInfo.accountNum!''}</td>
-                    </tr>
-                    <#else>
-                        <tr class="text-c"><td colspan="4">暂无数据</td></tr>
-                    </#if>
-                    </tbody>
-                </table>
-            </div>
-        </div>
-        <#--new billing end-->
-
-        <div class="row cl">
-            <label class="form-label col-3">
-                <div class="tit-2">开票信息</div>
-            </label>
-            <div class="formControls col-9">
-            </div>
-        </div>
-        <#--<div style="margin-left: -27px;">
-        <#if ticketOpeningInfo??>
-        <div class="row cl">
-            <label class="form-label col-2 col-sm-2" style="padding:0 0;margin-top: 2px;">发票类型：</label>
-            <div class="formControls col-2 col-sm-2" style="padding:0 0;">
-                <label>
-                <#if ticketOpeningInfo.ticketType == 1>专票</#if>
-                <#if ticketOpeningInfo.ticketType == 2>普票</#if>
-                </label>
-            </div>
-            <label class="form-label col-2 col-sm-2" style="padding:0 0;margin-top: 2px;">开户支行：</label>
-            <div class="formControls col-2 col-sm-2" style="padding:0 0;">
-                <label>${ticketOpeningInfo.accountOpeningBranch!''}</label>
-            </div>
-            <label class="form-label col-2 col-sm-2" style="padding:0 0;margin-top: 2px;">开票账号：</label>
-            <div class="formControls col-2 col-sm-2" style="padding:0 0;">
-                <label>${ticketOpeningInfo.ticketOpeningAccount!''}</label>
-            </div>
-        </div>
-
-        <div class="row cl">
-            <label class="form-label col-2 col-sm-2" style="padding:0 0;margin-top: 2px;">企业名称：</label>
-            <div class="formControls col-2 col-sm-2" style="padding:0 0;">
-                <label>${ticketOpeningInfo.enterpriseName!''}</label>
-            </div>
-            <label class="form-label col-2 col-sm-2" style="padding:0 0;margin-top: 2px;">纳税人识别号：</label>
-            <div class="formControls col-2 col-sm-2" style="padding:0 0;">
-                <label>${ticketOpeningInfo.taxpayerIdentificationNum!''}</label>
-            </div>
-            <label class="form-label col-2 col-sm-2" style="padding:0 0;margin-top: 2px;">开票电话：</label>
-            <div class="formControls col-2 col-sm-2" style="padding:0 0;">
-                <label>${ticketOpeningInfo.ticketOpeningPhone!''}</label>
-            </div>
-        </div>
-        <div class="row cl">
-            <label class="form-label col-2 col-sm-2" style="padding:0 0;margin-top: 2px;">企业地址：</label>
-            <div class="formControls col-2 col-sm-2" style="padding:0 0;">
-                <label>${ticketOpeningInfo.enterpriseAddress!''}</label>
-            </div>
-        </div>
-        <#else>
-            <div class="row cl">
-                <label class="form-label col-1 col-sm-1"></label>
-            </div>
-            <div class="row cl">
-                <label class="form-label col-1 col-sm-1"></label>
-                <div class="formControls col-4 col-sm-4">
-                    <label>未填写开票信息</label>
-                </div>
-            </div>
-        </#if>
-        </div>-->
-
-    <#--new ticketOpening start-->
-        <div class="row cl">
-            <label class="form-label col-1 col-sm-1"></label>
-            <div class="formControls col-7 col-sm-7 text-c" style="margin-left: -10px;">
-                <table class="table table-border table-bg table-bordered">
-                    <thead>
-                    <tr class="text-c">
-                        <th width="100">发票类型</th>
-                        <th width="100">开户支行</th>
-                        <th width="100">开票账号</th>
-                        <th width="100">企业名称</th>
-                        <th width="100">纳税人识别号</th>
-                        <th width="100">开票电话</th>
-                        <th width="100">企业地址</th>
-                    </tr>
-                    </thead>
-                    <tbody id="contactListId">
-                    <#if ticketOpeningInfo??>
-                    <tr class="text-c">
-                        <#assign isStatus=(ticketOpeningInfo.ticketType == 1)/>
-                        <#if isStatus>
-                        <td>专票</td>
-                        <#else>
-                        <td>普票</td>
-                        </#if>
-                        <#--<td>${ticketOpeningInfo.ticketType!''}</td>-->
-                        <td>${ticketOpeningInfo.accountOpeningBranch!''}</td>
-                        <td>${ticketOpeningInfo.ticketOpeningAccount!''}</td>
-                        <td>${ticketOpeningInfo.enterpriseName!''}</td>
-                        <td>${ticketOpeningInfo.taxpayerIdentificationNum!''}</td>
-                        <td>${ticketOpeningInfo.ticketOpeningPhone!''}</td>
-                        <td>${ticketOpeningInfo.enterpriseAddress!''}</td>
-                    </tr>
-                    <#else>
-                        <tr><td colspan="7">暂无数据</td></tr>
-                    </#if>
-                    </tbody>
-                </table>
-            </div>
-        </div>
-    <#--new ticketOpening end-->
-
-        <div class="row cl">
-            <label class="form-label col-3">
-                <div class="tit-2">客户备注</div>
-            </label>
-            <div class="formControls col-9">
-            </div>
-        </div>
-        <div class="row cl">
-            <label class="form-label col-1 col-sm-1"></label>
-            <div class="formControls col-4 col-sm-4" style="margin-left: -10px;">
-                <label>${customerBasicInfo.customerRemarks!''}</label>
-            </div>
-        </div>
-    </form>
-</article>
-<script type="text/javascript" src="${path}/common/lib/My97DatePicker/4.8/WdatePicker.js"></script>
-<script type="text/javascript" src="${path}/common/lib/webuploader/0.1.5/webuploader.min.js"></script>
-<script type="text/javascript" src="${path}/common/lib/icheck/jquery.icheck.min.js"></script>
-<script type="text/javascript" src="${path}/common/lib/cm.lib/jquery.provincesCity.js"></script>
-<script type="text/javascript" src="${path}/common/lib/cm.lib/provincesData.js"></script>
-<script type="text/javascript" src="${path}/common/lib/cm.lib/airCity.js"></script>
-<script type="text/javascript" src="${path}/common/lib/cm.lib/suggest.js"></script>
-<script type="text/javascript" charset="utf-8" src="${path}/common/lib/ueditor/1.4.3/lang/zh-cn/zh-cn.js"></script>
-
-</body>
-</html>

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

@@ -1,219 +0,0 @@
-<!DOCTYPE html>
-<html>
-	<head>
-		<meta charset="UTF-8">
-		<title></title>
-        <#include "/base/list_base.ftl">
-		<style>
-			*{padding: 0;margin: 0;}
-			.my-input{border: 1px solid rgba(0,0,0,.1);padding: 1px 5px;height: 32px;margin-right: 10px;}
-			/*.my-input::-webkit-input-placeholder,.my-select{color: #dcdcdc;}*/
-            .my-select{border: 1px solid rgba(0,0,0,.1);padding:6px 50px 6px 15px;height: 34px; -webkit-appearance:none;appearance:none;background: url(/common/images/pts/select-11.png) right center no-repeat;background-size:auto 100%;}
-            .my-btn-search{border: 1px solid #50a2ea;padding: 1px 25px;height: 32px;background-color: #fff;color: #50a2ea;}
-            .barcodeImg{margin:10px 0px}
-            .table-bg thead th{background-color: #e2f6ff;}
-            input[type=radio]{-webkit-appearance:none;appearance:none;background: url(${path}/common/images/pts/radio-1.png) center center no-repeat;background-size:auto 100%;width: 20px;height: 20px;margin-right: 10px;}
-            input[type=radio]:checked{-webkit-appearance:none;appearance:none;background: url(${path}/common/images/pts/radio-2.png) center center no-repeat;background-size:auto 100%;width: 20px;height: 20px;margin-right: 10px;}
-            .txt2{
-                width:60px;
-                overflow: hidden;
-                white-space: nowrap;
-                text-overflow: ellipsis;
-            }
-        </style>
-	</head>
-	<body>
-    <nav class="breadcrumb"><i class="Hui-iconfont">&#xe67f;</i> 首页
-        <span class="c-gray en">/</span> 客户信息管理
-        <span class="c-gray en">/</span> 客户信息列表
-        <a class="btn radius r" href="javascript:location.replace(location.href);" title="刷新" ><i class="Hui-iconfont">&#xe68f;</i></a>
-    </nav>
-		<div class="text-c" style="margin-top: 20px;">
-			<form action="${path}/admin/customerBasic/listCustomerBasic" method="post">
-                <div style="display: block;">
-                    <button type="button"  class="my-btn-search" style="margin-right: 10px;height: 30px;" onclick="customerAdd()">新增</button>
-					<select class="my-select" name="isLookAll" style="width: 110px;height: 32px;">
-					<#if isLookAll??>
-						<option value ="1" <#if isLookAll == 1>selected</#if>>查看全部客户</option>
-						<option value ="2" <#if isLookAll == 2>selected</#if>>只看我的客户</option>
-					<#else >
-						<option value ="1">查看全部客户</option>
-						<option value ="2">只看我的客户</option>
-					</#if>
-					</select>
-                    <select class="my-select" name="customerType" style="width: 110px;height: 32px;">
-                        <option value ="">所有客户类型</option>
-                        <#if customerType??>
-                         <option value ="1" <#if customerType == 1>selected</#if>>个人</option>
-                         <option value ="2" <#if customerType == 2>selected</#if>>企业</option>
-                        <#else >
-                            <option value ="1">个人</option>
-                            <option value ="2">企业</option>
-                        </#if>
-                    </select>
-                    <select class="my-select" name="cooperativeState" style="width: 100px;height: 32px;">
-                        <option value ="">合作状态</option>
-                    <#if cooperativeState??>
-                        <option value ="1" <#if cooperativeState == 1>selected</#if>>意向合作</option>
-                        <option value ="2" <#if cooperativeState == 2>selected</#if>>已经合作</option>
-                        <option value ="3" <#if cooperativeState == 3>selected</#if>>停止合作</option>
-                    <#else >
-                        <option value ="1">意向合作</option>
-                        <option value ="2">已经合作</option>
-                        <option value ="3">停止合作</option>
-                    </#if>
-                    </select>
-                    <input class="my-input" type="text" name="customerName" style="width: 84px;height: 30px;" value="${customerName!''}" placeholder="请输入客户名称"/>
-                    <input class="my-input" type="text" name="contactName" style="width: 120px;height: 30px;" value="${contactName!''}" placeholder="请输入客户联系人姓名"/>
-                    <input class="my-input" type="text" name="contactPhone" style="width: 120px;height: 30px;" value="${contactPhone!''}" placeholder="请输入客户联系人电话"/>
-                    <input class="my-input" type="text" name="contactEmail" style="width: 120px;height: 30px;" value="${contactEmail!''}" placeholder="请输入客户联系人邮箱"/>
-					<button type="submit" style="cursor:pointer; height: 32px;" class="my-btn-search">搜索</button>
-                </div>
-            </form>
-		</div>
-		<div class="mt-20" style="margin: 20px;">
-			<table class="table table-border table-bordered table-bg table-hover table-sort">
-				<thead>
-				<tr class="text-c">
-                    <th width="50">状态</th>
-					<th width="50">合作状态</th>
-					<th width="60">业务员</th>
-					<th width="30">客户类型</th>
-					<th width="100">客户名称</th>
-					<th width="50">客户行业</th>
-                    <th width="100">所在区域</th>
-                    <th width="40">备注信息</th>
-                    <th width="55">添加日期</th>
-					<th width="70">操作</th>
-				</tr>
-				</thead>
-				<tbody id="listid">
-                <#if page.dataList?? &&  (page.dataList?size > 0) >
-					<#list page.dataList as list>
-						<tr>
-                            <td class="text-c" width="50">
-                                <#if list.customerStatus == 1>
-                                    已删除
-                                </#if>
-                                <#if list.customerStatus == 2>
-                                    正常
-                                </#if>
-                            </td>
-							<td class="text-c" width="50">
-                                <#if list.cooperativeState == 1>
-                                    意向合作
-                                </#if>
-                                <#if list.cooperativeState == 2>
-                                    已经合作
-                                </#if>
-                                <#if list.cooperativeState == 3>
-                                    停止合作
-                                </#if>
-                            </td>
-							<td class="text-c" width="60">${list.adminName!''}</td>
-                            <td class="text-c" width="30">
-                                <#if list.customerType == 1>
-                                        个人
-                                </#if>
-                                <#if list.customerType == 2>
-                                        企业
-                                </#if>
-                            </td>
-                            <td class="text-c" width="100">
-                                ${list.customerName!''}
-                            </td>
-                            <td class="text-c" width="100">
-                                ${list.customerIndustry!''}
-                            </td>
-                            <td class="text-c" width="100">
-                                ${list.provinceName!''}-${list.cityName!''}
-                            </td>
-                            <td class="text-c" width="50">
-                                <span class="txt2" style="display: inline-block;padding: 2px 4px;font-size: 11.844px;" title="${list.customerRemarks!''}" >${list.customerRemarks!''}</span>
-                            </td>
-                            <td class="text-c" width="55">${(list.createDate?string("yyyy-MM-dd"))!''}</td>
-							<!-- 遍历操作 -->
-							<td class="td-manage text-c" width="70">
-                                <#if !isSelectAll?? ||(isSelectAll != 2) || (adminId == list.idCreateBy)>
-                                        <a href="#" onclick="customerDetail(${list.customerId!''})">详情</a>
-                                </#if>
-                                <#if adminId == list.idCreateBy>
-                                    <#if list.customerStatus == 2>
-                                        <a href="#" onclick="customerupdate(${list.customerId!''})">修改</a>
-                                    </#if>
-                                </#if>
-                                <#if list.customerStatus == 2>
-                                    <#if adminId == list.idCreateBy>
-                                        <a href="#" onclick="deleteState(${list.customerId!''})">删除</a>
-                                    </#if>
-                                </#if>
-                            </td>
-						</tr>
-					</#list>
-                <#else>
-                <tr><td id="noMachineTr" colspan="11" class="td-manage text-c" >暂时没有客户信息，请添加！</td></tr>
-                </#if>
-				</tbody>
-			</table>
-		</div>
-		<#include "/base/page_util.ftl">
-
-        <#--jquery.PrintArea 2.4-->
-        <script type="text/javascript" src="${path}/common/lib/jquery.PrintArea/jquery.PrintArea.js"></script>
-        <script type="text/javascript" src="${path}/common/lib/jquery/1.9.1/jquery-barcode.js"></script>
-
-		<script type="text/javascript">
-
-            /**
-             * 删除 （修改状态为已删除）
-             */
-            function deleteState(customerId) {
-                layer.confirm('确认要删除吗？',function(index){
-                    $.ajax({
-                        cache: true,
-                        type: "POST",
-                        data: {"customerId":customerId},
-                        url: "${path}/admin/customerBasic/update_customerState",
-                        async: false,
-                        success: function(data){
-                            if (data.returnCode == 200) {
-                                layer.msg(data.resultMsg,{icon: 1,time:1000});
-                                window.location.reload();
-                            } else {
-                                layer.msg(data.resultMsg,{icon: 5,time:1000});
-                            }
-                            /*location.replace(location.href);*/
-                        },
-                        error: function(XmlHttpRequest, textStatus, errorThrown){
-                        }
-                    })
-                }, function() {
-
-                });
-            }
-
-
-            /**
-             *跳转到详情页面
-             * @param employee
-             */
-            function customerDetail(customerId) {
-                window.location.href= "${path}/admin/customerBasic/customer_Basic_Detail?customerId="+customerId;
-            }
-            /**
-             *跳转到修改页面
-             * @param employee
-             */
-            function customerupdate(customerId) {
-                window.location.href= "${path}/admin/customerBasic/to_update_customer_Basic?customerId="+customerId;
-            }
-            /**
-             *跳转到添加页面
-             * @param employee
-             */
-            function customerAdd() {
-                window.location.href= "${path}/admin/customerBasic/saveCustomerInfo";
-            }
-        </script>
-	</body>
-</html>