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

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

@@ -0,0 +1,76 @@
+package com.iamberry.rst.core.cm;
+
+import java.io.Serializable;
+import java.util.Date;
+
+/**
+ * 客诉销售公司实体类
+ * Created by liuzhiwei on 2017/10/31.
+ */
+public class CompanyInfo implements Serializable {
+
+    private static final long serialVersionUID = 5881619733609391385L;
+    private Integer companyId;          //主键
+    private String companyName;         //公司名称
+    private String companyAbbreviation; //公司简称
+    private String companyAddress;      //公司地址
+    private Integer companyStatus;      //状态
+    private String companyRemark;       //备注
+    private Date companyCreateTime;     //创建时间
+
+    public Integer getCompanyId() {
+        return companyId;
+    }
+
+    public void setCompanyId(Integer companyId) {
+        this.companyId = companyId;
+    }
+
+    public String getCompanyName() {
+        return companyName;
+    }
+
+    public void setCompanyName(String companyName) {
+        this.companyName = companyName;
+    }
+
+    public String getCompanyAbbreviation() {
+        return companyAbbreviation;
+    }
+
+    public void setCompanyAbbreviation(String companyAbbreviation) {
+        this.companyAbbreviation = companyAbbreviation;
+    }
+
+    public String getCompanyAddress() {
+        return companyAddress;
+    }
+
+    public void setCompanyAddress(String companyAddress) {
+        this.companyAddress = companyAddress;
+    }
+
+    public Integer getCompanyStatus() {
+        return companyStatus;
+    }
+
+    public void setCompanyStatus(Integer companyStatus) {
+        this.companyStatus = companyStatus;
+    }
+
+    public String getCompanyRemark() {
+        return companyRemark;
+    }
+
+    public void setCompanyRemark(String companyRemark) {
+        this.companyRemark = companyRemark;
+    }
+
+    public Date getCompanyCreateTime() {
+        return companyCreateTime;
+    }
+
+    public void setCompanyCreateTime(Date companyCreateTime) {
+        this.companyCreateTime = companyCreateTime;
+    }
+}

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

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

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

