添加了新的实体类

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

@@ -1,4 +1,4 @@
-package com.iamberry.wechat.core.entity.drp;
+package com.iamberry.wechat.core.entity.agentInfo;
 
 import java.util.Date;
 
@@ -6,11 +6,11 @@ import java.util.Date;
  * 批量采购配置实体类
  * Created by liuzhiwei on 2017/10/11.
  */
-public class PlaceConfig implements java.io.Serializable{
+public class AgentConfig implements java.io.Serializable{
 
     private static final long serialVersionUID = 7788953884099970994L;
     private Integer configId;       //id
-    private Integer placeId;        //商户id
+    private Integer agentId;        //商户id
     private Integer colorId;        //产品颜色id
     private Integer configAmount;   //采购金额
     private Integer configStatus;   //状态
@@ -24,14 +24,6 @@ public class PlaceConfig implements java.io.Serializable{
         this.configId = configId;
     }
 
-    public Integer getPlaceId() {
-        return placeId;
-    }
-
-    public void setPlaceId(Integer placeId) {
-        this.placeId = placeId;
-    }
-
     public Integer getColorId() {
         return colorId;
     }
@@ -63,4 +55,12 @@ public class PlaceConfig implements java.io.Serializable{
     public void setConfigCreateTime(Date configCreateTime) {
         this.configCreateTime = configCreateTime;
     }
+
+    public Integer getAgentId() {
+        return agentId;
+    }
+
+    public void setAgentId(Integer agentId) {
+        this.agentId = agentId;
+    }
 }

tooth-common-core/src/main/java/com/iamberry/wechat/core/entity/agentInfo/AgentInfo.java

@@ -0,0 +1,84 @@
+package com.iamberry.wechat.core.entity.agentInfo;
+
+import java.util.Date;
+
+/**
+ * 代理商信息表
+ * Created by liuzhiwei on 2017/10/11.
+ */
+public class AgentInfo implements java.io.Serializable{
+
+    private static final long serialVersionUID = 2348414330680714715L;
+    private Integer agentId;        //id
+    private String agent_name;      //名称
+    private String agent_addr;      //地址
+    private String agent_tel;       //电话
+    private Integer agentRoleId;    //角色名称
+    private Date agentCreateDate;   //创建时间
+    private Integer agentStatus;    //线下状态
+    private String agentOpenid;     //微信openid
+
+    public Integer getAgentId() {
+        return agentId;
+    }
+
+    public void setAgentId(Integer agentId) {
+        this.agentId = agentId;
+    }
+
+    public String getAgent_name() {
+        return agent_name;
+    }
+
+    public void setAgent_name(String agent_name) {
+        this.agent_name = agent_name;
+    }
+
+    public String getAgent_addr() {
+        return agent_addr;
+    }
+
+    public void setAgent_addr(String agent_addr) {
+        this.agent_addr = agent_addr;
+    }
+
+    public String getAgent_tel() {
+        return agent_tel;
+    }
+
+    public void setAgent_tel(String agent_tel) {
+        this.agent_tel = agent_tel;
+    }
+
+    public Integer getAgentRoleId() {
+        return agentRoleId;
+    }
+
+    public void setAgentRoleId(Integer agentRoleId) {
+        this.agentRoleId = agentRoleId;
+    }
+
+    public Date getAgentCreateDate() {
+        return agentCreateDate;
+    }
+
+    public void setAgentCreateDate(Date agentCreateDate) {
+        this.agentCreateDate = agentCreateDate;
+    }
+
+    public Integer getAgentStatus() {
+        return agentStatus;
+    }
+
+    public void setAgentStatus(Integer agentStatus) {
+        this.agentStatus = agentStatus;
+    }
+
+    public String getAgentOpenid() {
+        return agentOpenid;
+    }
+
+    public void setAgentOpenid(String agentOpenid) {
+        this.agentOpenid = agentOpenid;
+    }
+}

tooth-common-core/src/main/java/com/iamberry/wechat/core/entity/agentInfo/AgentOrder.java

@@ -0,0 +1,156 @@
+package com.iamberry.wechat.core.entity.agentInfo;
+
+import java.util.Date;
+
+/**
+ * 代理订货记录类
+ * Created by liuzhiwei on 2017/10/11.
+ */
+public class AgentOrder implements java.io.Serializable{
+
+    private static final long serialVersionUID = -3002867268414307355L;
+    private String agentOrderid;        //订单id
+    private Integer agentId;            //代理商id
+    private Integer agentYetAmount;     //付款金额
+    private Integer agentAmount;        //订单总额
+    private Date agentCreateDate;       //订单创建时间
+    private String agentPostNum;        //快递单号
+    private String agentPostFirm;       //快递公司
+    private Integer agentStatus;        //状态
+    private Date agentSendDate;         //发货时间
+    private String agentAddressInfo;    //详细地址
+    private String agentAddressPostnum; //邮编
+    private String agentAddressTel;     //收件人电话
+    private String agentAddressName;    //收件人姓名
+    private String agentAdminRemark;    //后台的备注
+    private String agentTransactionId;  //微信订单号
+    private Date agentTransactionDate;  //微信支付时间
+
+    public String getAgentOrderid() {
+        return agentOrderid;
+    }
+
+    public void setAgentOrderid(String agentOrderid) {
+        this.agentOrderid = agentOrderid;
+    }
+
+    public Integer getAgentId() {
+        return agentId;
+    }
+
+    public void setAgentId(Integer agentId) {
+        this.agentId = agentId;
+    }
+
+    public Integer getAgentYetAmount() {
+        return agentYetAmount;
+    }
+
+    public void setAgentYetAmount(Integer agentYetAmount) {
+        this.agentYetAmount = agentYetAmount;
+    }
+
+    public Integer getAgentAmount() {
+        return agentAmount;
+    }
+
+    public void setAgentAmount(Integer agentAmount) {
+        this.agentAmount = agentAmount;
+    }
+
+    public Date getAgentCreateDate() {
+        return agentCreateDate;
+    }
+
+    public void setAgentCreateDate(Date agentCreateDate) {
+        this.agentCreateDate = agentCreateDate;
+    }
+
+    public String getAgentPostNum() {
+        return agentPostNum;
+    }
+
+    public void setAgentPostNum(String agentPostNum) {
+        this.agentPostNum = agentPostNum;
+    }
+
+    public String getAgentPostFirm() {
+        return agentPostFirm;
+    }
+
+    public void setAgentPostFirm(String agentPostFirm) {
+        this.agentPostFirm = agentPostFirm;
+    }
+
+    public Integer getAgentStatus() {
+        return agentStatus;
+    }
+
+    public void setAgentStatus(Integer agentStatus) {
+        this.agentStatus = agentStatus;
+    }
+
+    public Date getAgentSendDate() {
+        return agentSendDate;
+    }
+
+    public void setAgentSendDate(Date agentSendDate) {
+        this.agentSendDate = agentSendDate;
+    }
+
+    public String getAgentAddressInfo() {
+        return agentAddressInfo;
+    }
+
+    public void setAgentAddressInfo(String agentAddressInfo) {
+        this.agentAddressInfo = agentAddressInfo;
+    }
+
+    public String getAgentAddressPostnum() {
+        return agentAddressPostnum;
+    }
+
+    public void setAgentAddressPostnum(String agentAddressPostnum) {
+        this.agentAddressPostnum = agentAddressPostnum;
+    }
+
+    public String getAgentAddressTel() {
+        return agentAddressTel;
+    }
+
+    public void setAgentAddressTel(String agentAddressTel) {
+        this.agentAddressTel = agentAddressTel;
+    }
+
+    public String getAgentAddressName() {
+        return agentAddressName;
+    }
+
+    public void setAgentAddressName(String agentAddressName) {
+        this.agentAddressName = agentAddressName;
+    }
+
+    public String getAgentAdminRemark() {
+        return agentAdminRemark;
+    }
+
+    public void setAgentAdminRemark(String agentAdminRemark) {
+        this.agentAdminRemark = agentAdminRemark;
+    }
+
+    public String getAgentTransactionId() {
+        return agentTransactionId;
+    }
+
+    public void setAgentTransactionId(String agentTransactionId) {
+        this.agentTransactionId = agentTransactionId;
+    }
+
+    public Date getAgentTransactionDate() {
+        return agentTransactionDate;
+    }
+
+    public void setAgentTransactionDate(Date agentTransactionDate) {
+        this.agentTransactionDate = agentTransactionDate;
+    }
+}

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

@@ -1,4 +1,4 @@
-package com.iamberry.wechat.core.entity.drp;
+package com.iamberry.wechat.core.entity.agentInfo;
 
 import java.util.Date;
 
@@ -6,11 +6,11 @@ import java.util.Date;
  * 代理订单项类
  * Created by liuzhiwei on 2017/10/11.
  */
-public class PlaceOrderItem implements java.io.Serializable{
+public class AgentOrderItem implements java.io.Serializable{
 
     private static final long serialVersionUID = 8254500140389491883L;
     private Integer itemId;                 //订单条目id
-    private String placeOrderid;            //所属订单
+    private String agentOrderid;            //所属订单
     private Integer productId;              //购物商品id
     private Integer colorId;                //产品颜色id
     private Integer productType;            //产品类型id
@@ -31,14 +31,6 @@ public class PlaceOrderItem implements java.io.Serializable{
         this.itemId = itemId;
     }
 
-    public String getPlaceOrderid() {
-        return placeOrderid;
-    }
-
-    public void setPlaceOrderid(String placeOrderid) {
-        this.placeOrderid = placeOrderid;
-    }
-
     public Integer getProductId() {
         return productId;
     }
@@ -126,4 +118,12 @@ public class PlaceOrderItem implements java.io.Serializable{
     public void setItemProductPic(String itemProductPic) {
         this.itemProductPic = itemProductPic;
     }
+
+    public String getAgentOrderid() {
+        return agentOrderid;
+    }
+
+    public void setAgentOrderid(String agentOrderid) {
+        this.agentOrderid = agentOrderid;
+    }
 }

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

@@ -1,156 +0,0 @@
-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-wechat-web/src/main/resources/jdbc.properties

@@ -5,7 +5,7 @@ jdbc.driver=com.mysql.jdbc.Driver
 #jdbc.password=tooth123
 
 #±¾µØ¿â
-jdbc.url=jdbc:mysql://192.168.1.254:3306/watero_pf?useUnicode=true&characterEncoding=UTF-8&allowMultiQueries=true&autoReconnect=true&failOverReadOnly=false&zeroDateTimeBehavior=convertToNull
+jdbc.url=jdbc:mysql://192.168.1.254:3306/tooth?useUnicode=true&characterEncoding=UTF-8&allowMultiQueries=true&autoReconnect=true&failOverReadOnly=false&zeroDateTimeBehavior=convertToNull
 jdbc.username=root
 jdbc.password=root