客户系统管理

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

@@ -41,7 +41,7 @@ public class SalesOrder implements Serializable {
     private String salesAddressName;        //收件人姓名
     private String salesAddressPostcode;        //收件人邮政编码
     private Integer salesAmount;            //订单总金额
-    private Integer salesPayMoney;          //已付金额
+    private Integer salesPayMoney;          //已付金额 - 支付金额
     private Integer salesPayType;           //付款方式  1：微信支付 2：现金支付3：已支付定金￥99 4：刷卡支付 5：支付宝支付
     private Integer salesWaitMoney;         //待付金额
     private Integer salesLastMoney;         //本次支付金额

watero-rst-core/src/main/java/com.iamberry.rst.core/dm/ClaimOrder.java

@@ -0,0 +1,41 @@
+package com.iamberry.rst.core.dm;
+
+import  java.io.Serializable;
+/**
+ *  认领订单关系类
+ * @author xm
+ * @Date 2019-07-19
+ */
+public class ClaimOrder  implements  Serializable{
+    private static final long serialVersionUID = 3245798512953020234L;
+    //认领订单id
+    private Integer claimOrderId;
+    //订单id
+    private Integer salesId;
+    //财务收款id'
+    private Integer frId;
+
+    public Integer getClaimOrderId(){
+        return claimOrderId;
+    }
+
+    public void setClaimOrderId(Integer  claimOrderId){
+        this.claimOrderId=claimOrderId;
+    }
+
+    public Integer getSalesId(){
+        return salesId;
+    }
+
+    public void setSalesId(Integer  salesId){
+        this.salesId=salesId;
+    }
+
+    public Integer getFrId(){
+        return frId;
+    }
+
+    public void setFrId(Integer  frId){
+        this.frId=frId;
+    }
+}

watero-rst-core/src/main/java/com.iamberry.rst.core/dm/CooperationAgree.java

@@ -0,0 +1,72 @@
+package com.iamberry.rst.core.dm;
+
+import  java.util.Date;
+import  java.io.Serializable;
+/**
+ *  合作协议类
+ * @author xm
+ * @Date 2019-07-19
+ */
+public class CooperationAgree  implements  Serializable{
+    private static final long serialVersionUID = 4052916520361303868L;
+    //合作协议id
+    private Integer coopAgreeId;
+    //客户id
+    private Integer dealerId;
+    //合作时间
+    private Date coopAgreeDate;
+    //图片
+    private String coopAgreeImg;
+    //备注
+    private String coopAgreeRemake;
+    //创建时间'
+    private Date createDate;
+
+    public Integer getCoopAgreeId(){
+        return coopAgreeId;
+    }
+
+    public void setCoopAgreeId(Integer  coopAgreeId){
+        this.coopAgreeId=coopAgreeId;
+    }
+
+    public Integer getDealerId(){
+        return dealerId;
+    }
+
+    public void setDealerId(Integer  dealerId){
+        this.dealerId=dealerId;
+    }
+
+    public Date getCoopAgreeDate(){
+        return coopAgreeDate;
+    }
+
+    public void setCoopAgreeDate(Date  coopAgreeDate){
+        this.coopAgreeDate=coopAgreeDate;
+    }
+
+    public String getCoopAgreeImg(){
+        return coopAgreeImg;
+    }
+
+    public void setCoopAgreeImg(String  coopAgreeImg){
+        this.coopAgreeImg=coopAgreeImg;
+    }
+
+    public String getCoopAgreeRemake(){
+        return coopAgreeRemake;
+    }
+
+    public void setCoopAgreeRemake(String  coopAgreeRemake){
+        this.coopAgreeRemake=coopAgreeRemake;
+    }
+
+    public Date getCreateDate(){
+        return createDate;
+    }
+
+    public void setCreateDate(Date  createDate){
+        this.createDate=createDate;
+    }
+}

watero-rst-core/src/main/java/com.iamberry.rst.core/dm/DealerChannel.java

@@ -0,0 +1,82 @@
+package com.iamberry.rst.core.dm;
+import  java.util.Date;
+import  java.io.Serializable;
+/**
+ *  客户渠道信息类
+ * @author xm
+ * @Date 2019-07-19
+ */
+public class DealerChannel  implements  Serializable{
+    private static final long serialVersionUID = 5173905993542299252L;
+    //渠道id
+    private Integer channelId;
+    //渠道名称
+    private String channelName;
+    //渠道类型id
+    private Integer channelTypeId;
+    //渠道编码
+    private String channelCode;
+    //状态 1:使用中 2:禁用
+    private Integer channelStatus;
+    //创建时间'
+    private Date createDate;
+
+    //渠道
+    private String dealChannelIdStr;
+
+    public Integer getChannelId() {
+        return channelId;
+    }
+
+    public void setChannelId(Integer channelId) {
+        this.channelId = channelId;
+    }
+
+    public String getChannelName() {
+        return channelName;
+    }
+
+    public void setChannelName(String channelName) {
+        this.channelName = channelName;
+    }
+
+    public Integer getChannelTypeId() {
+        return channelTypeId;
+    }
+
+    public void setChannelTypeId(Integer channelTypeId) {
+        this.channelTypeId = channelTypeId;
+    }
+
+    public String getChannelCode() {
+        return channelCode;
+    }
+
+    public void setChannelCode(String channelCode) {
+        this.channelCode = channelCode;
+    }
+
+    public Integer getChannelStatus() {
+        return channelStatus;
+    }
+
+    public void setChannelStatus(Integer channelStatus) {
+        this.channelStatus = channelStatus;
+    }
+
+    public Date getCreateDate() {
+        return createDate;
+    }
+
+    public void setCreateDate(Date createDate) {
+        this.createDate = createDate;
+    }
+
+    public String getDealChannelIdStr() {
+        return dealChannelIdStr;
+    }
+
+    public void setDealChannelIdStr(String dealChannelIdStr) {
+        this.dealChannelIdStr = dealChannelIdStr;
+    }
+}

watero-rst-core/src/main/java/com.iamberry.rst.core/dm/DealerContact.java

@@ -0,0 +1,112 @@
+package com.iamberry.rst.core.dm;
+import  java.util.Date;
+import  java.io.Serializable;
+/**
+ *  对接联系人
+ * @author xm
+ * @Date 2019-07-19
+ */
+public class DealerContact  implements  Serializable{
+    private static final long serialVersionUID = 516246982375167871L;
+    //对接联系人id
+    private Integer dealContactId;
+    //客户id
+    private Integer dealerId;
+    //联系人姓名
+    private String dealContactName;
+    //联系人电话
+    private String dealContactPhone;
+    //职位/身份
+    private String dealContactType;
+    //联系邮箱
+    private String dealContactEmail;
+    //微信号
+    private String dealContactWechat;
+    //QQ号
+    private String dealContactQq;
+    //创建时间'
+    private Date dealCreateDate;
+
+    //标识
+    private String dealContactStr;
+
+    public Integer getDealContactId(){
+        return dealContactId;
+    }
+
+    public void setDealContactId(Integer  dealContactId){
+        this.dealContactId=dealContactId;
+    }
+
+    public Integer getDealerId(){
+        return dealerId;
+    }
+
+    public void setDealerId(Integer  dealerId){
+        this.dealerId=dealerId;
+    }
+
+    public String getDealContactName(){
+        return dealContactName;
+    }
+
+    public void setDealContactName(String  dealContactName){
+        this.dealContactName=dealContactName;
+    }
+
+    public String getDealContactPhone(){
+        return dealContactPhone;
+    }
+
+    public void setDealContactPhone(String  dealContactPhone){
+        this.dealContactPhone=dealContactPhone;
+    }
+
+    public String getDealContactType(){
+        return dealContactType;
+    }
+
+    public void setDealContactType(String  dealContactType){
+        this.dealContactType=dealContactType;
+    }
+
+    public String getDealContactEmail(){
+        return dealContactEmail;
+    }
+
+    public void setDealContactEmail(String  dealContactEmail){
+        this.dealContactEmail=dealContactEmail;
+    }
+
+    public String getDealContactWechat(){
+        return dealContactWechat;
+    }
+
+    public void setDealContactWechat(String  dealContactWechat){
+        this.dealContactWechat=dealContactWechat;
+    }
+
+    public String getDealContactQq(){
+        return dealContactQq;
+    }
+
+    public void setDealContactQq(String  dealContactQq){
+        this.dealContactQq=dealContactQq;
+    }
+
+    public Date getDealCreateDate(){
+        return dealCreateDate;
+    }
+
+    public void setDealCreateDate(Date  dealCreateDate){
+        this.dealCreateDate=dealCreateDate;
+    }
+
+    public String getDealContactStr() {
+        return dealContactStr;
+    }
+
+    public void setDealContactStr(String dealContactStr) {
+        this.dealContactStr = dealContactStr;
+    }
+}

watero-rst-core/src/main/java/com.iamberry.rst.core/dm/DealerProduct.java

@@ -0,0 +1,62 @@
+package com.iamberry.rst.core.dm;
+
+import  java.util.Date;
+import  java.io.Serializable;
+/**
+ *  客户产品供应类
+ * @author xm
+ * @Date 2019-07-19
+ */
+public class DealerProduct  implements  Serializable{
+    private static final long serialVersionUID = -2581701487046383379L;
+    //
+    private Integer dealProdId;
+    //客户id
+    private Integer dealerId;
+    //颜色id
+    private Integer colorId;
+    //供应价格
+    private Integer dealProdPrice;
+    //创建时间'
+    private Date createDate;
+
+    public Integer getDealProdId(){
+        return dealProdId;
+    }
+
+    public void setDealProdId(Integer  dealProdId){
+        this.dealProdId=dealProdId;
+    }
+
+    public Integer getDealerId(){
+        return dealerId;
+    }
+
+    public void setDealerId(Integer  dealerId){
+        this.dealerId=dealerId;
+    }
+
+    public Integer getColorId(){
+        return colorId;
+    }
+
+    public void setColorId(Integer  colorId){
+        this.colorId=colorId;
+    }
+
+    public Integer getDealProdPrice(){
+        return dealProdPrice;
+    }
+
+    public void setDealProdPrice(Integer  dealProdPrice){
+        this.dealProdPrice=dealProdPrice;
+    }
+
+    public Date getCreateDate(){
+        return createDate;
+    }
+
+    public void setCreateDate(Date  createDate){
+        this.createDate=createDate;
+    }
+}

watero-rst-core/src/main/java/com.iamberry.rst.core/dm/DealerProductStore.java

@@ -0,0 +1,41 @@
+package com.iamberry.rst.core.dm;
+
+import  java.io.Serializable;
+/**
+ *  客户产品关联店铺类
+ * @author xm
+ * @Date 2019-07-19
+ */
+public class DealerProductStore  implements  Serializable{
+    private static final long serialVersionUID = -788064814386221420L;
+    //关联主键
+    private Integer productStoreId;
+    //客户产品供应id
+    private Integer prodSuppId;
+    //店铺id'
+    private Integer storeId;
+
+    public Integer getProductStoreId(){
+        return productStoreId;
+    }
+
+    public void setProductStoreId(Integer  productStoreId){
+        this.productStoreId=productStoreId;
+    }
+
+    public Integer getProdSuppId(){
+        return prodSuppId;
+    }
+
+    public void setProdSuppId(Integer  prodSuppId){
+        this.prodSuppId=prodSuppId;
+    }
+
+    public Integer getStoreId(){
+        return storeId;
+    }
+
+    public void setStoreId(Integer  storeId){
+        this.storeId=storeId;
+    }
+}

watero-rst-core/src/main/java/com.iamberry.rst.core/dm/DmChannel.java

@@ -0,0 +1,71 @@
+package com.iamberry.rst.core.dm;
+import  java.util.Date;
+import  java.io.Serializable;
+/**
+ *  渠道信息类
+ * @author xm
+ * @Date 2019-07-19
+ */
+public class DmChannel  implements  Serializable{
+    private static final long serialVersionUID = -426580931981606380L;
+    //渠道id
+    private Integer channelId;
+    //渠道类别 1：电商 2：特殊渠道 3：线下 4：海外
+    private Integer channelCategory;
+    //渠道类型/名称
+    private String channelType;
+    //渠道类型编码
+    private String channelCode;
+    //状态 1:使用中 2:禁用
+    private Integer channelStatus;
+    //创建时间'
+    private Date createDate;
+
+    public Integer getChannelId(){
+        return channelId;
+    }
+
+    public void setChannelId(Integer  channelId){
+        this.channelId=channelId;
+    }
+
+    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 Integer getChannelStatus(){
+        return channelStatus;
+    }
+
+    public void setChannelStatus(Integer  channelStatus){
+        this.channelStatus=channelStatus;
+    }
+
+    public Date getCreateDate(){
+        return createDate;
+    }
+
+    public void setCreateDate(Date  createDate){
+        this.createDate=createDate;
+    }
+}

watero-rst-core/src/main/java/com.iamberry.rst.core/dm/DmChannelType.java

@@ -0,0 +1,62 @@
+package com.iamberry.rst.core.dm;
+
+import  java.util.Date;
+import  java.io.Serializable;
+/**
+ *  渠道类型类
+ * @author xm
+ * @Date 2019-07-24
+ */
+public class DmChannelType  implements  Serializable{
+    private static final long serialVersionUID = 1884816485402653912L;
+    //渠道类型id
+    private Integer channelTypeId;
+    //渠道类型名称
+    private String channelTypeName;
+    //渠道类型备注
+    private String channelTypeDesc;
+    //状态 1:使用中 2:禁用
+    private Integer channelTypeStatus;
+    //创建时间'
+    private Date createDate;
+
+    public Integer getChannelTypeId(){
+        return channelTypeId;
+    }
+
+    public void setChannelTypeId(Integer  channelTypeId){
+        this.channelTypeId=channelTypeId;
+    }
+
+    public String getChannelTypeName(){
+        return channelTypeName;
+    }
+
+    public void setChannelTypeName(String  channelTypeName){
+        this.channelTypeName=channelTypeName;
+    }
+
+    public String getChannelTypeDesc(){
+        return channelTypeDesc;
+    }
+
+    public void setChannelTypeDesc(String  channelTypeDesc){
+        this.channelTypeDesc=channelTypeDesc;
+    }
+
+    public Integer getChannelTypeStatus(){
+        return channelTypeStatus;
+    }
+
+    public void setChannelTypeStatus(Integer  channelTypeStatus){
+        this.channelTypeStatus=channelTypeStatus;
+    }
+
+    public Date getCreateDate(){
+        return createDate;
+    }
+
+    public void setCreateDate(Date  createDate){
+        this.createDate=createDate;
+    }
+}

watero-rst-core/src/main/java/com.iamberry.rst.core/dm/DmDealer.java

@@ -0,0 +1,131 @@
+package com.iamberry.rst.core.dm;
+
+import  java.util.Date;
+import  java.io.Serializable;
+/**
+ *  客户基本信息-经销商类
+ * @author xm
+ * @Date 2019-07-22
+ */
+public class DmDealer  implements  Serializable{
+    //客户id
+    private Integer dealerId;
+    //客户名称
+    private String dealerName;
+    //客户行业
+    private String dealerIndustry;
+    //客户类型 1:个人 2：企业
+    private Integer dealerType;
+    //合作进度 1:意向合作 2：已经合作 3：停止合作
+    private Integer dealerState;
+    //是否自营 1:自营 2:非自营
+    private Integer dealerSelfOperated;
+    //提款费率
+    private Double dealerRate;
+    //状态 1:使用中 2:禁用
+    private Integer dealerStatus;
+    //备注信息
+    private String dealerRemarks;
+    //创建人Id
+    private Integer createId;
+    //创建时间
+    private Date createDate;
+    //修改时间'
+    private Date updateDate;
+
+    public Integer getDealerId(){
+        return dealerId;
+    }
+
+    public void setDealerId(Integer  dealerId){
+        this.dealerId=dealerId;
+    }
+
+    public String getDealerName(){
+        return dealerName;
+    }
+
+    public void setDealerName(String  dealerName){
+        this.dealerName=dealerName;
+    }
+
+    public String getDealerIndustry(){
+        return dealerIndustry;
+    }
+
+    public void setDealerIndustry(String  dealerIndustry){
+        this.dealerIndustry=dealerIndustry;
+    }
+
+    public Integer getDealerType(){
+        return dealerType;
+    }
+
+    public void setDealerType(Integer  dealerType){
+        this.dealerType=dealerType;
+    }
+
+    public Integer getDealerState(){
+        return dealerState;
+    }
+
+    public void setDealerState(Integer  dealerState){
+        this.dealerState=dealerState;
+    }
+
+    public Integer getDealerSelfOperated(){
+        return dealerSelfOperated;
+    }
+
+    public void setDealerSelfOperated(Integer  dealerSelfOperated){
+        this.dealerSelfOperated=dealerSelfOperated;
+    }
+
+    public Double getDealerRate(){
+        return dealerRate;
+    }
+
+    public void setDealerRate(Double  dealerRate){
+        this.dealerRate=dealerRate;
+    }
+
+    public Integer getDealerStatus(){
+        return dealerStatus;
+    }
+
+    public void setDealerStatus(Integer  dealerStatus){
+        this.dealerStatus=dealerStatus;
+    }
+
+    public String getDealerRemarks(){
+        return dealerRemarks;
+    }
+
+    public void setDealerRemarks(String  dealerRemarks){
+        this.dealerRemarks=dealerRemarks;
+    }
+
+    public Integer getCreateId(){
+        return createId;
+    }
+
+    public void setCreateId(Integer  createId){
+        this.createId=createId;
+    }
+
+    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;
+    }
+}

watero-rst-core/src/main/java/com.iamberry.rst.core/dm/DmSupplier.java

@@ -0,0 +1,92 @@
+package com.iamberry.rst.core.dm;
+
+import  java.util.Date;
+import  java.io.Serializable;
+/**
+ *  供应商类
+ * @author xm
+ * @Date 2019-07-19
+ */
+public class DmSupplier  implements  Serializable{
+    private static final long serialVersionUID = -7155817399059163649L;
+    //供应商id
+    private Integer supplierId;
+    //供应商名称
+    private String supplierName;
+    //合作进度 1:正在合作 2:停止合作
+    private Integer supplierSchedule;
+    //供应商地址
+    private String supplierAddress;
+    //供应商行业
+    private String supplierIndustry;
+    //备注
+    private String supplierRemake;
+    //状态 1:使用中 2:禁用
+    private Integer supplierStatus;
+    //创建时间'
+    private Date createDate;
+
+    public Integer getSupplierId(){
+        return supplierId;
+    }
+
+    public void setSupplierId(Integer  supplierId){
+        this.supplierId=supplierId;
+    }
+
+    public String getSupplierName(){
+        return supplierName;
+    }
+
+    public void setSupplierName(String  supplierName){
+        this.supplierName=supplierName;
+    }
+
+    public Integer getSupplierSchedule(){
+        return supplierSchedule;
+    }
+
+    public void setSupplierSchedule(Integer  supplierSchedule){
+        this.supplierSchedule=supplierSchedule;
+    }
+
+    public String getSupplierAddress(){
+        return supplierAddress;
+    }
+
+    public void setSupplierAddress(String  supplierAddress){
+        this.supplierAddress=supplierAddress;
+    }
+
+    public String getSupplierIndustry(){
+        return supplierIndustry;
+    }
+
+    public void setSupplierIndustry(String  supplierIndustry){
+        this.supplierIndustry=supplierIndustry;
+    }
+
+    public String getSupplierRemake(){
+        return supplierRemake;
+    }
+
+    public void setSupplierRemake(String  supplierRemake){
+        this.supplierRemake=supplierRemake;
+    }
+
+    public Integer getSupplierStatus(){
+        return supplierStatus;
+    }
+
+    public void setSupplierStatus(Integer  supplierStatus){
+        this.supplierStatus=supplierStatus;
+    }
+
+    public Date getCreateDate(){
+        return createDate;
+    }
+
+    public void setCreateDate(Date  createDate){
+        this.createDate=createDate;
+    }
+}

watero-rst-core/src/main/java/com.iamberry.rst.core/dm/FinancialReceipt.java

@@ -0,0 +1,112 @@
+package com.iamberry.rst.core.dm;
+
+import  java.util.Date;
+import  java.io.Serializable;
+/**
+ *  财务收款类
+ * @author xm
+ * @Date 2019-07-19
+ */
+public class FinancialReceipt  implements  Serializable{
+    private static final long serialVersionUID = -6497953961765732562L;
+    //财务收款id
+    private Integer frId;
+    //客户信息
+    private Integer dealerId;
+    //认领人
+    private Integer frClaimAdminId;
+    //认领时间
+    private Date frClaimDate;
+    //回款账号
+    private String frBank;
+    //回款金额
+    private Integer frAmount;
+    //回款时间
+    private Date frDate;
+    //备注
+    private String frRemake;
+    //创建人
+    private Integer createAdminId;
+    //创建时间'
+    private Date createDate;
+
+    public Integer getFrId(){
+        return frId;
+    }
+
+    public void setFrId(Integer  frId){
+        this.frId=frId;
+    }
+
+    public Integer getDealerId(){
+        return dealerId;
+    }
+
+    public void setDealerId(Integer  dealerId){
+        this.dealerId=dealerId;
+    }
+
+    public Integer getFrClaimAdminId(){
+        return frClaimAdminId;
+    }
+
+    public void setFrClaimAdminId(Integer  frClaimAdminId){
+        this.frClaimAdminId=frClaimAdminId;
+    }
+
+    public Date getFrClaimDate(){
+        return frClaimDate;
+    }
+
+    public void setFrClaimDate(Date  frClaimDate){
+        this.frClaimDate=frClaimDate;
+    }
+
+    public String getFrBank(){
+        return frBank;
+    }
+
+    public void setFrBank(String  frBank){
+        this.frBank=frBank;
+    }
+
+    public Integer getFrAmount(){
+        return frAmount;
+    }
+
+    public void setFrAmount(Integer  frAmount){
+        this.frAmount=frAmount;
+    }
+
+    public Date getFrDate(){
+        return frDate;
+    }
+
+    public void setFrDate(Date  frDate){
+        this.frDate=frDate;
+    }
+
+    public String getFrRemake(){
+        return frRemake;
+    }
+
+    public void setFrRemake(String  frRemake){
+        this.frRemake=frRemake;
+    }
+
+    public Integer getCreateAdminId(){
+        return createAdminId;
+    }
+
+    public void setCreateAdminId(Integer  createAdminId){
+        this.createAdminId=createAdminId;
+    }
+
+    public Date getCreateDate(){
+        return createDate;
+    }
+
+    public void setCreateDate(Date  createDate){
+        this.createDate=createDate;
+    }
+}