@@ -0,0 +1,274 @@
+package com.iamberry.rst.core.cm;
+
+import java.io.Serializable;
+import java.util.Date;
+
+/**
+ * 客诉订单实体类
+ * Created by liuzhiwei on 2017/10/31.
+ */
+public class SalesOrder implements Serializable {
+
+    private static final long serialVersionUID = -2015761953380110553L;
+    private Integer salesId;                //订单id
+    private String salesOrderId;            //订单号
+    private String salesOpenId;             //身份证号/openid
+    private Integer salesDiscountMoney;     //优惠金额
+    private Integer salesPledgeMoney;       //押金金额
+    private Integer salesRemainDeposit;     //待提取金额
+    private Integer salesStatus;            //订单状态
+    private Integer salesSendType;          //送货方式
+    private Date salesSendTime;             //发货时间
+    private Date salesSalesTime;            //订购时间
+    private String salesPostNum;            //快递单号
+    private String salesPostFirm;           //快递公司
+    private String salesAddressInfo;        //详细地址
+    private String salesAddressTel;         //收件人电话
+    private String salesAddressName;        //收件人姓名
+    private Integer salesAmount;            //订单总金额
+    private Integer salesPayMoney;          //已付金额
+    private Integer salesPayType;           //付款方式
+    private Integer salesWaitMoney;         //待付金额
+    private Integer salesLastMoney;         //本次支付金额
+    private Integer salesShippingFee;       //邮费
+    private Date salesPayTime;              //支付时间
+    private Date salesCreateTime;           //创建时间
+    private String salesAdminRemark;        //后台的备注
+    private String salesUserRemark;         //用户备注
+    private String salesPayNumber;          //交易尾号
+    private Integer salesStoreId;           //店铺id
+    private Integer salesCompanyId;         //销售公司id
+    private Integer salesType;              //订单类型
+
+    public Integer getSalesId() {
+        return salesId;
+    }
+
+    public void setSalesId(Integer salesId) {
+        this.salesId = salesId;
+    }
+
+    public String getSalesOrderId() {
+        return salesOrderId;
+    }
+
+    public void setSalesOrderId(String salesOrderId) {
+        this.salesOrderId = salesOrderId;
+    }
+
+    public String getSalesOpenId() {
+        return salesOpenId;
+    }
+
+    public void setSalesOpenId(String salesOpenId) {
+        this.salesOpenId = salesOpenId;
+    }
+
+    public Integer getSalesDiscountMoney() {
+        return salesDiscountMoney;
+    }
+
+    public void setSalesDiscountMoney(Integer salesDiscountMoney) {
+        this.salesDiscountMoney = salesDiscountMoney;
+    }
+
+    public Integer getSalesPledgeMoney() {
+        return salesPledgeMoney;
+    }
+
+    public void setSalesPledgeMoney(Integer salesPledgeMoney) {
+        this.salesPledgeMoney = salesPledgeMoney;
+    }
+
+    public Integer getSalesRemainDeposit() {
+        return salesRemainDeposit;
+    }
+
+    public void setSalesRemainDeposit(Integer salesRemainDeposit) {
+        this.salesRemainDeposit = salesRemainDeposit;
+    }
+
+    public Integer getSalesStatus() {
+        return salesStatus;
+    }
+
+    public void setSalesStatus(Integer salesStatus) {
+        this.salesStatus = salesStatus;
+    }
+
+    public Integer getSalesSendType() {
+        return salesSendType;
+    }
+
+    public void setSalesSendType(Integer salesSendType) {
+        this.salesSendType = salesSendType;
+    }
+
+    public Date getSalesSendTime() {
+        return salesSendTime;
+    }
+
+    public void setSalesSendTime(Date salesSendTime) {
+        this.salesSendTime = salesSendTime;
+    }
+
+    public Date getSalesSalesTime() {
+        return salesSalesTime;
+    }
+
+    public void setSalesSalesTime(Date salesSalesTime) {
+        this.salesSalesTime = salesSalesTime;
+    }
+
+    public String getSalesPostNum() {
+        return salesPostNum;
+    }
+
+    public void setSalesPostNum(String salesPostNum) {
+        this.salesPostNum = salesPostNum;
+    }
+
+    public String getSalesPostFirm() {
+        return salesPostFirm;
+    }
+
+    public void setSalesPostFirm(String salesPostFirm) {
+        this.salesPostFirm = salesPostFirm;
+    }
+
+    public String getSalesAddressInfo() {
+        return salesAddressInfo;
+    }
+
+    public void setSalesAddressInfo(String salesAddressInfo) {
+        this.salesAddressInfo = salesAddressInfo;
+    }
+
+    public String getSalesAddressTel() {
+        return salesAddressTel;
+    }
+
+    public void setSalesAddressTel(String salesAddressTel) {
+        this.salesAddressTel = salesAddressTel;
+    }
+
+    public String getSalesAddressName() {
+        return salesAddressName;
+    }
+
+    public void setSalesAddressName(String salesAddressName) {
+        this.salesAddressName = salesAddressName;
+    }
+
+    public Integer getSalesAmount() {
+        return salesAmount;
+    }
+
+    public void setSalesAmount(Integer salesAmount) {
+        this.salesAmount = salesAmount;
+    }
+
+    public Integer getSalesPayMoney() {
+        return salesPayMoney;
+    }
+
+    public void setSalesPayMoney(Integer salesPayMoney) {
+        this.salesPayMoney = salesPayMoney;
+    }
+
+    public Integer getSalesPayType() {
+        return salesPayType;
+    }
+
+    public void setSalesPayType(Integer salesPayType) {
+        this.salesPayType = salesPayType;
+    }
+
+    public Integer getSalesWaitMoney() {
+        return salesWaitMoney;
+    }
+
+    public void setSalesWaitMoney(Integer salesWaitMoney) {
+        this.salesWaitMoney = salesWaitMoney;
+    }
+
+    public Integer getSalesLastMoney() {
+        return salesLastMoney;
+    }
+
+    public void setSalesLastMoney(Integer salesLastMoney) {
+        this.salesLastMoney = salesLastMoney;
+    }
+
+    public Integer getSalesShippingFee() {
+        return salesShippingFee;
+    }
+
+    public void setSalesShippingFee(Integer salesShippingFee) {
+        this.salesShippingFee = salesShippingFee;
+    }
+
+    public Date getSalesPayTime() {
+        return salesPayTime;
+    }
+
+    public void setSalesPayTime(Date salesPayTime) {
+        this.salesPayTime = salesPayTime;
+    }
+
+    public Date getSalesCreateTime() {
+        return salesCreateTime;
+    }
+
+    public void setSalesCreateTime(Date salesCreateTime) {
+        this.salesCreateTime = salesCreateTime;
+    }
+
+    public String getSalesAdminRemark() {
+        return salesAdminRemark;
+    }
+
+    public void setSalesAdminRemark(String salesAdminRemark) {
+        this.salesAdminRemark = salesAdminRemark;
+    }
+
+    public String getSalesUserRemark() {
+        return salesUserRemark;
+    }
+
+    public void setSalesUserRemark(String salesUserRemark) {
+        this.salesUserRemark = salesUserRemark;
+    }
+
+    public String getSalesPayNumber() {
+        return salesPayNumber;
+    }
+
+    public void setSalesPayNumber(String salesPayNumber) {
+        this.salesPayNumber = salesPayNumber;
+    }
+
+    public Integer getSalesStoreId() {
+        return salesStoreId;
+    }
+
+    public void setSalesStoreId(Integer salesStoreId) {
+        this.salesStoreId = salesStoreId;
+    }
+
+    public Integer getSalesCompanyId() {
+        return salesCompanyId;
+    }
+
+    public void setSalesCompanyId(Integer salesCompanyId) {
+        this.salesCompanyId = salesCompanyId;
+    }
+
+    public Integer getSalesType() {
+        return salesType;
+    }
+
+    public void setSalesType(Integer salesType) {
+        this.salesType = salesType;
+    }
+}

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

