添加了新的实体类

tooth-common-core/src/main/java/com/iamberry/wechat/core/entity/coupon/CouponType.java

@@ -49,6 +49,25 @@ public class CouponType implements Serializable{
 	private Integer couponPriorityLevels;		//券优先级别
 	private String couponRemark;			//优惠券备注
 	private PageBean page;					//分页
+	private Integer couponIsSource;			//是否限制来源
+	private String couponSourceName;		//限制来源
+
+	public Integer getCouponIsSource() {
+		return couponIsSource;
+	}
+
+	public void setCouponIsSource(Integer couponIsSource) {
+		this.couponIsSource = couponIsSource;
+	}
+
+	public String getCouponSourceName() {
+		return couponSourceName;
+	}
+
+	public void setCouponSourceName(String couponSourceName) {
+		this.couponSourceName = couponSourceName;
+	}
+
 	public Integer getCouponId() {
 		return couponId;
 	}

tooth-common-core/src/main/java/com/iamberry/wechat/core/entity/drp/PlaceConfig.java

@@ -0,0 +1,66 @@
+package com.iamberry.wechat.core.entity.drp;
+
+import java.util.Date;
+
+/**
+ * 批量采购配置实体类
+ * Created by liuzhiwei on 2017/10/11.
+ */
+public class PlaceConfig implements java.io.Serializable{
+
+    private static final long serialVersionUID = 7788953884099970994L;
+    private Integer configId;       //id
+    private Integer placeId;        //商户id
+    private Integer colorId;        //产品颜色id
+    private Integer configAmount;   //采购金额
+    private Integer configStatus;   //状态
+    private Date configCreateTime;  //创建时间
+
+    public Integer getConfigId() {
+        return configId;
+    }
+
+    public void setConfigId(Integer configId) {
+        this.configId = configId;
+    }
+
+    public Integer getPlaceId() {
+        return placeId;
+    }
+
+    public void setPlaceId(Integer placeId) {
+        this.placeId = placeId;
+    }
+
+    public Integer getColorId() {
+        return colorId;
+    }
+
+    public void setColorId(Integer colorId) {
+        this.colorId = colorId;
+    }
+
+    public Integer getConfigAmount() {
+        return configAmount;
+    }
+
+    public void setConfigAmount(Integer configAmount) {
+        this.configAmount = configAmount;
+    }
+
+    public Integer getConfigStatus() {
+        return configStatus;
+    }
+
+    public void setConfigStatus(Integer configStatus) {
+        this.configStatus = configStatus;
+    }
+
+    public Date getConfigCreateTime() {
+        return configCreateTime;
+    }
+
+    public void setConfigCreateTime(Date configCreateTime) {
+        this.configCreateTime = configCreateTime;
+    }
+}

tooth-common-core/src/main/java/com/iamberry/wechat/core/entity/drp/PlaceOrder.java

@@ -0,0 +1,156 @@
+package com.iamberry.wechat.core.entity.drp;
+
+import java.util.Date;
+
+/**
+ * 代理订货记录类
+ * Created by liuzhiwei on 2017/10/11.
+ */
+public class PlaceOrder implements java.io.Serializable{
+
+    private static final long serialVersionUID = -3002867268414307355L;
+    private String placeOrderid;        //订单id
+    private Integer placeId;            //代理商id
+    private Integer placeYetAmount;     //付款金额
+    private Integer placeAmount;        //订单总额
+    private Date placeCreateDate;       //订单创建时间
+    private String placePostNum;        //快递单号
+    private String placePostFirm;       //快递公司
+    private Integer placeStatus;        //状态
+    private Date placeSendDate;         //发货时间
+    private String placeAddressInfo;    //详细地址
+    private String placeAddressPostnum; //邮编
+    private String placeAddressTel;     //收件人电话
+    private String placeAddressName;    //收件人姓名
+    private String placeAdminRemark;    //后台的备注
+    private String placeTransactionId;  //微信订单号
+    private Date placeTransactionDate;  //微信支付时间
+
+    public String getPlaceOrderid() {
+        return placeOrderid;
+    }
+
+    public void setPlaceOrderid(String placeOrderid) {
+        this.placeOrderid = placeOrderid;
+    }
+
+    public Integer getPlaceId() {
+        return placeId;
+    }
+
+    public void setPlaceId(Integer placeId) {
+        this.placeId = placeId;
+    }
+
+    public Integer getPlaceYetAmount() {
+        return placeYetAmount;
+    }
+
+    public void setPlaceYetAmount(Integer placeYetAmount) {
+        this.placeYetAmount = placeYetAmount;
+    }
+
+    public Integer getPlaceAmount() {
+        return placeAmount;
+    }
+
+    public void setPlaceAmount(Integer placeAmount) {
+        this.placeAmount = placeAmount;
+    }
+
+    public Date getPlaceCreateDate() {
+        return placeCreateDate;
+    }
+
+    public void setPlaceCreateDate(Date placeCreateDate) {
+        this.placeCreateDate = placeCreateDate;
+    }
+
+    public String getPlacePostNum() {
+        return placePostNum;
+    }
+
+    public void setPlacePostNum(String placePostNum) {
+        this.placePostNum = placePostNum;
+    }
+
+    public String getPlacePostFirm() {
+        return placePostFirm;
+    }
+
+    public void setPlacePostFirm(String placePostFirm) {
+        this.placePostFirm = placePostFirm;
+    }
+
+    public Integer getPlaceStatus() {
+        return placeStatus;
+    }
+
+    public void setPlaceStatus(Integer placeStatus) {
+        this.placeStatus = placeStatus;
+    }
+
+    public Date getPlaceSendDate() {
+        return placeSendDate;
+    }
+
+    public void setPlaceSendDate(Date placeSendDate) {
+        this.placeSendDate = placeSendDate;
+    }
+
+    public String getPlaceAddressInfo() {
+        return placeAddressInfo;
+    }
+
+    public void setPlaceAddressInfo(String placeAddressInfo) {
+        this.placeAddressInfo = placeAddressInfo;
+    }
+
+    public String getPlaceAddressPostnum() {
+        return placeAddressPostnum;
+    }
+
+    public void setPlaceAddressPostnum(String placeAddressPostnum) {
+        this.placeAddressPostnum = placeAddressPostnum;
+    }
+
+    public String getPlaceAddressTel() {
+        return placeAddressTel;
+    }
+
+    public void setPlaceAddressTel(String placeAddressTel) {
+        this.placeAddressTel = placeAddressTel;
+    }
+
+    public String getPlaceAddressName() {
+        return placeAddressName;
+    }
+
+    public void setPlaceAddressName(String placeAddressName) {
+        this.placeAddressName = placeAddressName;
+    }
+
+    public String getPlaceAdminRemark() {
+        return placeAdminRemark;
+    }
+
+    public void setPlaceAdminRemark(String placeAdminRemark) {
+        this.placeAdminRemark = placeAdminRemark;
+    }
+
+    public String getPlaceTransactionId() {
+        return placeTransactionId;
+    }
+
+    public void setPlaceTransactionId(String placeTransactionId) {
+        this.placeTransactionId = placeTransactionId;
+    }
+
+    public Date getPlaceTransactionDate() {
+        return placeTransactionDate;
+    }
+
+    public void setPlaceTransactionDate(Date placeTransactionDate) {
+        this.placeTransactionDate = placeTransactionDate;
+    }
+}

tooth-common-core/src/main/java/com/iamberry/wechat/core/entity/drp/PlaceOrderItem.java

@@ -0,0 +1,129 @@
+package com.iamberry.wechat.core.entity.drp;
+
+import java.util.Date;
+
+/**
+ * 代理订单项类
+ * Created by liuzhiwei on 2017/10/11.
+ */
+public class PlaceOrderItem implements java.io.Serializable{
+
+    private static final long serialVersionUID = 8254500140389491883L;
+    private Integer itemId;                 //订单条目id
+    private String placeOrderid;            //所属订单
+    private Integer productId;              //购物商品id
+    private Integer colorId;                //产品颜色id
+    private Integer productType;            //产品类型id
+    private Integer itemNum;                //商品数量
+    private Integer itemTotal;              //小结
+    private Date itemCreateDate;            //创建时间
+    private String itemProductName;         //商品名称
+    private String itemColorName;           //商品颜色
+    private Integer itemProductDiscount;    //商品优惠价
+    private Integer itemProductPrice;       //商品原价
+    private String itemProductPic;          //介绍图
+
+    public Integer getItemId() {
+        return itemId;
+    }
+
+    public void setItemId(Integer itemId) {
+        this.itemId = itemId;
+    }
+
+    public String getPlaceOrderid() {
+        return placeOrderid;
+    }
+
+    public void setPlaceOrderid(String placeOrderid) {
+        this.placeOrderid = placeOrderid;
+    }
+
+    public Integer getProductId() {
+        return productId;
+    }
+
+    public void setProductId(Integer productId) {
+        this.productId = productId;
+    }
+
+    public Integer getColorId() {
+        return colorId;
+    }
+
+    public void setColorId(Integer colorId) {
+        this.colorId = colorId;
+    }
+
+    public Integer getProductType() {
+        return productType;
+    }
+
+    public void setProductType(Integer productType) {
+        this.productType = productType;
+    }
+
+    public Integer getItemNum() {
+        return itemNum;
+    }
+
+    public void setItemNum(Integer itemNum) {
+        this.itemNum = itemNum;
+    }
+
+    public Integer getItemTotal() {
+        return itemTotal;
+    }
+
+    public void setItemTotal(Integer itemTotal) {
+        this.itemTotal = itemTotal;
+    }
+
+    public Date getItemCreateDate() {
+        return itemCreateDate;
+    }
+
+    public void setItemCreateDate(Date itemCreateDate) {
+        this.itemCreateDate = itemCreateDate;
+    }
+
+    public String getItemProductName() {
+        return itemProductName;
+    }
+
+    public void setItemProductName(String itemProductName) {
+        this.itemProductName = itemProductName;
+    }
+
+    public String getItemColorName() {
+        return itemColorName;
+    }
+
+    public void setItemColorName(String itemColorName) {
+        this.itemColorName = itemColorName;
+    }
+
+    public Integer getItemProductDiscount() {
+        return itemProductDiscount;
+    }
+
+    public void setItemProductDiscount(Integer itemProductDiscount) {
+        this.itemProductDiscount = itemProductDiscount;
+    }
+
+    public Integer getItemProductPrice() {
+        return itemProductPrice;
+    }
+
+    public void setItemProductPrice(Integer itemProductPrice) {
+        this.itemProductPrice = itemProductPrice;
+    }
+
+    public String getItemProductPic() {
+        return itemProductPic;
+    }
+
+    public void setItemProductPic(String itemProductPic) {
+        this.itemProductPic = itemProductPic;
+    }
+}

tooth-common-core/src/main/java/com/iamberry/wechat/core/entity/order/OrderHint.java

@@ -0,0 +1,75 @@
+package com.iamberry.wechat.core.entity.order;
+
+import java.util.Date;
+
+/**
+ * 更换刷头提示类
+ * Created by liuzhiwei on 2017/10/11.
+ */
+public class OrderHint implements java.io.Serializable{
+
+    private static final long serialVersionUID = -5865274505441810483L;
+    private Integer hintId;         //id
+    private String orderId;         //订单号
+    private String userOpenId;      //openId
+    private Integer hintNum;        //已提示次数
+    private Date hintTime;          //下次提醒时间
+    private Integer hintStatus;     //状态
+    private Date hintCreateTime;    //创建时间
+
+    public Integer getHintId() {
+        return hintId;
+    }
+
+    public void setHintId(Integer hintId) {
+        this.hintId = hintId;
+    }
+
+    public String getOrderId() {
+        return orderId;
+    }
+
+    public void setOrderId(String orderId) {
+        this.orderId = orderId;
+    }
+
+    public String getUserOpenId() {
+        return userOpenId;
+    }
+
+    public void setUserOpenId(String userOpenId) {
+        this.userOpenId = userOpenId;
+    }
+
+    public Integer getHintNum() {
+        return hintNum;
+    }
+
+    public void setHintNum(Integer hintNum) {
+        this.hintNum = hintNum;
+    }
+
+    public Date getHintTime() {
+        return hintTime;
+    }
+
+    public void setHintTime(Date hintTime) {
+        this.hintTime = hintTime;
+    }
+
+    public Integer getHintStatus() {
+        return hintStatus;
+    }
+
+    public void setHintStatus(Integer hintStatus) {
+        this.hintStatus = hintStatus;
+    }
+
+    public Date getHintCreateTime() {
+        return hintCreateTime;
+    }
+
+    public void setHintCreateTime(Date hintCreateTime) {
+        this.hintCreateTime = hintCreateTime;
+    }
+}