watero-rst-core/src/main/java/com.iamberry.rst.core/dm/SupplierDirector.java

@@ -0,0 +1,102 @@
+package com.iamberry.rst.core.dm;
+
+import  java.util.Date;
+import  java.io.Serializable;
+/**
+ *  供应商对接人类
+ * @author xm
+ * @Date 2019-07-19
+ */
+public class SupplierDirector  implements  Serializable{
+    private static final long serialVersionUID = -6634235518308516400L;
+    //对接人id
+    private Integer sdId;
+    //供应商id
+    private Integer supplierId;
+    //姓名
+    private String sdName;
+    //职位
+    private String sdPost;
+    //电话
+    private String sdTel;
+    //邮箱
+    private String sdEmail;
+    //微信号
+    private String sdWechat;
+    //QQ号
+    private String sdQq;
+    //创建时间'
+    private Date createDate;
+
+    public Integer getSdId(){
+        return sdId;
+    }
+
+    public void setSdId(Integer  sdId){
+        this.sdId=sdId;
+    }
+
+    public Integer getSupplierId(){
+        return supplierId;
+    }
+
+    public void setSupplierId(Integer  supplierId){
+        this.supplierId=supplierId;
+    }
+
+    public String getSdName(){
+        return sdName;
+    }
+
+    public void setSdName(String  sdName){
+        this.sdName=sdName;
+    }
+
+    public String getSdPost(){
+        return sdPost;
+    }
+
+    public void setSdPost(String  sdPost){
+        this.sdPost=sdPost;
+    }
+
+    public String getSdTel(){
+        return sdTel;
+    }
+
+    public void setSdTel(String  sdTel){
+        this.sdTel=sdTel;
+    }
+
+    public String getSdEmail(){
+        return sdEmail;
+    }
+
+    public void setSdEmail(String  sdEmail){
+        this.sdEmail=sdEmail;
+    }
+
+    public String getSdWechat(){
+        return sdWechat;
+    }
+
+    public void setSdWechat(String  sdWechat){
+        this.sdWechat=sdWechat;
+    }
+
+    public String getSdQq(){
+        return sdQq;
+    }
+
+    public void setSdQq(String  sdQq){
+        this.sdQq=sdQq;
+    }
+
+    public Date getCreateDate(){
+        return createDate;
+    }
+
+    public void setCreateDate(Date  createDate){
+        this.createDate=createDate;
+    }
+}

watero-rst-core/src/main/java/com.iamberry.rst.core/dm/SupplierProduct.java

@@ -0,0 +1,72 @@
+package com.iamberry.rst.core.dm;
+
+import  java.util.Date;
+import  java.io.Serializable;
+/**
+ *  对接产品类
+ * @author xm
+ * @Date 2019-07-19
+ */
+public class SupplierProduct  implements  Serializable{
+    private static final long serialVersionUID = -5170904182239373176L;
+    //对接产品id
+    private Integer spId;
+    //供应商id
+    private Integer supplierId;
+    //颜色
+    private Integer colorId;
+    //总成本
+    private Integer spCost;
+    //备注
+    private String spRemake;
+    //创建时间'
+    private Date createDate;
+
+    public Integer getSpId(){
+        return spId;
+    }
+
+    public void setSpId(Integer  spId){
+        this.spId=spId;
+    }
+
+    public Integer getSupplierId(){
+        return supplierId;
+    }
+
+    public void setSupplierId(Integer  supplierId){
+        this.supplierId=supplierId;
+    }
+
+    public Integer getColorId(){
+        return colorId;
+    }
+
+    public void setColorId(Integer  colorId){
+        this.colorId=colorId;
+    }
+
+    public Integer getSpCost(){
+        return spCost;
+    }
+
+    public void setSpCost(Integer  spCost){
+        this.spCost=spCost;
+    }
+
+    public String getSpRemake(){
+        return spRemake;
+    }
+
+    public void setSpRemake(String  spRemake){
+        this.spRemake=spRemake;
+    }
+
+    public Date getCreateDate(){
+        return createDate;
+    }
+
+    public void setCreateDate(Date  createDate){
+        this.createDate=createDate;
+    }
+}

watero-rst-core/src/main/java/com.iamberry.rst.core/dm/SupplierProductItem.java

@@ -0,0 +1,51 @@
+package com.iamberry.rst.core.dm;
+
+import  java.io.Serializable;
+/**
+ *  供应产品成本明细类
+ * @author xm
+ * @Date 2019-07-19
+ */
+public class SupplierProductItem  implements  Serializable{
+    private static final long serialVersionUID = -105963843080586388L;
+    //对接人id
+    private Integer spiId;
+    //对接产品id
+    private Integer spId;
+    //费用名称
+    private String spiName;
+    //成本'
+    private Integer spiCost;
+
+    public Integer getSpiId(){
+        return spiId;
+    }
+
+    public void setSpiId(Integer  spiId){
+        this.spiId=spiId;
+    }
+
+    public Integer getSpId(){
+        return spId;
+    }
+
+    public void setSpId(Integer  spId){
+        this.spId=spId;
+    }
+
+    public String getSpiName(){
+        return spiName;
+    }
+
+    public void setSpiName(String  spiName){
+        this.spiName=spiName;
+    }
+
+    public Integer getSpiCost(){
+        return spiCost;
+    }
+
+    public void setSpiCost(Integer  spiCost){
+        this.spiCost=spiCost;
+    }
+}

watero-rst-interface/src/main/java/com/iamberry/rst/faces/dm/ClaimOrderService.java

@@ -0,0 +1,49 @@
+package com.iamberry.rst.faces.dm;
+
+import com.iamberry.rst.core.dm.ClaimOrder;
+
+import java.util.List;
+
+/**
+ *  认领订单关系接口
+ * @author xm
+ * @Date 2019-07-19
+ */
+public interface ClaimOrderService {
+    /**
+     * 获取集合
+     * @param  claimOrder
+     * @return List
+     */
+    List<ClaimOrder> getClaimOrderList(ClaimOrder  claimOrder);
+    /**
+     * 查询单条数据
+     * @param  id
+     * @return  claimOrder
+     */
+    ClaimOrder  getClaimOrderById(Integer  id);
+    /**
+     * 增加数据
+     * @param  claimOrder
+     * @return Integer
+     */
+    Integer  save(ClaimOrder  claimOrder);
+    /**
+     * 修改数据
+     * @param  claimOrder
+     * @return Integer
+     */
+    Integer  update(ClaimOrder  claimOrder);
+    /**
+     * 删除数据
+     * @param  id
+     * @return Integer
+     */
+    Integer  delete(Integer  id);
+    /**
+     * 增加数据 <集合>
+     * @param  claimOrderList
+     * @return Integer
+     */
+    Integer  saveList(List<ClaimOrder>  claimOrderList);
+}

watero-rst-interface/src/main/java/com/iamberry/rst/faces/dm/CooperationAgreeService.java

@@ -0,0 +1,43 @@
+package com.iamberry.rst.faces.dm;
+
+import com.iamberry.rst.core.dm.CooperationAgree;
+
+import java.util.List;
+
+/**
+ *  合作协议接口
+ * @author xm
+ * @Date 2019-07-19
+ */
+public interface CooperationAgreeService {
+    /**
+     * 获取集合
+     * @param  cooperationAgree
+     * @return List
+     */
+    List<CooperationAgree> getCooperationAgreeList(CooperationAgree  cooperationAgree);
+    /**
+     * 查询单条数据
+     * @param  id
+     * @return  cooperationAgree
+     */
+    CooperationAgree  getCooperationAgreeById(Integer  id);
+    /**
+     * 增加数据
+     * @param  cooperationAgree
+     * @return Integer
+     */
+    Integer  save(CooperationAgree  cooperationAgree);
+    /**
+     * 修改数据
+     * @param  cooperationAgree
+     * @return Integer
+     */
+    Integer  update(CooperationAgree  cooperationAgree);
+    /**
+     * 删除数据
+     * @param  id
+     * @return Integer
+     */
+    Integer  delete(Integer  id);
+}

watero-rst-interface/src/main/java/com/iamberry/rst/faces/dm/DealerChannelService.java

@@ -0,0 +1,43 @@
+package com.iamberry.rst.faces.dm;
+
+import com.iamberry.rst.core.dm.DealerChannel;
+
+import java.util.List;
+
+/**
+ *  客户渠道信息接口
+ * @author xm
+ * @Date 2019-07-19
+ */
+public interface DealerChannelService {
+    /**
+     * 获取集合
+     * @param  dealerChannel
+     * @return List
+     */
+    List<DealerChannel> getDealerChannelList(DealerChannel  dealerChannel);
+    /**
+     * 查询单条数据
+     * @param  id
+     * @return  dealerChannel
+     */
+    DealerChannel  getDealerChannelById(Integer  id);
+    /**
+     * 删除数据
+     * @param  id
+     * @return Integer
+     */
+    Integer  delete(Integer  id);
+    /**
+     * 增加数据 <集合>
+     * @param  dealerChannelList
+     * @return Integer
+     */
+    Integer  saveList(List<DealerChannel>  dealerChannelList);
+    /**
+     * 修改数据 <集合>
+     * @param  dealerChannelList
+     * @return Integer
+     */
+    Integer  updateList(List<DealerChannel>  dealerChannelList);
+}

watero-rst-interface/src/main/java/com/iamberry/rst/faces/dm/DealerContactService.java

@@ -0,0 +1,43 @@
+package com.iamberry.rst.faces.dm;
+
+import com.iamberry.rst.core.dm.DealerContact;
+
+import java.util.List;
+
+/**
+ *  对接联系人接口
+ * @author xm
+ * @Date 2019-07-19
+ */
+public interface DealerContactService {
+    /**
+     * 获取集合
+     * @param  dealerContact
+     * @return List
+     */
+    List<DealerContact> getDealerContactList(DealerContact  dealerContact);
+    /**
+     * 查询单条数据
+     * @param  id
+     * @return  dealerContact
+     */
+    DealerContact  getDealerContactById(Integer  id);
+    /**
+     * 删除数据
+     * @param  id
+     * @return Integer
+     */
+    Integer  delete(Integer  id);
+    /**
+     * 增加数据 <集合>
+     * @param  dealerContactList
+     * @return Integer
+     */
+    Integer  saveList(List<DealerContact>  dealerContactList);
+    /**
+     * 修改数据 <集合>
+     * @param  dealerContactList
+     * @return Integer
+     */
+    Integer  updateList(List<DealerContact>  dealerContactList);
+}

watero-rst-interface/src/main/java/com/iamberry/rst/faces/dm/DealerProductService.java

@@ -0,0 +1,37 @@
+package com.iamberry.rst.faces.dm;
+
+import com.iamberry.rst.core.dm.DealerProduct;
+
+import java.util.List;
+
+/**
+ *  客户产品供应接口
+ * @author xm
+ * @Date 2019-07-19
+ */
+public interface DealerProductService {
+    /**
+     * 获取集合
+     * @param  dealerProduct
+     * @return List
+     */
+    List<DealerProduct> getDealerProductList(DealerProduct  dealerProduct);
+    /**
+     * 查询单条数据
+     * @param  id
+     * @return  dealerProduct
+     */
+    DealerProduct  getDealerProductById(Integer  id);
+    /**
+     * 删除数据
+     * @param  id
+     * @return Integer
+     */
+    Integer  delete(Integer  id);
+    /**
+     * 增加数据 <集合>
+     * @param  dealerProductList
+     * @return Integer
+     */
+    Integer  saveList(List<DealerProduct>  dealerProductList);
+}

watero-rst-interface/src/main/java/com/iamberry/rst/faces/dm/DealerProductStoreService.java

@@ -0,0 +1,37 @@
+package com.iamberry.rst.faces.dm;
+
+import com.iamberry.rst.core.dm.DealerProductStore;
+
+import java.util.List;
+
+/**
+ *  客户产品关联店铺接口
+ * @author xm
+ * @Date 2019-07-19
+ */
+public interface DealerProductStoreService {
+    /**
+     * 获取集合
+     * @param  dealerProductStore
+     * @return List
+     */
+    List<DealerProductStore> getDealerProductStoreList(DealerProductStore  dealerProductStore);
+    /**
+     * 查询单条数据
+     * @param  id
+     * @return  dealerProductStore
+     */
+    DealerProductStore  getDealerProductStoreById(Integer  id);
+    /**
+     * 删除数据
+     * @param  id
+     * @return Integer
+     */
+    Integer  delete(Integer  id);
+    /**
+     * 增加数据 <集合>
+     * @param  dealerProductStoreList
+     * @return Integer
+     */
+    Integer  saveList(List<DealerProductStore>  dealerProductStoreList);
+}

watero-rst-interface/src/main/java/com/iamberry/rst/faces/dm/DmChannelService.java

@@ -0,0 +1,43 @@
+package com.iamberry.rst.faces.dm;
+
+import com.iamberry.rst.core.dm.DmChannel;
+
+import java.util.List;
+
+/**
+ *  渠道信息接口
+ * @author xm
+ * @Date 2019-07-19
+ */
+public interface DmChannelService {
+    /**
+     * 获取集合
+     * @param  dmChannel
+     * @return List
+     */
+    List<DmChannel> getDmChannelList(DmChannel  dmChannel);
+    /**
+     * 查询单条数据
+     * @param  id
+     * @return  dmChannel
+     */
+    DmChannel getDmChannelById(Integer  id);
+    /**
+     * 增加数据
+     * @param  dmChannel
+     * @return Integer
+     */
+    Integer  save(DmChannel  dmChannel);
+    /**
+     * 修改数据
+     * @param  dmChannel
+     * @return Integer
+     */
+    Integer  update(DmChannel  dmChannel);
+    /**
+     * 删除数据
+     * @param  id
+     * @return Integer
+     */
+    Integer  delete(Integer  id);
+}

watero-rst-interface/src/main/java/com/iamberry/rst/faces/dm/DmChannelTypeService.java

@@ -0,0 +1,37 @@
+package com.iamberry.rst.faces.dm;
+
+import com.iamberry.rst.core.dm.DmChannelType;
+
+import java.util.List;
+
+/**
+ *  渠道类型接口
+ * @author xm
+ * @Date 2019-07-24
+ */
+public interface DmChannelTypeService {
+    /**
+     * 获取集合
+     * @param  dmChannelType
+     * @return List
+     */
+    List<DmChannelType> getDmChannelTypeList(DmChannelType  dmChannelType);
+    /**
+     * 查询单条数据
+     * @param  id
+     * @return  dmChannelType
+     */
+    DmChannelType  getDmChannelTypeById(Integer  id);
+    /**
+     * 增加数据
+     * @param  dmChannelType
+     * @return Integer
+     */
+    Integer  save(DmChannelType  dmChannelType);
+    /**
+     * 修改数据
+     * @param  dmChannelType
+     * @return Integer
+     */
+    Integer  update(DmChannelType  dmChannelType);
+}

watero-rst-interface/src/main/java/com/iamberry/rst/faces/dm/DmDealerService.java

@@ -0,0 +1,46 @@
+package com.iamberry.rst.faces.dm;
+
+import com.iamberry.rst.core.dm.DmDealer;
+import com.iamberry.rst.core.page.PageRequest;
+import com.iamberry.rst.core.page.PagedResult;
+
+import java.util.List;
+
+/**
+ *  客户基本信息-经销商接口
+ * @author xm
+ * @Date 2019-07-19
+ */
+public interface DmDealerService {
+    /**
+     * 获取集合
+     * @param  dmDealer
+     * @return List
+     */
+    List<DmDealer> getDmDealerList(DmDealer  dmDealer);
+    /**
+     * 获取集合
+     * @param  pageRequest
+     * @return List
+     */
+    PagedResult<DmDealer> listDmDealerPage(PageRequest<DmDealer> pageRequest);
+    /**
+     * 查询单条数据
+     * @param  id
+     * @return  dmDealer
+     */
+    DmDealer  getDmDealerById(Integer  id);
+    /**
+     * 增加数据
+     * @param  dmDealer
+     * @return Integer
+     */
+    Integer  save(DmDealer  dmDealer);
+    /**
+     * 修改数据
+     * @param  dmDealer
+     * @return Integer
+     */
+    Integer  update(DmDealer  dmDealer);
+
+}

watero-rst-interface/src/main/java/com/iamberry/rst/faces/dm/DmSupplierService.java

@@ -0,0 +1,43 @@
+package com.iamberry.rst.faces.dm;
+
+import com.iamberry.rst.core.dm.DmSupplier;
+
+import java.util.List;
+
+/**
+ *  供应商接口
+ * @author xm
+ * @Date 2019-07-19
+ */
+public interface DmSupplierService {
+    /**
+     * 获取集合
+     * @param  dmSupplier
+     * @return List
+     */
+    List<DmSupplier> getDmSupplierList(DmSupplier  dmSupplier);
+    /**
+     * 查询单条数据
+     * @param  id
+     * @return  dmSupplier
+     */
+    DmSupplier  getDmSupplierById(Integer  id);
+    /**
+     * 增加数据
+     * @param  dmSupplier
+     * @return Integer
+     */
+    Integer  save(DmSupplier  dmSupplier);
+    /**
+     * 修改数据
+     * @param  dmSupplier
+     * @return Integer
+     */
+    Integer  update(DmSupplier  dmSupplier);
+    /**
+     * 删除数据
+     * @param  id
+     * @return Integer
+     */
+    Integer  delete(Integer  id);
+}

watero-rst-interface/src/main/java/com/iamberry/rst/faces/dm/FinancialReceiptService.java

@@ -0,0 +1,43 @@
+package com.iamberry.rst.faces.dm;
+
+import com.iamberry.rst.core.dm.FinancialReceipt;
+
+import java.util.List;
+
+/**
+ *  财务收款接口
+ * @author xm
+ * @Date 2019-07-19
+ */
+public interface FinancialReceiptService {
+    /**
+     * 获取集合
+     * @param  financialReceipt
+     * @return List
+     */
+    List<FinancialReceipt> getFinancialReceiptList(FinancialReceipt  financialReceipt);
+    /**
+     * 查询单条数据
+     * @param  id
+     * @return  financialReceipt
+     */
+    FinancialReceipt  getFinancialReceiptById(Integer  id);
+    /**
+     * 增加数据
+     * @param  financialReceipt
+     * @return Integer
+     */
+    Integer  save(FinancialReceipt  financialReceipt);
+    /**
+     * 修改数据
+     * @param  financialReceipt
+     * @return Integer
+     */
+    Integer  update(FinancialReceipt  financialReceipt);
+    /**
+     * 删除数据
+     * @param  id
+     * @return Integer
+     */
+    Integer  delete(Integer  id);
+}

watero-rst-interface/src/main/java/com/iamberry/rst/faces/dm/SupplierDirectorService.java

@@ -0,0 +1,37 @@
+package com.iamberry.rst.faces.dm;
+
+import com.iamberry.rst.core.dm.SupplierDirector;
+
+import java.util.List;
+
+/**
+ *  供应商对接人接口
+ * @author xm
+ * @Date 2019-07-19
+ */
+public interface SupplierDirectorService {
+    /**
+     * 获取集合
+     * @param  supplierDirector
+     * @return List
+     */
+    List<SupplierDirector> getSupplierDirectorList(SupplierDirector  supplierDirector);
+    /**
+     * 查询单条数据
+     * @param  id
+     * @return  supplierDirector
+     */
+    SupplierDirector getSupplierDirectorById(Integer  id);
+    /**
+     * 删除数据
+     * @param  id
+     * @return Integer
+     */
+    Integer  delete(Integer  id);
+    /**
+     * 增加数据 <集合>
+     * @param  supplierDirectorList
+     * @return Integer
+     */
+    Integer  saveList(List<SupplierDirector>  supplierDirectorList);
+}

watero-rst-interface/src/main/java/com/iamberry/rst/faces/dm/SupplierProductItemService.java

@@ -0,0 +1,37 @@
+package com.iamberry.rst.faces.dm;
+
+import com.iamberry.rst.core.dm.SupplierProductItem;
+
+import java.util.List;
+
+/**
+ *  供应产品成本明细接口
+ * @author xm
+ * @Date 2019-07-19
+ */
+public interface SupplierProductItemService {
+    /**
+     * 获取集合
+     * @param  supplierProductItem
+     * @return List
+     */
+    List<SupplierProductItem> getSupplierProductItemList(SupplierProductItem  supplierProductItem);
+    /**
+     * 查询单条数据
+     * @param  id
+     * @return  supplierProductItem
+     */
+    SupplierProductItem getSupplierProductItemById(Integer  id);
+    /**
+     * 删除数据
+     * @param  id
+     * @return Integer
+     */
+    Integer  delete(Integer  id);
+    /**
+     * 增加数据 <集合>
+     * @param  supplierProductItemList
+     * @return Integer
+     */
+    Integer  saveList(List<SupplierProductItem>  supplierProductItemList);
+}

watero-rst-interface/src/main/java/com/iamberry/rst/faces/dm/SupplierProductService.java

@@ -0,0 +1,37 @@
+package com.iamberry.rst.faces.dm;
+
+import com.iamberry.rst.core.dm.SupplierProduct;
+
+import java.util.List;
+
+/**
+ *  接口
+ * @author xm
+ * @Date 2019-07-19
+ */
+public interface SupplierProductService {
+    /**
+     * 获取集合
+     * @param  supplierProduct
+     * @return List
+     */
+    List<SupplierProduct> getSupplierProductList(SupplierProduct  supplierProduct);
+    /**
+     * 查询单条数据
+     * @param  id
+     * @return  supplierProduct
+     */
+    SupplierProduct getSupplierProductById(Integer  id);
+    /**
+     * 删除数据
+     * @param  id
+     * @return Integer
+     */
+    Integer  delete(Integer  id);
+    /**
+     * 增加数据 <集合>
+     * @param  supplierProductList
+     * @return Integer
+     */
+    Integer  saveList(List<SupplierProduct>  supplierProductList);
+}

watero-rst-service/src/main/java/com/iamberry/rst/service/dm/ClaimOrderServiceImpl.java