@@ -0,0 +1,129 @@
+package com.iamberry.rst.core.cm;
+
+import java.io.Serializable;
+import java.util.Date;
+
+/**
+ * 客诉订单项实体类
+ * Created by liuzhiwei on 2017/10/31.
+ */
+public class SalesOrderItem implements Serializable {
+
+    private Integer itemId;             //订单项id
+    private Integer itemOrderId;        //所属订单
+    private Integer itemProductId;      //产品id
+    private Integer itemNum;            //产品数量
+    private Integer itemColorId;        //产品颜色
+    private Integer itemProductType;    //产品类型id
+    private String itemProductName;     //商品名称
+    private String itemProductPic;      //介绍图
+    private String itemProductColor;    //产品颜色
+    private String itemColorBar;        //产品SKU码(百胜)
+    private Integer itemProductPrice;   //产品市场价
+    private Integer itemProductDiscount;//产品折扣价
+    private Date itemCreateTime;        //创建时间
+
+    public Integer getItemId() {
+        return itemId;
+    }
+
+    public void setItemId(Integer itemId) {
+        this.itemId = itemId;
+    }
+
+    public Integer getItemOrderId() {
+        return itemOrderId;
+    }
+
+    public void setItemOrderId(Integer itemOrderId) {
+        this.itemOrderId = itemOrderId;
+    }
+
+    public Integer getItemProductId() {
+        return itemProductId;
+    }
+
+    public void setItemProductId(Integer itemProductId) {
+        this.itemProductId = itemProductId;
+    }
+
+    public Integer getItemNum() {
+        return itemNum;
+    }
+
+    public void setItemNum(Integer itemNum) {
+        this.itemNum = itemNum;
+    }
+
+    public Integer getItemColorId() {
+        return itemColorId;
+    }
+
+    public void setItemColorId(Integer itemColorId) {
+        this.itemColorId = itemColorId;
+    }
+
+    public Integer getItemProductType() {
+        return itemProductType;
+    }
+
+    public void setItemProductType(Integer itemProductType) {
+        this.itemProductType = itemProductType;
+    }
+
+    public String getItemProductName() {
+        return itemProductName;
+    }
+
+    public void setItemProductName(String itemProductName) {
+        this.itemProductName = itemProductName;
+    }
+
+    public String getItemProductPic() {
+        return itemProductPic;
+    }
+
+    public void setItemProductPic(String itemProductPic) {
+        this.itemProductPic = itemProductPic;
+    }
+
+    public String getItemProductColor() {
+        return itemProductColor;
+    }
+
+    public void setItemProductColor(String itemProductColor) {
+        this.itemProductColor = itemProductColor;
+    }
+
+    public String getItemColorBar() {
+        return itemColorBar;
+    }
+
+    public void setItemColorBar(String itemColorBar) {
+        this.itemColorBar = itemColorBar;
+    }
+
+    public Integer getItemProductPrice() {
+        return itemProductPrice;
+    }
+
+    public void setItemProductPrice(Integer itemProductPrice) {
+        this.itemProductPrice = itemProductPrice;
+    }
+
+    public Integer getItemProductDiscount() {
+        return itemProductDiscount;
+    }
+
+    public void setItemProductDiscount(Integer itemProductDiscount) {
+        this.itemProductDiscount = itemProductDiscount;
+    }
+
+    public Date getItemCreateTime() {
+        return itemCreateTime;
+    }
+
+    public void setItemCreateTime(Date itemCreateTime) {
+        this.itemCreateTime = itemCreateTime;
+    }
+}

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