@@ -0,0 +1,74 @@
+package com.iamberry.rst.service.dm;
+
+import com.iamberry.rst.core.dm.ClaimOrder;
+import com.iamberry.rst.faces.dm.ClaimOrderService;
+import com.iamberry.rst.service.dm.mapper.ClaimOrderMapper;
+import org.springframework.beans.factory.annotation.Autowired;
+import org.springframework.stereotype.Service;
+
+import java.util.List;
+
+/**
+ *  认领订单关系接口
+ * @author xm
+ * @Date 2019-07-19
+ */
+@Service
+public class ClaimOrderServiceImpl  implements ClaimOrderService {
+    @Autowired
+    private ClaimOrderMapper claimOrderMapper;
+    /**
+     * 获取集合
+     * @param  claimOrder
+     * @return List
+     */
+    @Override
+    public  List<ClaimOrder>  getClaimOrderList(ClaimOrder  claimOrder){
+        return  claimOrderMapper.getClaimOrderList(claimOrder);
+    }
+    /**
+     * 查询单条数据
+     * @param  id
+     * @return  claimOrder
+     */
+    @Override
+    public  ClaimOrder  getClaimOrderById(Integer  id){
+        return  claimOrderMapper.getClaimOrderById(id);
+    }
+    /**
+     * 增加数据
+     * @param  claimOrder
+     * @return Integer
+     */
+    @Override
+    public  Integer  save(ClaimOrder  claimOrder){
+        return  claimOrderMapper.save(claimOrder);
+    }
+    /**
+     * 修改数据
+     * @param  claimOrder
+     * @return Integer
+     */
+    @Override
+    public  Integer  update(ClaimOrder  claimOrder){
+        return  claimOrderMapper.update(claimOrder);
+    }
+    /**
+     * 删除数据
+     * @param  id
+     * @return Integer
+     */
+    @Override
+    public  Integer  delete(Integer  id){
+        return  claimOrderMapper.delete(id);
+    }
+    /**
+     * 增加数据 <集合>
+     * @param  claimOrderList
+     * @return Integer
+     */
+    @Override
+    public  Integer  saveList(List<ClaimOrder> claimOrderList){
+        return  claimOrderMapper.saveList(claimOrderList);
+    }
+}

watero-rst-service/src/main/java/com/iamberry/rst/service/dm/CooperationAgreeServiceImpl.java

@@ -0,0 +1,65 @@
+package com.iamberry.rst.service.dm;
+
+import com.iamberry.rst.core.dm.CooperationAgree;
+import com.iamberry.rst.faces.dm.CooperationAgreeService;
+import com.iamberry.rst.service.dm.mapper.CooperationAgreeMapper;
+import org.springframework.beans.factory.annotation.Autowired;
+import org.springframework.stereotype.Service;
+
+import java.util.List;
+
+/**
+ *  合作协议接口
+ * @author xm
+ * @Date 2019-07-19
+ */
+@Service
+public class CooperationAgreeServiceImpl  implements CooperationAgreeService {
+    @Autowired
+    private CooperationAgreeMapper cooperationAgreeMapper;
+    /**
+     * 获取集合
+     * @param  cooperationAgree
+     * @return List
+     */
+    @Override
+    public List<CooperationAgree> getCooperationAgreeList(CooperationAgree  cooperationAgree){
+        return  cooperationAgreeMapper.getCooperationAgreeList(cooperationAgree);
+    }
+    /**
+     * 查询单条数据
+     * @param  id
+     * @return  cooperationAgree
+     */
+    @Override
+    public  CooperationAgree  getCooperationAgreeById(Integer  id){
+        return  cooperationAgreeMapper.getCooperationAgreeById(id);
+    }
+    /**
+     * 增加数据
+     * @param  cooperationAgree
+     * @return Integer
+     */
+    @Override
+    public  Integer  save(CooperationAgree  cooperationAgree){
+        return  cooperationAgreeMapper.save(cooperationAgree);
+    }
+    /**
+     * 修改数据
+     * @param  cooperationAgree
+     * @return Integer
+     */
+    @Override
+    public  Integer  update(CooperationAgree  cooperationAgree){
+        return  cooperationAgreeMapper.update(cooperationAgree);
+    }
+    /**
+     * 删除数据
+     * @param  id
+     * @return Integer
+     */
+    @Override
+    public  Integer  delete(Integer  id){
+        return  cooperationAgreeMapper.delete(id);
+    }
+}

watero-rst-service/src/main/java/com/iamberry/rst/service/dm/DealerChannelServiceImpl.java

@@ -0,0 +1,65 @@
+package com.iamberry.rst.service.dm;
+
+import com.iamberry.rst.core.dm.DealerChannel;
+import com.iamberry.rst.faces.dm.DealerChannelService;
+import com.iamberry.rst.service.dm.mapper.DealerChannelMapper;
+import org.springframework.beans.factory.annotation.Autowired;
+import org.springframework.stereotype.Service;
+
+import java.util.List;
+
+/**
+ *  客户渠道信息接口
+ * @author xm
+ * @Date 2019-07-19
+ */
+@Service
+public class DealerChannelServiceImpl  implements DealerChannelService {
+    @Autowired
+    private DealerChannelMapper dealerChannelMapper;
+    /**
+     * 获取集合
+     * @param  dealerChannel
+     * @return List
+     */
+    @Override
+    public  List<DealerChannel>  getDealerChannelList(DealerChannel  dealerChannel){
+        return  dealerChannelMapper.getDealerChannelList(dealerChannel);
+    }
+    /**
+     * 查询单条数据
+     * @param  id
+     * @return  dealerChannel
+     */
+    @Override
+    public  DealerChannel  getDealerChannelById(Integer  id){
+        return  dealerChannelMapper.getDealerChannelById(id);
+    }
+    /**
+     * 删除数据
+     * @param  id
+     * @return Integer
+     */
+    @Override
+    public  Integer  delete(Integer  id){
+        return  dealerChannelMapper.delete(id);
+    }
+    /**
+     * 增加数据 <集合>
+     * @param  dealerChannelList
+     * @return Integer
+     */
+    @Override
+    public  Integer  saveList(List<DealerChannel> dealerChannelList){
+        return  dealerChannelMapper.saveList(dealerChannelList);
+    }
+    /**
+     * 修改数据 <集合>
+     * @param  dealerChannelList
+     * @return Integer
+     */
+    @Override
+    public  Integer  updateList(List<DealerChannel>  dealerChannelList){
+        return  dealerChannelMapper.updateList(dealerChannelList);
+    }
+}

watero-rst-service/src/main/java/com/iamberry/rst/service/dm/DealerContactServiceImpl.java

@@ -0,0 +1,65 @@
+package com.iamberry.rst.service.dm;
+
+import com.iamberry.rst.core.dm.DealerContact;
+import com.iamberry.rst.faces.dm.DealerContactService;
+import com.iamberry.rst.service.dm.mapper.DealerContactMapper;
+import org.springframework.beans.factory.annotation.Autowired;
+import org.springframework.stereotype.Service;
+
+import java.util.List;
+
+/**
+ *  对接联系人接口
+ * @author xm
+ * @Date 2019-07-19
+ */
+@Service
+public class DealerContactServiceImpl  implements DealerContactService {
+    @Autowired
+    private DealerContactMapper dealerContactMapper;
+    /**
+     * 获取集合
+     * @param  dealerContact
+     * @return List
+     */
+    @Override
+    public List<DealerContact> getDealerContactList(DealerContact  dealerContact){
+        return  dealerContactMapper.getDealerContactList(dealerContact);
+    }
+    /**
+     * 查询单条数据
+     * @param  id
+     * @return  dealerContact
+     */
+    @Override
+    public  DealerContact  getDealerContactById(Integer  id){
+        return  dealerContactMapper.getDealerContactById(id);
+    }
+    /**
+     * 删除数据
+     * @param  id
+     * @return Integer
+     */
+    @Override
+    public  Integer  delete(Integer  id){
+        return  dealerContactMapper.delete(id);
+    }
+    /**
+     * 增加数据 <集合>
+     * @param  dealerContactList
+     * @return Integer
+     */
+    @Override
+    public  Integer  saveList(List<DealerContact>  dealerContactList){
+        return  dealerContactMapper.saveList(dealerContactList);
+    }
+    /**
+     * 修改数据 <集合>
+     * @param  dealerContactList
+     * @return Integer
+     */
+    @Override
+    public  Integer  updateList(List<DealerContact>  dealerContactList){
+        return  dealerContactMapper.updateList(dealerContactList);
+    }
+}

watero-rst-service/src/main/java/com/iamberry/rst/service/dm/DealerProductServiceImpl.java

@@ -0,0 +1,56 @@
+package com.iamberry.rst.service.dm;
+
+import com.iamberry.rst.core.dm.DealerProduct;
+import com.iamberry.rst.faces.dm.DealerProductService;
+import com.iamberry.rst.service.dm.mapper.DealerProductMapper;
+import org.springframework.beans.factory.annotation.Autowired;
+import org.springframework.stereotype.Service;
+
+import java.util.List;
+
+/**
+ *  客户产品供应接口
+ * @author xm
+ * @Date 2019-07-19
+ */
+@Service
+public class DealerProductServiceImpl  implements DealerProductService {
+    @Autowired
+    private DealerProductMapper dealerProductMapper;
+    /**
+     * 获取集合
+     * @param  dealerProduct
+     * @return List
+     */
+    @Override
+    public List<DealerProduct> getDealerProductList(DealerProduct  dealerProduct){
+        return  dealerProductMapper.getDealerProductList(dealerProduct);
+    }
+    /**
+     * 查询单条数据
+     * @param  id
+     * @return  dealerProduct
+     */
+    @Override
+    public  DealerProduct  getDealerProductById(Integer  id){
+        return  dealerProductMapper.getDealerProductById(id);
+    }
+    /**
+     * 删除数据
+     * @param  id
+     * @return Integer
+     */
+    @Override
+    public  Integer  delete(Integer  id){
+        return  dealerProductMapper.delete(id);
+    }
+    /**
+     * 增加数据 <集合>
+     * @param  dealerProductList
+     * @return Integer
+     */
+    @Override
+    public  Integer  saveList(List<DealerProduct>  dealerProductList){
+        return  dealerProductMapper.saveList(dealerProductList);
+    }
+}

watero-rst-service/src/main/java/com/iamberry/rst/service/dm/DealerProductStoreServiceImpl.java

@@ -0,0 +1,56 @@
+package com.iamberry.rst.service.dm;
+
+import com.iamberry.rst.core.dm.DealerProductStore;
+import com.iamberry.rst.faces.dm.DealerProductStoreService;
+import com.iamberry.rst.service.dm.mapper.DealerProductStoreMapper;
+import org.springframework.beans.factory.annotation.Autowired;
+import org.springframework.stereotype.Service;
+
+import java.util.List;
+
+/**
+ *  客户产品关联店铺接口
+ * @author xm
+ * @Date 2019-07-19
+ */
+@Service
+public class DealerProductStoreServiceImpl  implements DealerProductStoreService {
+    @Autowired
+    private DealerProductStoreMapper dealerProductStoreMapper;
+    /**
+     * 获取集合
+     * @param  dealerProductStore
+     * @return List
+     */
+    @Override
+    public List<DealerProductStore> getDealerProductStoreList(DealerProductStore  dealerProductStore){
+        return  dealerProductStoreMapper.getDealerProductStoreList(dealerProductStore);
+    }
+    /**
+     * 查询单条数据
+     * @param  id
+     * @return  dealerProductStore
+     */
+    @Override
+    public  DealerProductStore  getDealerProductStoreById(Integer  id){
+        return  dealerProductStoreMapper.getDealerProductStoreById(id);
+    }
+    /**
+     * 删除数据
+     * @param  id
+     * @return Integer
+     */
+    @Override
+    public  Integer  delete(Integer  id){
+        return  dealerProductStoreMapper.delete(id);
+    }
+    /**
+     * 增加数据 <集合>
+     * @param  dealerProductStoreList
+     * @return Integer
+     */
+    @Override
+    public  Integer  saveList(List<DealerProductStore>  dealerProductStoreList){
+        return  dealerProductStoreMapper.saveList(dealerProductStoreList);
+    }
+}

watero-rst-service/src/main/java/com/iamberry/rst/service/dm/DmChannelServiceImpl.java

@@ -0,0 +1,65 @@
+package com.iamberry.rst.service.dm;
+
+import com.iamberry.rst.core.dm.DmChannel;
+import com.iamberry.rst.faces.dm.DmChannelService;
+import com.iamberry.rst.service.dm.mapper.DmChannelMapper;
+import org.springframework.beans.factory.annotation.Autowired;
+import org.springframework.stereotype.Service;
+
+import java.util.List;
+
+/**
+ *  渠道信息接口
+ * @author xm
+ * @Date 2019-07-19
+ */
+@Service
+public class DmChannelServiceImpl  implements DmChannelService {
+    @Autowired
+    private DmChannelMapper dmChannelMapper;
+    /**
+     * 获取集合
+     * @param  dmChannel
+     * @return List
+     */
+    @Override
+    public List<DmChannel> getDmChannelList(DmChannel  dmChannel){
+        return  dmChannelMapper.getDmChannelList(dmChannel);
+    }
+    /**
+     * 查询单条数据
+     * @param  id
+     * @return  dmChannel
+     */
+    @Override
+    public  DmChannel  getDmChannelById(Integer  id){
+        return  dmChannelMapper.getDmChannelById(id);
+    }
+    /**
+     * 增加数据
+     * @param  dmChannel
+     * @return Integer
+     */
+    @Override
+    public  Integer  save(DmChannel dmChannel){
+        return  dmChannelMapper.save(dmChannel);
+    }
+    /**
+     * 修改数据
+     * @param  dmChannel
+     * @return Integer
+     */
+    @Override
+    public  Integer  update(DmChannel  dmChannel){
+        return  dmChannelMapper.update(dmChannel);
+    }
+    /**
+     * 删除数据
+     * @param  id
+     * @return Integer
+     */
+    @Override
+    public  Integer  delete(Integer  id){
+        return  dmChannelMapper.delete(id);
+    }
+}

watero-rst-service/src/main/java/com/iamberry/rst/service/dm/DmChannelTypeServiceImpl.java

@@ -0,0 +1,56 @@
+package com.iamberry.rst.service.dm;
+
+import com.iamberry.rst.core.dm.DmChannelType;
+import com.iamberry.rst.faces.dm.DmChannelTypeService;
+import com.iamberry.rst.service.dm.mapper.DmChannelTypeMapper;
+import org.springframework.beans.factory.annotation.Autowired;
+import org.springframework.stereotype.Service;
+
+import java.util.List;
+
+/**
+ *  渠道类型接口
+ * @author xm
+ * @Date 2019-07-24
+ */
+@Service
+public class DmChannelTypeServiceImpl  implements DmChannelTypeService {
+    @Autowired
+    private DmChannelTypeMapper dmChannelTypeMapper;
+    /**
+     * 获取集合
+     * @param  dmChannelType
+     * @return List
+     */
+    @Override
+    public List<DmChannelType> getDmChannelTypeList(DmChannelType  dmChannelType){
+        return  dmChannelTypeMapper.getDmChannelTypeList(dmChannelType);
+    }
+    /**
+     * 查询单条数据
+     * @param  id
+     * @return  dmChannelType
+     */
+    @Override
+    public DmChannelType getDmChannelTypeById(Integer  id){
+        return  dmChannelTypeMapper.getDmChannelTypeById(id);
+    }
+    /**
+     * 增加数据
+     * @param  dmChannelType
+     * @return Integer
+     */
+    @Override
+    public  Integer  save(DmChannelType  dmChannelType){
+        return  dmChannelTypeMapper.save(dmChannelType);
+    }
+    /**
+     * 修改数据
+     * @param  dmChannelType
+     * @return Integer
+     */
+    @Override
+    public  Integer  update(DmChannelType  dmChannelType){
+        return  dmChannelTypeMapper.update(dmChannelType);
+    }
+}

watero-rst-service/src/main/java/com/iamberry/rst/service/dm/DmDealerServiceImpl.java

@@ -0,0 +1,70 @@
+package com.iamberry.rst.service.dm;
+
+import com.github.pagehelper.PageHelper;
+import com.iamberry.rst.core.customer.CustomerBasicInfo;
+import com.iamberry.rst.core.dm.DmDealer;
+import com.iamberry.rst.core.page.PageRequest;
+import com.iamberry.rst.core.page.PagedResult;
+import com.iamberry.rst.faces.dm.DmDealerService;
+import com.iamberry.rst.service.dm.mapper.DmDealerMapper;
+import com.iamberry.rst.util.PageUtil;
+import org.springframework.beans.factory.annotation.Autowired;
+import org.springframework.stereotype.Service;
+
+import java.util.List;
+
+/**
+ *  客户基本信息-经销商接口
+ * @author xm
+ * @Date 2019-07-19
+ */
+@Service
+public class DmDealerServiceImpl  implements DmDealerService {
+    @Autowired
+    private DmDealerMapper dmDealerMapper;
+    /**
+     * 获取集合
+     * @param  dmDealer
+     * @return List
+     */
+    @Override
+    public List<DmDealer> getDmDealerList(DmDealer  dmDealer){
+        return  dmDealerMapper.getDmDealerList(dmDealer);
+    }
+
+    @Override
+    public PagedResult<DmDealer> listDmDealerPage(PageRequest<DmDealer> pageRequest) {
+        PageHelper.startPage(pageRequest.getPageNO(), pageRequest.getPageSize(), pageRequest.isPageTotal());
+        List<DmDealer> dmDealerList = dmDealerMapper.getDmDealerList(pageRequest.getData());
+        return PageUtil.getPage(dmDealerList);
+    }
+
+    /**
+     * 查询单条数据
+     * @param  id
+     * @return  dmDealer
+     */
+    @Override
+    public  DmDealer  getDmDealerById(Integer  id){
+        return  dmDealerMapper.getDmDealerById(id);
+    }
+    /**
+     * 增加数据
+     * @param  dmDealer
+     * @return Integer
+     */
+    @Override
+    public  Integer  save(DmDealer  dmDealer){
+        return  dmDealerMapper.save(dmDealer);
+    }
+    /**
+     * 修改数据
+     * @param  dmDealer
+     * @return Integer
+     */
+    @Override
+    public  Integer  update(DmDealer  dmDealer){
+        return  dmDealerMapper.update(dmDealer);
+    }
+
+}

watero-rst-service/src/main/java/com/iamberry/rst/service/dm/DmSupplierServiceImpl.java

@@ -0,0 +1,65 @@
+package com.iamberry.rst.service.dm;
+
+import com.iamberry.rst.core.dm.DmSupplier;
+import com.iamberry.rst.faces.dm.DmSupplierService;
+import com.iamberry.rst.service.dm.mapper.DmSupplierMapper;
+import org.springframework.beans.factory.annotation.Autowired;
+import org.springframework.stereotype.Service;
+
+import java.util.List;
+
+/**
+ *  供应商接口
+ * @author xm
+ * @Date 2019-07-19
+ */
+@Service
+public class DmSupplierServiceImpl  implements DmSupplierService {
+    @Autowired
+    private DmSupplierMapper dmSupplierMapper;
+    /**
+     * 获取集合
+     * @param  dmSupplier
+     * @return List
+     */
+    @Override
+    public List<DmSupplier> getDmSupplierList(DmSupplier  dmSupplier){
+        return  dmSupplierMapper.getDmSupplierList(dmSupplier);
+    }
+    /**
+     * 查询单条数据
+     * @param  id
+     * @return  dmSupplier
+     */
+    @Override
+    public  DmSupplier  getDmSupplierById(Integer  id){
+        return  dmSupplierMapper.getDmSupplierById(id);
+    }
+    /**
+     * 增加数据
+     * @param  dmSupplier
+     * @return Integer
+     */
+    @Override
+    public  Integer  save(DmSupplier  dmSupplier){
+        return  dmSupplierMapper.save(dmSupplier);
+    }
+    /**
+     * 修改数据
+     * @param  dmSupplier
+     * @return Integer
+     */
+    @Override
+    public  Integer  update(DmSupplier  dmSupplier){
+        return  dmSupplierMapper.update(dmSupplier);
+    }
+    /**
+     * 删除数据
+     * @param  id
+     * @return Integer
+     */
+    @Override
+    public  Integer  delete(Integer  id){
+        return  dmSupplierMapper.delete(id);
+    }
+}

watero-rst-service/src/main/java/com/iamberry/rst/service/dm/FinancialReceiptServiceImpl.java

@@ -0,0 +1,65 @@
+package com.iamberry.rst.service.dm;
+
+import com.iamberry.rst.core.dm.FinancialReceipt;
+import com.iamberry.rst.faces.dm.FinancialReceiptService;
+import com.iamberry.rst.service.dm.mapper.FinancialReceiptMapper;
+import org.springframework.beans.factory.annotation.Autowired;
+import org.springframework.stereotype.Service;
+
+import java.util.List;
+
+/**
+ *  财务收款接口
+ * @author xm
+ * @Date 2019-07-19
+ */
+@Service
+public class FinancialReceiptServiceImpl  implements FinancialReceiptService {
+    @Autowired
+    private FinancialReceiptMapper financialReceiptMapper;
+    /**
+     * 获取集合
+     * @param  financialReceipt
+     * @return List
+     */
+    @Override
+    public List<FinancialReceipt> getFinancialReceiptList(FinancialReceipt  financialReceipt){
+        return  financialReceiptMapper.getFinancialReceiptList(financialReceipt);
+    }
+    /**
+     * 查询单条数据
+     * @param  id
+     * @return  financialReceipt
+     */
+    @Override
+    public  FinancialReceipt  getFinancialReceiptById(Integer  id){
+        return  financialReceiptMapper.getFinancialReceiptById(id);
+    }
+    /**
+     * 增加数据
+     * @param  financialReceipt
+     * @return Integer
+     */
+    @Override
+    public  Integer  save(FinancialReceipt  financialReceipt){
+        return  financialReceiptMapper.save(financialReceipt);
+    }
+    /**
+     * 修改数据
+     * @param  financialReceipt
+     * @return Integer
+     */
+    @Override
+    public  Integer  update(FinancialReceipt  financialReceipt){
+        return  financialReceiptMapper.update(financialReceipt);
+    }
+    /**
+     * 删除数据
+     * @param  id
+     * @return Integer
+     */
+    @Override
+    public  Integer  delete(Integer  id){
+        return  financialReceiptMapper.delete(id);
+    }
+}

watero-rst-service/src/main/java/com/iamberry/rst/service/dm/SupplierDirectorServiceImpl.java