@@ -0,0 +1,76 @@
+package com.iamberry.rst.core.cm;
+
+import java.io.Serializable;
+import java.util.Date;
+
+/**
+ * 客诉店铺实体类
+ * Created by liuzhiwei on 2017/10/31.
+ */
+public class StoreInfo implements Serializable {
+
+    private static final long serialVersionUID = 7840037623092754414L;
+    private Integer storeId;        //主键
+    private Integer companyId;      //销售公司id
+    private String storeEfast;      //Efast店铺
+    private String storeName;       //店铺名称
+    private Integer storeStatus;    //状态
+    private String storeRemark;     //备注
+    private Date storeCreateTime;   //创建时间
+
+    public Integer getStoreId() {
+        return storeId;
+    }
+
+    public void setStoreId(Integer storeId) {
+        this.storeId = storeId;
+    }
+
+    public Integer getCompanyId() {
+        return companyId;
+    }
+
+    public void setCompanyId(Integer companyId) {
+        this.companyId = companyId;
+    }
+
+    public String getStoreEfast() {
+        return storeEfast;
+    }
+
+    public void setStoreEfast(String storeEfast) {
+        this.storeEfast = storeEfast;
+    }
+
+    public String getStoreName() {
+        return storeName;
+    }
+
+    public void setStoreName(String storeName) {
+        this.storeName = storeName;
+    }
+
+    public Integer getStoreStatus() {
+        return storeStatus;
+    }
+
+    public void setStoreStatus(Integer storeStatus) {
+        this.storeStatus = storeStatus;
+    }
+
+    public String getStoreRemark() {
+        return storeRemark;
+    }
+
+    public void setStoreRemark(String storeRemark) {
+        this.storeRemark = storeRemark;
+    }
+
+    public Date getStoreCreateTime() {
+        return storeCreateTime;
+    }
+
+    public void setStoreCreateTime(Date storeCreateTime) {
+        this.storeCreateTime = storeCreateTime;
+    }
+}