@@ -0,0 +1,56 @@
+package com.iamberry.rst.service.dm;
+
+import com.iamberry.rst.core.dm.SupplierDirector;
+import com.iamberry.rst.faces.dm.SupplierDirectorService;
+import com.iamberry.rst.service.dm.mapper.SupplierDirectorMapper;
+import org.springframework.beans.factory.annotation.Autowired;
+import org.springframework.stereotype.Service;
+
+import java.util.List;
+
+/**
+ *  供应商对接人接口
+ * @author xm
+ * @Date 2019-07-19
+ */
+@Service
+public class SupplierDirectorServiceImpl  implements SupplierDirectorService {
+    @Autowired
+    private SupplierDirectorMapper supplierDirectorMapper;
+    /**
+     * 获取集合
+     * @param  supplierDirector
+     * @return List
+     */
+    @Override
+    public List<SupplierDirector> getSupplierDirectorList(SupplierDirector  supplierDirector){
+        return  supplierDirectorMapper.getSupplierDirectorList(supplierDirector);
+    }
+    /**
+     * 查询单条数据
+     * @param  id
+     * @return  supplierDirector
+     */
+    @Override
+    public  SupplierDirector  getSupplierDirectorById(Integer  id){
+        return  supplierDirectorMapper.getSupplierDirectorById(id);
+    }
+    /**
+     * 删除数据
+     * @param  id
+     * @return Integer
+     */
+    @Override
+    public  Integer  delete(Integer  id){
+        return  supplierDirectorMapper.delete(id);
+    }
+    /**
+     * 增加数据 <集合>
+     * @param  supplierDirectorList
+     * @return Integer
+     */
+    @Override
+    public  Integer  saveList(List<SupplierDirector>  supplierDirectorList){
+        return  supplierDirectorMapper.saveList(supplierDirectorList);
+    }
+}

watero-rst-service/src/main/java/com/iamberry/rst/service/dm/SupplierProductItemServiceImpl.java

@@ -0,0 +1,56 @@
+package com.iamberry.rst.service.dm;
+
+import com.iamberry.rst.core.dm.SupplierProductItem;
+import com.iamberry.rst.faces.dm.SupplierProductItemService;
+import com.iamberry.rst.service.dm.mapper.SupplierProductItemMapper;
+import org.springframework.beans.factory.annotation.Autowired;
+import org.springframework.stereotype.Service;
+
+import java.util.List;
+
+/**
+ *  供应产品成本明细接口
+ * @author xm
+ * @Date 2019-07-19
+ */
+@Service
+public class SupplierProductItemServiceImpl  implements SupplierProductItemService {
+    @Autowired
+    private SupplierProductItemMapper supplierProductItemMapper;
+    /**
+     * 获取集合
+     * @param  supplierProductItem
+     * @return List
+     */
+    @Override
+    public List<SupplierProductItem> getSupplierProductItemList(SupplierProductItem  supplierProductItem){
+        return  supplierProductItemMapper.getSupplierProductItemList(supplierProductItem);
+    }
+    /**
+     * 查询单条数据
+     * @param  id
+     * @return  supplierProductItem
+     */
+    @Override
+    public  SupplierProductItem  getSupplierProductItemById(Integer  id){
+        return  supplierProductItemMapper.getSupplierProductItemById(id);
+    }
+    /**
+     * 删除数据
+     * @param  id
+     * @return Integer
+     */
+    @Override
+    public  Integer  delete(Integer  id){
+        return  supplierProductItemMapper.delete(id);
+    }
+    /**
+     * 增加数据 <集合>
+     * @param  supplierProductItemList
+     * @return Integer
+     */
+    @Override
+    public  Integer  saveList(List<SupplierProductItem>  supplierProductItemList){
+        return  supplierProductItemMapper.saveList(supplierProductItemList);
+    }
+}

watero-rst-service/src/main/java/com/iamberry/rst/service/dm/SupplierProductServiceImpl.java

@@ -0,0 +1,56 @@
+package com.iamberry.rst.service.dm;
+
+import com.iamberry.rst.core.dm.SupplierProduct;
+import com.iamberry.rst.faces.dm.SupplierProductService;
+import com.iamberry.rst.service.dm.mapper.SupplierProductMapper;
+import org.springframework.beans.factory.annotation.Autowired;
+import org.springframework.stereotype.Service;
+
+import java.util.List;
+
+/**
+ *  接口
+ * @author xm
+ * @Date 2019-07-19
+ */
+@Service
+public class SupplierProductServiceImpl  implements SupplierProductService {
+    @Autowired
+    private SupplierProductMapper supplierProductMapper;
+    /**
+     * 获取集合
+     * @param  supplierProduct
+     * @return List
+     */
+    @Override
+    public  List<SupplierProduct>  getSupplierProductList(SupplierProduct  supplierProduct){
+        return  supplierProductMapper.getSupplierProductList(supplierProduct);
+    }
+    /**
+     * 查询单条数据
+     * @param  id
+     * @return  supplierProduct
+     */
+    @Override
+    public  SupplierProduct  getSupplierProductById(Integer  id){
+        return  supplierProductMapper.getSupplierProductById(id);
+    }
+    /**
+     * 删除数据
+     * @param  id
+     * @return Integer
+     */
+    @Override
+    public  Integer  delete(Integer  id){
+        return  supplierProductMapper.delete(id);
+    }
+    /**
+     * 增加数据 <集合>
+     * @param  supplierProductList
+     * @return Integer
+     */
+    @Override
+    public  Integer  saveList(List<SupplierProduct> supplierProductList){
+        return  supplierProductMapper.saveList(supplierProductList);
+    }
+}

watero-rst-service/src/main/java/com/iamberry/rst/service/dm/mapper/ClaimOrderMapper.java

@@ -0,0 +1,49 @@
+package com.iamberry.rst.service.dm.mapper;
+
+import com.iamberry.rst.core.dm.ClaimOrder;
+
+import java.util.List;
+
+/**
+ *  认领订单关系接口
+ * @author xm
+ * @Date 2019-07-19
+ */
+public interface ClaimOrderMapper {
+    /**
+     * 获取集合
+     * @param  claimOrder
+     * @return List
+     */
+    List<ClaimOrder> getClaimOrderList(ClaimOrder claimOrder);
+    /**
+     * 查询单条数据
+     * @param  id
+     * @return  claimOrder
+     */
+    ClaimOrder  getClaimOrderById(Integer  id);
+    /**
+     * 增加数据
+     * @param  claimOrder
+     * @return Integer
+     */
+    Integer  save(ClaimOrder  claimOrder);
+    /**
+     * 修改数据
+     * @param  claimOrder
+     * @return Integer
+     */
+    Integer  update(ClaimOrder  claimOrder);
+    /**
+     * 删除数据
+     * @param  id
+     * @return Integer
+     */
+    Integer  delete(Integer  id);
+    /**
+     * 增加数据 <集合>
+     * @param  claimOrderList
+     * @return Integer
+     */
+    Integer  saveList(List<ClaimOrder>  claimOrderList);
+}

watero-rst-service/src/main/java/com/iamberry/rst/service/dm/mapper/CooperationAgreeMapper.java

@@ -0,0 +1,43 @@
+package com.iamberry.rst.service.dm.mapper;
+
+import com.iamberry.rst.core.dm.CooperationAgree;
+
+import java.util.List;
+
+/**
+ *  合作协议接口
+ * @author xm
+ * @Date 2019-07-19
+ */
+public interface CooperationAgreeMapper {
+    /**
+     * 获取集合
+     * @param  cooperationAgree
+     * @return List
+     */
+    List<CooperationAgree> getCooperationAgreeList(CooperationAgree  cooperationAgree);
+    /**
+     * 查询单条数据
+     * @param  id
+     * @return  cooperationAgree
+     */
+    CooperationAgree  getCooperationAgreeById(Integer  id);
+    /**
+     * 增加数据
+     * @param  cooperationAgree
+     * @return Integer
+     */
+    Integer  save(CooperationAgree  cooperationAgree);
+    /**
+     * 修改数据
+     * @param  cooperationAgree
+     * @return Integer
+     */
+    Integer  update(CooperationAgree  cooperationAgree);
+    /**
+     * 删除数据
+     * @param  id
+     * @return Integer
+     */
+    Integer  delete(Integer  id);
+}

watero-rst-service/src/main/java/com/iamberry/rst/service/dm/mapper/DealerChannelMapper.java

@@ -0,0 +1,43 @@
+package com.iamberry.rst.service.dm.mapper;
+
+import com.iamberry.rst.core.dm.DealerChannel;
+
+import java.util.List;
+
+/**
+ *  客户渠道信息接口
+ * @author xm
+ * @Date 2019-07-19
+ */
+public interface DealerChannelMapper {
+    /**
+     * 获取集合
+     * @param  dealerChannel
+     * @return List
+     */
+    List<DealerChannel> getDealerChannelList(DealerChannel  dealerChannel);
+    /**
+     * 查询单条数据
+     * @param  id
+     * @return  dealerChannel
+     */
+    DealerChannel  getDealerChannelById(Integer  id);
+    /**
+     * 删除数据
+     * @param  id
+     * @return Integer
+     */
+    Integer  delete(Integer  id);
+    /**
+     * 增加数据 <集合>
+     * @param  dealerChannelList
+     * @return Integer
+     */
+    Integer  saveList(List<DealerChannel>  dealerChannelList);
+    /**
+     * 修改数据 <集合>
+     * @param  dealerChannelList
+     * @return Integer
+     */
+    Integer  updateList(List<DealerChannel>  dealerChannelList);
+}

watero-rst-service/src/main/java/com/iamberry/rst/service/dm/mapper/DealerContactMapper.java

@@ -0,0 +1,43 @@
+package com.iamberry.rst.service.dm.mapper;
+
+import com.iamberry.rst.core.dm.DealerContact;
+
+import java.util.List;
+
+/**
+ *  对接联系人接口
+ * @author xm
+ * @Date 2019-07-19
+ */
+public interface DealerContactMapper {
+    /**
+     * 获取集合
+     * @param  dealerContact
+     * @return List
+     */
+    List<DealerContact> getDealerContactList(DealerContact  dealerContact);
+    /**
+     * 查询单条数据
+     * @param  id
+     * @return  dealerContact
+     */
+    DealerContact  getDealerContactById(Integer  id);
+    /**
+     * 删除数据
+     * @param  id
+     * @return Integer
+     */
+    Integer  delete(Integer  id);
+    /**
+     * 增加数据 <集合>
+     * @param  dealerContactList
+     * @return Integer
+     */
+    Integer  saveList(List<DealerContact>  dealerContactList);
+    /**
+     * 修改数据 <集合>
+     * @param  dealerContactList
+     * @return Integer
+     */
+    Integer  updateList(List<DealerContact>  dealerContactList);
+}

watero-rst-service/src/main/java/com/iamberry/rst/service/dm/mapper/DealerProductMapper.java

@@ -0,0 +1,37 @@
+package com.iamberry.rst.service.dm.mapper;
+
+import com.iamberry.rst.core.dm.DealerProduct;
+
+import java.util.List;
+
+/**
+ *  客户产品供应接口
+ * @author xm
+ * @Date 2019-07-19
+ */
+public interface DealerProductMapper {
+    /**
+     * 获取集合
+     * @param  dealerProduct
+     * @return List
+     */
+    List<DealerProduct> getDealerProductList(DealerProduct  dealerProduct);
+    /**
+     * 查询单条数据
+     * @param  id
+     * @return  dealerProduct
+     */
+    DealerProduct  getDealerProductById(Integer  id);
+    /**
+     * 删除数据
+     * @param  id
+     * @return Integer
+     */
+    Integer  delete(Integer  id);
+    /**
+     * 增加数据 <集合>
+     * @param  dealerProductList
+     * @return Integer
+     */
+    Integer  saveList(List<DealerProduct>  dealerProductList);
+}

watero-rst-service/src/main/java/com/iamberry/rst/service/dm/mapper/DealerProductStoreMapper.java

@@ -0,0 +1,37 @@
+package com.iamberry.rst.service.dm.mapper;
+
+import com.iamberry.rst.core.dm.DealerProductStore;
+
+import java.util.List;
+
+/**
+ *  客户产品关联店铺接口
+ * @author xm
+ * @Date 2019-07-19
+ */
+public interface DealerProductStoreMapper {
+    /**
+     * 获取集合
+     * @param  dealerProductStore
+     * @return List
+     */
+    List<DealerProductStore> getDealerProductStoreList(DealerProductStore  dealerProductStore);
+    /**
+     * 查询单条数据
+     * @param  id
+     * @return  dealerProductStore
+     */
+    DealerProductStore  getDealerProductStoreById(Integer  id);
+    /**
+     * 删除数据
+     * @param  id
+     * @return Integer
+     */
+    Integer  delete(Integer  id);
+    /**
+     * 增加数据 <集合>
+     * @param  dealerProductStoreList
+     * @return Integer
+     */
+    Integer  saveList(List<DealerProductStore>  dealerProductStoreList);
+}

watero-rst-service/src/main/java/com/iamberry/rst/service/dm/mapper/DmChannelMapper.java

@@ -0,0 +1,43 @@
+package com.iamberry.rst.service.dm.mapper;
+
+import com.iamberry.rst.core.dm.DmChannel;
+
+import java.util.List;
+
+/**
+ *  渠道信息接口
+ * @author xm
+ * @Date 2019-07-19
+ */
+public interface DmChannelMapper {
+    /**
+     * 获取集合
+     * @param  dmChannel
+     * @return List
+     */
+    List<DmChannel> getDmChannelList(DmChannel  dmChannel);
+    /**
+     * 查询单条数据
+     * @param  id
+     * @return  dmChannel
+     */
+    DmChannel  getDmChannelById(Integer  id);
+    /**
+     * 增加数据
+     * @param  dmChannel
+     * @return Integer
+     */
+    Integer  save(DmChannel  dmChannel);
+    /**
+     * 修改数据
+     * @param  dmChannel
+     * @return Integer
+     */
+    Integer  update(DmChannel  dmChannel);
+    /**
+     * 删除数据
+     * @param  id
+     * @return Integer
+     */
+    Integer  delete(Integer  id);
+}

watero-rst-service/src/main/java/com/iamberry/rst/service/dm/mapper/DmChannelTypeMapper.java

@@ -0,0 +1,37 @@
+package com.iamberry.rst.service.dm.mapper;
+
+import com.iamberry.rst.core.dm.DmChannelType;
+
+import java.util.List;
+
+/**
+ *  渠道类型接口
+ * @author xm
+ * @Date 2019-07-24
+ */
+public interface DmChannelTypeMapper {
+    /**
+     * 获取集合
+     * @param  dmChannelType
+     * @return List
+     */
+    List<DmChannelType> getDmChannelTypeList(DmChannelType  dmChannelType);
+    /**
+     * 查询单条数据
+     * @param  id
+     * @return  dmChannelType
+     */
+    DmChannelType  getDmChannelTypeById(Integer  id);
+    /**
+     * 增加数据
+     * @param  dmChannelType
+     * @return Integer
+     */
+    Integer  save(DmChannelType  dmChannelType);
+    /**
+     * 修改数据
+     * @param  dmChannelType
+     * @return Integer
+     */
+    Integer  update(DmChannelType  dmChannelType);
+}

watero-rst-service/src/main/java/com/iamberry/rst/service/dm/mapper/DmDealerMapper.java

@@ -0,0 +1,38 @@
+package com.iamberry.rst.service.dm.mapper;
+
+import com.iamberry.rst.core.dm.DmDealer;
+
+import java.util.List;
+
+/**
+ *  客户基本信息-经销商接口
+ * @author xm
+ * @Date 2019-07-19
+ */
+public interface DmDealerMapper {
+    /**
+     * 获取集合
+     * @param  dmDealer
+     * @return List
+     */
+    List<DmDealer> getDmDealerList(DmDealer  dmDealer);
+    /**
+     * 查询单条数据
+     * @param  id
+     * @return  dmDealer
+     */
+    DmDealer  getDmDealerById(Integer  id);
+    /**
+     * 增加数据
+     * @param  dmDealer
+     * @return Integer
+     */
+    Integer  save(DmDealer  dmDealer);
+    /**
+     * 修改数据
+     * @param  dmDealer
+     * @return Integer
+     */
+    Integer  update(DmDealer  dmDealer);
+
+}

watero-rst-service/src/main/java/com/iamberry/rst/service/dm/mapper/DmSupplierMapper.java

@@ -0,0 +1,43 @@
+package com.iamberry.rst.service.dm.mapper;
+
+import com.iamberry.rst.core.dm.DmSupplier;
+
+import java.util.List;
+
+/**
+ *  供应商接口
+ * @author xm
+ * @Date 2019-07-19
+ */
+public interface DmSupplierMapper {
+    /**
+     * 获取集合
+     * @param  dmSupplier
+     * @return List
+     */
+    List<DmSupplier> getDmSupplierList(DmSupplier  dmSupplier);
+    /**
+     * 查询单条数据
+     * @param  id
+     * @return  dmSupplier
+     */
+    DmSupplier  getDmSupplierById(Integer  id);
+    /**
+     * 增加数据
+     * @param  dmSupplier
+     * @return Integer
+     */
+    Integer  save(DmSupplier  dmSupplier);
+    /**
+     * 修改数据
+     * @param  dmSupplier
+     * @return Integer
+     */
+    Integer  update(DmSupplier  dmSupplier);
+    /**
+     * 删除数据
+     * @param  id
+     * @return Integer
+     */
+    Integer  delete(Integer  id);
+}

watero-rst-service/src/main/java/com/iamberry/rst/service/dm/mapper/FinancialReceiptMapper.java

@@ -0,0 +1,43 @@
+package com.iamberry.rst.service.dm.mapper;
+
+import com.iamberry.rst.core.dm.FinancialReceipt;
+
+import java.util.List;
+
+/**
+ *  财务收款接口
+ * @author xm
+ * @Date 2019-07-19
+ */
+public interface FinancialReceiptMapper {
+    /**
+     * 获取集合
+     * @param  financialReceipt
+     * @return List
+     */
+    List<FinancialReceipt> getFinancialReceiptList(FinancialReceipt  financialReceipt);
+    /**
+     * 查询单条数据
+     * @param  id
+     * @return  financialReceipt
+     */
+    FinancialReceipt  getFinancialReceiptById(Integer  id);
+    /**
+     * 增加数据
+     * @param  financialReceipt
+     * @return Integer
+     */
+    Integer  save(FinancialReceipt  financialReceipt);
+    /**
+     * 修改数据
+     * @param  financialReceipt
+     * @return Integer
+     */
+    Integer  update(FinancialReceipt  financialReceipt);
+    /**
+     * 删除数据
+     * @param  id
+     * @return Integer
+     */
+    Integer  delete(Integer  id);
+}

watero-rst-service/src/main/java/com/iamberry/rst/service/dm/mapper/SupplierDirectorMapper.java

@@ -0,0 +1,37 @@
+package com.iamberry.rst.service.dm.mapper;
+
+import com.iamberry.rst.core.dm.SupplierDirector;
+
+import java.util.List;
+
+/**
+ *  供应商对接人接口
+ * @author xm
+ * @Date 2019-07-19
+ */
+public interface SupplierDirectorMapper {
+    /**
+     * 获取集合
+     * @param  supplierDirector
+     * @return List
+     */
+    List<SupplierDirector> getSupplierDirectorList(SupplierDirector  supplierDirector);
+    /**
+     * 查询单条数据
+     * @param  id
+     * @return  supplierDirector
+     */
+    SupplierDirector  getSupplierDirectorById(Integer  id);
+    /**
+     * 删除数据
+     * @param  id
+     * @return Integer
+     */
+    Integer  delete(Integer  id);
+    /**
+     * 增加数据 <集合>
+     * @param  supplierDirectorList
+     * @return Integer
+     */
+    Integer  saveList(List<SupplierDirector>  supplierDirectorList);
+}

watero-rst-service/src/main/java/com/iamberry/rst/service/dm/mapper/SupplierProductItemMapper.java

@@ -0,0 +1,37 @@
+package com.iamberry.rst.service.dm.mapper;
+
+import com.iamberry.rst.core.dm.SupplierProductItem;
+
+import java.util.List;
+
+/**
+ *  供应产品成本明细接口
+ * @author xm
+ * @Date 2019-07-19
+ */
+public interface SupplierProductItemMapper {
+    /**
+     * 获取集合
+     * @param  supplierProductItem
+     * @return List
+     */
+    List<SupplierProductItem> getSupplierProductItemList(SupplierProductItem  supplierProductItem);
+    /**
+     * 查询单条数据
+     * @param  id
+     * @return  supplierProductItem
+     */
+    SupplierProductItem  getSupplierProductItemById(Integer  id);
+    /**
+     * 删除数据
+     * @param  id
+     * @return Integer
+     */
+    Integer  delete(Integer  id);
+    /**
+     * 增加数据 <集合>
+     * @param  supplierProductItemList
+     * @return Integer
+     */
+    Integer  saveList(List<SupplierProductItem>  supplierProductItemList);
+}

watero-rst-service/src/main/java/com/iamberry/rst/service/dm/mapper/SupplierProductMapper.java

@@ -0,0 +1,37 @@
+package com.iamberry.rst.service.dm.mapper;
+
+import com.iamberry.rst.core.dm.SupplierProduct;
+
+import java.util.List;
+
+/**
+ *  接口
+ * @author xm
+ * @Date 2019-07-19
+ */
+public interface SupplierProductMapper {
+    /**
+     * 获取集合
+     * @param  supplierProduct
+     * @return List
+     */
+    List<SupplierProduct> getSupplierProductList(SupplierProduct  supplierProduct);
+    /**
+     * 查询单条数据
+     * @param  id
+     * @return  supplierProduct
+     */
+    SupplierProduct  getSupplierProductById(Integer  id);
+    /**
+     * 删除数据
+     * @param  id
+     * @return Integer
+     */
+    Integer  delete(Integer  id);
+    /**
+     * 增加数据 <集合>
+     * @param  supplierProductList
+     * @return Integer
+     */
+    Integer  saveList(List<SupplierProduct>  supplierProductList);
+}

watero-rst-service/src/main/java/com/iamberry/rst/service/dm/mapper/claimOrderMapper.xml

@@ -0,0 +1,79 @@
+<?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.dm.mapper.ClaimOrderMapper">
+    <resultMap  id="BaseResultMap" type="ClaimOrder" >
+        <result    column="claim_order_id"    property="claimOrderId" />
+        <result    column="sales_id"    property="salesId" />
+        <result    column="fr_id"    property="frId" />
+    </resultMap>
+    <sql    id="Base_List" >
+        t.claim_order_id,
+        t.sales_id,
+        t.fr_id
+    </sql>
+    <select id="getClaimOrderList" resultMap="BaseResultMap" parameterType="ClaimOrder" >
+        select
+        <include refid="Base_List" />
+        from tb_rst_dm_claim_order t
+        <where>
+            <if test="salesId != null ">
+                AND t.sales_id = #{salesId}
+            </if >
+            <if test="frId != null ">
+                AND t.fr_id = #{frId}
+            </if >
+        </where>
+    </select>
+    <select id="getClaimOrderById" resultMap="BaseResultMap" parameterType="Integer" >
+        select
+        <include refid="Base_List" />
+        from tb_rst_dm_claim_order t
+        where t.claim_order_id= #{claimOrderId}
+    </select>
+    <insert id="save" parameterType="ClaimOrder" >
+        insert into
+        tb_rst_dm_claim_order
+        (
+        sales_id,
+        fr_id
+        )
+        values
+        (
+        #{salesId},
+        #{frId}
+        )
+    </insert>
+    <update id="update" parameterType="ClaimOrder" >
+        update
+        tb_rst_dm_claim_order
+        <set >
+            <if test="salesId != null ">
+                sales_id = #{salesId},
+            </if >
+            <if test="frId != null ">
+                fr_id = #{frId}
+            </if >
+        </set >
+        where claim_order_id= #{claimOrderId}
+    </update>
+    <delete id="delete" parameterType="Integer" >
+        delete
+        tb_rst_dm_claim_order
+        where claim_order_id=#{claimOrderId}
+    </delete>
+    <insert id="saveList" parameterType="java.util.List" >
+        insert into
+        tb_rst_dm_claim_order
+        (
+        sales_id,
+        fr_id
+        )
+        values
+        <foreach collection="list" item="node" index="index" separator="," open="" close="">
+            (
+            #{node.salesId},
+            #{node.frId}
+            )
+        </foreach >
+    </insert>
+</mapper>

watero-rst-service/src/main/java/com/iamberry/rst/service/dm/mapper/cooperationAgreeMapper.xml

@@ -0,0 +1,80 @@
+<?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.dm.mapper.CooperationAgreeMapper">
+    <resultMap  id="BaseResultMap" type="CooperationAgree" >
+        <result    column="coop_agree_id"    property="coopAgreeId" />
+        <result    column="dealer_id"    property="dealerId" />
+        <result    column="coop_agree_date"    property="coopAgreeDate" />
+        <result    column="coop_agree_img"    property="coopAgreeImg" />
+        <result    column="coop_agree_remake"    property="coopAgreeRemake" />
+        <result    column="create_date"    property="createDate" />
+    </resultMap>
+    <sql    id="Base_List" >
+        t.coop_agree_id,
+        t.dealer_id,
+        t.coop_agree_date,
+        t.coop_agree_img,
+        t.coop_agree_remake,
+        t.create_date
+    </sql>
+    <select id="getCooperationAgreeList" resultMap="BaseResultMap" parameterType="CooperationAgree" >
+        select
+        <include refid="Base_List" />
+        from tb_rst_dm_cooperation_agree t
+        <where>
+            <if test="coopAgreeId != null ">
+                AND t.coop_agree_id = #{coopAgreeId}
+            </if >
+            <if test="dealerId != null ">
+                AND t.dealer_id = #{dealerId}
+            </if >
+        </where>
+    </select>
+    <select id="getCooperationAgreeById" resultMap="BaseResultMap" parameterType="Integer" >
+        select
+        <include refid="Base_List" />
+        from tb_rst_dm_cooperation_agree t
+        where t.coop_agree_id= #{coopAgreeId}
+    </select>
+    <insert id="save" parameterType="CooperationAgree" >
+        insert into
+        tb_rst_dm_cooperation_agree
+        (
+        dealer_id,
+        coop_agree_date,
+        coop_agree_img,
+        coop_agree_remake
+        )
+        values
+        (
+        #{dealerId},
+        #{coopAgreeDate},
+        #{coopAgreeImg},
+        #{coopAgreeRemake}
+        )
+    </insert>
+    <update id="update" parameterType="CooperationAgree" >
+        update
+        tb_rst_dm_cooperation_agree
+        <set >
+            <if test="dealerId != null ">
+                dealer_id = #{dealerId},
+            </if >
+            <if test="coopAgreeDate != null and coopAgreeDate != ''">
+                coop_agree_date = #{coopAgreeDate},
+            </if >
+            <if test="coopAgreeImg != null and coopAgreeImg != ''">
+                coop_agree_img = #{coopAgreeImg},
+            </if >
+            <if test="coopAgreeRemake != null and coopAgreeRemake != ''">
+                coop_agree_remake = #{coopAgreeRemake},
+            </if >
+        </set >
+        where coop_agree_id= #{coopAgreeId}
+    </update>
+    <delete id="delete" parameterType="Integer" >
+        delete
+        tb_rst_dm_cooperation_agree
+        where coop_agree_id=#{coopAgreeId}
+    </delete>
+</mapper>

watero-rst-service/src/main/java/com/iamberry/rst/service/dm/mapper/dealerChannelMapper.xml

@@ -0,0 +1,90 @@
+<?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.dm.mapper.DealerChannelMapper">
+    <resultMap  id="BaseResultMap" type="DealerChannel" >
+        <result    column="deal_channel_id"    property="dealChannelId" />
+        <result    column="dealer_id"    property="dealerId" />
+        <result    column="channel_division_id"    property="channelDivisionId" />
+        <result    column="store_id"    property="storeId" />
+        <result    column="deal_channel_account_period"    property="dealChannelAccountPeriod" />
+        <result    column="create_date"    property="createDate" />
+    </resultMap>
+    <sql    id="Base_List" >
+        t.deal_channel_id,
+        t.dealer_id,
+        t.channel_division_id,
+        t.store_id,
+        t.deal_channel_account_period,
+        t.create_date
+    </sql>
+    <select id="getDealerChannelList" resultMap="BaseResultMap" parameterType="DealerChannel" >
+        select
+        <include refid="Base_List" />
+        from tb_rst_dm_dealer_channel t
+        <where>
+            <if test="dealChannelId != null ">
+                AND t.deal_channel_id = #{dealChannelId}
+            </if >
+            <if test="dealerId != null ">
+                AND t.dealer_id = #{dealerId}
+            </if >
+            <if test="channelDivisionId != null ">
+                AND t.channel_division_id = #{channelDivisionId}
+            </if >
+            <if test="storeId != null ">
+                AND t.store_id = #{storeId}
+            </if >
+        </where>
+    </select>
+    <select id="getDealerChannelById" resultMap="BaseResultMap" parameterType="Integer" >
+        select
+        <include refid="Base_List" />
+        from tb_rst_dm_dealer_channel t
+        where t.deal_channel_id= #{dealChannelId}
+    </select>
+    <delete id="delete" parameterType="Integer" >
+        delete
+        tb_rst_dm_dealer_channel
+        where deal_channel_id=#{dealChannelId}
+    </delete>
+    <insert id="saveList" parameterType="java.util.List" >
+        insert into
+        tb_rst_dm_dealer_channel
+        (
+        dealer_id,
+        channel_division_id,
+        store_id,
+        deal_channel_account_period
+        )
+        values
+        <foreach collection="list" item="node" index="index" separator="," open="" close="">
+            (
+            #{node.dealerId},
+            #{node.channelDivisionId},
+            #{node.storeId},
+            #{node.dealChannelAccountPeriod}
+            )
+        </foreach >
+    </insert>
+    <update id="updateList" parameterType="java.util.List" >
+        <foreach collection="list" item="node" index="index" separator="," open="" close="">
+            update
+            tb_rst_dm_dealer_channel
+            <set >
+                <if test="node.dealerId != null ">
+                    dealer_id = #{node.dealerId},
+                </if >
+                <if test="node.channelDivisionId != null ">
+                    channel_division_id = #{node.channelDivisionId},
+                </if >
+                <if test="node.storeId != null ">
+                    store_id = #{node.storeId},
+                </if >
+                <if test="node.dealChannelAccountPeriod != null and node.dealChannelAccountPeriod != ''">
+                    deal_channel_account_period = #{node.dealChannelAccountPeriod},
+                </if >
+            </set >
+            where deal_channel_id= #{node.dealChannelId}
+        </foreach >
+    </update>
+</mapper>

watero-rst-service/src/main/java/com/iamberry/rst/service/dm/mapper/dealerContactMapper.xml

@@ -0,0 +1,123 @@
+<?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.dm.mapper.DealerContactMapper">
+    <resultMap  id="BaseResultMap" type="DealerContact" >
+        <result    column="deal_contact_id"    property="dealContactId" />
+        <result    column="dealer_id"    property="dealerId" />
+        <result    column="deal_contact_name"    property="dealContactName" />
+        <result    column="deal_contact_phone"    property="dealContactPhone" />
+        <result    column="deal_contact_type"    property="dealContactType" />
+        <result    column="deal_contact_email"    property="dealContactEmail" />
+        <result    column="deal_contact_wechat"    property="dealContactWechat" />
+        <result    column="deal_contact_qq"    property="dealContactQq" />
+        <result    column="deal_create_date"    property="dealCreateDate" />
+    </resultMap>
+    <sql    id="Base_List" >
+        t.deal_contact_id,
+        t.dealer_id,
+        t.deal_contact_name,
+        t.deal_contact_phone,
+        t.deal_contact_type,
+        t.deal_contact_email,
+        t.deal_contact_wechat,
+        t.deal_contact_qq,
+        t.deal_create_date
+    </sql>
+    <select id="getDealerContactList" resultMap="BaseResultMap" parameterType="DealerContact" >
+        select
+        <include refid="Base_List" />
+        from tb_rst_dm_dealer_contact t
+        <where>
+            <if test="dealContactId != null ">
+                AND t.deal_contact_id = #{dealContactId}
+            </if >
+            <if test="dealerId != null ">
+                AND t.dealer_id = #{dealerId}
+            </if >
+            <if test="dealContactName != null and dealContactName != ''">
+                AND t.deal_contact_name  like  CONCAT ('%',#{dealContactName},'%')
+            </if >
+            <if test="dealContactPhone != null and dealContactPhone != ''">
+                AND t.deal_contact_phone  like  CONCAT ('%',#{dealContactPhone},'%')
+            </if >
+            <if test="dealContactType != null and dealContactType != ''">
+                AND t.deal_contact_type  like  CONCAT ('%',#{dealContactType},'%')
+            </if >
+            <if test="dealContactEmail != null and dealContactEmail != ''">
+                AND t.deal_contact_email  like  CONCAT ('%',#{dealContactEmail},'%')
+            </if >
+            <if test="dealContactWechat != null and dealContactWechat != ''">
+                AND t.deal_contact_wechat  like  CONCAT ('%',#{dealContactWechat},'%')
+            </if >
+            <if test="dealContactQq != null and dealContactQq != ''">
+                AND t.deal_contact_qq  like  CONCAT ('%',#{dealContactQq},'%')
+            </if >
+        </where>
+    </select>
+    <select id="getDealerContactById" resultMap="BaseResultMap" parameterType="Integer" >
+        select
+        <include refid="Base_List" />
+        from tb_rst_dm_dealer_contact t
+        where t.deal_contact_id= #{dealContactId}
+    </select>
+    <delete id="delete" parameterType="Integer" >
+        delete
+        tb_rst_dm_dealer_contact
+        where deal_contact_id=#{dealContactId}
+    </delete>
+    <insert id="saveList" parameterType="java.util.List" >
+        insert into
+        tb_rst_dm_dealer_contact
+        (
+        dealer_id,
+        deal_contact_name,
+        deal_contact_phone,
+        deal_contact_type,
+        deal_contact_email,
+        deal_contact_wechat,
+        deal_contact_qq
+        )
+        values
+        <foreach collection="list" item="node" index="index" separator="," open="" close="">
+            (
+            #{node.dealerId},
+            #{node.dealContactName},
+            #{node.dealContactPhone},
+            #{node.dealContactType},
+            #{node.dealContactEmail},
+            #{node.dealContactWechat},
+            #{node.dealContactQq}
+            )
+        </foreach >
+    </insert>
+    <update id="updateList" parameterType="java.util.List" >
+        <foreach collection="list" item="node" index="index" separator="," open="" close="">
+            update
+            tb_rst_dm_dealer_contact
+            <set >
+                <if test="node.dealerId != null ">
+                    dealer_id = #{node.dealerId},
+                </if >
+                <if test="node.dealContactName != null and node.dealContactName != ''">
+                    deal_contact_name = #{node.dealContactName},
+                </if >
+                <if test="node.dealContactPhone != null and node.dealContactPhone != ''">
+                    deal_contact_phone = #{node.dealContactPhone},
+                </if >
+                <if test="node.dealContactType != null and node.dealContactType != ''">
+                    deal_contact_type = #{node.dealContactType},
+                </if >
+                <if test="node.dealContactEmail != null and node.dealContactEmail != ''">
+                    deal_contact_email = #{node.dealContactEmail},
+                </if >
+                <if test="node.dealContactWechat != null and node.dealContactWechat != ''">
+                    deal_contact_wechat = #{node.dealContactWechat},
+                </if >
+                <if test="node.dealContactQq != null and node.dealContactQq != ''">
+                    deal_contact_qq = #{node.dealContactQq},
+                </if >
+            </set >
+            where deal_contact_id= #{node.dealContactId}
+        </foreach >
+    </update>
+</mapper>

watero-rst-service/src/main/java/com/iamberry/rst/service/dm/mapper/dealerProductMapper.xml

@@ -0,0 +1,65 @@
+<?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.dm.mapper.DealerProductMapper">
+    <resultMap  id="BaseResultMap" type="DealerProduct" >
+        <result    column="deal_prod_id"    property="dealProdId" />
+        <result    column="dealer_id"    property="dealerId" />
+        <result    column="color_id"    property="colorId" />
+        <result    column="deal_prod_price"    property="dealProdPrice" />
+        <result    column="create_date"    property="createDate" />
+    </resultMap>
+    <sql    id="Base_List" >
+        t.deal_prod_id,
+        t.dealer_id,
+        t.color_id,
+        t.deal_prod_price,
+        t.create_date
+    </sql>
+    <select id="getDealerProductList" resultMap="BaseResultMap" parameterType="DealerProduct" >
+        select
+        <include refid="Base_List" />
+        from tb_rst_dm_dealer_product t
+        <where>
+            <if test="dealProdId != null ">
+                AND t.deal_prod_id = #{dealProdId}
+            </if >
+            <if test="dealerId != null ">
+                AND t.dealer_id = #{dealerId}
+            </if >
+            <if test="colorId != null ">
+                AND t.color_id = #{colorId}
+            </if >
+            <if test="dealProdPrice != null ">
+                AND t.deal_prod_price = #{dealProdPrice}
+            </if >
+        </where>
+    </select>
+    <select id="getDealerProductById" resultMap="BaseResultMap" parameterType="Integer" >
+        select
+        <include refid="Base_List" />
+        from tb_rst_dm_dealer_product t
+        where t.deal_prod_id= #{dealProdId}
+    </select>
+    <delete id="delete" parameterType="Integer" >
+        delete
+        tb_rst_dm_dealer_product
+        where deal_prod_id=#{dealProdId}
+    </delete>
+    <insert id="saveList" parameterType="java.util.List" >
+        insert into
+        tb_rst_dm_dealer_product
+        (
+        dealer_id,
+        color_id,
+        deal_prod_price
+        )
+        values
+        <foreach collection="list" item="node" index="index" separator="," open="" close="">
+            (
+            #{node.dealerId},
+            #{node.colorId},
+            #{node.dealProdPrice}
+            )
+        </foreach >
+    </insert>
+</mapper>

watero-rst-service/src/main/java/com/iamberry/rst/service/dm/mapper/dealerProductStoreMapper.xml

@@ -0,0 +1,56 @@
+<?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.dm.mapper.DealerProductStoreMapper">
+    <resultMap  id="BaseResultMap" type="DealerProductStore" >
+        <result    column="product_store_id"    property="productStoreId" />
+        <result    column="prod_supp_id"    property="prodSuppId" />
+        <result    column="store_id"    property="storeId" />
+    </resultMap>
+    <sql    id="Base_List" >
+        t.product_store_id,
+        t.prod_supp_id,
+        t.store_id
+    </sql>
+    <select id="getDealerProductStoreList" resultMap="BaseResultMap" parameterType="DealerProductStore" >
+        select
+        <include refid="Base_List" />
+        from tb_rst_dm_dealer_product_store t
+        <where>
+            <if test="productStoreId != null ">
+                AND t.product_store_id = #{productStoreId}
+            </if >
+            <if test="prodSuppId != null ">
+                AND t.prod_supp_id = #{prodSuppId}
+            </if >
+            <if test="storeId != null ">
+                AND t.store_id = #{storeId}
+            </if >
+        </where>
+    </select>
+    <select id="getDealerProductStoreById" resultMap="BaseResultMap" parameterType="Integer" >
+        select
+        <include refid="Base_List" />
+        from tb_rst_dm_dealer_product_store t
+        where t.product_store_id= #{productStoreId}
+    </select>
+    <delete id="delete" parameterType="Integer" >
+        delete
+        tb_rst_dm_dealer_product_store
+        where product_store_id=#{productStoreId}
+    </delete>
+    <insert id="saveList" parameterType="java.util.List" >
+        insert into
+        tb_rst_dm_dealer_product_store
+        (
+        prod_supp_id,
+        store_id
+        )
+        values
+        <foreach collection="list" item="node" index="index" separator="," open="" close="">
+            (
+            #{node.prodSuppId},
+            #{node.storeId}
+            )
+        </foreach >
+    </insert>
+</mapper>

watero-rst-service/src/main/java/com/iamberry/rst/service/dm/mapper/dmChannelMapper.xml

@@ -0,0 +1,89 @@
+<?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.dm.mapper.DmChannelMapper">
+    <resultMap  id="BaseResultMap" type="DmChannel" >
+        <result    column="channel_id"    property="channelId" />
+        <result    column="channel_name"    property="channelName" />
+        <result    column="channel_type_id"    property="channelTypeId" />
+        <result    column="channel_code"    property="channelCode" />
+        <result    column="channel_status"    property="channelStatus" />
+        <result    column="create_date"    property="createDate" />
+    </resultMap>
+    <sql    id="Base_List" >
+        t.channel_id,
+        t.channel_name,
+        t.channel_type_id,
+        t.channel_code,
+        t.channel_status,
+        t.create_date
+    </sql>
+    <select id="getDmChannelList" resultMap="BaseResultMap" parameterType="DmChannel" >
+        select
+        <include refid="Base_List" />
+        from tb_rst_dm_channel t
+        <where>
+            <if test="channelId != null ">
+                AND t.channel_id = #{channelId}
+            </if >
+            <if test="channelName != null and channelName != ''">
+                AND t.channel_name  like  CONCAT ('%',#{channelName},'%')
+            </if >
+            <if test="channelTypeId != null ">
+                AND t.channel_type_id = #{channelTypeId}
+            </if >
+            <if test="channelCode != null and channelCode != ''">
+                AND t.channel_code = #{channelCode}
+            </if >
+            <if test="channelStatus != null ">
+                AND t.channel_status = #{channelStatus}
+            </if >
+        </where>
+    </select>
+    <select id="getDmChannelById" resultMap="BaseResultMap" parameterType="Integer" >
+        select
+        <include refid="Base_List" />
+        from tb_rst_dm_channel t
+        where t.channel_id= #{channelId}
+    </select>
+    <insert id="save" parameterType="DmChannel" >
+        insert into
+        tb_rst_dm_channel
+        (
+        channel_name,
+        channel_type_id,
+        channel_code,
+        channel_status
+        )
+        values
+        (
+        #{channelName},
+        #{channelTypeId},
+        #{channelCode},
+        #{channelStatus}
+        )
+    </insert>
+    <update id="update" parameterType="DmChannel" >
+        update
+        tb_rst_dm_channel
+        <set >
+            <if test="channelName != null and channelName != ''">
+                channel_name = #{channelName},
+            </if >
+            <if test="channelTypeId != null ">
+                channel_type_id = #{channelTypeId},
+            </if >
+            <if test="channelCode != null and channelCode != ''">
+                channel_code = #{channelCode},
+            </if >
+            <if test="channelStatus != null ">
+                channel_status = #{channelStatus},
+            </if >
+        </set >
+        where channel_id= #{channelId}
+    </update>
+    <delete id="delete" parameterType="Integer" >
+        delete FROM
+            tb_rst_dm_channel
+        where channel_id=#{channelId}
+    </delete>
+</mapper>

watero-rst-service/src/main/java/com/iamberry/rst/service/dm/mapper/dmChannelTypeMapper.xml

@@ -0,0 +1,71 @@
+<?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.dm.mapper.DmChannelTypeMapper">
+    <resultMap  id="BaseResultMap" type="DmChannelType" >
+        <result    column="channel_type_id"    property="channelTypeId" />
+        <result    column="channel_type_name"    property="channelTypeName" />
+        <result    column="channel_type_desc"    property="channelTypeDesc" />
+        <result    column="channel_type_status"    property="channelTypeStatus" />
+        <result    column="create_date"    property="createDate" />
+    </resultMap>
+    <sql    id="Base_List" >
+        t.channel_type_id,
+        t.channel_type_name,
+        t.channel_type_desc,
+        t.channel_type_status,
+        t.create_date
+    </sql>
+    <select id="getDmChannelTypeList" resultMap="BaseResultMap" parameterType="DmChannelType" >
+        select
+        <include refid="Base_List" />
+        from tb_rst_dm_channel_type t
+        <where>
+            <if test="channelTypeId != null ">
+                AND t.channel_type_id = #{channelTypeId}
+            </if >
+            <if test="channelTypeName != null and channelTypeName != ''">
+                AND t.channel_type_name  like  CONCAT ('%',#{channelTypeName},'%')
+            </if >
+            <if test="channelTypeStatus != null ">
+                AND t.channel_type_status = #{channelTypeStatus}
+            </if >
+        </where>
+    </select>
+    <select id="getDmChannelTypeById" resultMap="BaseResultMap" parameterType="Integer" >
+        select
+        <include refid="Base_List" />
+        from tb_rst_dm_channel_type t
+        where t.channel_type_id= #{channelTypeId}
+    </select>
+    <insert id="save" parameterType="DmChannelType" >
+        insert into
+        tb_rst_dm_channel_type
+        (
+        channel_type_name,
+        channel_type_desc,
+        channel_type_status
+        )
+        values
+        (
+        #{channelTypeName},
+        #{channelTypeDesc},
+        #{channelTypeStatus}
+        )
+    </insert>
+    <update id="update" parameterType="DmChannelType" >
+        update
+        tb_rst_dm_channel_type
+        <set >
+            <if test="channelTypeName != null and channelTypeName != ''">
+                channel_type_name = #{channelTypeName},
+            </if >
+            <if test="channelTypeDesc != null and channelTypeDesc != ''">
+                channel_type_desc = #{channelTypeDesc},
+            </if >
+            <if test="channelTypeStatus != null ">
+                channel_type_status = #{channelTypeStatus},
+            </if >
+        </set >
+        where channel_type_id= #{channelTypeId}
+    </update>
+</mapper>

watero-rst-service/src/main/java/com/iamberry/rst/service/dm/mapper/dmDealerMapper.xml

@@ -0,0 +1,128 @@
+<?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.dm.mapper.DmDealerMapper">
+    <resultMap  id="BaseResultMap" type="DmDealer" >
+        <result    column="dealer_id"    property="dealerId" />
+        <result    column="dealer_name"    property="dealerName" />
+        <result    column="dealer_industry"    property="dealerIndustry" />
+        <result    column="dealer_type"    property="dealerType" />
+        <result    column="dealer_state"    property="dealerState" />
+        <result    column="dealer_self_operated"    property="dealerSelfOperated" />
+        <result    column="dealer_rate"    property="dealerRate" />
+        <result    column="dealer_status"    property="dealerStatus" />
+        <result    column="dealer_remarks"    property="dealerRemarks" />
+        <result    column="create_id"    property="createId" />
+        <result    column="create_date"    property="createDate" />
+        <result    column="update_date"    property="updateDate" />
+    </resultMap>
+    <sql    id="Base_List" >
+        t.dealer_id,
+        t.dealer_name,
+        t.dealer_industry,
+        t.dealer_type,
+        t.dealer_state,
+        t.dealer_self_operated,
+        t.dealer_rate,
+        t.dealer_status,
+        t.dealer_remarks,
+        t.create_id,
+        t.create_date,
+        t.update_date
+    </sql>
+    <select id="getDmDealerList" resultMap="BaseResultMap" parameterType="DmDealer" >
+        select
+        <include refid="Base_List" />
+        from tb_rst_dm_dealer t
+        <where>
+            <if test="dealerId != null ">
+                AND t.dealer_id = #{dealerId}
+            </if >
+            <if test="dealerName != null and dealerName != ''">
+                AND t.dealer_name  like  CONCAT ('%',#{dealerName},'%')
+            </if >
+            <if test="dealerIndustry != null and dealerIndustry != ''">
+                AND t.dealer_industry  like  CONCAT ('%',#{dealerIndustry},'%')
+            </if >
+            <if test="dealerType != null ">
+                AND t.dealer_type = #{dealerType}
+            </if >
+            <if test="dealerState != null ">
+                AND t.dealer_state = #{dealerState}
+            </if >
+            <if test="dealerSelfOperated != null ">
+                AND t.dealer_self_operated = #{dealerSelfOperated}
+            </if >
+            <if test="dealerStatus != null ">
+                AND t.dealer_status = #{dealerStatus}
+            </if >
+            <if test="createId != null ">
+                AND t.create_id = #{createId}
+            </if >
+        </where>
+    </select>
+    <select id="getDmDealerById" resultMap="BaseResultMap" parameterType="Integer" >
+        select
+        <include refid="Base_List" />
+        from tb_rst_dm_dealer t
+        where t.dealer_id= #{dealerId}
+    </select>
+    <insert id="save" parameterType="DmDealer" >
+        insert into
+        tb_rst_dm_dealer
+        (
+        dealer_name,
+        dealer_industry,
+        dealer_type,
+        dealer_state,
+        dealer_self_operated,
+        dealer_rate,
+        dealer_status,
+        dealer_remarks,
+        create_id
+        )
+        values
+        (
+        #{dealerName},
+        #{dealerIndustry},
+        #{dealerType},
+        #{dealerState},
+        #{dealerSelfOperated},
+        #{dealerRate},
+        #{dealerStatus},
+        #{dealerRemarks},
+        #{createId}
+        )
+    </insert>
+    <update id="update" parameterType="DmDealer" >
+        update
+        tb_rst_dm_dealer
+        <set >
+            <if test="dealerName != null and dealerName != ''">
+                dealer_name = #{dealerName},
+            </if >
+            <if test="dealerIndustry != null and dealerIndustry != ''">
+                dealer_industry = #{dealerIndustry},
+            </if >
+            <if test="dealerType != null ">
+                dealer_type = #{dealerType},
+            </if >
+            <if test="dealerState != null ">
+                dealer_state = #{dealerState},
+            </if >
+            <if test="dealerSelfOperated != null ">
+                dealer_self_operated = #{dealerSelfOperated},
+            </if >
+            <if test="dealerRate != null and dealerRate != ''">
+                dealer_rate = #{dealerRate},
+            </if >
+            <if test="dealerStatus != null ">
+                dealer_status = #{dealerStatus},
+            </if >
+            <if test="dealerRemarks != null and dealerRemarks != ''">
+                dealer_remarks = #{dealerRemarks},
+            </if >
+        </set >
+        where dealer_id= #{dealerId}
+    </update>
+
+</mapper>

watero-rst-service/src/main/java/com/iamberry/rst/service/dm/mapper/dmSupplierMapper.xml

@@ -0,0 +1,100 @@
+<?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.dm.mapper.DmSupplierMapper">
+    <resultMap  id="BaseResultMap" type="DmSupplier" >
+        <result    column="supplier_id"    property="supplierId" />
+        <result    column="supplier_name"    property="supplierName" />
+        <result    column="supplier_schedule"    property="supplierSchedule" />
+        <result    column="supplier_address"    property="supplierAddress" />
+        <result    column="supplier_industry"    property="supplierIndustry" />
+        <result    column="supplier_remake"    property="supplierRemake" />
+        <result    column="supplier_status"    property="supplierStatus" />
+        <result    column="create_date"    property="createDate" />
+    </resultMap>
+    <sql    id="Base_List" >
+        t.supplier_id,
+        t.supplier_name,
+        t.supplier_schedule,
+        t.supplier_address,
+        t.supplier_industry,
+        t.supplier_remake,
+        t.supplier_status,
+        t.create_date
+    </sql>
+    <select id="getDmSupplierList" resultMap="BaseResultMap" parameterType="DmSupplier" >
+        select
+        <include refid="Base_List" />
+        from tb_rst_dm_supplier t
+        <where>
+            <if test="supplierId != null ">
+                AND t.supplier_id = #{supplierId}
+            </if >
+            <if test="supplierName != null and supplierName != ''">
+                AND t.supplier_name  like  CONCAT ('%',#{supplierName},'%')
+            </if >
+            <if test="supplierSchedule != null ">
+                AND t.supplier_schedule = #{supplierSchedule}
+            </if >
+            <if test="supplierStatus != null ">
+                AND t.supplier_status = #{supplierStatus}
+            </if >
+        </where>
+    </select>
+    <select id="getDmSupplierById" resultMap="BaseResultMap" parameterType="Integer" >
+        select
+        <include refid="Base_List" />
+        from tb_rst_dm_supplier t
+        where t.supplier_id= #{supplierId}
+    </select>
+    <insert id="save" parameterType="DmSupplier" >
+        insert into
+        tb_rst_dm_supplier
+        (
+        supplier_name,
+        supplier_schedule,
+        supplier_address,
+        supplier_industry,
+        supplier_remake,
+        supplier_status
+        )
+        values
+        (
+        #{supplierName},
+        #{supplierSchedule},
+        #{supplierAddress},
+        #{supplierIndustry},
+        #{supplierRemake},
+        #{supplierStatus}
+        )
+    </insert>
+    <update id="update" parameterType="DmSupplier" >
+        update
+        tb_rst_dm_supplier
+        <set >
+            <if test="supplierName != null and supplierName != ''">
+                supplier_name = #{supplierName},
+            </if >
+            <if test="supplierSchedule != null ">
+                supplier_schedule = #{supplierSchedule},
+            </if >
+            <if test="supplierAddress != null and supplierAddress != ''">
+                supplier_address = #{supplierAddress},
+            </if >
+            <if test="supplierIndustry != null and supplierIndustry != ''">
+                supplier_industry = #{supplierIndustry},
+            </if >
+            <if test="supplierRemake != null and supplierRemake != ''">
+                supplier_remake = #{supplierRemake},
+            </if >
+            <if test="supplierStatus != null ">
+                supplier_status = #{supplierStatus},
+            </if >
+        </set >
+        where supplier_id= #{supplierId}
+    </update>
+    <delete id="delete" parameterType="Integer" >
+        delete
+        tb_rst_dm_supplier
+        where supplier_id=#{supplierId}
+    </delete>
+</mapper>

watero-rst-service/src/main/java/com/iamberry/rst/service/dm/mapper/financialReceiptMapper.xml

@@ -0,0 +1,119 @@
+<?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.dm.mapper.FinancialReceiptMapper">
+    <resultMap  id="BaseResultMap" type="FinancialReceipt" >
+        <result    column="fr_id"    property="frId" />
+        <result    column="dealer_id"    property="dealerId" />
+        <result    column="fr_claim_admin_id"    property="frClaimAdminId" />
+        <result    column="fr_claim_date"    property="frClaimDate" />
+        <result    column="fr_bank"    property="frBank" />
+        <result    column="fr_amount"    property="frAmount" />
+        <result    column="fr_date"    property="frDate" />
+        <result    column="fr_remake"    property="frRemake" />
+        <result    column="create_admin_id"    property="createAdminId" />
+        <result    column="create_date"    property="createDate" />
+    </resultMap>
+    <sql    id="Base_List" >
+        t.fr_id,
+        t.dealer_id,
+        t.fr_claim_admin_id,
+        t.fr_claim_date,
+        t.fr_bank,
+        t.fr_amount,
+        t.fr_date,
+        t.fr_remake,
+        t.create_admin_id,
+        t.create_date
+    </sql>
+    <select id="getFinancialReceiptList" resultMap="BaseResultMap" parameterType="FinancialReceipt" >
+        select
+        <include refid="Base_List" />
+        from tb_rst_dm_financial_receipt t
+        <where>
+            <if test="frId != null ">
+                AND t.fr_id = #{frId}
+            </if >
+            <if test="dealerId != null ">
+                AND t.dealer_id = #{dealerId}
+            </if >
+            <if test="frClaimAdminId != null ">
+                AND t.fr_claim_admin_id = #{frClaimAdminId}
+            </if >
+            <if test="createAdminId != null ">
+                AND t.create_admin_id = #{createAdminId}
+            </if >
+            <if test="createDate != null and createDate != ''">
+                <![CDATA[
+                    AND t.create_date >= #{beginTime}
+                ]]>
+            </if >
+            <if test="createDate != null and createDate != ''">
+                <![CDATA[
+                    AND t.create_date <= #{endTime}
+                ]]>
+            </if >
+        </where>
+    </select>
+    <select id="getFinancialReceiptById" resultMap="BaseResultMap" parameterType="Integer" >
+        select
+        <include refid="Base_List" />
+        from tb_rst_dm_financial_receipt t
+        where t.fr_id= #{frId}
+    </select>
+    <insert id="save" parameterType="FinancialReceipt" >
+        insert into
+        tb_rst_dm_financial_receipt
+        (
+        dealer_id,
+        fr_claim_admin_id,
+        fr_claim_date,
+        fr_bank,
+        fr_amount,
+        fr_date,
+        fr_remake
+        )
+        values
+        (
+        #{dealerId},
+        #{frClaimAdminId},
+        #{frClaimDate},
+        #{frBank},
+        #{frAmount},
+        #{frDate},
+        #{frRemake}
+        )
+    </insert>
+    <update id="update" parameterType="FinancialReceipt" >
+        update
+        tb_rst_dm_financial_receipt
+        <set >
+            <if test="dealerId != null ">
+                dealer_id = #{dealerId},
+            </if >
+            <if test="frClaimAdminId != null ">
+                fr_claim_admin_id = #{frClaimAdminId},
+            </if >
+            <if test="frClaimDate != null and frClaimDate != ''">
+                fr_claim_date = #{frClaimDate},
+            </if >
+            <if test="frBank != null and frBank != ''">
+                fr_bank = #{frBank},
+            </if >
+            <if test="frAmount != null ">
+                fr_amount = #{frAmount},
+            </if >
+            <if test="frDate != null and frDate != ''">
+                fr_date = #{frDate},
+            </if >
+            <if test="frRemake != null and frRemake != ''">
+                fr_remake = #{frRemake},
+            </if >
+        </set >
+        where fr_id= #{frId}
+    </update>
+    <delete id="delete" parameterType="Integer" >
+        delete
+        tb_rst_dm_financial_receipt
+        where fr_id=#{frId}
+    </delete>
+</mapper>

watero-rst-service/src/main/java/com/iamberry/rst/service/dm/mapper/supplierDirectorMapper.xml

@@ -0,0 +1,75 @@
+<?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.dm.mapper.SupplierDirectorMapper">
+    <resultMap  id="BaseResultMap" type="SupplierDirector" >
+        <result    column="sd_id"    property="sdId" />
+        <result    column="supplier_id"    property="supplierId" />
+        <result    column="sd_name"    property="sdName" />
+        <result    column="sd_post"    property="sdPost" />
+        <result    column="sd_tel"    property="sdTel" />
+        <result    column="sd_email"    property="sdEmail" />
+        <result    column="sd_wechat"    property="sdWechat" />
+        <result    column="sd_qq"    property="sdQq" />
+        <result    column="create_date"    property="createDate" />
+    </resultMap>
+    <sql    id="Base_List" >
+        t.sd_id,
+        t.supplier_id,
+        t.sd_name,
+        t.sd_post,
+        t.sd_tel,
+        t.sd_email,
+        t.sd_wechat,
+        t.sd_qq,
+        t.create_date
+    </sql>
+    <select id="getSupplierDirectorList" resultMap="BaseResultMap" parameterType="SupplierDirector" >
+        select
+        <include refid="Base_List" />
+        from tb_rst_dm_supplier_director t
+        <where>
+            <if test="sdId != null ">
+                AND t.sd_id = #{sdId}
+            </if >
+            <if test="supplierId != null ">
+                AND t.supplier_id = #{supplierId}
+            </if >
+        </where>
+    </select>
+    <select id="getSupplierDirectorById" resultMap="BaseResultMap" parameterType="Integer" >
+        select
+        <include refid="Base_List" />
+        from tb_rst_dm_supplier_director t
+        where t.sd_id= #{sdId}
+    </select>
+    <delete id="delete" parameterType="Integer" >
+        delete
+        tb_rst_dm_supplier_director
+        where sd_id=#{sdId}
+    </delete>
+    <insert id="saveList" parameterType="java.util.List" >
+        insert into
+        tb_rst_dm_supplier_director
+        (
+        supplier_id,
+        sd_name,
+        sd_post,
+        sd_tel,
+        sd_email,
+        sd_wechat,
+        sd_qq
+        )
+        values
+        <foreach collection="list" item="node" index="index" separator="," open="" close="">
+            (
+            #{node.supplierId},
+            #{node.sdName},
+            #{node.sdPost},
+            #{node.sdTel},
+            #{node.sdEmail},
+            #{node.sdWechat},
+            #{node.sdQq}
+            )
+        </foreach >
+    </insert>
+</mapper>

watero-rst-service/src/main/java/com/iamberry/rst/service/dm/mapper/supplierProductItemMapper.xml

@@ -0,0 +1,63 @@
+<?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.dm.mapper.SupplierProductItemMapper">
+    <resultMap  id="BaseResultMap" type="SupplierProductItem" >
+        <result    column="spi_id"    property="spiId" />
+        <result    column="sp_id"    property="spId" />
+        <result    column="spi_name"    property="spiName" />
+        <result    column="spi_cost"    property="spiCost" />
+    </resultMap>
+    <sql    id="Base_List" >
+        t.spi_id,
+        t.sp_id,
+        t.spi_name,
+        t.spi_cost
+    </sql>
+    <select id="getSupplierProductItemList" resultMap="BaseResultMap" parameterType="SupplierProductItem" >
+        select
+        <include refid="Base_List" />
+        from tb_rst_dm_supplier_product_item t
+        <where>
+            <if test="spiId != null ">
+                AND t.spi_id = #{spiId}
+            </if >
+            <if test="spId != null ">
+                AND t.sp_id = #{spId}
+            </if >
+            <if test="spiName != null and spiName != ''">
+                AND t.spi_name  like  CONCAT ('%',#{spiName},'%')
+            </if >
+            <if test="spiCost != null ">
+                AND t.spi_cost = #{spiCost}
+            </if >
+        </where>
+    </select>
+    <select id="getSupplierProductItemById" resultMap="BaseResultMap" parameterType="Integer" >
+        select
+        <include refid="Base_List" />
+        from tb_rst_dm_supplier_product_item t
+        where t.spi_id= #{spiId}
+    </select>
+    <delete id="delete" parameterType="Integer" >
+        delete
+        tb_rst_dm_supplier_product_item
+        where spi_id=#{spiId}
+    </delete>
+    <insert id="saveList" parameterType="java.util.List" >
+        insert into
+        tb_rst_dm_supplier_product_item
+        (
+        sp_id,
+        spi_name,
+        spi_cost
+        )
+        values
+        <foreach collection="list" item="node" index="index" separator="," open="" close="">
+            (
+            #{node.spId},
+            #{node.spiName},
+            #{node.spiCost}
+            )
+        </foreach >
+    </insert>
+</mapper>

watero-rst-service/src/main/java/com/iamberry/rst/service/dm/mapper/supplierProductMapper.xml

@@ -0,0 +1,69 @@
+<?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.dm.mapper.SupplierProductMapper">
+    <resultMap  id="BaseResultMap" type="SupplierProduct" >
+        <result    column="sp_id"    property="spId" />
+        <result    column="supplier_id"    property="supplierId" />
+        <result    column="color_id"    property="colorId" />
+        <result    column="sp_cost"    property="spCost" />
+        <result    column="sp_remake"    property="spRemake" />
+        <result    column="create_date"    property="createDate" />
+    </resultMap>
+    <sql    id="Base_List" >
+        t.sp_id,
+        t.supplier_id,
+        t.color_id,
+        t.sp_cost,
+        t.sp_remake,
+        t.create_date
+    </sql>
+    <select id="getSupplierProductList" resultMap="BaseResultMap" parameterType="SupplierProduct" >
+        select
+        <include refid="Base_List" />
+        from tb_rst_dm_supplier_product t
+        <where>
+            <if test="spId != null ">
+                AND t.sp_id = #{spId}
+            </if >
+            <if test="supplierId != null ">
+                AND t.supplier_id = #{supplierId}
+            </if >
+            <if test="colorId != null ">
+                AND t.color_id = #{colorId}
+            </if >
+            <if test="spCost != null ">
+                AND t.sp_cost = #{spCost}
+            </if >
+        </where>
+    </select>
+    <select id="getSupplierProductById" resultMap="BaseResultMap" parameterType="Integer" >
+        select
+        <include refid="Base_List" />
+        from tb_rst_dm_supplier_product t
+        where t.sp_id= #{spId}
+    </select>
+    <delete id="delete" parameterType="Integer" >
+        delete
+        tb_rst_dm_supplier_product
+        where sp_id=#{spId}
+    </delete>
+    <insert id="saveList" parameterType="java.util.List" >
+        insert into
+        tb_rst_dm_supplier_product
+        (
+        supplier_id,
+        color_id,
+        sp_cost,
+        sp_remake
+        )
+        values
+        <foreach collection="list" item="node" index="index" separator="," open="" close="">
+            (
+            #{node.supplierId},
+            #{node.colorId},
+            #{node.spCost},
+            #{node.spRemake}
+            )
+        </foreach >
+    </insert>
+</mapper>

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

@@ -237,44 +237,51 @@ public class ComplaintDetectInfoServiceImpl implements ComplaintDetectInfoServic
             throw new RuntimeException("修改QC检测状态");
         }
 
-        /*if(record.getMaintenanceResults() == 1){ //maintenanceResults
+        if(record.getMaintenanceResults() == 1){ //maintenanceResults
             //判断是否为维修
             ComplaintDetectInfo cdi = complaintDetectInfoMapper.getDetectById(record.getDetectId());
-            if(cdi.getProcTypeId() == 3){    //3: 维修
-                //减去售后仓库不良品
-                InventoryInfo inventoryInfo1 = new InventoryInfo();
-                inventoryInfo1.setInventoryDefectiveProductNum(1);
-                inventoryInfo1.setInventoryProductColorId(cdi.getProductColorId());
-                inventoryInfo1.setWarehouseId(2);
-                inventoryInfo1.setInventoryRecentRecord("维修机器完成，从售后不良品仓转入售后良品仓(维修ID:"+record.getDetectNumber()+")");
-                inventoryService.minusInventory(inventoryInfo1);
-
-                //增加售后仓库的良品
-                InventoryInfo inventoryInfo2 = new InventoryInfo();
-                inventoryInfo2.setInventoryGoodProductNum(1);
-                inventoryInfo2.setInventoryProductColorId(cdi.getProductColorId());
-                inventoryInfo2.setWarehouseId(2);
-                inventoryInfo2.setInventoryRecentRecord("维修机器完成，从售后不良品仓转入售后良品仓(维修ID:"+record.getDetectNumber()+")");
-                inventoryService.addInventory(inventoryInfo2);
-
-            }else{  //退货等
-                //减去售后仓库不良品
-                InventoryInfo inventoryInfo1 = new InventoryInfo();
-                inventoryInfo1.setInventoryDefectiveProductNum(1);
-                inventoryInfo1.setInventoryProductColorId(cdi.getProductColorId());
-                inventoryInfo1.setWarehouseId(2);
-                inventoryInfo1.setInventoryRecentRecord("退货/换货，从售后不良品仓转入正常销售良品仓(维修ID:"+record.getDetectNumber()+")");
-                inventoryService.minusInventory(inventoryInfo1);
-
-                //增加销售仓库的良品
-                InventoryInfo inventoryInfo2 = new InventoryInfo();
-                inventoryInfo2.setInventoryGoodProductNum(1);
-                inventoryInfo2.setInventoryProductColorId(cdi.getProductColorId());
-                inventoryInfo2.setWarehouseId(1);
-                inventoryInfo2.setInventoryRecentRecord("退货/换货，从售后不良品仓转入正常销售良品仓(维修ID:"+record.getDetectNumber()+")");
-                inventoryService.addInventory(inventoryInfo2);
+            Integer typeId = cdi.getProcTypeId();
+            if(typeId == null){
+                typeId = cdi.getTypeId();
             }
-        }*/
+            if(typeId != null){
+                if(typeId == 3){    //3: 维修
+                    //减去售后仓库不良品
+                    InventoryInfo inventoryInfo1 = new InventoryInfo();
+                    inventoryInfo1.setInventoryDefectiveProductNum(1);
+                    inventoryInfo1.setInventoryProductColorId(cdi.getProductColorId());
+                    inventoryInfo1.setWarehouseId(2);
+                    inventoryInfo1.setInventoryRecentRecord("维修机器完成，从售后不良品仓转入售后良品仓(维修ID:"+record.getDetectNumber()+")");
+                    inventoryService.minusInventory(inventoryInfo1);
+
+                    //增加售后仓库的良品
+                    InventoryInfo inventoryInfo2 = new InventoryInfo();
+                    inventoryInfo2.setInventoryGoodProductNum(1);
+                    inventoryInfo2.setInventoryProductColorId(cdi.getProductColorId());
+                    inventoryInfo2.setWarehouseId(2);
+                    inventoryInfo2.setInventoryRecentRecord("维修机器完成，从售后不良品仓转入售后良品仓(维修ID:"+record.getDetectNumber()+")");
+                    inventoryService.addInventory(inventoryInfo2);
+                }else{  //退货等
+                    //减去售后仓库不良品
+                    InventoryInfo inventoryInfo1 = new InventoryInfo();
+                    inventoryInfo1.setInventoryDefectiveProductNum(1);
+                    inventoryInfo1.setInventoryProductColorId(cdi.getProductColorId());
+                    inventoryInfo1.setWarehouseId(2);
+                    inventoryInfo1.setInventoryRecentRecord("退货/换货，从售后不良品仓转入正常销售良品仓(维修ID:"+record.getDetectNumber()+")");
+                    inventoryService.minusInventory(inventoryInfo1);
+
+                    //增加销售仓库的良品
+                    InventoryInfo inventoryInfo2 = new InventoryInfo();
+                    inventoryInfo2.setInventoryGoodProductNum(1);
+                    inventoryInfo2.setInventoryProductColorId(cdi.getProductColorId());
+                    inventoryInfo2.setWarehouseId(1);
+                    inventoryInfo2.setInventoryRecentRecord("退货/换货，从售后不良品仓转入正常销售良品仓(维修ID:"+record.getDetectNumber()+")");
+                    inventoryService.addInventory(inventoryInfo2);
+                }
+            }else{
+                throw new RuntimeException("未知的维修类型");
+            }
+        }
         return flag;
     }
     @Transactional

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

@@ -75,6 +75,7 @@
       cq.question_name questionName,
       cpms.proc_method_name methodName,
       cpts.proc_type_name typeName,
+      cpts.proc_type_id typeId,
       cd.company_id companyId,
       si.store_name signclosedStoreName
     from tb_rst_complaint_detect cd

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

@@ -453,7 +453,13 @@ public class AdminDetectController {
             msg.setReturnCode(500);
             return msg;
         }
-        Integer num = complaintDetectInfoService.updateDetectQc(detectInfo);
+
+        Integer num = 0;
+        try {
+            num = complaintDetectInfoService.updateDetectQc(detectInfo);
+        }catch (Exception e){
+            e.printStackTrace();
+        }
 
         if (num < 1) {
             msg.setResultCode(500);

watero-rst-web/src/main/java/com/iamberry/rst/controllers/dm/DmChannelController.java

@@ -0,0 +1,46 @@
+package com.iamberry.rst.controllers.dm;
+
+import com.iamberry.rst.core.dm.DmChannel;
+import com.iamberry.rst.faces.dm.DmChannelService;
+import com.iamberry.wechat.tools.ResponseJson;
+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.ResponseBody;
+
+import javax.servlet.http.HttpServletRequest;
+import java.util.List;
+
+@Controller
+@RequestMapping("/admin/dmchannel")
+public class DmChannelController {
+
+    private Logger logger = LoggerFactory.getLogger(DmChannelController.class);
+    @Autowired
+    private DmChannelService dmChannelService;
+
+    /**
+     * 获取渠道类型
+     * @param request
+     * @return
+     */
+    @ResponseBody
+    @RequestMapping("/get_channel_type")
+    public ResponseJson getChannelType(HttpServletRequest request,DmChannel dmChannel) {
+        ResponseJson rj = ResponseJson.getSUCCESS();
+        List<DmChannel> dmChannelList = dmChannelService.getDmChannelList(dmChannel);
+        if(dmChannelList == null || dmChannelList.size()<1){
+            rj = ResponseJson.getFAILURE();
+            return  rj;
+        }else{
+            rj.setResultMsg("添加成功");
+            return rj;
+        }
+    }
+
+
+
+
+}

watero-rst-web/src/main/java/com/iamberry/rst/controllers/dm/DmDealerController.java

@@ -0,0 +1,112 @@
+package com.iamberry.rst.controllers.dm;
+
+import com.iamberry.rst.core.dm.DealerChannel;
+import com.iamberry.rst.core.dm.DealerContact;
+import com.iamberry.rst.core.dm.DmDealer;
+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.dm.DealerContactService;
+import com.iamberry.rst.faces.dm.DmDealerService;
+import com.iamberry.rst.faces.sys.SysService;
+import com.iamberry.rst.utils.AdminUtils;
+import com.iamberry.rst.utils.StitchAttrUtil;
+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.servlet.ModelAndView;
+
+import javax.servlet.http.HttpServletRequest;
+
+@Controller
+@RequestMapping("/admin/dealer")
+public class DmDealerController {
+
+    private Logger logger = LoggerFactory.getLogger(DmDealerController.class);
+    @Autowired
+    private SysService sysService;
+    @Autowired
+    private DmDealerService dmDealerService;
+    @Autowired
+    private DealerContactService dealerContactService;
+
+    /**
+     * 查询客户基本信息列表
+     *
+     * @return
+     * @author
+     * @date
+     */
+    @RequiresPermissions("dm:dealer:list")
+    @RequestMapping("/list_page_dealer")
+    public ModelAndView listCustomerBasic(HttpServletRequest request, DmDealer dmDealer,
+                                          @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("dm/dealer/dealer_list");
+        //获取登录员工id
+        Integer adminId = AdminUtils.getLoginAdminId();
+        Admin admin = new Admin();
+        admin.setAdminId(adminId);
+        admin = sysService.get(admin);
+
+        dmDealer.setCreateId(adminId);
+
+        // 封装请求数据
+        PageRequest<DmDealer> pageRequest = new PageRequest<>(dmDealer, pageNO, pageSize, totalNum == 0);
+        // 查询订单列表
+        PagedResult<DmDealer> result = dmDealerService.listDmDealerPage(pageRequest);
+        if (totalNum != 0) {
+            result.setTotal(totalNum);
+        }
+        StitchAttrUtil.getSa().setModelAndView(dmDealer, mv, "/admin/dealer/list_page_dealer", result);
+        return mv;
+    }
+
+    /**
+     * 添加客户页面
+     * @return
+     * @author
+     * @date
+     */
+    @RequiresPermissions("dm:dealer:add")
+    @RequestMapping("/to_add_dealer")
+    public ModelAndView toAddDealer(HttpServletRequest request) {
+        ModelAndView mv = new ModelAndView("dm/dealer/add_dealer");
+        return mv;
+    }
+
+    /**
+     * 添加客户页面- 添加对接人
+     * @return
+     * @author
+     * @date
+     */
+    @RequiresPermissions("dm:dealer:add")
+    @RequestMapping("/to_add_dealer_contact")
+    public ModelAndView toAddDealerContact(HttpServletRequest request,DealerContact dc) {
+        ModelAndView mv = new ModelAndView("dm/dealer/add_dealer_contact");
+        mv.addObject("dealerContact",dc);
+        return mv;
+    }
+
+    /**
+     * 添加客户页面- 添加对接人
+     * @return
+     * @author
+     * @date
+     */
+    @RequiresPermissions("dm:dealer:add")
+    @RequestMapping("/to_add_dealer_channel")
+    public ModelAndView toAddDealerChannel(HttpServletRequest request,DealerChannel dealerChannel) {
+        ModelAndView mv = new ModelAndView("dm/dealer/add_dealer_channel");
+        mv.addObject("dealerChannel",dealerChannel);
+        return mv;
+    }
+
+
+}

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

@@ -199,8 +199,6 @@
 
 		<typeAlias type="com.iamberry.wechat.core.entity.PaperBean" alias="PaperBean"/>
 
-
-
 		<typeAlias type="com.iamberry.rst.core.cm.PostageInfo" alias="PostageInfo"/>
 		<typeAlias type="com.iamberry.rst.core.cm.SendbackInfo" alias="SendbackInfo"/>
 		<typeAlias type="com.iamberry.rst.core.cm.SendbackItem" alias="SendbackItem"/>
@@ -220,6 +218,22 @@
 		<typeAlias type="com.iamberry.rst.core.ei.PlatformInfo" alias="PlatformInfo"/>
 		<typeAlias type="com.iamberry.rst.core.ei.PushLog" alias="PushLog"/>
 		<typeAlias type="com.iamberry.rst.core.ei.InvoPlatform" alias="InvoPlatform"/>
+
+		<!--dm 客户系统-->
+		<typeAlias type="com.iamberry.rst.core.dm.ClaimOrder" alias="ClaimOrder"/>
+		<typeAlias type="com.iamberry.rst.core.dm.CooperationAgree" alias="CooperationAgree"/>
+		<typeAlias type="com.iamberry.rst.core.dm.DealerChannel" alias="DealerChannel"/>
+		<typeAlias type="com.iamberry.rst.core.dm.DealerContact" alias="DealerContact"/>
+		<typeAlias type="com.iamberry.rst.core.dm.DealerProduct" alias="DealerProduct"/>
+		<typeAlias type="com.iamberry.rst.core.dm.DealerProductStore" alias="DealerProductStore"/>
+		<typeAlias type="com.iamberry.rst.core.dm.DmChannel" alias="DmChannel"/>
+		<typeAlias type="com.iamberry.rst.core.dm.DmDealer" alias="DmDealer"/>
+		<typeAlias type="com.iamberry.rst.core.dm.DmSupplier" alias="DmSupplier"/>
+		<typeAlias type="com.iamberry.rst.core.dm.FinancialReceipt" alias="FinancialReceipt"/>
+		<typeAlias type="com.iamberry.rst.core.dm.SupplierDirector" alias="SupplierDirector"/>
+		<typeAlias type="com.iamberry.rst.core.dm.SupplierProduct" alias="SupplierProduct"/>
+		<typeAlias type="com.iamberry.rst.core.dm.SupplierProductItem" alias="SupplierProductItem"/>
+		<typeAlias type="com.iamberry.rst.core.dm.DmChannelType" alias="DmChannelType"/>
 	</typeAliases>
 	<!-- PageHelper -->
 	<plugins>
@@ -335,5 +349,21 @@
 		<mapper resource="com/iamberry/rst/service/ei/mapper/platformInfoMapper.xml"/>
 		<mapper resource="com/iamberry/rst/service/ei/mapper/pushLogMapper.xml"/>
 		<mapper resource="com/iamberry/rst/service/ei/mapper/invoPlatformMapper.xml"/>
+
+		<!--dm 客户系统-->
+		<mapper resource="com/iamberry/rst/service/dm/mapper/claimOrderMapper.xml"/>
+		<mapper resource="com/iamberry/rst/service/dm/mapper/cooperationAgreeMapper.xml"/>
+		<mapper resource="com/iamberry/rst/service/dm/mapper/dealerChannelMapper.xml"/>
+		<mapper resource="com/iamberry/rst/service/dm/mapper/dealerContactMapper.xml"/>
+		<mapper resource="com/iamberry/rst/service/dm/mapper/dealerProductMapper.xml"/>
+		<mapper resource="com/iamberry/rst/service/dm/mapper/dealerProductStoreMapper.xml"/>
+		<mapper resource="com/iamberry/rst/service/dm/mapper/dmChannelMapper.xml"/>
+		<mapper resource="com/iamberry/rst/service/dm/mapper/dmDealerMapper.xml"/>
+		<mapper resource="com/iamberry/rst/service/dm/mapper/dmSupplierMapper.xml"/>
+		<mapper resource="com/iamberry/rst/service/dm/mapper/financialReceiptMapper.xml"/>
+		<mapper resource="com/iamberry/rst/service/dm/mapper/supplierDirectorMapper.xml"/>
+		<mapper resource="com/iamberry/rst/service/dm/mapper/supplierProductItemMapper.xml"/>
+		<mapper resource="com/iamberry/rst/service/dm/mapper/supplierProductMapper.xml"/>
+		<mapper resource="com/iamberry/rst/service/dm/mapper/dmChannelTypeMapper.xml"/>
 	</mappers>
 </configuration>

watero-rst-web/src/main/webapp/WEB-INF/views/dm/dealer/add_dealer.ftl

@@ -0,0 +1,290 @@
+<!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">
+
+    <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;}
+        .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_results li a span {float:right}
+        .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;}
+        .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>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;}
+        .msg-phone{height: 35px;line-height: 35px;}
+        .col-sm-1{width: 150px;}
+
+        .all_down{text-decoration: underline;color: #00c;}
+    </style>
+    <title>添加客户 - 客户管理 - RST</title>
+</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>
+    <a class="btn radius r"
+       href="javascript:history.back(-1);" title="后退"><i class="Hui-iconfont">&#xe6d4;</i></a>
+</nav>
+<article class="page-container" style="padding: 10px;">
+    <div class="pd-20 cl" style="padding-top: 0px;">
+        <form action="${path}/admin/complaintQuestion/add_question" method="post" class="form form-horizontal" id="form-question"  onkeydown="if(event.keyCode==13)return false;">
+
+            <input type="hidden" name="questionState" value="1">
+
+            <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" id="" style="">
+                <label class="form-label col-1 col-sm-1"><span class="c-red">*</span>客户名称：</label>
+                <div class="formControls col-3 col-sm-3">
+                    <input type="text" class="input-text" value="" placeholder="填写客户名称" id="dealerName" name="dealerName" datatype="*1-20" errormsg="客户名称格式不正确！" >
+                </div>
+                <label class="form-label col-1 col-sm-1"><span class="c-red">*</span>客户行业：</label>
+                <div class="formControls col-3 col-sm-3">
+                    <input type="text" class="input-text" value="" placeholder="填写客户行业" id="dealerIndustry" name="dealerIndustry" datatype="*1-20" errormsg="客户行业格式不正确！" >
+                </div>
+            </div>
+
+            <div class="row cl" id="" style="">
+                <label class="form-label col-1 col-sm-1"><span class="c-red">*</span>是否自营：</label>
+                <div class="formControls col-3 col-sm-3">
+                    <div class="radio-box">
+                        <input type="radio" id="tel-1" name="dealerSelfOperated" value="1" >
+                        <label for="tel-1">自营</label>
+                    </div>
+                    <div class="radio-box">
+                        <input type="radio" id="tel-2" name="dealerSelfOperated" value="2" checked>
+                        <label for="tel-2">非自营</label>
+                    </div>
+                </div>
+
+                <label class="form-label col-1 col-sm-1"><span class="c-red">*</span>提款费率：</label>
+                <div class="formControls col-3 col-sm-3">
+                    <input type="text" class="input-text" value="0" placeholder="填写提款费率" id="dealerRate" name="dealerRate" >
+                </div>
+            </div>
+
+            <div class="row cl" id="" style="">
+                <label class="form-label col-1 col-sm-1"><span class="c-red">*</span>客户类型：</label>
+                <div class="formControls col-3 col-sm-3" >
+                    <span class="select-box">
+                         <select name="dealerType" class="select" id="complaint">
+                             <option value="1">个人</option>
+                             <option value="2">企业</option>
+                         </select>
+				    </span>
+                </div>
+                <label class="form-label col-1 col-sm-1"><span class="c-red">*</span>合作进度：</label>
+                <div class="formControls col-3 col-sm-3" >
+                    <span class="select-box">
+                         <select name="dealerState" class="select" id="dealerState">
+                             <option value="1">意向合作</option>
+                             <option value="2">已经合作</option>
+                             <option value="3">停止合作</option>
+                         </select>
+				    </span>
+                </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" id="add_contact_make" style="margin-left: 25px;">
+                <div class="formControls col-11 col-sm-11">
+                    <input type="button" class="btn btn-primary" onclick="addDealerContact()" value="添加对接人" >
+                    <table class="table table-border table-bg table-bordered" style="margin-top: 10px;" id="">
+                        <thead>
+                            <tr class="text-c" id="table1">
+                                <th width="30" >姓名</th>
+                                <th width="30" >职位</th>
+                                <th width="10">电话</th>
+                                <th width="10">邮箱</th>
+                                <th width="30">微信号</th>
+                                <th width="30">QQ号</th>
+                                <th width="10">操作</th>
+                            </tr>
+                        </thead>
+                        <tbody id="add_contact">
+                            <tr><td colspan="7" class="td-manage text-c" >暂时没有对接人，请添加！</td></tr>
+                        </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" id="add_dealer_channel_make" style="margin-left: 25px;">
+                <div class="formControls col-11 col-sm-11">
+                    <input type="button" class="btn btn-primary" onclick="add_product()" value="添加销售渠道" >
+                    <table class="table table-border table-bg table-bordered" style="margin-top: 10px;" id="">
+                        <thead>
+                        <tr class="text-c" id="table1">
+                            <th style="text-align: center;" width="30" >渠道类别</th>
+                            <th style="text-align: center;" width="30" >渠道类型</th>
+                            <th style="text-align: center;" width="10">渠道名称</th>
+                            <th style="text-align: center;" width="10">账期</th>
+                            <th style="text-align: center;" width="5">操作</th>
+                        </tr>
+                        </thead>
+                        <tbody id="add_dealer_channel">
+                            <tr><td colspan="5" class="td-manage text-c" >暂时没有销售渠道信息，请添加！</td></tr>
+                        </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" id="" style="margin-left: 25px;">
+                <div class="formControls col-11 col-sm-11">
+                    <input type="button" class="btn btn-primary" onclick="add_product()" value="添加供应产品" >
+                    <table class="table table-border table-bg table-bordered" style="margin-top: 10px;" id="">
+                        <thead>
+                        <tr class="text-c" id="table1">
+                            <th style="text-align: center;" width="30" >产品名称</th>
+                            <th style="text-align: center;" width="30" >产品颜色</th>
+                            <th style="text-align: center;" width="10">供应价格</th>
+                            <th style="text-align: center;" width="10">供应渠道对象</th>
+                            <th style="text-align: center;" width="5">操作</th>
+                        </tr>
+                        </thead>
+                        <tbody id="add_color_id">
+                        <tr><td colspan="5" class="td-manage text-c" >暂时没有供应产品，请添加！</td></tr>
+                        </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" id="" style="margin-left: 25px;">
+                <div class="formControls col-11 col-sm-11">
+                    <input type="button" class="btn btn-primary" onclick="add_product()" value="添加合作协议" >
+                    <table class="table table-border table-bg table-bordered" style="margin-top: 10px;" id="">
+                        <thead>
+                        <tr class="text-c" id="table1">
+                            <th style="text-align: center;" width="30" >合作时间</th>
+                            <th style="text-align: center;" width="30" >合作协议</th>
+                            <th style="text-align: center;" width="10">备注</th>
+                            <th style="text-align: center;" width="5">操作</th>
+                        </tr>
+                        </thead>
+                        <tbody id="add_color_id">
+                        <tr><td colspan="4" class="td-manage text-c" >暂时没有合作协议，请添加！</td></tr>
+                        </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" id="" style="margin-left: 25px;">
+                <div class="formControls col-11 col-sm-11">
+                    <textarea id="dealerRemarks" name="dealerRemarks" style="height: 65px;width: 100%"></textarea>
+                </div>
+            </div>
+
+            <div class="row cl">
+                <div class="col-2 col-sm-2 col-offset-3">
+                    <button class="btn btn-block btn-primary size-XL" type="submit">确认录入</button>
+                </div>
+            </div>
+        </form>
+    </div>
+</article>
+<#-- 业务脚本JS -->
+<script type="text/javascript" charset="utf-8" src="${path}/common/js/dealer/dealer.js"></script>
+<script type="text/javascript">
+    var url_path = "${path}";
+</script>
+
+
+<script type="text/javascript">
+
+    $('.skin-minimal input').iCheck({
+        checkboxClass: 'icheckbox-blue',
+        radioClass: 'iradio-blue',
+        increaseArea: '20%'
+    });
+    //是否是修改
+    var ISUPDATE = false;
+
+    var CHANNEL_ID_PREFIX = "CHANNEL_";
+    var CHANNEL_ID_NUM = 0;
+    var CHANNEL_IS_UPDATE = 1;  //用来标识渠道的弹窗是添加还是修改，  1添加 2修改
+    var CHANNEL_TR_NUM = 0; //渠道信息数量  1：表示有   0：表示没有
+
+    /**
+     * 添加对接人
+     */
+    function addDealerChannnel() {
+        CHANNEL_IS_UPDATE = 1;
+        CHANNEL_ID_NUM ++;
+        dealChannelIdStr = CHANNEL_ID_PREFIX + CHANNEL_ID_NUM;
+        layer_show_height("添加对接人","${path}/admin/dealer/to_add_dealer_contact?dealContactStr="+dealChannelIdStr,1);
+    }
+
+</script>
+
+
+
+</body>
+</html>

watero-rst-web/src/main/webapp/WEB-INF/views/dm/dealer/add_dealer_channel.ftl

@@ -0,0 +1,143 @@
+<!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">
+
+    <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;}
+        .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_results li a span {float:right}
+        .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;}
+        .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>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;}
+        .msg-phone{height: 35px;line-height: 35px;}
+        .all_down{text-decoration: underline;color: #00c;}
+    </style>
+    <title>渠道添加 - 客户管理 - RST</title>
+</head>
+<body>
+
+<article class="page-container" style="padding: 10px;">
+    <div class="pd-20 cl" style="padding-top: 0px;" >
+        <form  method="post" class="form form-horizontal" id="form-contact"  >
+
+            <input type="hidden" class="input-text" value="${dealerChannel.dealChannelId!0}" id="dealChannelId" name="dealChannelId"  >
+            <input type="hidden" class="input-text" value="${dealerChannel.dealChannelIdStr!""}" id="dealChannelIdStr" name="dealChannelIdStr"  >
+
+            <div class="row cl" id="" style="">
+                <label class="form-label col-xs-3 col-sm-3" style="text-align: right;"><span class="c-red">*</span>渠道类型：</label>
+                <div class="formControls col-xs-8 col-sm-8">
+                    <span class="select-box">
+                         <select name="dealerType" class="select" id="complaint">
+                             <option value="1">个人</option>
+                             <option value="2">企业</option>
+                             <option value="2">企业</option>
+                             <option value="2">企业</option>
+                         </select>
+				    </span>
+                </div>
+            </div>
+
+            <div class="row cl" id="" style="">
+                <label class="form-label col-xs-3 col-sm-3" style="text-align: right;"><span class="c-red">*</span>职位：</label>
+                <div class="formControls col-xs-8 col-sm-8">
+                    <input type="text" class="input-text add_form" value="${dealerChannel.dealContactType!""}" placeholder="填写职位" id="dealContactType" name="dealContactType" myMinlength="1"  myMaxlength="20" errormsg="职位格式不正确！" >
+                </div>
+            </div>
+
+            <div class="row cl" id="" style="">
+                <label class="form-label col-xs-3 col-sm-3" style="text-align: right;"><span class="c-red">*</span>手机号：</label>
+                <div class="formControls col-xs-8 col-sm-8">
+                    <input type="text" class="input-text add_form" value="${dealerChannel.dealContactPhone!""}" placeholder="填写手机号" id="dealContactPhone" name="dealContactPhone"  myMinlength="1"  myMaxlength="20" errormsg="手机号格式不正确！" >
+                </div>
+            </div>
+
+            <div class="row cl">
+                <div class="col-2 col-sm-2 col-offset-3">
+                    <input type="text" class="btn  btn-primary "  onclick="save()" value="保存">
+                </div>
+            </div>
+
+        </form>
+    </div>
+</article>
+<script type="text/javascript">
+    var url_path = "${path}";
+</script>
+
+
+<script type="text/javascript">
+
+
+
+    /**
+     * 保存
+     */
+    function save() {
+        if(!verification()){
+            return false;
+        }
+        var contact = new Object();
+        contact.dealChannelId=$("#dealChannelId").val();
+        contact.dealChannelIdStr=$("#dealChannelIdStr").val();
+        parent.showContact(contact);
+        parent.layer.close(parent.layer.getFrameIndex(window.name));
+    }
+
+    function verification(){
+        var flag = true;
+        $("#form-contact").find(".add_form").each(function () {
+            var $node = $(this);
+            var myValue = $node.val();
+            var myMinlength = $node.attr("myMinlength");
+            if(!isEmpty(myMinlength)){
+                myMinlength = 0;
+            }
+            if(!isEmpty(myValue) && myMinlength != 0){
+                vailErrorMsg_3($(this),$(this).attr("errormsg"));
+                flag = false;
+                return false;
+            }
+            var myMaxlength = $node.attr("myMaxlength");
+            if(isEmpty(myMaxlength)){
+                if(myValue.length > myMaxlength){
+                    vailErrorMsg_3($(this),$(this).attr("errormsg"));
+                    flag = false;
+                    return false;
+                }
+            }
+        });
+        return flag;
+    }
+
+
+
+</script>
+
+
+
+</body>
+</html>

watero-rst-web/src/main/webapp/WEB-INF/views/dm/dealer/add_dealer_contact.ftl

@@ -0,0 +1,159 @@
+<!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">
+
+    <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;}
+        .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_results li a span {float:right}
+        .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;}
+        .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>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;}
+        .msg-phone{height: 35px;line-height: 35px;}
+        .all_down{text-decoration: underline;color: #00c;}
+    </style>
+    <title>对接人添加 - 客户管理 - RST</title>
+</head>
+<body>
+
+<article class="page-container" style="padding: 10px;">
+    <div class="pd-20 cl" style="padding-top: 0px;" >
+        <form  method="post" class="form form-horizontal" id="form-contact"  >
+
+            <input type="hidden" class="input-text" value="${dealerContact.dealContactId!0}" id="dealContactId" name="dealContactId"  >
+            <input type="hidden" class="input-text" value="${dealerContact.dealContactStr!""}" id="dealContactStr" name="dealContactStr"  >
+
+            <div class="row cl" id="" style="">
+                <label class="form-label col-xs-3 col-sm-3" style="text-align: right;"><span class="c-red">*</span>姓名：</label>
+                <div class="formControls col-xs-8 col-sm-8">
+                    <input type="text" class="input-text add_form" value="${dealerContact.dealContactName!""}" placeholder="填写姓名" id="dealContactName" name="dealContactName" myMinlength="1"  myMaxlength="20" errormsg="姓名格式不正确！"  >
+                </div>
+            </div>
+
+            <div class="row cl" id="" style="">
+                <label class="form-label col-xs-3 col-sm-3" style="text-align: right;"><span class="c-red">*</span>职位：</label>
+                <div class="formControls col-xs-8 col-sm-8">
+                    <input type="text" class="input-text add_form" value="${dealerContact.dealContactType!""}" placeholder="填写职位" id="dealContactType" name="dealContactType" myMinlength="1"  myMaxlength="20" errormsg="职位格式不正确！" >
+                </div>
+            </div>
+
+            <div class="row cl" id="" style="">
+                <label class="form-label col-xs-3 col-sm-3" style="text-align: right;"><span class="c-red">*</span>手机号：</label>
+                <div class="formControls col-xs-8 col-sm-8">
+                    <input type="text" class="input-text add_form" value="${dealerContact.dealContactPhone!""}" placeholder="填写手机号" id="dealContactPhone" name="dealContactPhone"  myMinlength="1"  myMaxlength="20" errormsg="手机号格式不正确！" >
+                </div>
+            </div>
+
+            <div class="row cl" id="" style="">
+                <label class="form-label col-xs-3 col-sm-3" style="text-align: right;"><span class="c-red">*</span>邮箱：</label>
+                <div class="formControls col-xs-8 col-sm-8">
+                    <input type="text" class="input-text add_form" value="${dealerContact.dealContactEmail!""}" placeholder="填写邮箱" id="dealContactEmail" name="dealContactEmail"  myMinlength="1"  myMaxlength="30" errormsg="邮箱格式不正确！" >
+                </div>
+            </div>
+
+            <div class="row cl" id="" style="">
+                <label class="form-label col-xs-3 col-sm-3" style="text-align: right;"><span class="c-red">*</span>微信号：</label>
+                <div class="formControls col-xs-8 col-sm-8">
+                    <input type="text" class="input-text add_form" value="${dealerContact.dealContactWechat!""}" placeholder="填写微信号" id="dealContactWechat" name="dealContactWechat"  myMinlength="1"  myMaxlength="30" errormsg="微信号格式不正确！" >
+                </div>
+            </div>
+
+            <div class="row cl" id="" style="">
+                <label class="form-label col-xs-3 col-sm-3" style="text-align: right;">QQ：</label>
+                <div class="formControls col-xs-8 col-sm-8">
+                    <input type="text" class="input-text add_form" value="${dealerContact.dealContactQq!""}" placeholder="填写QQ" id="dealContactQq" name="dealContactQq"  myMinlength="0"  myMaxlength="30" errormsg="QQ格式不正确！" >
+                </div>
+            </div>
+
+            <div class="row cl">
+                <div class="col-2 col-sm-2 col-offset-3">
+                    <input type="text" class="btn  btn-primary "  onclick="save_contact()" value="保存">
+                </div>
+            </div>
+
+        </form>
+    </div>
+</article>
+<script type="text/javascript">
+    var url_path = "${path}";
+</script>
+
+
+<script type="text/javascript">
+
+    /**
+     * 保存
+     */
+    function save_contact() {
+        if(!verification()){
+            return false;
+        }
+        var contact = new Object();
+        contact.dealContactId=$("#dealContactId").val();
+        contact.dealContactStr=$("#dealContactStr").val();
+        contact.dealContactName=$("#dealContactName").val();
+        contact.dealContactPhone=$("#dealContactPhone").val();
+        contact.dealContactType=$("#dealContactType").val(); //职位/身份
+        contact.dealContactEmail=$("#dealContactEmail").val(); //联系邮箱
+        contact.dealContactWechat=$("#dealContactWechat").val(); //微信号
+        contact.dealContactQq=$("#dealContactQq").val(); //QQ号
+        parent.showContact(contact);
+        parent.layer.close(parent.layer.getFrameIndex(window.name));
+    }
+
+    function verification(){
+        var flag = true;
+        $("#form-contact").find(".add_form").each(function () {
+            var $node = $(this);
+            var myValue = $node.val();
+            var myMinlength = $node.attr("myMinlength");
+            if(!isEmpty(myMinlength)){
+                myMinlength = 0;
+            }
+            if(!isEmpty(myValue) && myMinlength != 0){
+                vailErrorMsg_3($(this),$(this).attr("errormsg"));
+                flag = false;
+                return false;
+            }
+            var myMaxlength = $node.attr("myMaxlength");
+            if(isEmpty(myMaxlength)){
+                if(myValue.length > myMaxlength){
+                    vailErrorMsg_3($(this),$(this).attr("errormsg"));
+                    flag = false;
+                    return false;
+                }
+            }
+        });
+        return flag;
+    }
+
+</script>
+
+
+
+</body>
+</html>

watero-rst-web/src/main/webapp/WEB-INF/views/dm/dealer/dealer_list.ftl

@@ -0,0 +1,199 @@
+<!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" />
+    <link rel="Bookmark" href="/favicon.ico" >
+    <link rel="Shortcut Icon" href="/favicon.ico" />
+<#include "/base/list_base.ftl">
+    <title>客户列表 - 客户管理 - RST</title>
+    <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{text-indent: 1em;}
+        /*.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(${path}/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;}
+        .table-bg thead th{background-color: #f7fafd;}
+        /*.table-bg tr:nth-child(odd){background: #fff;}
+        .table-bg tr:nth-child(even){background: #f7fafd;}*/
+        .update-parts>span{margin-right: 10px;padding: 3px 4px;background-color: #effaff;border: 1px solid #32a3d8;}
+        /*input[type=radio]{-webkit-appearance:none;appearance:none;background: url(/rst/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(/rst/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; }
+        .postage-table{float: left;width: 150px;height: 30px;line-height: 30px;}
+        .select-upd{height: 16px;width: 90px;padding: 5px 10px 10px 15px;display: inline-block;text-align: left;cursor: pointer;-webkit-appearance: none;border: 1px solid rgba(0,0,0,.1);    background: url(/common/images/pts/select-dw.png) right center no-repeat;background-size: auto 100%;margin: 0;position: absolute;}
+        .select-upd.active{background: url(/common/images/pts/select-up.png) right center no-repeat;background-size: auto 100%;}
+        .search-other{display: none;}
+    </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="page-container">
+    <div class="text-c ulc_question" code="returnCode" msg="resultMsg" data="returnMsg" urlPrefix="${path}">
+        <form action="${path}/admin/complaintQuestion/question_page" method="post">
+            <button type="button" style="cursor:pointer; float: left;height: 35px;margin-right: 30px;margin-bottom: 10px;" class="my-btn-search" onclick="toAdddealer();">添加客户</button>
+
+           <#--
+
+            <select class="my-select" name="detectComplaintType" id="detectComplaintType" style="height: 36px;width: 132px;margin: 0px;padding: 12px 10px 6px 15px;margin-bottom: 10px;">
+                <option value="">产品分类</option>
+                <option value="1" <#if complaintQuestionInfo.detectComplaintType??><#if complaintQuestionInfo.detectComplaintType == 1 >selected="selected"</#if></#if>>净水机</option>
+                <option value="2" <#if complaintQuestionInfo.detectComplaintType??><#if complaintQuestionInfo.detectComplaintType == 2 >selected="selected"</#if></#if>>电动牙刷</option>
+                <option value="3" <#if complaintQuestionInfo.detectComplaintType??><#if complaintQuestionInfo.detectComplaintType == 3 >selected="selected"</#if></#if>>净水花洒</option>
+                <option value="4" <#if complaintQuestionInfo.detectComplaintType??><#if complaintQuestionInfo.detectComplaintType == 4 >selected="selected"</#if></#if>>软水机</option>
+                <option value="5" <#if complaintQuestionInfo.detectComplaintType??><#if complaintQuestionInfo.detectComplaintType == 5 >selected="selected"</#if></#if>>果蔬机</option>
+                <option value="6" <#if complaintQuestionInfo.detectComplaintType??><#if complaintQuestionInfo.detectComplaintType == 6 >selected="selected"</#if></#if>>净水龙头</option>
+            </select>
+
+            <select class="my-select" name="questionIsQcDetect" id="questionIsQcDetect" style="height: 36px;width: 132px;margin: 0px;padding: 12px 10px 6px 15px;margin-bottom: 10px;">
+                <option value="">QC检测</option>
+                <option value="1" <#if complaintQuestionInfo.questionIsQcDetect??><#if complaintQuestionInfo.questionIsQcDetect == 1 >selected="selected"</#if></#if>>需要</option>
+                <option value="0" <#if complaintQuestionInfo.questionIsQcDetect??><#if complaintQuestionInfo.questionIsQcDetect == 0 >selected="selected"</#if></#if>>不需要</option>
+            </select>
+
+            <select class="my-select" name="questionState" id="questionState" style="height: 36px;width: 132px;margin: 0px;padding: 12px 10px 6px 15px;margin-bottom: 10px;">
+                <option value="">状态</option>
+                <option value="1" <#if complaintQuestionInfo.questionState??><#if complaintQuestionInfo.questionState == 1 >selected="selected"</#if></#if>>使用</option>
+                <option value="2" <#if complaintQuestionInfo.questionState??><#if complaintQuestionInfo.questionState == 2 >selected="selected"</#if></#if>>禁用</option>
+            </select>
+
+
+            <input type="text" class="my-input trim_input"  style="width:120px;margin-right: 0px; margin-bottom: 8px;" value="${complaintQuestionInfo.questionName!}" placeholder="问题名称" id="questionName" name="questionName">
+-->
+            <button type="submit" class="btn" style="background: #50a2ea;border: 1px solid #50a2ea;color: #fff;height: 35px;margin-top: -8px;"><i class="Hui-iconfont">&#xe665;</i> 查询</button>
+
+        </form>
+    </div>
+
+
+    <div class="mt-20">
+        <table class="table table-border table-bg table-bordered">
+        <thead>
+        <tr class="text-c">
+            <th width="50">客户名称</th>
+            <th width="50">客户类型</th>
+            <th width="50">是否自营</th>
+            <th width="150">客户行业</th>
+            <th width="40">合作状态</th>
+            <th width="40">首次合作时间</th>
+            <th width="60">合同有效期</th>
+            <th width="60">订单总数</th>
+            <th width="60">总金额</th>
+            <th width="60">客户备注</th>
+            <th width="60">跟进客户经理</th>
+            <th width="60">操作</th>
+        </tr>
+        </thead>
+        <tbody>
+            <#if page.dataList?? &&  (page.dataList?size > 0) >
+                    <#list page.dataList as dmDealer>
+                        <tr class="text-c">
+                            <td>${dmDealer.dealerName!''}</td>
+                            <td>${dmDealer.dealerType!''}</td>
+                            <td>${dmDealer.dealerSelfOperated!''}</td>
+                            <td>${dmDealer.dealerIndustry!''}</td>
+                            <td>${dmDealer.dealerState!''}</td>
+                            <td></td>
+                            <td></td>
+                            <td></td>
+                            <td></td>
+                            <td></td>
+                            <td></td>
+                            <td>
+                                <#if question.questionState == 1>
+                                    <a style="text-decoration:none" href="javascript:void(0);" title="禁用" onclick="forbid(${dmDealer.dealerId!''},2)">
+                                        <font color=#06c>禁用</font>
+                                    </a>
+                                <#elseif question.questionState == 2>
+                                    <a style="text-decoration:none" href="javascript:void(0);" title="启用" onclick="forbid(${dmDealer.dealerId!''},1)">
+                                        <font color=#06c>启用</font>
+                                    </a>
+                                </#if>
+                                &nbsp;
+                                <a style="text-decoration:none" href="javascript:void(0);" title="修改" onclick="toUpdateQuestion(${dmDealer.dealerId!''})">
+                                    <font color=#06c>修改</font>
+                                </a>
+                                &nbsp;
+                                <a style="text-decoration:none" href="javascript:void(0);" title="查看" onclick="detail(${dmDealer.dealerId!''})">
+                                    <font color=#06c>查看</font>
+                                </a>
+                            </td>
+                        </tr>
+                    </#list>
+            <#else>
+                <tr><td colspan="8" class="td-manage text-c" >暂时没有客户信息，请添加！</td></tr>
+            </#if>
+        </tbody>
+    </table>
+    </div>
+</div>
+
+<tfoot>
+<#include "/base/page_util.ftl">
+</tfoot>
+
+<script type="text/javascript">
+    var ulc = $(".ulc_question").initUlcByHtml({
+        urlPrefix: root_path,
+        ulcLevel:null
+    });
+
+    /**
+     * 跳转到添加客户
+     */
+    function toAdddealer(){
+        window.location.href= "${path}/admin/dealer/to_add_dealer";
+    }
+
+    /**
+     * 跳转到添加Question页面
+     */
+    function toUpdateQuestion(questionId){
+        window.location.href= "${path}/admin/complaintQuestion/to_update_question?questionId="+questionId;
+    }
+
+    /**
+     * 查看详情
+     */
+    function detail(questionId){
+        layer_show_norm("问题详情","${path}/admin/complaintQuestion/to_question_detail?questionId="+questionId,4);
+    }
+
+    /**
+     * 禁用
+     * @param questionId
+     * @param state
+     */
+    function forbid(questionId,state) {
+        $.ajax({
+            type: "POST",
+            data: {
+                "questionId" :questionId,
+                "questionState" :state
+            },
+            url: "${path}/admin/complaintQuestion/update_question",
+            async: false,
+            success: function(data){
+                if (data.returnCode == 200) {
+                    location.replace(location.href);
+                }else{
+                    layer.msg("更改状态失败！", {icon: 5, time: 3000});
+                }
+            },
+            error: function(XmlHttpRequest, textStatus, errorThrown){
+            }
+        });
+    }
+
+</script>
+
+</body>
+</html>

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

@@ -243,6 +243,33 @@ function layer_show_norm(name,url,type) {
     layer_show(name,url,w,h);
 }
 
+/**
+ * 弹窗规格
+ * @param name
+ * @param url
+ * @param type
+ */
+function layer_show_height(name,url,type) {
+    var w=1460,h=660;
+    switch (type){
+        case 1:
+            w=600;h=450;
+            break;
+        case 2:
+            w=600;h=500;
+            break;
+        case 3:
+            w=600;h=600;
+            break;
+        case 4:
+            w=600;h=700;
+            break;
+        default:
+            break
+    }
+    layer_show(name,url,w,h);
+}
+
 /**物流名称替换**/
 function replace(code) {
     var name = null;

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

@@ -0,0 +1,105 @@
+var CONTACT_ID_PREFIX = "CONTACT_";
+var CONTACT_ID_NUM = 0;
+var CONTACT_IS_UPDATE = 1;  //用来标识此事对接人的弹窗是添加还是修改，  1添加 2修改
+var CONTACT_TR_NUM = 0; //对接人 的 数量  1：表示有   0：表示没有
+
+
+//-----------------------对接人 start -----------------------------
+/**
+ * 展示添加的对接人信息
+ */
+function showContact(contact){
+    if(CONTACT_IS_UPDATE == 1){ //添加
+        var html = '<tr class="text-c" >';
+        html += ' <input type="hidden" class="input-text dealContactId" value="" id="dealContactId" name="dealContactId">';
+        html += ' <input type="hidden" class="input-text dealContactStr" value="'+ cufte(contact.dealContactStr) +'" id="dealContactStr" name="dealContactStr">';
+        html += '<td class="dealContactName">'+ cufte(contact.dealContactName) +'</td>';
+        html += '<td class="dealContactType">'+ cufte(contact.dealContactType) +'</td>';
+        html += '<td class="dealContactPhone">'+ cufte(contact.dealContactPhone) +'</td>';
+        html += '<td class="dealContactEmail">'+ cufte(contact.dealContactEmail) +'</td>';
+        html += '<td class="dealContactWechat">'+ cufte(contact.dealContactWechat) +'</td>';
+        html += '<td class="dealContactQq">'+ cufte(contact.dealContactQq) +'</td>';
+        html += '<td><a href="javascript:void(0)" onclick="updateDealerContact($(this))">修改</a>&nbsp;&nbsp;<a href="javascript:void(0)" onclick="delTableByTr($(this),1)">删除</a></td>';
+        if(CONTACT_TR_NUM == 0){
+            $("#add_contact").html(html);
+            CONTACT_TR_NUM =1;
+        }else{
+            $("#add_contact").append(html);
+        }
+    }else{
+        //修改
+        var $contactTr;
+        $("#add_contact").find("tr").each(function () {
+            var dealContactStr = $(this).find(".dealContactStr").val();
+            if(dealContactStr == contact.dealContactStr){
+                $contactTr =  $(this);
+            }
+        });
+        $contactTr.find(".dealContactName").text(cufte(contact.dealContactName));
+        $contactTr.find(".dealContactType").text(cufte(contact.dealContactType));
+        $contactTr.find(".dealContactPhone").text(cufte(contact.dealContactPhone));
+        $contactTr.find(".dealContactEmail").text(cufte(contact.dealContactEmail));
+        $contactTr.find(".dealContactWechat").text(cufte(contact.dealContactWechat));
+        $contactTr.find(".dealContactQq").text(cufte(contact.dealContactQq));
+    }
+}
+
+/**
+ * 添加对接人
+ */
+function addDealerContact() {
+    CONTACT_IS_UPDATE = 1;
+    CONTACT_ID_NUM ++;
+    dealContactStr = CONTACT_ID_PREFIX + CONTACT_ID_NUM;
+    layer_show_height("添加对接人","${path}/admin/dealer/to_add_dealer_contact?dealContactStr="+dealContactStr,1);
+}
+/**
+ * 修改对接人
+ */
+function updateDealerContact($this) {
+    CONTACT_IS_UPDATE =2;
+    var $contact = $this.parents("tr");
+    var contact = new Object();
+    contact.dealContactId = $contact.find(".dealContactId").val();
+    contact.dealContactStr = $contact.find(".dealContactStr").val();
+    contact.dealContactName= $contact.find(".dealContactName").text();
+    contact.dealContactPhone=$contact.find(".dealContactPhone").text();
+    contact.dealContactType=$contact.find(".dealContactType").text();
+    contact.dealContactEmail=$contact.find(".dealContactEmail").text();
+    contact.dealContactWechat=$contact.find(".dealContactWechat").text();
+    contact.dealContactQq=$contact.find(".dealContactQq").text();
+    layer_show_height("添加对接人","${path}/admin/dealer/to_add_dealer_contact?"+parseParam(contact),1);
+}
+//-----------------------对接人 END -----------------------------
+
+
+
+
+/**
+ * 删除
+ * @param $this
+ */
+function delTableByTr($this,type) {
+    var typeDesc = '';
+    if(type == 1 && $("#add_contact").find("tr").length < 2){
+        vailErrorMsg_3($("#add_contact_make"),"必须要要有一个对接人");
+    }else if(type == 2){
+
+    }else{
+        $this.parents("tr").remove();
+    }
+}
+
+//将对象转成url 参数
+var parseParam=function(param, key){
+    var paramStr="";
+    if(param instanceof String||param instanceof Number||param instanceof Boolean){
+        paramStr+="&"+key+"="+encodeURIComponent(param);
+    }else{
+        $.each(param,function(i){
+            var k=key==null?i:key+(param instanceof Array?"["+i+"]":"."+i);
+            paramStr+='&'+parseParam(this, k);
+        });
+    }
+    return paramStr.substr(1);
+};