creat watero

pom.xml

@@ -0,0 +1,601 @@
+<?xml version="1.0" encoding="UTF-8"?>
+<project xmlns="http://maven.apache.org/POM/4.0.0" xmlns:xsi="http://www.w3.org/2001/XMLSchema-instance"
+		 xsi:schemaLocation="http://maven.apache.org/POM/4.0.0 http://maven.apache.org/xsd/maven-4.0.0.xsd">
+	<modelVersion>4.0.0</modelVersion>
+
+	<!-- iamberry 父配置 -->
+	<groupId>com.iamberry</groupId>
+	<artifactId>iamberry-parent</artifactId>
+	<version>1.0.0</version>
+
+	<!-- pom类型 -->
+	<packaging>pom</packaging>
+
+	<!-- 爱贝源仓库 -->
+	<repositories>
+		<!--<repository>
+            <id>spring-snapshots</id>
+            <url>http://repo.spring.io/snapshot</url>
+            <snapshots><enabled>true</enabled></snapshots>
+        </repository>
+        <repository>
+            <id>spring-milestones</id>
+            <url>http://repo.spring.io/milestone</url>
+        </repository>-->
+		<repository>
+			<id>Iamberr_Nexus</id>
+			<name>iamberry nexus</name>
+			<url>http://maven.iamberry.com/content/groups/public/</url>
+		</repository>
+	</repositories>
+
+	<!-- 插件地址 -->
+	<pluginRepositories>
+		<!--<pluginRepository>
+			<id>spring-snapshots</id>
+			<url>http://repo.spring.io/snapshot</url>
+		</pluginRepository>
+		<pluginRepository>
+			<id>spring-milestones</id>
+			<url>http://repo.spring.io/milestone</url>
+		</pluginRepository>-->
+		<pluginRepository>
+			<id>iamberry_nexus</id>
+			<url>http://maven.iamberry.com/content/groups/public/</url>
+		</pluginRepository>
+	</pluginRepositories>
+
+	<dependencyManagement>
+		<dependencies>
+			<dependency>
+				<!-- Import dependency management from Spring Boot -->
+				<groupId>org.springframework.boot</groupId>
+				<artifactId>spring-boot-dependencies</artifactId>
+				<version>1.4.1.RELEASE</version>
+				<type>pom</type>
+				<scope>import</scope>
+			</dependency>
+		</dependencies>
+	</dependencyManagement>
+
+	<distributionManagement>
+		<repository>
+			<id>releases</id>
+			<url>http://maven.iamberry.com/content/repositories/releases</url>
+		</repository>
+		<snapshotRepository>
+			<id>snapshots</id>
+			<url>http://maven.iamberry.com/content/repositories/snapshots</url>
+		</snapshotRepository>
+	</distributionManagement>
+
+	<!-- 隐性变量 -->
+	<properties>
+		<project.build.sourceEncoding>UTF-8</project.build.sourceEncoding>
+		<spring.version>4.3.2.RELEASE</spring.version>
+		<aspectj.version>1.8.7</aspectj.version>
+	</properties>
+
+	<dependencies>
+		<!--二维码 -->
+		<dependency>
+			<groupId>com.google.zxing</groupId>
+			<artifactId>core</artifactId>
+			<version>3.2.0</version>
+		</dependency>
+
+		<dependency>
+			<groupId>com.google.zxing</groupId>
+			<artifactId>javase</artifactId>
+			<version>3.2.0</version>
+		</dependency>
+
+		<dependency>
+			<groupId>com.jcraft</groupId>
+			<artifactId>jsch</artifactId>
+			<version>0.1.53</version>
+		</dependency>
+		<dependency>
+			<groupId>jaxen</groupId>
+			<artifactId>jaxen</artifactId>
+		</dependency>
+
+		<!-- 单元测试 -->
+		<dependency>
+			<groupId>junit</groupId>
+			<artifactId>junit</artifactId>
+			<scope>test</scope>
+		</dependency>
+
+		<!-- spring start -->
+		<dependency>
+			<groupId>org.springframework</groupId>
+			<artifactId>spring-aop</artifactId>
+		</dependency>
+		<dependency>
+			<groupId>org.springframework</groupId>
+			<artifactId>spring-aspects</artifactId>
+		</dependency>
+		<dependency>
+			<groupId>org.springframework</groupId>
+			<artifactId>spring-beans</artifactId>
+		</dependency>
+		<dependency>
+			<groupId>org.springframework</groupId>
+			<artifactId>spring-context</artifactId>
+		</dependency>
+		<dependency>
+			<groupId>org.springframework</groupId>
+			<artifactId>spring-context-support</artifactId>
+			<version>4.3.2.RELEASE</version>
+		</dependency>
+		<dependency>
+			<groupId>org.springframework</groupId>
+			<artifactId>spring-core</artifactId>
+		</dependency>
+		<dependency>
+			<groupId>org.springframework</groupId>
+			<artifactId>spring-expression</artifactId>
+		</dependency>
+		<dependency>
+			<groupId>org.springframework</groupId>
+			<artifactId>spring-jdbc</artifactId>
+		</dependency>
+		<dependency>
+			<groupId>org.springframework</groupId>
+			<artifactId>spring-mock</artifactId>
+			<version>2.0.8</version>
+		</dependency>
+		<dependency>
+			<groupId>org.springframework</groupId>
+			<artifactId>spring-orm</artifactId>
+		</dependency>
+		<dependency>
+			<groupId>org.springframework</groupId>
+			<artifactId>spring-test</artifactId>
+		</dependency>
+		<dependency>
+			<groupId>org.springframework</groupId>
+			<artifactId>spring-tx</artifactId>
+		</dependency>
+		<dependency>
+			<groupId>org.springframework</groupId>
+			<artifactId>spring-web</artifactId>
+		</dependency>
+		<dependency>
+			<groupId>org.springframework</groupId>
+			<artifactId>spring-webmvc</artifactId>
+		</dependency>
+		<!-- spring end -->
+
+		<!-- 数据源 -->
+		<dependency>
+			<groupId>mysql</groupId>
+			<artifactId>mysql-connector-java</artifactId>
+			<scope>runtime</scope>
+		</dependency>
+
+		<!-- json -->
+		<dependency>
+			<groupId>org.codehaus.jackson</groupId>
+			<artifactId>jackson-mapper-lgpl</artifactId>
+			<version>1.9.12</version>
+		</dependency>
+		<dependency>
+			<groupId>org.codehaus.jackson</groupId>
+			<artifactId>jackson-core-lgpl</artifactId>
+			<version>1.9.12</version>
+		</dependency>
+		<dependency>
+			<groupId>com.fasterxml.jackson.core</groupId>
+			<artifactId>jackson-core</artifactId>
+		</dependency>
+		<dependency>
+			<groupId>com.fasterxml.jackson.core</groupId>
+			<artifactId>jackson-annotations</artifactId>
+		</dependency>
+		<dependency>
+			<groupId>com.fasterxml.jackson.core</groupId>
+			<artifactId>jackson-databind</artifactId>
+		</dependency>
+
+
+		<!-- freemarker依赖 -->
+		<dependency>
+			<groupId>org.freemarker</groupId>
+			<artifactId>freemarker</artifactId>
+		</dependency>
+
+		<!-- 基础包依赖 -->
+		<dependency>
+			<groupId>commons-lang</groupId>
+			<artifactId>commons-lang</artifactId>
+			<version>2.6</version>
+		</dependency>
+		<dependency>
+			<groupId>commons-io</groupId>
+			<artifactId>commons-io</artifactId>
+			<version>2.4</version>
+		</dependency>
+		<dependency>
+			<groupId>org.apache.httpcomponents</groupId>
+			<artifactId>httpclient</artifactId>
+		</dependency>
+		<dependency>
+			<groupId>org.apache.httpcomponents</groupId>
+			<artifactId>httpcore</artifactId>
+		</dependency>
+		<dependency>
+			<groupId>commons-beanutils</groupId>
+			<artifactId>commons-beanutils</artifactId>
+			<type>jar</type>
+			<scope>compile</scope>
+		</dependency>
+		<dependency>
+			<groupId>commons-digester</groupId>
+			<artifactId>commons-digester</artifactId>
+			<type>jar</type>
+			<scope>compile</scope>
+		</dependency>
+		<dependency>
+			<groupId>commons-fileupload</groupId>
+			<artifactId>commons-fileupload</artifactId>
+			<version>1.3.1</version>
+		</dependency>
+		<dependency>
+			<groupId>com.google.guava</groupId>
+			<artifactId>guava</artifactId>
+			<version>16.0.1</version>
+		</dependency>
+
+		<!-- aspectj 依赖 -->
+		<dependency>
+			<groupId>org.aspectj</groupId>
+			<artifactId>aspectjrt</artifactId>
+		</dependency>
+		<dependency>
+			<groupId>org.aspectj</groupId>
+			<artifactId>aspectjtools</artifactId>
+		</dependency>
+		<dependency>
+			<groupId>org.aspectj</groupId>
+			<artifactId>aspectjweaver</artifactId>
+		</dependency>
+
+		<!-- displaytag -->
+		<dependency>
+			<groupId>displaytag</groupId>
+			<artifactId>displaytag</artifactId>
+			<version>1.2</version>
+			<exclusions>
+				<exclusion>
+					<groupId>org.slf4j</groupId>
+					<artifactId>jcl104-over-slf4j</artifactId>
+				</exclusion>
+			</exclusions>
+		</dependency>
+		<dependency>
+			<groupId>jsptags</groupId>
+			<artifactId>pager-taglib</artifactId>
+			<version>2.0</version>
+		</dependency>
+
+		<!-- dom4j -->
+		<dependency>
+			<groupId>dom4j</groupId>
+			<artifactId>dom4j</artifactId>
+		</dependency>
+
+		<!-- redis -->
+		<dependency>
+			<groupId>redis.clients</groupId>
+			<artifactId>jedis</artifactId>
+		</dependency>
+
+		<!-- 日志 -->
+		<dependency>
+			<groupId>commons-logging</groupId>
+			<artifactId>commons-logging</artifactId>
+			<version>1.2</version>
+		</dependency>
+		<dependency>
+			<groupId>log4j</groupId>
+			<artifactId>log4j</artifactId>
+			<version>1.2.17</version>
+		</dependency>
+		<dependency>
+			<groupId>org.slf4j</groupId>
+			<artifactId>slf4j-api</artifactId>
+		</dependency>
+		<dependency>
+			<groupId>org.slf4j</groupId>
+			<artifactId>jcl-over-slf4j</artifactId>
+		</dependency>
+		<dependency>
+			<groupId>org.slf4j</groupId>
+			<artifactId>slf4j-log4j12</artifactId>
+		</dependency>
+
+		<dependency>
+			<groupId>joda-time</groupId>
+			<artifactId>joda-time</artifactId>
+		</dependency>
+
+		<!--代码生成 -->
+		<dependency>
+			<groupId>org.apache.velocity</groupId>
+			<artifactId>velocity</artifactId>
+		</dependency>
+
+		<dependency>
+			<groupId>com.google.code.gson</groupId>
+			<artifactId>gson</artifactId>
+		</dependency>
+		<dependency>
+			<groupId>com.alibaba</groupId>
+			<artifactId>fastjson</artifactId>
+			<version>1.2.6</version>
+		</dependency>
+		<dependency>
+			<groupId>org.apache.commons</groupId>
+			<artifactId>commons-lang3</artifactId>
+			<version>3.4</version>
+		</dependency>
+		<dependency>
+			<groupId>com.nimbusds</groupId>
+			<artifactId>nimbus-jose-jwt</artifactId>
+			<version>4.11.2</version>
+		</dependency>
+		<dependency>
+			<groupId>xstream</groupId>
+			<artifactId>xstream</artifactId>
+			<version>1.2.1</version>
+		</dependency>
+		<dependency>
+			<groupId>net.sf.json-lib</groupId>
+			<artifactId>json-lib-ext-spring</artifactId>
+			<version>1.0.2</version>
+			<exclusions>
+				<exclusion>
+					<groupId>javax.servlet</groupId>
+					<artifactId>servlet-api</artifactId>
+				</exclusion>
+			</exclusions>
+		</dependency>
+
+		<!-- .servlet-api -->
+		<dependency>
+			<groupId>javax.servlet</groupId>
+			<artifactId>javax.servlet-api</artifactId>
+			<version>3.1.0</version>
+		</dependency>
+
+
+		<dependency>
+			<groupId>org.apache.poi</groupId>
+			<artifactId>poi</artifactId>
+			<version>3.14</version>
+		</dependency>
+
+		<dependency>
+			<groupId>com.mortennobel</groupId>
+			<artifactId>java-image-scaling</artifactId>
+			<version>0.8.5</version>
+		</dependency>
+
+		<dependency>
+			<groupId>QRCode</groupId>
+			<artifactId>QRCode</artifactId>
+			<version>3.0</version>
+		</dependency>
+
+		<dependency>
+			<groupId>com.github.sogyf</groupId>
+			<artifactId>goja-qrcode</artifactId>
+			<version>0.1.2</version>
+		</dependency>
+
+
+		<dependency>
+			<groupId>jdom</groupId>
+			<artifactId>jdom</artifactId>
+			<version>1.0</version>
+		</dependency>
+
+		<dependency>
+			<groupId>jexcelapi</groupId>
+			<artifactId>jxl</artifactId>
+			<version>2.4.2</version>
+		</dependency>
+
+		<!-- 依赖 -->
+		<dependency>
+			<groupId>javax.servlet</groupId>
+			<artifactId>jstl</artifactId>
+			<version>1.2</version>
+		</dependency>
+
+		<!-- owasp -->
+		<dependency>
+			<groupId>org.owasp.antisamy</groupId>
+			<artifactId>antisamy</artifactId>
+			<version>1.4.3</version>
+		</dependency>
+		<dependency>
+			<groupId>org.owasp.esapi</groupId>
+			<artifactId>esapi</artifactId>
+			<version>2.1.0</version>
+		</dependency>
+
+		<!-- mybatis -->
+		<dependency>
+			<groupId>org.mybatis</groupId>
+			<artifactId>mybatis</artifactId>
+			<version>3.2.8</version>
+		</dependency>
+		<dependency>
+			<groupId>org.mybatis</groupId>
+			<artifactId>mybatis-spring</artifactId>
+			<version>1.2.2</version>
+		</dependency>
+
+		<dependency>
+			<groupId>oro</groupId>
+			<artifactId>oro</artifactId>
+			<version>2.0.8</version>
+		</dependency>
+
+		<!-- zookeeper server -->
+		<dependency>
+			<groupId>org.apache.zookeeper</groupId>
+			<artifactId>zookeeper</artifactId>
+			<version>3.4.6</version>
+			<type>pom</type>
+		</dependency>
+
+		<!-- zookeeper client -->
+		<dependency>
+			<groupId>com.101tec</groupId>
+			<artifactId>zkclient</artifactId>
+			<version>0.3</version>
+		</dependency>
+
+		<!-- dubbo -->
+		<dependency>
+			<groupId>com.alibaba</groupId>
+			<artifactId>dubbo</artifactId>
+			<version>2.5.3</version>
+			<exclusions>
+				<exclusion>
+					<artifactId>spring</artifactId>
+					<groupId>org.springframework</groupId>
+				</exclusion>
+			</exclusions>
+		</dependency>
+
+		<!-- 校验框架 -->
+		<dependency>
+			<groupId>org.hibernate</groupId>
+			<artifactId>hibernate-validator</artifactId>
+		</dependency>
+
+		<!-- 依赖 -->
+		<dependency>
+			<groupId>org.apache.httpcomponents</groupId>
+			<artifactId>httpmime</artifactId>
+			<version>4.3.6</version>
+		</dependency>
+
+		<dependency>
+			<groupId>org.json</groupId>
+			<artifactId>json</artifactId>
+			<version>20160212</version>
+		</dependency>
+
+		<dependency>
+			<groupId>cn.jpush.api</groupId>
+			<artifactId>jpush-client</artifactId>
+			<version>3.2.8</version>
+		</dependency>
+
+		<dependency>
+			<groupId>org.springframework</groupId>
+			<artifactId>spring-websocket</artifactId>
+			<version>4.1.3.RELEASE</version>
+		</dependency>
+
+		<!-- mybatis分页 -->
+		<dependency>
+			<groupId>com.github.pagehelper</groupId>
+			<artifactId>pagehelper</artifactId>
+			<version>5.0.1</version>
+		</dependency>
+
+		<!-- 工作流 -->
+		<dependency>
+			<groupId>org.activiti</groupId>
+			<artifactId>activiti-engine</artifactId>
+			<version>6.0.0</version>
+		</dependency>
+		<dependency>
+			<groupId>org.activiti</groupId>
+			<artifactId>activiti-spring</artifactId>
+			<version>6.0.0</version>
+		</dependency>
+
+	</dependencies>
+	<build>
+		<plugins>
+			<plugin>
+				<groupId>org.springframework.boot</groupId>
+				<artifactId>spring-boot-maven-plugin</artifactId>
+				<version>1.4.0.RELEASE</version>
+			</plugin>
+		</plugins>
+		<defaultGoal>compile</defaultGoal>
+	</build>
+
+	<modules>
+		<!--<module>iamberry-app-international</module>
+		<module>iamberry-app-international-service</module>
+		<module>iamberry-common-config</module>
+		<module>iamberry-common-interface</module>
+		<module>iamberry-app-api</module>
+		<module>iamberry-app-service</module>
+		<module>iamberry-app-interface</module>
+
+		<module>iamberry-common-core</module>
+		<module>iamberry-common-tool</module>
+		<module>iamberry-common-web</module>
+		<module>iamberry-wechat-interface</module>
+		<module>iamberry-wechat-service</module>
+		<module>iamberry-wechat-web</module>-->
+
+		<module>watero-common-core</module>
+		<module>watero-common-tool</module>
+		<module>watero-common-web</module>
+		<!--<module>watero-rent-interface</module>
+		<module>watero-rent-service</module>
+		<module>watero-wechat-interface</module>
+		<module>watero-wechat-service</module>
+		<module>watero-wechat-web</module>
+		<module>watero-rent-web</module>-->
+		<module>watero-rst-web</module>
+		<module>watero-rst-core</module>
+		<module>watero-rst-interface</module>
+		<module>watero-rst-service</module>
+		<!--<module>wateroPF-common-core</module>
+		<module>wateroPF-common-tool</module>
+		<module>wateroPF-common-web</module>
+		<module>wateroPF-wechat-interface</module>
+		<module>wateroPF-wechat-service</module>
+		<module>wateroPF-wechat-web</module>-->
+	</modules>
+
+	<!-- 配置 -->
+	<profiles>
+		<profile>
+			<id>jdk-1.8</id>
+			<activation>
+				<activeByDefault>true</activeByDefault>
+				<jdk>1.8</jdk>
+			</activation>
+			<properties>
+				<maven.compiler.source>1.8</maven.compiler.source>
+				<maven.compiler.target>1.8</maven.compiler.target>
+				<maven.compiler.compilerVersion>1.8</maven.compiler.compilerVersion>
+			</properties>
+		</profile>
+		<profile>
+			<id>sonar</id>
+			<activation>
+				<activeByDefault>true</activeByDefault>
+			</activation>
+			<properties>
+				<sonar.host.url>http://sonar.iamberry.com/</sonar.host.url>
+				<sonar.login>admin</sonar.login>
+				<sonar.password>iamberry123</sonar.password>
+			</properties>
+		</profile>
+	</profiles>
+</project>

watero-common-core/pom.xml

@@ -0,0 +1,52 @@
+<project xmlns="http://maven.apache.org/POM/4.0.0" xmlns:xsi="http://www.w3.org/2001/XMLSchema-instance"
+	xsi:schemaLocation="http://maven.apache.org/POM/4.0.0 http://maven.apache.org/xsd/maven-4.0.0.xsd">
+	<modelVersion>4.0.0</modelVersion>
+	
+	<!-- 父类定义 -->
+	<parent>
+		<groupId>com.iamberry</groupId>
+		<artifactId>iamberry-parent</artifactId>
+		<version>1.0.0</version>
+	</parent>
+	
+	<!-- 系统公众的核心模块，编写核心的数据模块(公众的Bean等等) -->
+	<artifactId>watero-common-core</artifactId>
+	
+	<!-- 核心模块依赖tool -->
+	<dependencies>
+		<dependency>
+			<groupId>com.iamberry</groupId>
+			<artifactId>watero-common-tool</artifactId>
+			<version>1.0.0</version>
+		</dependency>
+	</dependencies>
+	<build>
+		<plugins>
+			<plugin>
+				<groupId>org.apache.maven.plugins</groupId>
+				<artifactId>maven-compiler-plugin</artifactId>
+				<version>3.3</version>
+				<configuration>
+					<source>1.7</source>
+					<target>1.7</target>
+				</configuration>
+			</plugin>
+		</plugins>
+	</build>
+
+	<!-- 配置 -->
+	<profiles>
+		<profile>
+			<id>jdk-1.7</id>
+			<activation>
+				<activeByDefault>true</activeByDefault>
+				<jdk>1.7</jdk>
+			</activation>
+			<properties>
+				<maven.compiler.source>1.7</maven.compiler.source>
+				<maven.compiler.target>1.7</maven.compiler.target>
+				<maven.compiler.compilerVersion>1.7</maven.compiler.compilerVersion>
+			</properties>
+		</profile>
+	</profiles>
+</project>

watero-common-core/src/main/java/com/iamberry/cms/core/dto/MilkPowderInfoDto.java

@@ -0,0 +1,54 @@
+package com.iamberry.cms.core.dto;
+
+import java.io.Serializable;
+
+import com.iamberry.wechat.core.entity.PageBean;
+
+public class MilkPowderInfoDto  implements Serializable{
+	
+	/**
+	 * 
+	 */
+	private static final long serialVersionUID = 4854607722861776978L;
+	private String powderNumber;				// 奶粉编号
+	private String barCode;						// 条形码
+	private String brand;						// 品牌
+	private String status;						//状态			approved(已认证)	not_approved(未认证)	电话号码为用户上传
+	private PageBean page = new PageBean();						//分页用
+	
+	public String getPowderNumber() {
+		return powderNumber;
+	}
+	public void setPowderNumber(String powderNumber) {
+		this.powderNumber = powderNumber;
+	}
+	public String getBarCode() {
+		return barCode;
+	}
+	public void setBarCode(String barCode) {
+		this.barCode = barCode;
+	}
+	public String getBrand() {
+		return brand;
+	}
+	public void setBrand(String brand) {
+		this.brand = brand;
+	}
+	public String getStatus() {
+		return status;
+	}
+	public void setStatus(String status) {
+		this.status = status;
+	}
+	public PageBean getPage() {
+		return page;
+	}
+	public void setPage(PageBean page) {
+		this.page = page;
+	}
+	@Override
+	public String toString() {
+		return "MilkPowderInfoDto [powderNumber=" + powderNumber + ", brand="
+				+ brand + ", status=" + status + ", page=" + page + "]";
+	}
+}

watero-common-core/src/main/java/com/iamberry/cms/core/entity/Machine.java

@@ -0,0 +1,98 @@
+package com.iamberry.cms.core.entity;
+
+import java.util.Date;
+
+import com.iamberry.wechat.core.entity.PageBean;
+
+/**
+ * 冲奶机实体类
+ * @author 刘志伟
+ * 2016-12-12
+ */
+public class Machine implements java.io.Serializable {
+
+	/**
+	 * 
+	 */
+	private static final long serialVersionUID = -1882917614438980174L;
+
+	private Long id;					//id
+	private Long owner;					//所属用户
+	private String machineName;		//机器名称
+	private String machineMac;			//机器 mac码
+	private String machineInfo;		//机器信息
+	private String status;				//机器状态		离线：offline		在线：online	
+	private String location;			//机器位置
+	private Date createdOn;			//创建时间	/ 修改时间
+	private String extOpenId;		//openid
+	private String userName;			//用户名称
+	private PageBean page = new PageBean();	//分页
+	
+	public PageBean getPage() {
+		return page;
+	}
+	public void setPage(PageBean page) {
+		this.page = page;
+	}
+	public String getUserName() {
+		return userName;
+	}
+	public void setUserName(String userName) {
+		this.userName = userName;
+	}
+	public String getExtOpenId() {
+		return extOpenId;
+	}
+	public void setExtOpenId(String extOpenId) {
+		this.extOpenId = extOpenId;
+	}
+	public Long getId() {
+		return id;
+	}
+	public void setId(Long id) {
+		this.id = id;
+	}
+	public Long getOwner() {
+		return owner;
+	}
+	public void setOwner(Long owner) {
+		this.owner = owner;
+	}
+	public String getMachineName() {
+		return machineName;
+	}
+	public void setMachineName(String machineName) {
+		this.machineName = machineName;
+	}
+	public String getMachineMac() {
+		return machineMac;
+	}
+	public void setMachineMac(String machineMac) {
+		this.machineMac = machineMac;
+	}
+	public String getMachineInfo() {
+		return machineInfo;
+	}
+	public void setMachineInfo(String machineInfo) {
+		this.machineInfo = machineInfo;
+	}
+	public String getStatus() {
+		return status;
+	}
+	public void setStatus(String status) {
+		this.status = status;
+	}
+	public String getLocation() {
+		return location;
+	}
+	public void setLocation(String location) {
+		this.location = location;
+	}
+	public Date getCreatedOn() {
+		return createdOn;
+	}
+	public void setCreatedOn(Date createdOn) {
+		this.createdOn = createdOn;
+	}
+	
+}

watero-common-core/src/main/java/com/iamberry/cms/core/entity/MilkMakingRecord.java

@@ -0,0 +1,161 @@
+package com.iamberry.cms.core.entity;
+
+import java.util.Date;
+
+
+
+import com.iamberry.wechat.core.entity.Page;
+import com.iamberry.wechat.core.entity.PaperBean;
+
+/**
+ * @author Sikandar
+ *
+ */
+
+public class MilkMakingRecord implements java.io.Serializable {
+
+	/**
+	 * 
+	 */
+	private static final long serialVersionUID = -2673681146930650920L;
+	private Long id;							//id
+	private Integer volume;				//冲奶量
+	private String controller;				//冲奶操作单位
+	private Integer stars;					//评分等级
+	private String comments;			//吐槽
+	private String brand;					//品牌
+	private Long powderInfo;			//比例
+	private String machineName;		//机器名
+	private String machine;				//冲奶机
+	private Long user;						//用户id
+	private Date timestamp;				//冲奶时间
+	private Page page;
+	private String username;
+	public MilkMakingRecord() {
+	}
+
+	public MilkMakingRecord(Long id, Integer volume, String controller, Integer stars, String comments, String brand, Long powderInfo,
+			String machineName, String machine, Long user, Date timestamp) {
+		super();
+		this.id = id;
+		this.volume = volume;
+		this.controller = controller;
+		this.stars = stars;
+		this.comments = comments;
+		this.brand = brand;
+		this.powderInfo = powderInfo;
+		this.machineName = machineName;
+		this.machine = machine;
+		this.user = user;
+		this.timestamp = timestamp;
+	}
+
+	public Long getId() {
+		return id;
+	}
+
+	public void setId(Long id) {
+		this.id = id;
+	}
+
+	public Integer getVolume() {
+		return volume;
+	}
+
+	public void setVolume(Integer volume) {
+		this.volume = volume;
+	}
+
+	public String getController() {
+		return controller;
+	}
+
+	public void setController(String controller) {
+		this.controller = controller;
+	}
+
+	public Integer getStars() {
+		return stars;
+	}
+
+	public void setStars(Integer stars) {
+		this.stars = stars;
+	}
+
+	public String getComments() {
+		return comments;
+	}
+
+	public void setComments(String comments) {
+		this.comments = comments;
+	}
+
+	public String getBrand() {
+		return brand;
+	}
+
+	public void setBrand(String brand) {
+		this.brand = brand;
+	}
+
+	
+	public String getMachine() {
+		return machine;
+	}
+
+	public void setMachine(String machine) {
+		this.machine = machine;
+	}
+
+	public Long getUser() {
+		return user;
+	}
+
+	public void setUser(Long user) {
+		this.user = user;
+	}
+
+	
+
+	public Page getPage() {
+		return page;
+	}
+
+	public void setPage(Page page) {
+		this.page = page;
+	}
+
+	public String getUsername() {
+		return username;
+	}
+
+	public void setUsername(String username) {
+		this.username = username;
+	}
+
+	public Long getPowderInfo() {
+		return powderInfo;
+	}
+
+	public void setPowderInfo(Long powderInfo) {
+		this.powderInfo = powderInfo;
+	}
+
+	public String getMachineName() {
+		return machineName;
+	}
+
+	public void setMachineName(String machineName) {
+		this.machineName = machineName;
+	}
+
+	public Date getTimestamp() {
+		return timestamp;
+	}
+
+	public void setTimestamp(Date timestamp) {
+		this.timestamp = timestamp;
+	}
+	
+
+}

watero-common-core/src/main/java/com/iamberry/cms/core/entity/MilkPowderInfo.java

@@ -0,0 +1,145 @@
+package com.iamberry.cms.core.entity;
+
+import java.io.Serializable;
+import java.util.Date;
+
+/**
+ * 奶粉信息 实体类
+ * 2016年12月12日
+ * 穆再兴
+ * @author Administrator
+ *
+ */
+public class MilkPowderInfo implements Serializable{
+	
+	private static final long serialVersionUID = -104586575800168679L;
+	
+	private Long id;							//id
+	private String powderNumber;				// 奶粉编号
+	private String spoonPicture;				// 图片
+	private String barCode;						// 条形码
+	private String brand;						// 品牌
+	
+	private String series;						// 系列
+	private String level;						// 段数
+	private String version;						// 版本
+	private String ageRange;					// 适用年龄范围
+	private Float weightPerSpoon;				// 每勺多少克
+	
+	private Float milkVolumePerSpoon;			// 奶量
+	private Float powderRatio;					// 比例
+	private Float density;						//密度
+	private Integer type;						//类型
+	private String status;						//状态	approved(已认证)	not_approved(未认证)	电话号码为用户上传
+	private Date createdOn;						//创建时间
+	
+	public Long getId() {
+		return id;
+	}
+	public void setId(Long id) {
+		this.id = id;
+	}
+	public String getPowderNumber() {
+		return powderNumber;
+	}
+	public void setPowderNumber(String powderNumber) {
+		this.powderNumber = powderNumber;
+	}
+	public String getSpoonPicture() {
+		return spoonPicture;
+	}
+	public void setSpoonPicture(String spoonPicture) {
+		this.spoonPicture = spoonPicture;
+	}
+	public String getBarCode() {
+		return barCode;
+	}
+	public void setBarCode(String barCode) {
+		this.barCode = barCode;
+	}
+	public String getBrand() {
+		return brand;
+	}
+	public void setBrand(String brand) {
+		this.brand = brand;
+	}
+	public String getSeries() {
+		return series;
+	}
+	public void setSeries(String series) {
+		this.series = series;
+	}
+	public String getLevel() {
+		return level;
+	}
+	public void setLevel(String level) {
+		this.level = level;
+	}
+	public String getVersion() {
+		return version;
+	}
+	public void setVersion(String version) {
+		this.version = version;
+	}
+	public String getAgeRange() {
+		return ageRange;
+	}
+	public void setAgeRange(String ageRange) {
+		this.ageRange = ageRange;
+	}
+	public Float getWeightPerSpoon() {
+		return weightPerSpoon;
+	}
+	public void setWeightPerSpoon(Float weightPerSpoon) {
+		this.weightPerSpoon = weightPerSpoon;
+	}
+	public Float getMilkVolumePerSpoon() {
+		return milkVolumePerSpoon;
+	}
+	public void setMilkVolumePerSpoon(Float milkVolumePerSpoon) {
+		this.milkVolumePerSpoon = milkVolumePerSpoon;
+	}
+	public Float getPowderRatio() {
+		return powderRatio;
+	}
+	public void setPowderRatio(Float powderRatio) {
+		this.powderRatio = powderRatio;
+	}
+	public Float getDensity() {
+		return density;
+	}
+	public void setDensity(Float density) {
+		this.density = density;
+	}
+	public Integer getType() {
+		return type;
+	}
+	public void setType(Integer type) {
+		this.type = type;
+	}
+	public String getStatus() {
+		return status;
+	}
+	public void setStatus(String status) {
+		this.status = status;
+	}
+	public Date getCreatedOn() {
+		return createdOn;
+	}
+	public void setCreatedOn(Date createdOn) {
+		this.createdOn = createdOn;
+	}
+	@Override
+	public String toString() {
+		return "MilkPowder [id=" + id + ", powderNumber=" + powderNumber
+				+ ", spoonPicture=" + spoonPicture + ", barCode=" + barCode
+				+ ", brand=" + brand + ", series=" + series + ", level="
+				+ level + ", version=" + version + ", ageRange=" + ageRange
+				+ ", weightPerSpoon=" + weightPerSpoon
+				+ ", milkVolumePerSpoon=" + milkVolumePerSpoon
+				+ ", powderRatio=" + powderRatio + ", density=" + density
+				+ ", type=" + type + ", status=" + status + ", createdOn="
+				+ createdOn + "]";
+	}
+	
+}

watero-common-core/src/main/java/com/iamberry/exception/ServiceException.java

@@ -0,0 +1,45 @@
+package com.iamberry.exception;
+/**
+ * service层的异常封装
+ * @company	深圳爱贝源科技有限公司
+ * @website www.iamberry.com
+ * @author 	献
+ * @tel		18271840547
+ * @date	2017年3月9日
+ */
+public class ServiceException extends Throwable {
+
+	private static final long serialVersionUID = 2837525369786552232L;
+
+	/**
+	 * 异常代码:内部标识
+	 */
+	private Integer errorCode;
+	
+	/**
+	 * 异常描述
+	 */
+	private String errorMsg;
+
+	public ServiceException(Integer errorCode, String errorMsg) {
+		super();
+		this.errorCode = errorCode;
+		this.errorMsg = errorMsg;
+	}
+
+	public Integer getErrorCode() {
+		return errorCode;
+	}
+
+	public void setErrorCode(Integer errorCode) {
+		this.errorCode = errorCode;
+	}
+
+	public String getErrorMsg() {
+		return errorMsg;
+	}
+
+	public void setErrorMsg(String errorMsg) {
+		this.errorMsg = errorMsg;
+	}
+}

watero-common-core/src/main/java/com/iamberry/wechat/core/entity/AdminUtils.java

@@ -0,0 +1,326 @@
+package com.iamberry.wechat.core.entity;
+
+import java.security.SecureRandom;
+import java.util.Date;
+import java.util.UUID;
+
+import javax.servlet.http.Cookie;
+import javax.servlet.http.HttpServletRequest;
+import javax.servlet.http.HttpServletResponse;
+import javax.servlet.http.HttpSession;
+
+import com.iamberry.wechat.tools.NameUtils;
+import org.springframework.beans.factory.annotation.Autowired;
+import org.springframework.stereotype.Component;
+
+import com.iamberry.app.tool.des.MD5;
+import com.iamberry.app.tool.log.RatFWLogger;
+import com.iamberry.wechat.core.entity.admin.AdminLoginDTO;
+
+@Component
+public class AdminUtils {
+	
+	public static void addAdminUserToSession(Object object, HttpServletRequest request) {
+		// 一旦登陆成功，就改变sessionID的值，防止发生session fixation
+//		request.getSession().invalidate();
+//		DefaultHTTPUtilities defaultHTTPUtilities = new DefaultHTTPUtilities();
+//		HttpSession session = null;
+//		try {
+//			session = defaultHTTPUtilities.changeSessionIdentifier(request);
+//		} catch (AuthenticationException e) {
+//			// TODO Auto-generated catch block
+//			e.printStackTrace();
+//		}
+//		HttpSession session = request.getSession(true);
+		request.getSession().setAttribute("login_admin_userinfo", object);
+	}
+	
+	public static Object getLoginAdminUser(HttpSession session) {
+		return session.getAttribute("login_admin_userinfo");
+	}
+	
+	@Autowired
+	private RatFWLogger logger;
+	public void setLogger(RatFWLogger logger) {
+		this.logger = logger;
+	}
+	
+	
+	/**
+	 * 设置用户信息到response，而后保存到cookie
+	 * @param response
+	 * @param name
+	 * @param pwd
+	 * @throws Exception
+	 */
+	@SuppressWarnings("deprecation")
+	public void setCookieToResponse(HttpServletResponse response, String name, String pwd) throws Exception {
+		// 账户信息
+		StringBuffer buffer = new StringBuffer("");
+		buffer.append(name).append("-").append(pwd).append("adminuserlogin");
+		MD5 md5 = new MD5("loginadmin");
+		createCookie(response, "d42b2423_ratfw7d5f4he0d2c5_acoolrat0ed655cbf3d2cd", md5.encrypt(buffer.toString()));
+		// 账户信息有效时
+		Date date = new Date();
+		date.setDate(date.getDate()+7);
+		createCookie(response, "t3dt5f89df3jlk35kdf-093_da_dk3kj5d0", md5.encrypt(date.getTime()+"datetimelong"));
+		// 安全的随机数
+		String str = byte2hex(createRandomByte());
+		createCookie(response, "8dk3d435kj4d9d834kjgfh54k3_435j", str);
+		// 加密安全的随机数
+		createCookie(response, "3k5k49dhjkj45j3j65-5k_52", md5.encrypt(str));
+	}
+	
+	/**
+	 * 创建cookie，并保存到response中，写入客户端
+	 * @param response
+	 * @param name
+	 * @param value
+	 */
+	public static void createCookie(HttpServletResponse response, String name, String value) {
+		Cookie cookie = new Cookie(name, value);
+		// 有效期为(三天减一分钟)
+		cookie.setMaxAge(60 * 60 * 24 * 3 - 60);
+//		cookie.setPath("/" + NameUtils.getConfig("ROOT_PATH"));
+		cookie.setPath("/");
+		cookie.setHttpOnly(true);
+		cookie.setDomain(NameUtils.getConfig("DO_MAIN"));
+		response.addCookie(cookie);
+	}
+
+
+
+	/**
+	 * 解析当前浏览器是否登陆过我们的后台，名称为:d42b2423_ratfw7d5f4he0d2c5_acoolrat0ed655cbf3d2cd
+	 * @param request
+	 * @throws Exception
+	 */
+	public AdminLoginDTO parseCookieAdminUser(HttpServletRequest request, MD5 md5test) throws Exception {
+		try {
+			// 时间校验
+			MD5 md5 = new MD5("loginadmin");
+			Cookie[] cookies = request.getCookies();//这样便可以获取一个cookie数组
+			String timeStr = null; // 有效期加密值
+			String md5Str = null; // 用户信息加密值
+			String random = null; // 安全的随机数
+			String randomMd5 = null; // 安全随机数的加密值
+			for(Cookie cookie : cookies){
+				if (cookie.getName().equals("t3dt5f89df3jlk35kdf-093_da_dk3kj5d0")) {
+					timeStr = md5.decrypt(cookie.getValue());
+					timeStr = timeStr.replaceAll("datetimelong", "");
+				} else if (cookie.getName().equals("d42b2423_ratfw7d5f4he0d2c5_acoolrat0ed655cbf3d2cd")) {
+					String value = cookie.getValue(); // 此数据为加密后的信息
+					md5Str = md5.decrypt(value); // 解密
+				} else if (cookie.getName().equals("8dk3d435kj4d9d834kjgfh54k3_435j")) {
+					random = cookie.getValue();
+				} else if (cookie.getName().equals("3k5k49dhjkj45j3j65-5k_52")) {
+					randomMd5 = md5.decrypt(cookie.getValue());
+				}
+			}
+			if (timeStr == null || "".equals(timeStr)) {
+				return null;
+			}
+			if (new Date(Long.parseLong(timeStr)).getTime() < new Date().getTime()) {
+				return null;
+			}
+			if (!randomMd5.equals(random)) {
+				return null;
+			}
+			if (md5Str.indexOf("adminuserlogin") != -1) {
+				String str = md5Str.replaceAll("adminuserlogin", "");
+				String[] infos = str.split("-");
+				if (infos.length == 2) {
+					AdminLoginDTO dto = new AdminLoginDTO();
+					dto.setAdminLoginName(infos[0]);
+					dto.setAdminLoginPwd(md5test.decrypt(infos[1]));
+					return dto;
+				}
+			}
+			// 解析信息
+		} catch (Exception e) {
+			// 不处理,只记录，交由程序员处理
+		}
+		return null;
+	}
+
+	/**
+	 * 创建后台登陆时需要的token
+	 * @param session
+	 */
+	public void createRandom(HttpSession session) {
+		try {
+			session.setAttribute("loginToken", byte2hex(createRandomByte()));
+		} catch (Exception e) {
+			session.setAttribute("loginToken", UUID.randomUUID().toString());
+		}
+	}
+	
+	/**
+	 * 创建一个安全的随机数组byte[]
+	 * @return
+	 */
+	public byte[] createRandomByte() {
+		try {
+			SecureRandom random = SecureRandom.getInstance("SHA1PRNG");
+			byte[] bytes = new byte[1024 / 8];
+			random.nextBytes(bytes);
+			int count = 10;
+			byte[] seed = random.generateSeed(count);
+			random = SecureRandom.getInstance("SHA1PRNG");
+			random.setSeed(seed);
+			SecureRandom random2 = SecureRandom.getInstance("SHA1PRNG");
+			random2.setSeed(seed);
+			return seed;
+		} catch (Exception e) {
+			return UUID.randomUUID().toString().getBytes();
+		}
+	}
+	
+	/**
+	 * Function description: 向session中添加一个token
+	 * Return Value:boolean true:添加成功，false:添加是吧
+	 * Param value: tokenName，session
+	 * Exception Info: 无
+	 * Create User: 何秀刚
+	 */
+	public String saveTokenToSession(String tokenName, HttpSession session) {
+		try {
+			String token = byte2hex(createRandomByte());
+			session.setAttribute(tokenName, token);
+			return token;
+		} catch (Exception e) {
+			// TODO: handle exception
+			return null;
+		}
+	}
+
+	/**
+	 * byte[] 转 字符串
+	 * @param b
+	 * @return
+	 */
+	public String byte2hex(byte[] b) {
+		String hs = "";
+		String stmp = "";
+		for (int n = 0; n < b.length; n++) {
+			stmp = (java.lang.Integer.toHexString(b[n] & 0XFF));
+			if (stmp.length() == 1)
+				hs = hs + "x" + stmp;
+			else
+				hs = hs + stmp;
+		}
+		hs.replaceAll("0", "x");
+		return hs.toUpperCase();
+	}
+	
+	/**
+	 * 校验session中的token
+	 * @param token
+	 * @return
+	 */
+	public boolean checkLoginToken(String token, HttpSession session) {
+		if (!(token != null && !"".equals(token))) {
+			return false;
+		}
+		String sessionToken = (String) session.getAttribute("loginToken");
+		if (!(sessionToken != null && !"".equals(sessionToken))) {
+			return false;
+		}
+		if (token.equals(sessionToken)) {
+			return true;
+		} else {
+			return false;
+		}
+	}
+	
+	public boolean checkToken(String token, String tokenName, HttpSession session) {
+		if (!(token != null && !"".equals(token))) {
+			return false;
+		}
+		String sessionToken = (String) session.getAttribute(tokenName);
+		if (!(sessionToken != null && !"".equals(sessionToken))) {
+			return false;
+		}
+		if (token.equals(sessionToken)) {
+			session.removeAttribute(tokenName);
+			return true;
+		} else {
+			return false;
+		}
+	}
+
+	/**
+	 * 验证码校验
+	 * @param session
+	 * @param verifyCode
+	 * @return
+	 */
+	public boolean checkVerifyCode(HttpSession session, String verifyCode) {
+		if (!(verifyCode != null && !"".equals(verifyCode))) {
+			return false;
+		}
+		String sessionCode = (String) session.getAttribute("verifyCode");
+		if (!(sessionCode != null && !"".equals(sessionCode))) {
+			return false;
+		}
+		if (verifyCode.equalsIgnoreCase(sessionCode)) {
+			return true;
+		} else {
+			return false;
+		}
+	}
+	
+	/**
+	 * 对object对象加盐后加密
+	 * @param obj 需要加密的元数据
+	 * @param salting 加盐值
+	 * @return
+	 * @throws Exception 
+	 */
+	public String encryptObject(Object obj, final String salting) throws Exception {
+		String str = "";
+		if (obj instanceof String) {
+			str = salting + obj.toString();
+		} else if (obj instanceof Integer) {
+			str = salting + obj;
+		} else {
+			str = salting + obj.hashCode();
+		}
+		MD5 md5 = new MD5(salting);
+		return md5.encrypt(str);
+	}
+	
+	/**
+	 * 对加盐后加密的数据解析
+	 * @param str 加密后的数据
+	 * @param salting 加盐值
+	 * @return
+	 */
+	public String decryptObject(String str, final String salting) {
+		try {
+			MD5 md5 = new MD5(salting);
+			str = md5.decrypt(str);
+			return str.replaceAll(salting, "");
+		} catch (Exception e) {
+			return null;
+		}
+	}
+	
+	/**
+	 * 字段长度验证
+	 * @param args
+	 * @throws Exception
+	 */
+	public boolean parseFieldLength(String str,int minLength, int maxLength) {
+		if(str != null && str != "") {
+			int strLength = str.length();
+			if(strLength >= minLength && strLength <= maxLength) {
+				return true;
+			} else {
+				return false;
+			}
+		} else {
+			return false;
+		}
+	}
+}

watero-common-core/src/main/java/com/iamberry/wechat/core/entity/CommonDto.java

@@ -0,0 +1,55 @@
+package com.iamberry.wechat.core.entity;
+
+import java.io.Serializable;
+
+/**
+ * 公共实体类
+ * @author Administrator
+ *
+ */
+public class CommonDto implements Serializable{
+    /**
+     * 
+     */
+    private static final long serialVersionUID = 1292426580889730141L;
+    private String str1;
+    private String str2;
+    private String str3;
+    private String str4;
+    private String str5;
+    public String getStr1() {
+        return str1;
+    }
+    public void setStr1(String str1) {
+        this.str1 = str1;
+    }
+    public String getStr2() {
+        return str2;
+    }
+    public void setStr2(String str2) {
+        this.str2 = str2;
+    }
+    public String getStr3() {
+        return str3;
+    }
+    public void setStr3(String str3) {
+        this.str3 = str3;
+    }
+    public String getStr4() {
+        return str4;
+    }
+    public void setStr4(String str4) {
+        this.str4 = str4;
+    }
+    public String getStr5() {
+        return str5;
+    }
+    public void setStr5(String str5) {
+        this.str5 = str5;
+    }
+    @Override
+    public String toString() {
+        return "CommonDto [str1=" + str1 + ", str2=" + str2 + ", str3=" + str3
+                + ", str4=" + str4 + ", str5=" + str5 + "]";
+    }
+}

watero-common-core/src/main/java/com/iamberry/wechat/core/entity/ComparatorUtil.java

@@ -0,0 +1,24 @@
+package com.iamberry.wechat.core.entity;
+
+import java.util.Comparator;
+
+import com.iamberry.wechat.core.entity.reback.StoreStatiscInfo;
+
+public class ComparatorUtil implements Comparator{
+
+	@Override
+	public int compare(Object arg0, Object arg1) {
+		// TODO Auto-generated method stub
+		StoreStatiscInfo storeStatiscInfo0 = (StoreStatiscInfo)arg0;
+		StoreStatiscInfo storeStatiscInfo1 = (StoreStatiscInfo)arg1;
+		if (storeStatiscInfo0.getNum() == null) {
+			storeStatiscInfo0.setNum(0);
+		}
+		if (storeStatiscInfo1.getNum() == null) {
+			storeStatiscInfo1.setNum(0);
+		}
+		int flag = storeStatiscInfo1.getNum().compareTo(storeStatiscInfo0.getNum());
+		return flag;
+	}
+
+}

watero-common-core/src/main/java/com/iamberry/wechat/core/entity/JsonBack.java

@@ -0,0 +1,35 @@
+package com.iamberry.wechat.core.entity;
+
+
+/**
+ * 处理返回结果
+ * @author liurui
+ * @2016年3月4日 @下午5:31:04
+ */
+public class JsonBack implements java.io.Serializable{
+	
+	/**
+	 * 
+	 */
+	private static final long serialVersionUID = -7623349240799864718L;
+
+	private boolean isSuccess; // 请求是否成功
+	
+	private String responseData; // 请求返回数据
+
+	public boolean isSuccess() {
+		return isSuccess;
+	}
+
+	public void setSuccess(boolean isSuccess) {
+		this.isSuccess = isSuccess;
+	}
+
+	public String getResponseData() {
+		return responseData;
+	}
+
+	public void setResponseData(String responseData) {
+		this.responseData = responseData;
+	}
+}

watero-common-core/src/main/java/com/iamberry/wechat/core/entity/OrderUtil.java

@@ -0,0 +1,346 @@
+package com.iamberry.wechat.core.entity;
+
+import java.util.ArrayList;
+import java.util.List;
+
+import org.springframework.stereotype.Component;
+
+import com.iamberry.app.tool.des.MD5;
+import com.iamberry.wechat.core.entity.order.OrderOperation;
+
+
+@Component
+public class OrderUtil {
+
+	
+		// 订单状态:下标对应数据库中记录状态, 此用于请求操作时
+		public final String[] orderStatusStrList = 
+			{
+				"quitOrder", "etcOrder", "paySuccess", "returnOrder",
+				"returnOrderSuccess", "sendOrder", "returnOrderEtc", "returnOrderEtcAdmin", "returnOrderThe",
+				"theOrderSuccess", "theOrderSuccessAdmin", "inOrder", "inFinish"
+			};
+		
+		public String[] getOrderStatusStrList() {
+			return orderStatusStrList;
+		}
+		
+		// 订单状态文字，显示给用户看
+		public final String[] orderStatusView = 
+			{
+				"取消订单", "待支付", "已支付、待发货", "退款申请中",
+				"已退款", "已发货", "申请退货中", "退货中", "订单退货，订单关闭" ,
+				"换货中", "换货完成", "申请换货中", "已完成"
+			};
+		
+		// 订单操作状态
+		private final String [] orderActin = 
+			{
+				"quitOrderAction", 			// 取消订单操作
+				"getShopOrderByOrderId",	// 查看订单详情操作
+				"sendOrder", 				// 发货
+				"remark", 					// 订单备注
+				"rejectedRefund", 			// 驳回退款
+				"agreedRefund", 			// 同意退款
+				"rejectedOrder", 			// 同意退货，等等收取货物
+				"agreedOrder", 				// 确认退货
+				"successInOrder", 			// 同意换货
+				"insertPostInfoAndSend", 	// 录入物流信息并发货
+				"rejectedReturn",			//拒绝退货
+				"rejectedInOrder",			//拒绝换货
+				"select_efast_order"		//同步订单状态
+			};
+		
+		public String[] getOrderActin() {
+			return orderActin;
+		}
+		
+		// 加密
+		public final MD5 md5 = new MD5("orderact");
+		
+		// 安全的随机数
+		private AdminUtils adminUtils;
+		public void setAdminUtils(AdminUtils adminUtils) {
+			this.adminUtils = adminUtils;
+		}
+		
+		/**
+		 * 根据订单因为标识，获取订单的数字标识
+		 * @param status
+		 * @return
+		 */
+		public Integer getOrderStatusByStr(String status) {
+			for(int i = 0; i < orderStatusStrList.length; i++) {
+				if (orderStatusStrList[i].equals(status)) {
+					return i;
+				}
+			}
+			return 2;
+		}
+		
+		/**
+		 * 转换订单类型为字母表示
+		 * @param orderStatus
+		 * @return
+		 */
+		public String orderStatusIntToOrderStatusString(Integer orderStatus) {
+			if (orderStatus == null || orderStatus >= orderStatusStrList.length) {
+				return "订单状态有误";
+			}
+			if (orderStatus == -1) {
+				return "allOrder";
+			}
+			return orderStatusStrList[orderStatus];
+		}
+		
+		/**
+		 * 订单状态修改为文字
+		 * @param status
+		 * @return
+		 */
+		public String orderStatusToString(Integer status) {
+			
+			if (status == null || status >= orderStatusView.length) {
+				return "订单状态有误";
+			}
+			
+			if (status == -1) {
+				return "所有订单";
+			}
+			
+			return orderStatusView[status];
+		}
+		
+	/**
+	 * 后台：根据订单状态，获取订单的操作
+	 * @param status
+	 * @return
+	 * @throws Exception 
+	 */
+	public List<OrderOperation> orderStatusToOperation(Integer status, String orderId) throws Exception {
+		if (status == null) {
+			return null;
+		}
+		// 返回的操作
+		List<OrderOperation> operations = new ArrayList<OrderOperation>();
+		// 每个订单默认有查看详情和备注的功能权限
+		OrderOperation orderDesc = new OrderOperation("&#xe60c;", "查看订单详情",
+				"/admin/order/" + orderActin[1] + "/" + orderId);// + "&orderStatus=" + orderStatusStrList[status]
+		operations.add(orderDesc);// 订单详情
+		OrderOperation orderRemank = new OrderOperation("&#xe6de;", "备注",
+				"/admin/order/" + orderActin[3] + "/" + orderId);
+		operations.add(orderRemank);// 订单备注
+		OrderOperation orderSync = new OrderOperation("&#xe60c;", "同步订单状态",  "/admin/reserve/efast/" + orderActin[12] + "/" + orderId + "/1");
+		operations.add(orderSync);// 订单同步
+		// 根据状态分发权限
+		switch (status) {
+			case 0:
+				return operations;
+			case 1: // 待支付
+				
+				OrderOperation operation1 = new OrderOperation("&#xe60c;", "取消订单" ,
+						"/admin/order/" + orderActin[0] + "/" + orderId + "?orderStatus="
+								+ orderStatusStrList[status] + "&toOrderStatus=quitOrder&osid="
+								+ md5.encrypt(orderId + "_" + orderActin[0] + "-"
+								+ adminUtils.byte2hex(adminUtils.createRandomByte())));
+				operations.add(operation1);
+			case 2: // 已支付，待发货
+				
+				OrderOperation operation3 = new OrderOperation("&#xe60c;", "发货" ,
+						"/admin/order/" + orderActin[2] + "/" + orderId + "?orderStatus="
+								+ orderStatusStrList[status] + "&toOrderStatus=sendOrder&osid="
+								+ md5.encrypt(orderId + "_" + orderActin[2] + "-"
+								+ adminUtils.byte2hex(adminUtils.createRandomByte())));
+				operations.add(operation3);
+				return operations;
+			case 3: // 申请退款中
+				
+				OrderOperation returnPay = new OrderOperation("&#xe60c;", "驳回退款" ,
+						"/admin/order/" + orderActin[4] + "/" + orderId + "?orderStatus="
+								+ orderStatusStrList[status] + "&toOrderStatus=paySuccess&osid="
+								+ md5.encrypt(orderId + "_" + orderActin[4] + "-"
+								+ adminUtils.byte2hex(adminUtils.createRandomByte())));
+				operations.add(returnPay);
+				OrderOperation agreedRefund = new OrderOperation("&#xe60c;", "确认退款" ,
+						"/admin/order/" + orderActin[5] + "/" +orderId + "?orderStatus="
+								+ orderStatusStrList[status] + "&toOrderStatus=returnOrderSuccess&osid="
+								+ md5.encrypt(orderId + "_" + orderActin[5] + "-"
+								+ adminUtils.byte2hex(adminUtils.createRandomByte())));
+				operations.add(agreedRefund);
+				return operations;
+			case 4: // 无操作权限
+				
+				return operations;
+			case 5: // 无操作权限
+				
+				return operations;
+			case 6: // 申请退货中
+				
+				OrderOperation ruturnOrderError = new OrderOperation("&#xe60c;", "同意退货，等待收货" ,
+						"/admin/order/" + orderActin[6] + "/" + orderId + "?orderStatus=" +
+								orderStatusStrList[status] + "&toOrderStatus=returnOrderEtcAdmin&osid="
+								+ md5.encrypt(orderId + "_" + orderActin[6] + "-"
+								+ adminUtils.byte2hex(adminUtils.createRandomByte())));
+				operations.add(ruturnOrderError);
+				OrderOperation rejectedReturn = new OrderOperation("&#xe60c;", "驳回退货" ,
+						"/admin/order/" + orderActin[10] + "/" + orderId + "?orderStatus="
+								+ orderStatusStrList[status] + "&toOrderStatus=sendOrder&osid="
+								+ md5.encrypt(orderId + "_" + orderActin[10] + "-"
+								+ adminUtils.byte2hex(adminUtils.createRandomByte())));
+				operations.add(rejectedReturn);
+				return operations;
+			case 7: // 退货中
+				
+				OrderOperation quitOrderSuccess = new OrderOperation("&#xe60c;", "确认退货，已经收到货物" ,
+						"/admin/order/" + orderActin[7] + "/" + orderId + "?orderStatus="
+								+ orderStatusStrList[status] + "&toOrderStatus=returnOrderThe&osid="
+								+ md5.encrypt(orderId + "_" + orderActin[7] + "-"
+								+ adminUtils.byte2hex(adminUtils.createRandomByte())));
+				operations.add(quitOrderSuccess);
+				return operations;
+			case 8: // 无操作权限
+				
+				return operations;
+			case 9: // 换货中
+				
+				OrderOperation inOrderSuccess = new OrderOperation("&#xe60c;", "录入物流信息并发货" ,
+						"/admin/order/" + orderActin[9] + "/" + orderId + "?orderStatus="
+								+ orderStatusStrList[status] + "&toOrderStatus=sendOrder&osid="
+								+ md5.encrypt(orderId + "_" + orderActin[9] + "-"
+								+ adminUtils.byte2hex(adminUtils.createRandomByte())));
+				operations.add(inOrderSuccess);
+				return operations;
+			case 11: // 申请换货
+				
+				OrderOperation inOrder = new OrderOperation("&#xe60c;", "同意换货" ,
+						"/admin/order/" + orderActin[8] + "/" + orderId + "?orderStatus="
+								+ orderStatusStrList[status] + "&toOrderStatus=theOrderSuccess&osid="
+								+ md5.encrypt(orderId + "_" + orderActin[8] + "-"
+								+ adminUtils.byte2hex(adminUtils.createRandomByte())));
+				operations.add(inOrder);
+				OrderOperation rejectedInOrder = new OrderOperation("&#xe60c;", "驳回换货" ,
+						"/admin/order/" + orderActin[11] + "/" + orderId + "?orderStatus="
+								+ orderStatusStrList[status] + "&toOrderStatus=sendOrder&osid="
+								+ md5.encrypt(orderId + "_" + orderActin[11] + "-"
+								+ adminUtils.byte2hex(adminUtils.createRandomByte())));
+				operations.add(rejectedInOrder);
+				return operations;
+				
+			case 12://已完成
+				
+				return operations;
+			default:
+				break;
+		}
+		return operations;
+	}
+	
+	/**
+     * 后台：根据租赁订单状态，获取租赁订单的操作
+     * @param status
+     * @return
+     * @throws Exception 
+     */
+    public List<OrderOperation> rentOrderStatusToOperation(Integer status, String orderId) throws Exception {
+        if (status == null) {
+            return null;
+        }
+        // 返回的操作
+        List<OrderOperation> operations = new ArrayList<OrderOperation>();
+        // 每个订单默认有查看详情和备注的功能权限
+        OrderOperation orderDesc = new OrderOperation("&#xe60c;", "查看订单详情",  "/admin/rent_order/" + orderActin[1] + "/" + orderId);// + "&orderStatus=" + orderStatusStrList[status]
+        operations.add(orderDesc);// 订单详情
+        OrderOperation orderRemank = new OrderOperation("&#xe6de;", "备注",  "/admin/rent_order/" + orderActin[3] + "/" + orderId);
+        operations.add(orderRemank);// 订单备注
+		OrderOperation orderSync = new OrderOperation("&#xe60c;", "同步订单状态",  "/admin/reserve/efast/" + orderActin[12] + "/" + orderId + "/1");
+		operations.add(orderSync);// 订单同步
+        // 根据状态分发权限
+        switch (status) {
+            case 0:
+                return operations;
+            case 1: // 待支付
+                OrderOperation operation1 = new OrderOperation("&#xe60c;", "取消订单" ,
+						"/admin/rent_order/" + orderActin[0]
+						+ "/" + orderId + "?orderStatus=" + orderStatusStrList[status] + "&toOrderStatus=quitOrder&osid="
+						+ md5.encrypt(orderId + "_" + orderActin[0] + "-" + adminUtils.byte2hex(adminUtils.createRandomByte())));
+                operations.add(operation1);
+            case 2: // 已支付，待发货
+                OrderOperation operation3 = new OrderOperation("&#xe60c;", "发货" ,
+						"/admin/rent_order/" + orderActin[2] +
+								"/" + orderId + "?orderStatus=" + orderStatusStrList[status]
+								+ "&toOrderStatus=sendOrder&osid="
+								+ md5.encrypt(orderId + "_" + orderActin[2] + "-" + adminUtils.byte2hex(adminUtils.createRandomByte())));
+                operations.add(operation3);
+                return operations;
+            case 3: // 申请退款中
+                OrderOperation returnPay = new OrderOperation("&#xe60c;", "驳回退款" ,
+						"/admin/rent_order/" + orderActin[4]
+								+ "/" + orderId + "?orderStatus=" + orderStatusStrList[status]
+								+ "&toOrderStatus=paySuccess&osid="
+								+ md5.encrypt(orderId + "_" + orderActin[4] + "-" + adminUtils.byte2hex(adminUtils.createRandomByte())));
+                operations.add(returnPay);
+                OrderOperation agreedRefund = new OrderOperation("&#xe60c;", "确认退款" ,
+						"/admin/rent_order/" + orderActin[5]
+								+ "/" +orderId + "?orderStatus=" + orderStatusStrList[status]
+								+ "&toOrderStatus=returnOrderSuccess&osid="
+								+ md5.encrypt(orderId + "_" + orderActin[5] + "-" + adminUtils.byte2hex(adminUtils.createRandomByte())));
+                operations.add(agreedRefund);
+                return operations;
+            case 4: // 无操作权限
+                return operations;
+            case 5: // 无操作权限
+                return operations;
+            case 6: // 申请退货中
+                OrderOperation ruturnOrderError = new OrderOperation("&#xe60c;", "同意退货，等待收货" ,
+						"/admin/rent_order/" + orderActin[6]
+								+ "/" + orderId + "?orderStatus=" + orderStatusStrList[status]
+								+ "&toOrderStatus=returnOrderEtcAdmin&osid="
+								+ md5.encrypt(orderId + "_" + orderActin[6] + "-" + adminUtils.byte2hex(adminUtils.createRandomByte())));
+                operations.add(ruturnOrderError);
+                OrderOperation rejectedReturn = new OrderOperation("&#xe60c;", "驳回退货" ,
+						"/admin/rent_order/" + orderActin[10]
+								+ "/" + orderId + "?orderStatus=" + orderStatusStrList[status]
+								+ "&toOrderStatus=sendOrder&osid="
+								+ md5.encrypt(orderId + "_" + orderActin[10] + "-" + adminUtils.byte2hex(adminUtils.createRandomByte())));
+                operations.add(rejectedReturn);
+                return operations;
+            case 7: // 退货中
+                OrderOperation quitOrderSuccess = new OrderOperation("&#xe60c;", "确认退货，已经收到货物" ,
+						"/admin/rent_order/" + orderActin[7]
+								+ "/" + orderId + "?orderStatus=" + orderStatusStrList[status]
+								+ "&toOrderStatus=returnOrderThe&osid="
+								+ md5.encrypt(orderId + "_" + orderActin[7] + "-" + adminUtils.byte2hex(adminUtils.createRandomByte())));
+                operations.add(quitOrderSuccess);
+                return operations;
+            case 8: // 无操作权限
+                return operations;
+            case 9: // 换货中
+                OrderOperation inOrderSuccess = new OrderOperation("&#xe60c;", "录入物流信息并发货",
+						"/admin/rent_order/" + orderActin[9]
+								+ "/" + orderId + "?orderStatus=" + orderStatusStrList[status]
+								+ "&toOrderStatus=sendOrder&osid="
+								+ md5.encrypt(orderId + "_" + orderActin[9] + "-" + adminUtils.byte2hex(adminUtils.createRandomByte())));
+                operations.add(inOrderSuccess);
+                return operations;
+            case 11: // 申请换货
+                OrderOperation inOrder = new OrderOperation("&#xe60c;", "同意换货" ,
+						"/admin/rent_order/" + orderActin[8]
+								+ "/" + orderId + "?orderStatus=" + orderStatusStrList[status]
+								+ "&toOrderStatus=theOrderSuccess&osid="
+								+ md5.encrypt(orderId + "_" + orderActin[8] + "-" + adminUtils.byte2hex(adminUtils.createRandomByte())));
+                operations.add(inOrder);
+                OrderOperation rejectedInOrder = new OrderOperation("&#xe60c;", "驳回换货" ,
+						"/admin/rent_order/" + orderActin[11]
+								+ "/" + orderId + "?orderStatus=" + orderStatusStrList[status]
+								+ "&toOrderStatus=sendOrder&osid="
+								+ md5.encrypt(orderId + "_" + orderActin[11] + "-" + adminUtils.byte2hex(adminUtils.createRandomByte())));
+                operations.add(rejectedInOrder);
+                return operations;
+            case 12://已完成
+                return operations;
+            default:
+                break;
+        }
+        return operations;
+    }
+}

watero-common-core/src/main/java/com/iamberry/wechat/core/entity/Page.java

@@ -0,0 +1,112 @@
+package com.iamberry.wechat.core.entity;
+import java.util.Date;
+import java.util.HashMap;
+import java.util.List;
+import java.util.Map;
+ 
+/**
+ * 对分页的基本数据进行一个简单的封装
+ */
+public class Page implements java.io.Serializable{
+ 
+    /**
+	 * 
+	 */
+	private static final long serialVersionUID = -2502076458942170836L;
+	private int pageNo = 1;			//页码，默认是第一页
+    private int pageSize = 10;		//每页显示的记录数，默认是10
+    private int totalRecord;		//总记录数
+    private int totalPage;			//总页数
+    private List results;			//对应的当前页记录
+    private String name;
+  //开始时间
+  	private Date beginDate;
+  	//结束时间
+  	private Date endDate;
+    private Map<String, Object> params = new HashMap<String, Object>();		//其他的参数我们把它分装成一个Map对象
+ 
+    public int getPageNo() {
+       return pageNo;
+    }
+ 
+    public void setPageNo(int pageNo) {
+       this.pageNo = pageNo;
+    }
+ 
+    public int getPageSize() {
+       return pageSize;
+    }
+ 
+    public void setPageSize(int pageSize) {
+       this.pageSize = pageSize;
+    }
+ 
+    public int getTotalRecord() {
+       return totalRecord;
+    }
+ 
+    public void setTotalRecord(int totalRecord) {
+       this.totalRecord = totalRecord;
+       //在设置总页数的时候计算出对应的总页数，在下面的三目运算中加法拥有更高的优先级，所以最后可以不加括号。
+       int totalPage = totalRecord%pageSize==0 ? totalRecord/pageSize : totalRecord/pageSize + 1;
+       this.setTotalPage(totalPage);
+    }
+ 
+    public int getTotalPage() {
+       return totalPage;
+    }
+ 
+    public void setTotalPage(int totalPage) {
+       this.totalPage = totalPage;
+    }
+ 
+
+   
+    public List getResults() {
+		return results;
+	}
+
+	public void setResults(List results) {
+		this.results = results;
+	}
+
+	public Map<String, Object> getParams() {
+       return params;
+    }
+   
+    public void setParams(Map<String, Object> params) {
+       this.params = params;
+    }
+ 
+    public Date getBeginDate() {
+		return beginDate;
+	}
+
+	public void setBeginDate(Date beginDate) {
+		this.beginDate = beginDate;
+	}
+
+	public Date getEndDate() {
+		return endDate;
+	}
+
+	public void setEndDate(Date endDate) {
+		this.endDate = endDate;
+	}
+
+	public String getName() {
+		return name;
+	}
+
+	public void setName(String name) {
+		this.name = name;
+	}
+
+	@Override
+    public String toString() {
+       StringBuilder builder = new StringBuilder();
+       builder.append("Page [pageNo=").append(pageNo).append(", pageSize=").append(pageSize).append(", results=").append(results).append(", totalPage=").append(totalPage).append(", totalRecord=").append(totalRecord).append("]");
+       return builder.toString();
+    }
+ 
+}

watero-common-core/src/main/java/com/iamberry/wechat/core/entity/PageBean.java

@@ -0,0 +1,122 @@
+package com.iamberry.wechat.core.entity;
+
+import java.util.List;
+
+
+/**
+ * @Description 用于分页，存储分页信息的
+ * @author 欧阳明
+ * @date 2014-4-19
+ */
+public class PageBean implements java.io.Serializable{
+
+	/**
+	 * 
+	 */
+	private static final long serialVersionUID = 8970731867434157200L;
+	private int count;      //记录总数
+	private int pageSize;   //每一页的记录数
+	private int pageNumber;  //页码
+	private int pageCount;   //总页数
+	private int recordBegin ; //查询的开始记录数
+	private Object params;
+	
+	private List<Object> lists;
+	private Object condition;
+	
+	public PageBean(){
+		
+	}
+	
+	public PageBean(int count,int pageSize,int recordBegin){
+		this.count=count;
+		this.pageSize=pageSize;
+		this.recordBegin=recordBegin;
+	}
+	
+	public void init(int count,int pageSize,int pageNumber){
+		this.count=count;
+		this.pageSize=pageSize;
+		this.pageNumber=pageNumber;
+		initRecordBegin();
+	}
+	
+	public int getCount() {
+		return count;
+	}
+	public void setCount(int count) {
+		this.count = count;
+	}
+	public int getPageSize() {
+		if(pageSize==0) return 6;
+		return pageSize;
+	}
+	public void setPageSize(int pageSize) {
+		this.pageSize = pageSize;
+	}
+	public int getPageNumber() {
+		if(this.pageNumber==0)
+			this.pageNumber=1;
+		return pageNumber;
+	}
+	public void setPageNumber(int pageNumber) {
+		this.pageNumber = pageNumber;
+	}
+	public int getPageCount() {
+		if(pageSize>0 && count>0 ){
+			this.pageCount=(int) Math.ceil((double)count/pageSize);
+		}else{
+			this.pageCount=0;
+		}
+		return pageCount;
+	}
+	public void setPageCount(int pageCount) {
+		this.pageCount = pageCount;
+	}
+	public int getRecordBegin() {
+		return recordBegin;
+	}
+	public void setRecordBegin(int recordBegin) {
+		this.recordBegin = recordBegin;
+	}
+	/**
+	 * @decription 初始化分页查询的开始记录数
+	 */
+	public void initRecordBegin(){
+		if(pageNumber==1) this.recordBegin = 0;
+		if(pageNumber>1){
+			this.recordBegin=this.getPageSize()*(this.pageNumber-1);
+		}
+	}
+	
+	//获取下一页内容设置
+	public void setTurnToNextPage(){
+		pageNumber=pageNumber+1;
+		initRecordBegin();
+	}
+
+	public List<Object> getLists() {
+		return lists;
+	}
+
+	public void setLists(List<Object> lists) {
+		this.lists = lists;
+	}
+
+	public Object getCondition() {
+		return condition;
+	}
+
+	public void setCondition(Object condition) {
+		this.condition = condition;
+	}
+
+	public Object getParams() {
+		return params;
+	}
+
+	public void setParams(Object params) {
+		this.params = params;
+	}
+
+}

watero-common-core/src/main/java/com/iamberry/wechat/core/entity/PaperBean.java

@@ -0,0 +1,110 @@
+package com.iamberry.wechat.core.entity;
+import java.util.Date;
+public class PaperBean implements java.io.Serializable{
+	/**
+	 * 
+	 */
+	private static final long serialVersionUID = -4384087643092452530L;
+	/*检索到多少行*/
+	private Integer maxNum;
+	/*检索从多少行开始*/
+	private Integer minNum;
+	//开始时间
+	private Date beginDate;
+	//结束时间
+	private Date endDate;
+	//最小价格
+	private Double minMoney;
+	//最大价格
+	private Double maxMoney;
+	/*其他特殊数据*/
+	private String str;
+	/*特殊整形*/
+	private Integer otherInt;
+	//搜索的内容
+	private String text;
+	//订单的状态
+	private String status;
+	private Integer hid;
+	public Integer getHid() {
+		return hid;
+	}
+	public void setHid(Integer hid) {
+		this.hid = hid;
+	}
+	public String getStatus() {
+		return status;
+	}
+	public void setStatus(String status) {
+		this.status = status;
+	}
+	public String getText() {
+		return text;
+	}
+	public void setText(String text) {
+		this.text = text;
+	}
+	public Integer getOtherInt() {
+		return otherInt;
+	}
+	public void setOtherInt(Integer otherInt) {
+		this.otherInt = otherInt;
+	}
+	public String getStr() {
+		return str;
+	}
+	public void setStr(String str) {
+		this.str = str;
+	}
+	public Integer getMaxNum() {
+		return maxNum;
+	}
+	public void setMaxNum(Integer maxNum) {
+		this.maxNum = maxNum;
+	}
+	public Integer getMinNum() {
+		return minNum;
+	}
+	public void setMinNum(Integer minNum) {
+		this.minNum = minNum;
+	}
+	public Date getBeginDate() {
+		return beginDate;
+	}
+	public void setBeginDate(Date beginDate) {
+		this.beginDate = beginDate;
+	}
+	public Date getEndDate() {
+		return endDate;
+	}
+	public void setEndDate(Date endDate) {
+		this.endDate = endDate;
+	}
+	public Double getMinMoney() {
+		return minMoney;
+	}
+	public void setMinMoney(Double minMoney) {
+		this.minMoney = minMoney;
+	}
+	public Double getMaxMoney() {
+		return maxMoney;
+	}
+	public void setMaxMoney(Double maxMoney) {
+		this.maxMoney = maxMoney;
+	}
+	@Override
+	public String toString() {
+		return "PaperBean [maxNum=" + maxNum + ", minNum=" + minNum
+				+ ", beginDate=" + beginDate + ", endDate=" + endDate +", minMoney=" + minMoney
+				+", maxMoney=" + maxMoney + ", str=" + str + ", otherInt=" + otherInt + ", text=" + text
+				+ ", status=" + status + "]";
+	}
+	public void setPaperData(int pageNO, int pageSize) {
+		this.setMinNum((pageNO-1)*pageSize);
+		this.setMaxNum(pageSize);
+	}
+	public static int justPaperCount(int count, int pageSize) {
+		count = count % pageSize == 0? count/pageSize:(count/pageSize)+1;
+		return count;
+	}
+}

watero-common-core/src/main/java/com/iamberry/wechat/core/entity/ProbationOrderUtil.java

@@ -0,0 +1,165 @@
+package com.iamberry.wechat.core.entity;
+
+import java.util.ArrayList;
+import java.util.List;
+
+import org.springframework.stereotype.Component;
+
+import com.iamberry.app.tool.des.MD5;
+import com.iamberry.wechat.core.entity.order.OrderOperation;
+
+@Component
+public class ProbationOrderUtil {
+	
+	// 订单状态:下标对应数据库中记录状态, 此用于请求操作时
+			public final String[] orderStatusStrList = 
+				{
+					"quitOrder", "staySendOrder", "sendOrder", "stayPayOrder",
+					"probationPause", "paySuccess"
+				};
+			
+			public String[] getOrderStatusStrList() {
+				return orderStatusStrList;
+			}
+			
+			// 订单状态文字，显示给用户看
+			private final String[] orderStatusView = 
+				{
+					"取消订单", "待派送", "派送中", "待支付","试用暂停", "支付完成"
+				};
+			
+			public String[] getOrderStatusView() {
+				return orderStatusView;
+			}
+			
+			// 订单操作状态
+			public final String [] orderActin = 
+				{
+					"quitOrderByOrderId", 			// 取消订单操作
+					"getProbationOrderByOrderId",	// 查看订单详情操作
+					"sendOrder", 				// 派送中
+					"remark", 					// 订单备注
+					"stayPayOrder",		//待支付
+					"probationPause",		//试用暂停
+					"paySuccess",			//支付完成
+					"addCourierInfo",		//录入派送员信息
+					"delayOrder",				//订单延时
+					"addGiftInfo"				//录入礼品信息
+				};
+			
+			public String[] getOrderActin() {
+				return orderActin;
+			}
+			
+			// 加密
+			public final MD5 md5 = new MD5("orderact");
+			
+			// 安全的随机数
+			private AdminUtils adminUtils;
+			public void setAdminUtils(AdminUtils adminUtils) {
+				this.adminUtils = adminUtils;
+			}
+			
+			/**
+			 * 根据订单因为标识，获取订单的数字标识
+			 * @param status
+			 * @return
+			 */
+			public Integer getOrderStatusByStr(String status) {
+				for(int i = 0; i < orderStatusStrList.length; i++) {
+					if (orderStatusStrList[i].equals(status)) {
+						return i;
+					}
+				}
+				return 2;
+			}
+			
+			/**
+			 * 转换订单类型为字母表示
+			 * @param orderStatus
+			 * @return
+			 */
+			public String orderStatusIntToOrderStatusString(Integer orderStatus) {
+				if (orderStatus == null || orderStatus >= orderStatusStrList.length) {
+					return "订单状态有误";
+				}
+				if (orderStatus == -1) {
+					return "allOrder";
+				}
+				return orderStatusStrList[orderStatus];
+			}
+			
+			/**
+			 * 订单状态修改为文字
+			 * @param status
+			 * @return
+			 */
+			public String orderStatusToString(Integer status) {
+				
+				if (status == null || status >= orderStatusView.length) {
+					return "订单状态有误";
+				}
+				
+				if (status == -1) {
+					return "所有订单";
+				}
+				
+				return orderStatusView[status];
+			}
+			
+		/**
+		 * 后台：根据订单状态，获取订单的操作
+		 * @param status
+		 * @return
+		 * @throws Exception 
+		 */
+		public List<OrderOperation> orderOperationByStatus(Integer status, String orderId) throws Exception {
+			if (status == null) {
+				return null;
+			}
+			// 返回的操作
+			List<OrderOperation> operations = new ArrayList<OrderOperation>();
+			// 每个订单默认有查看详情和备注的功能权限
+			OrderOperation orderDesc = new OrderOperation("&#xe60c;", "查看订单详情",  "/admin/probationOrder/" + orderActin[1] + "/" + orderId);
+			operations.add(orderDesc);// 订单详情
+			OrderOperation orderRemank = new OrderOperation("&#xe6de;", "备注",  "/admin/probationOrder/" + orderActin[3] + "/" + orderId);
+			operations.add(orderRemank);// 订单备注
+			// 根据状态分发权限
+			switch (status) {
+				case 0:
+					return operations;
+				case 1: // 待派送
+					
+					OrderOperation operation1 = new OrderOperation("&#xe60c;", "关闭订单" ,  "/admin/probationOrder/" + orderActin[0] + "/" + orderId + "?orderStatus=" + orderStatusStrList[status] + "&toOrderStatus=quitOrder&osid=" + md5.encrypt(orderId + "_" + orderActin[0] + "-" + adminUtils.byte2hex(adminUtils.createRandomByte())));
+					operations.add(operation1);
+					OrderOperation sendOrder = new OrderOperation("&#xe60c;", "确认派送" ,  "/admin/probationOrder/" + orderActin[2] + "/" + orderId + "?orderStatus=" + orderStatusStrList[status] + "&toOrderStatus=sendOrder&osid=" + md5.encrypt(orderId + "_" + orderActin[2] + "-" + adminUtils.byte2hex(adminUtils.createRandomByte())));
+					operations.add(sendOrder);
+					return operations;
+				case 2: // 派送中
+					OrderOperation cancelOperation = new OrderOperation("&#xe60c;", "关闭订单" ,  "/admin/probationOrder/" + orderActin[0] + "/" + orderId + "?orderStatus=" + orderStatusStrList[status] + "&toOrderStatus=quitOrder&osid=" + md5.encrypt(orderId + "_" + orderActin[0] + "-" + adminUtils.byte2hex(adminUtils.createRandomByte())));
+					operations.add(cancelOperation);
+					OrderOperation addCourierInfo = new OrderOperation("&#xe60c;", "录入派送员信息" ,  "/admin/probationOrder/" + orderActin[7] + "/" + orderId);
+					operations.add(addCourierInfo);
+					OrderOperation stayPayOrder = new OrderOperation("&#xe60c;", "派送完成，进入试用环节" ,  "/admin/probationOrder/" + orderActin[4] + "/" + orderId + "?orderStatus=" + orderStatusStrList[status] + "&toOrderStatus=stayPayOrder&osid=" + md5.encrypt(orderId + "_" + orderActin[4] + "-" + adminUtils.byte2hex(adminUtils.createRandomByte())));
+					operations.add(stayPayOrder);
+					return operations;
+				case 3: // 待支付
+					OrderOperation cancelOperation3 = new OrderOperation("&#xe60c;", "关闭订单" ,  "/admin/probationOrder/" + orderActin[0] + "/" + orderId + "?orderStatus=" + orderStatusStrList[status] + "&toOrderStatus=quitOrder&osid=" + md5.encrypt(orderId + "_" + orderActin[0] + "-" + adminUtils.byte2hex(adminUtils.createRandomByte())));
+					operations.add(cancelOperation3);
+					OrderOperation probationPause = new OrderOperation("&#xe60c;", "试用暂停" , "/admin/probationOrder/" + orderActin[5] + "/" + orderId + "?orderStatus=" + orderStatusStrList[status] + "&toOrderStatus=probationPause&osid=" + md5.encrypt(orderId + "_" + orderActin[5] + "-" + adminUtils.byte2hex(adminUtils.createRandomByte())));
+					operations.add(probationPause);
+					OrderOperation delayOrder = new OrderOperation("&#xe6de;", "订单延时" , "/admin/probationOrder/" + orderActin[8] + "/" +orderId);
+					operations.add(delayOrder);
+					return operations;
+				case 4: // 试用暂停
+					OrderOperation operation4 = new OrderOperation("&#xe60c;", "暂停结束，开始试用" ,  "/admin/probationOrder/" + orderActin[4] + "/" + orderId + "?orderStatus=" + orderStatusStrList[status] + "&toOrderStatus=stayPayOrder&osid=" + md5.encrypt(orderId + "_" + orderActin[4] + "-" + adminUtils.byte2hex(adminUtils.createRandomByte())));
+					operations.add(operation4);
+					return operations;
+				case 5: // 支付完成
+					return operations;
+				default:
+					break;
+			}
+			return operations;
+		}
+}

watero-common-core/src/main/java/com/iamberry/wechat/core/entity/RentFilterUtil.java

@@ -0,0 +1,152 @@
+package com.iamberry.wechat.core.entity;
+
+import com.iamberry.app.tool.des.MD5;
+import com.iamberry.wechat.core.entity.order.OrderOperation;
+import org.springframework.stereotype.Component;
+
+import java.util.ArrayList;
+import java.util.List;
+
+/**
+ * Created by Administrator on 2017/4/24.
+ */
+@Component
+public class RentFilterUtil {
+    // 滤芯状态:下标对应数据库中记录状态, 此用于请求操作时
+    public final String[] filterStatusStrList =
+            {
+                    "quitFilter", "inFilter", "theFilterSuccess", "rejectFilter", "sendFilter", "inFinish"
+            };
+
+    public String[] getfilterStatusStrList() {
+        return filterStatusStrList;
+    }
+
+    // 滤芯状态文字，显示给用户看
+    public final String[] filterStatusView =
+            {
+                    "取消更换", "更换申请中", "更换中", "驳回", "已发货", "已完成"
+            };
+
+    // 滤芯操作状态
+    private final String [] filterActin =
+            {
+                    "quitFilterAction", 	    // 取消更换滤芯操作
+                    "getFilterById",	        // 查看更换滤芯详情操作
+                    "sendFilter", 				// 发货
+                    "filterRemark", 			// 更换备注
+                    "successInFilter", 			// 同意换货
+                    "savePostInfoAndSend", 	    // 录入物流信息并发货
+                    "rejectedInFilter",			//拒绝换货
+                    "select_efast_order"         //同步百胜订单状态
+            };
+
+    public String[] getFilterActin() {
+        return filterActin;
+    }
+
+    // 加密
+    public final MD5 md5 = new MD5("orderact");
+
+    // 安全的随机数
+    private AdminUtils adminUtils;
+    public void setAdminUtils(AdminUtils adminUtils) {
+        this.adminUtils = adminUtils;
+    }
+
+    /**
+     * 根据订单因为标识，获取订单的数字标识
+     * @param status
+     * @return
+     */
+    public Integer getFilterStatusByStr(String status) {
+        for(int i = 0; i < filterStatusStrList.length; i++) {
+            if (filterStatusStrList[i].equals(status)) {
+                return i;
+            }
+        }
+        return 2;
+    }
+
+    /**
+     * 转换订单类型为字母表示
+     * @param filterStatus
+     * @return
+     */
+    public String filterStatusIntToOrderStatusString(Integer filterStatus) {
+        if (filterStatus == null || filterStatus >= filterStatusStrList.length) {
+            return "滤芯状态有误";
+        }
+        if (filterStatus == -1) {
+            return "allFilter";
+        }
+        return filterStatusStrList[filterStatus];
+    }
+
+    /**
+     * 订单状态修改为文字
+     * @param status
+     * @return
+     */
+    public String filterStatusToString(Integer status) {
+
+        if (status == null || status >= filterStatusView.length) {
+            return "滤芯状态有误";
+        }
+
+        if (status == -1) {
+            return "所有滤芯";
+        }
+
+        return filterStatusView[status];
+    }
+
+    /**
+     * 后台：根据订单状态，获取订单的操作
+     * @param status
+     * @return
+     * @throws Exception
+     */
+    public List<OrderOperation> filterStatusToOperation(Integer status, Integer filterId) throws Exception {
+        if (status == null) {
+            return null;
+        }
+        // 返回的操作
+        List<OrderOperation> operations = new ArrayList<OrderOperation>();
+        // 每个订单默认有查看详情和备注的功能权限
+        OrderOperation orderDesc = new OrderOperation("&#xe60c;", "查看订单详情",  "/admin/admin_machine/" + filterActin[1] + "/" + filterId);// + "&orderStatus=" + filterStatusStrList[status]
+        operations.add(orderDesc);// 订单详情
+        OrderOperation orderSync = new OrderOperation("&#xe60c;", "同步订单状态",  "/admin/reserve/efast/" + filterActin[7] + "/" + filterId + "/6");
+        operations.add(orderSync);// 订单同步
+        /*OrderOperation orderRemank = new OrderOperation("&#xe6de;", "备注",  "/admin/admin_machine/" + filterActin[3] + "/" + filterId);
+        operations.add(orderRemank);// 订单备注*/
+        // 根据状态分发权限
+        switch (status) {
+            case 0:
+                return operations;
+            case 1: // 更换申请中
+
+                OrderOperation inOrder = new OrderOperation("&#xe60c;", "同意换货" , "/admin/admin_machine/" + filterActin[4] + "/" + filterId + "?orderStatus=" + filterStatusStrList[status] + "&toOrderStatus=theFilterSuccess&osid=" + md5.encrypt(filterId + "_" + filterActin[4] + "-" + adminUtils.byte2hex(adminUtils.createRandomByte())));
+                operations.add(inOrder);
+                OrderOperation operation1 = new OrderOperation("&#xe60c;", "取消订单" ,  "/admin/admin_machine/" + filterActin[0] + "/" + filterId + "?orderStatus=" + filterStatusStrList[status] + "&toOrderStatus=quitFilter&osid=" + md5.encrypt(filterId + "_" + filterActin[0] + "-" + adminUtils.byte2hex(adminUtils.createRandomByte())));
+                operations.add(operation1);
+                //OrderOperation rejectedInOrder = new OrderOperation("&#xe60c;", "驳回换货" , "/admin/admin_machine/" + filterActin[6] + "/" + filterId + "?orderStatus=" + filterStatusStrList[status] + "&toOrderStatus=sendOrder&osid=" + md5.encrypt(filterId + "_" + filterActin[6] + "-" + adminUtils.byte2hex(adminUtils.createRandomByte())));
+                //operations.add(rejectedInOrder);
+                return operations;
+            case 2: // 更换中
+
+                OrderOperation inOrderSuccess = new OrderOperation("&#xe60c;", "录入物流信息并发货" ,"/admin/admin_machine/" + filterActin[2] + "/" + filterId + "?orderStatus=" + filterStatusStrList[status] + "&toOrderStatus=sendFilter&osid=" + md5.encrypt(filterId + "_" + filterActin[2] + "-" + adminUtils.byte2hex(adminUtils.createRandomByte())));
+                operations.add(inOrderSuccess);
+                return operations;
+            case 3: // 更换驳回
+
+                return operations;
+            case 4: // 无操作权限
+
+                return operations;
+            default:
+                break;
+        }
+        return operations;
+    }
+}

watero-common-core/src/main/java/com/iamberry/wechat/core/entity/ResultMsg.java

@@ -0,0 +1,71 @@
+package com.iamberry.wechat.core.entity;
+
+/**
+ * @description 作为服务影响的返回结果，常用业务错误，返回错误码和错误信息；
+ * @author 欧阳明
+ * @data 2016-4-18 14:23
+ */
+public class ResultMsg implements java.io.Serializable{
+
+	/**
+	 * 
+	 */
+	private static final long serialVersionUID = 8987614804726091566L;
+
+	public static final String SUCCESS = "SUCCESS";
+	public static final String ERROR = "ERROR";
+
+	private boolean status; // 状态
+	
+	private String ResultCode ; //状态码
+	
+	private String message; //返回信息
+	
+	private Object data; //返回对象
+
+	public ResultMsg(){}
+	
+	public ResultMsg(boolean status, String resultCode, String message,
+			Object data) {
+		super();
+		this.status = status;
+		ResultCode = resultCode;
+		this.message = message;
+		this.data = data;
+	}
+
+	public boolean isStatus() {
+		return status;
+	}
+
+	public void setStatus(boolean status) {
+		this.status = status;
+	}
+
+	public String getResultCode() {
+		return ResultCode;
+	}
+
+	public void setResultCode(String resultCode) {
+		ResultCode = resultCode;
+	}
+
+	public String getMessage() {
+		return message;
+	}
+
+	public void setMessage(String message) {
+		this.message = message;
+	}
+
+	public Object getData() {
+		return data;
+	}
+
+	public void setData(Object data) {
+		this.data = data;
+	}
+	
+	
+
+}

watero-common-core/src/main/java/com/iamberry/wechat/core/entity/WechatUtils.java

@@ -0,0 +1,173 @@
+package com.iamberry.wechat.core.entity;
+import java.io.UnsupportedEncodingException;
+import java.net.URLEncoder;
+import java.util.Map;
+
+import javax.servlet.http.Cookie;
+import javax.servlet.http.HttpServletRequest;
+import javax.servlet.http.HttpServletResponse;
+
+import com.iamberry.app.tool.des.MD5;
+import com.iamberry.jwt.TokenUtil;
+import com.iamberry.jwt.UserNotLoginException;
+import com.iamberry.jwt.WebJsonTokenUtil;
+import com.iamberry.wechat.core.entity.member.Member;
+import com.iamberry.wechat.tools.NameUtils;
+
+/**
+ * description ： 微信端用户工具类 
+ * @author 何秀刚
+ * create date：2016年2月25日
+ */
+public class WechatUtils {
+	
+	/**
+	 * 将用户信息保存到session中，并做安全设置, 注意，如果了安全，将token写入cookie后，应该在后台保存一份token的签名，前台 保存value，后台保存签名
+	 * @param object
+	 * @param request
+	 * @throws Exception 
+	 */
+	public static void saveUserToSession(Member object, HttpServletRequest request, HttpServletResponse response) throws Exception {
+		// 判断当前是否存在
+		Cookie[] cookies = request.getCookies();
+		if (cookies != null) {
+			for (Cookie cookie : cookies) {
+				if (cookie.getName().equals("WATERO_WEB_")) {
+					continue;
+				}
+				// 如果cookie的name以cookie value的前8位口头，那么是用户token保存方式
+				String cookieNmae = cookie.getName();
+				String cookieValue = cookie.getValue().substring(0, 8);
+				if (!cookieNmae.startsWith(cookieValue)) {
+					continue;
+				}
+				// 无法准确获取key的值，只能遍历，所以系统应该尽量减少cookie,最后只是一个
+				Map<String, Object>	userMap = WebJsonTokenUtil.verifier(cookie.getValue(), cookieNmae.substring(8));
+				if ((Integer)userMap.get("status") == 2) {
+					cookie.setMaxAge(0);
+				}
+			}
+		}
+		// 生成原始token
+		String token = TokenUtil.getToken();
+		// 截取8位作为key
+		if (token.length() <= 13) {
+			token = "1234567890ABC";
+		}
+		String secret = token.substring(0, 8);
+		String userToken = WebJsonTokenUtil.getToken(object.getUserId(), object.getUserOpenid(), token.substring(8));
+		// 保存cookie, 多项验证
+		AdminUtils.createCookie(response, token, secret+userToken);
+	}
+	
+	/**
+	 * 1、获取当前用户，注意，前端系统完全弃用session,防止后端服务器宕机，导致用户业务异常终止 <br>
+	 * 2、调用此方法，不存在返回为空，所以无需判断，但是此方法在运行时会抛出异常，调用时，不能捕获，让给系统统一处理
+	 * @param request
+	 * @return
+	 * @throws Exception
+	 * @author 献
+	 * @Time   2016年11月24日
+	 */
+	public static Member getUserBySession(HttpServletRequest request) {
+
+		Member m = new Member();
+		m.setUserId(1);
+		m.setUserOpenid("o3G6nww8FoM08HSbwpJqrhGu8V6Q");
+		if(true){
+			return m;
+		}
+
+		//获取一个cookie数组
+		Cookie[] cookies = request.getCookies();
+		if (cookies == null) {
+			throw new UserNotLoginException();
+		}
+		for (Cookie cookie : cookies) {
+			if (cookie.getName().equals("WATERO_WEB_")) {
+				continue;
+			}
+			// 如果cookie的name以cookie value的前8位口头，那么是用户token保存方式
+			String cookieNmae = cookie.getName();
+			String cookieValue = cookie.getValue().substring(0, 8);
+			if (!cookieNmae.startsWith(cookieValue)) {
+				continue;
+			}
+			// 无法准确获取key的值, 只能遍历，所以系统应该尽量减少cookie数量, 最好只是一个
+			Map<String, Object>	userMap = WebJsonTokenUtil.verifier(cookie.getValue(), cookieNmae.substring(8));
+			if (Integer.parseInt(userMap.get("status").toString()) == 2) {
+				Member member = new Member();
+				member.setUserId(Integer.parseInt(userMap.get("userid").toString()));
+				member.setUserOpenid(userMap.get("WC_OPENID").toString());
+				return member;
+			}
+		}
+		// 凡是没有登录的用户，都抛出异常
+		throw new UserNotLoginException();
+	}
+	
+	/**
+	 * 微信授权获取openid
+	 * @param tokenId
+	 * @return
+	 */
+	public String getOpenIdFunction(String tokenId, boolean flag) {
+		String urlTemp;
+		if (flag) {
+			urlTemp = NameUtils.getConfig("WECHAT_BACK_URL") + "?tokenId=" + tokenId;
+		} else {
+			urlTemp = tokenId;
+		}
+		try {
+			StringBuilder builder = new StringBuilder("https://open.weixin.qq.com/connect/oauth2/authorize?appid=");
+			builder.append(NameUtils.getConfig("appId"))
+			.append("&redirect_uri=")
+			.append(URLEncoder.encode(urlTemp, "UTF-8"))
+			.append("&response_type=code&scope=snsapi_base&state=iamberry#wechat_redirect");
+			return builder.toString();
+		} catch (UnsupportedEncodingException e) {
+			e.printStackTrace();
+		}
+		return null;
+	}
+	
+	public static void main(String[] args) {
+		String token = TokenUtil.getToken();;
+		System.out.println(token);
+		String sec = token.substring(8);
+		System.out.println(sec);
+	}
+	
+	private static MD5 md5 = new MD5("callback");
+	
+	public static String setCallback(String callback) throws Exception {
+		return md5.encrypt(callback);
+	}
+	
+	public static String getCallback(String temp) throws Exception {
+		return md5.decrypt(temp);
+	}
+	
+	/**
+	 * 跳转链接
+	 * @param callback		跳转链接
+	 * @return
+	 * @author 献
+	 * @throws Exception 
+	 * @Time   2016年11月24日
+	 */
+	public static String getOpenIdFunction(String callback) throws Exception {
+		String redirect_url = NameUtils.getConfig("WECHAT_BACK_URL");
+		
+		if (callback != null) {
+			redirect_url = redirect_url + "?callback=" + setCallback(callback);
+		}
+		StringBuilder builder = new StringBuilder("https://open.weixin.qq.com/connect/oauth2/authorize?appid=");
+		builder.append(NameUtils.getConfig("appId"))
+		.append("&redirect_uri=")
+		.append(URLEncoder.encode(redirect_url, "UTF-8"))
+		.append("&response_type=code&scope=snsapi_base&state=iamberry#wechat_redirect");
+		
+		return builder.toString();
+	}
+}

watero-common-core/src/main/java/com/iamberry/wechat/core/entity/admin/AdminChildHavePermission.java

@@ -0,0 +1,51 @@
+package com.iamberry.wechat.core.entity.admin;
+/**
+ * description : 二级管理员对应的系统权限
+ * @author 何秀刚
+ * create date : 2015年12月10日
+ */
+public class AdminChildHavePermission implements java.io.Serializable{
+	
+	/**
+	 * 
+	 */
+	private static final long serialVersionUID = 7129253942481557398L;
+
+	/**
+	 * 
+	 */
+
+	/**
+	 * 
+	 */
+
+	private Integer haveId; // ID
+	
+	private Integer permissionId; // 二级权限ID
+	
+	private Integer adminChildId; // 二级管理员ID
+
+	public Integer getHaveId() {
+		return haveId;
+	}
+
+	public void setHaveId(Integer haveId) {
+		this.haveId = haveId;
+	}
+
+	public Integer getPermissionId() {
+		return permissionId;
+	}
+
+	public void setPermissionId(Integer permissionId) {
+		this.permissionId = permissionId;
+	}
+
+	public Integer getAdminChildId() {
+		return adminChildId;
+	}
+
+	public void setAdminChildId(Integer adminChildId) {
+		this.adminChildId = adminChildId;
+	}
+}

watero-common-core/src/main/java/com/iamberry/wechat/core/entity/admin/AdminChildInfo.java

@@ -0,0 +1,136 @@
+package com.iamberry.wechat.core.entity.admin;
+
+import java.util.Date;
+
+/**
+ * description : 服务器二级管理员信息实体类
+ * @author 何秀刚
+ * create date : 2015年12月9日
+ */
+public class AdminChildInfo  implements java.io.Serializable{
+	
+	/**
+	 * 
+	 */
+	private static final long serialVersionUID = -3930506753338016847L;
+
+	private Integer adminId; // ID
+	
+	private String adminLoginName; // 用户名
+	
+	private String adminLoginPwd; // 密码
+	
+	private Integer adminSex; // 性别
+	
+	private String adminTel; // 电话
+	
+	private String adminEmail; // 邮箱
+	
+	private String adminPhotoUrl; // 头像链接
+	
+	private String adminCity; // 城市
+	
+	private String adminDesc; // 简介
+	
+	private Integer adminStatus; // 状态
+	
+	private Integer adminCreateAdminId; // 创建人ID
+	
+	private Date adminCreateDate; // 创建时间
+
+	public Integer getAdminCreateAdminId() {
+		return adminCreateAdminId;
+	}
+
+	public void setAdminCreateAdminId(Integer adminCreateAdminId) {
+		this.adminCreateAdminId = adminCreateAdminId;
+	}
+
+	public Date getAdminCreateDate() {
+		return adminCreateDate;
+	}
+
+	public void setAdminCreateDate(Date adminCreateDate) {
+		this.adminCreateDate = adminCreateDate;
+	}
+
+	public Integer getAdminId() {
+		return adminId;
+	}
+
+	public void setAdminId(Integer adminId) {
+		this.adminId = adminId;
+	}
+
+	public String getAdminLoginName() {
+		return adminLoginName;
+	}
+
+	public void setAdminLoginName(String adminLoginName) {
+		this.adminLoginName = adminLoginName;
+	}
+
+	public String getAdminLoginPwd() {
+		return adminLoginPwd;
+	}
+
+	public void setAdminLoginPwd(String adminLoginPwd) {
+		this.adminLoginPwd = adminLoginPwd;
+	}
+
+	public Integer getAdminSex() {
+		return adminSex;
+	}
+
+	public void setAdminSex(Integer adminSex) {
+		this.adminSex = adminSex;
+	}
+
+	public String getAdminTel() {
+		return adminTel;
+	}
+
+	public void setAdminTel(String adminTel) {
+		this.adminTel = adminTel;
+	}
+
+	public String getAdminEmail() {
+		return adminEmail;
+	}
+
+	public void setAdminEmail(String adminEmail) {
+		this.adminEmail = adminEmail;
+	}
+
+	public String getAdminPhotoUrl() {
+		return adminPhotoUrl;
+	}
+
+	public void setAdminPhotoUrl(String adminPhotoUrl) {
+		this.adminPhotoUrl = adminPhotoUrl;
+	}
+
+	public String getAdminCity() {
+		return adminCity;
+	}
+
+	public void setAdminCity(String adminCity) {
+		this.adminCity = adminCity;
+	}
+
+	public String getAdminDesc() {
+		return adminDesc;
+	}
+
+	public void setAdminDesc(String adminDesc) {
+		this.adminDesc = adminDesc;
+	}
+
+	public Integer getAdminStatus() {
+		return adminStatus;
+	}
+
+	public void setAdminStatus(Integer adminStatus) {
+		this.adminStatus = adminStatus;
+	}
+}

watero-common-core/src/main/java/com/iamberry/wechat/core/entity/admin/AdminChildPermissionErmissions.java

@@ -0,0 +1,91 @@
+package com.iamberry.wechat.core.entity.admin;
+
+import java.io.Serializable;
+
+/**
+ * description : 二级管理员对应的二级菜单权限
+ * @author 何秀刚
+ * create date : 2015年12月10日
+ */
+public class AdminChildPermissionErmissions implements Serializable{
+	
+	/**
+	 * 
+	 */
+	private static final long serialVersionUID = 387441053371908503L;
+
+	private Integer ermissionsId; //ID
+	
+	private String ermissionsName; // 二级菜单名称
+	
+	private String ermissionsUrl; //二级菜单链接
+	
+	private String ermissionsDesc; // 二级菜单简介
+	
+	private Integer permissionId; // 所属的一级菜单
+	
+	private String ermissionsStatus; // 二级菜单状态，0:可以使用，其他不能使用
+	
+	private String ermissionsImg; // 二级菜单图标
+	
+	public String getErmissionsName() {
+		return ermissionsName;
+	}
+
+	public void setErmissionsName(String ermissionsName) {
+		this.ermissionsName = ermissionsName;
+	}
+
+	public Integer getErmissionsId() {
+		return ermissionsId;
+	}
+
+	public void setErmissionsId(Integer ermissionsId) {
+		this.ermissionsId = ermissionsId;
+	}
+
+	public String getErmissionsUrl() {
+		return ermissionsUrl;
+	}
+
+	public void setErmissionsUrl(String ermissionsUrl) {
+		this.ermissionsUrl = ermissionsUrl;
+	}
+
+	public String getErmissionsDesc() {
+		return ermissionsDesc;
+	}
+
+	public void setErmissionsDesc(String ermissionsDesc) {
+		this.ermissionsDesc = ermissionsDesc;
+	}
+
+	public Integer getPermissionId() {
+		return permissionId;
+	}
+
+	public void setPermissionId(Integer permissionId) {
+		this.permissionId = permissionId;
+	}
+
+	public String getErmissionsStatus() {
+		return ermissionsStatus;
+	}
+
+	public void setErmissionsStatus(String ermissionsStatus) {
+		this.ermissionsStatus = ermissionsStatus;
+	}
+
+	public String getErmissionsImg() {
+		return ermissionsImg;
+	}
+
+	public void setErmissionsImg(String ermissionsImg) {
+		this.ermissionsImg = ermissionsImg;
+	}
+
+	public static long getSerialversionuid() {
+		return serialVersionUID;
+	}
+	
+}

watero-common-core/src/main/java/com/iamberry/wechat/core/entity/admin/AdminChildPermissions.java

@@ -0,0 +1,91 @@
+package com.iamberry.wechat.core.entity.admin;
+
+import java.io.Serializable;
+import java.util.ArrayList;
+import java.util.List;
+
+/**
+ * description : 二级管理员权限:一级菜单
+ * @author 何秀刚
+ * create date : 2015年12月10日
+ */
+public class AdminChildPermissions implements Serializable{
+	
+	/**
+	 * 
+	 */
+	private static final long serialVersionUID = -5723669659339021311L;
+
+	private Integer permissionsId; // ID
+	
+	private String permissionsName; // 一级菜单名称
+	
+	private String permissionsUrl; // 一级菜单链接
+	
+	private String permissionsDesc; // 菜单简介
+	
+	private String permissionsImg; // 菜单图标
+	
+	private List<AdminChildPermissionErmissions> menus = new ArrayList<AdminChildPermissionErmissions>(); // 二级菜单
+
+	public List<AdminChildPermissionErmissions> getMenus() {
+		return menus;
+	}
+
+	public void setMenus(List<AdminChildPermissionErmissions> menus) {
+		this.menus = menus;
+	}
+
+	public Integer getPermissionsId() {
+		return permissionsId;
+	}
+
+	public void setPermissionsId(Integer permissionsId) {
+		this.permissionsId = permissionsId;
+	}
+
+	public String getPermissionsName() {
+		return permissionsName;
+	}
+
+	public void setPermissionsName(String permissionsName) {
+		this.permissionsName = permissionsName;
+	}
+
+	public String getPermissionsUrl() {
+		return permissionsUrl;
+	}
+
+	public void setPermissionsUrl(String permissionsUrl) {
+		this.permissionsUrl = permissionsUrl;
+	}
+
+	public String getPermissionsDesc() {
+		return permissionsDesc;
+	}
+
+	public void setPermissionsDesc(String permissionsDesc) {
+		this.permissionsDesc = permissionsDesc;
+	}
+
+	public String getPermissionsImg() {
+		return permissionsImg;
+	}
+
+	public void setPermissionsImg(String permissionsImg) {
+		this.permissionsImg = permissionsImg;
+	}
+
+	public static long getSerialversionuid() {
+		return serialVersionUID;
+	}
+
+	@Override
+	public String toString() {
+		return "AdminChildPermissions [permissionsId=" + permissionsId
+				+ ", permissionsName=" + permissionsName + ", permissionsUrl="
+				+ permissionsUrl + ", permissionsDesc=" + permissionsDesc
+				+ ", permissionsImg=" + permissionsImg + ", menus=" + menus
+				+ "]";
+	}
+}

watero-common-core/src/main/java/com/iamberry/wechat/core/entity/admin/AdminInfo.java

@@ -0,0 +1,113 @@
+package com.iamberry.wechat.core.entity.admin;
+/**
+ * description : 服务器超级管理员信息实体类
+ * @author 何秀刚
+ * create date : 2015年12月9日
+ */
+public class AdminInfo implements java.io.Serializable{
+	
+	/**
+	 * 
+	 */
+	private static final long serialVersionUID = -1288181428596466071L;
+
+	private Integer adminId; // ID
+	
+	private String adminLoginName; // 用户名
+	
+	private String adminLoginPwd; // 密码
+	
+	private Integer adminSex; // 性别
+	
+	private String adminTel; // 电话
+	
+	private String adminEmail; // 邮箱
+	
+	private String adminPhotoUrl; // 头像链接
+	
+	private String adminCity; // 城市
+	
+	private String adminDesc; // 简介
+	
+	private Integer adminStatus; // 状态
+
+	public Integer getAdminId() {
+		return adminId;
+	}
+
+	public void setAdminId(Integer adminId) {
+		this.adminId = adminId;
+	}
+
+	public String getAdminLoginName() {
+		return adminLoginName;
+	}
+
+	public void setAdminLoginName(String adminLoginName) {
+		this.adminLoginName = adminLoginName;
+	}
+
+	public String getAdminLoginPwd() {
+		return adminLoginPwd;
+	}
+
+	public void setAdminLoginPwd(String adminLoginPwd) {
+		this.adminLoginPwd = adminLoginPwd;
+	}
+
+	public Integer getAdminSex() {
+		return adminSex;
+	}
+
+	public void setAdminSex(Integer adminSex) {
+		this.adminSex = adminSex;
+	}
+
+	public String getAdminTel() {
+		return adminTel;
+	}
+
+	public void setAdminTel(String adminTel) {
+		this.adminTel = adminTel;
+	}
+
+	public String getAdminEmail() {
+		return adminEmail;
+	}
+
+	public void setAdminEmail(String adminEmail) {
+		this.adminEmail = adminEmail;
+	}
+
+	public String getAdminPhotoUrl() {
+		return adminPhotoUrl;
+	}
+
+	public void setAdminPhotoUrl(String adminPhotoUrl) {
+		this.adminPhotoUrl = adminPhotoUrl;
+	}
+
+	public String getAdminCity() {
+		return adminCity;
+	}
+
+	public void setAdminCity(String adminCity) {
+		this.adminCity = adminCity;
+	}
+
+	public String getAdminDesc() {
+		return adminDesc;
+	}
+
+	public void setAdminDesc(String adminDesc) {
+		this.adminDesc = adminDesc;
+	}
+
+	public Integer getAdminStatus() {
+		return adminStatus;
+	}
+
+	public void setAdminStatus(Integer adminStatus) {
+		this.adminStatus = adminStatus;
+	}
+}

watero-common-core/src/main/java/com/iamberry/wechat/core/entity/admin/AdminLog.java

@@ -0,0 +1,159 @@
+package com.iamberry.wechat.core.entity.admin;
+
+import java.util.Date;
+
+/**
+ * description ： 后台日志记录实体类 
+ * @author 何秀刚
+ * create date：2016年2月18日
+ */
+public class AdminLog implements java.io.Serializable{
+	
+	/**
+	 * 
+	 */
+	private static final long serialVersionUID = 5876782452620462199L;
+
+	private Integer adminLogId; // id
+	
+	private Integer adminLogUser; // 登陆用户id
+	
+	private Integer adminLogGrade; // 等级
+	
+	private Date adminLogDate; // 时间
+	
+	private String adminLogDesc; // 简介
+	
+	private String adminLogIp; // ip地址
+	
+	private String adminLogParentPage; // referre
+	
+	private String adminLogNowPage; // 当前url
+	
+	private Integer adminLogUseTime; // 响应耗时
+	
+	private Integer adminLogStatus; // 状态码
+	
+	private String adminLogOther; // 其他
+	
+	private Integer adminLogMethod; // 请求方法
+	
+	private String adminLogCookie; // cookie
+
+	public Integer getAdminLogId() {
+		return adminLogId;
+	}
+
+	public void setAdminLogId(Integer adminLogId) {
+		this.adminLogId = adminLogId;
+	}
+
+	public Integer getAdminLogUser() {
+		return adminLogUser;
+	}
+
+	public void setAdminLogUser(Integer adminLogUser) {
+		this.adminLogUser = adminLogUser;
+	}
+
+	public Integer getAdminLogGrade() {
+		return adminLogGrade;
+	}
+
+	public void setAdminLogGrade(Integer adminLogGrade) {
+		this.adminLogGrade = adminLogGrade;
+	}
+
+	public Date getAdminLogDate() {
+		return adminLogDate;
+	}
+
+	public void setAdminLogDate(Date adminLogDate) {
+		this.adminLogDate = adminLogDate;
+	}
+
+	public String getAdminLogDesc() {
+		return adminLogDesc;
+	}
+
+	public void setAdminLogDesc(String adminLogDesc) {
+		this.adminLogDesc = adminLogDesc;
+	}
+
+	public String getAdminLogIp() {
+		return adminLogIp;
+	}
+
+	public void setAdminLogIp(String adminLogIp) {
+		this.adminLogIp = adminLogIp;
+	}
+
+	public String getAdminLogParentPage() {
+		return adminLogParentPage;
+	}
+
+	public void setAdminLogParentPage(String adminLogParentPage) {
+		this.adminLogParentPage = adminLogParentPage;
+	}
+
+	public String getAdminLogNowPage() {
+		return adminLogNowPage;
+	}
+
+	public void setAdminLogNowPage(String adminLogNowPage) {
+		this.adminLogNowPage = adminLogNowPage;
+	}
+
+	public Integer getAdminLogUseTime() {
+		return adminLogUseTime;
+	}
+
+	public void setAdminLogUseTime(Integer adminLogUseTime) {
+		this.adminLogUseTime = adminLogUseTime;
+	}
+
+	public Integer getAdminLogStatus() {
+		return adminLogStatus;
+	}
+
+	public void setAdminLogStatus(Integer adminLogStatus) {
+		this.adminLogStatus = adminLogStatus;
+	}
+
+	public String getAdminLogOther() {
+		return adminLogOther;
+	}
+
+	public void setAdminLogOther(String adminLogOther) {
+		this.adminLogOther = adminLogOther;
+	}
+
+	public Integer getAdminLogMethod() {
+		return adminLogMethod;
+	}
+
+	public void setAdminLogMethod(Integer adminLogMethod) {
+		this.adminLogMethod = adminLogMethod;
+	}
+
+	public String getAdminLogCookie() {
+		return adminLogCookie;
+	}
+
+	public void setAdminLogCookie(String adminLogCookie) {
+		this.adminLogCookie = adminLogCookie;
+	}
+
+	@Override
+	public String toString() {
+		return "AdminLog [adminLogId=" + adminLogId + ", adminLogUser="
+				+ adminLogUser + ", adminLogGrade=" + adminLogGrade
+				+ ", adminLogDate=" + adminLogDate + ", adminLogDesc="
+				+ adminLogDesc + ", adminLogIp=" + adminLogIp
+				+ ", adminLogParentPage=" + adminLogParentPage
+				+ ", adminLogNowPage=" + adminLogNowPage + ", adminLogUseTime="
+				+ adminLogUseTime + ", adminLogStatus=" + adminLogStatus
+				+ ", adminLogOther=" + adminLogOther + ", adminLogMethod="
+				+ adminLogMethod + ", adminLogCookie=" + adminLogCookie + "]";
+	}
+}

watero-common-core/src/main/java/com/iamberry/wechat/core/entity/admin/AdminLoginDTO.java

@@ -0,0 +1,63 @@
+package com.iamberry.wechat.core.entity.admin;
+/**
+ * description : 登陆数据传输对象
+ * @author 何秀刚
+ * create date : 2015年12月9日
+ */
+public class AdminLoginDTO implements java.io.Serializable{
+	
+	/**
+	 * 
+	 */
+	private static final long serialVersionUID = 7911280649992062908L;
+
+	private String adminLoginName; // 用户名
+	
+	private String adminLoginPwd; // 密码
+	
+	private String verifyCode; // 验证码
+	
+	private String loginToken; // 登陆使用的token
+	
+	private String online; // 是否保存登陆状态
+
+	public String getAdminLoginName() {
+		return adminLoginName;
+	}
+
+	public void setAdminLoginName(String adminLoginName) {
+		this.adminLoginName = adminLoginName;
+	}
+
+	public String getAdminLoginPwd() {
+		return adminLoginPwd;
+	}
+
+	public void setAdminLoginPwd(String adminLoginPwd) {
+		this.adminLoginPwd = adminLoginPwd;
+	}
+
+	public String getVerifyCode() {
+		return verifyCode;
+	}
+
+	public void setVerifyCode(String verifyCode) {
+		this.verifyCode = verifyCode;
+	}
+
+	public String getLoginToken() {
+		return loginToken;
+	}
+
+	public void setLoginToken(String loginToken) {
+		this.loginToken = loginToken;
+	}
+
+	public String getOnline() {
+		return online;
+	}
+
+	public void setOnline(String online) {
+		this.online = online;
+	}
+}

watero-common-core/src/main/java/com/iamberry/wechat/core/entity/admin/ShopSystemRule.java

@@ -0,0 +1,75 @@
+package com.iamberry.wechat.core.entity.admin;
+
+import java.io.Serializable;
+import java.util.Date;
+
+/**
+ * @author 何秀刚
+ * Class Description: 商城系统规则
+ * Create Date:2016年4月20日
+ * Update Date:2016年4月20日
+ */
+public class ShopSystemRule implements Serializable {
+	
+	private static final long serialVersionUID = 3082345867599862877L;
+
+	private Integer ruleId; // ID
+	
+	private Double ruleNum; // 规则数量
+	
+	private String ruleDesc; // 规则简介
+	
+	private Integer ruleType; // 规则类型（详情参加数据库表） 
+	
+	private Date ruleCreateDate; // 创建时间
+	
+	private Integer ruleStatus; // 状态1:启用 ,其他表示不启用
+
+	public Integer getRuleId() {
+		return ruleId;
+	}
+
+	public void setRuleId(Integer ruleId) {
+		this.ruleId = ruleId;
+	}
+
+	public Double getRuleNum() {
+		return ruleNum;
+	}
+
+	public void setRuleNum(Double ruleNum) {
+		this.ruleNum = ruleNum;
+	}
+
+	public String getRuleDesc() {
+		return ruleDesc;
+	}
+
+	public void setRuleDesc(String ruleDesc) {
+		this.ruleDesc = ruleDesc;
+	}
+
+	public Integer getRuleType() {
+		return ruleType;
+	}
+
+	public void setRuleType(Integer ruleType) {
+		this.ruleType = ruleType;
+	}
+
+	public Date getRuleCreateDate() {
+		return ruleCreateDate;
+	}
+
+	public void setRuleCreateDate(Date ruleCreateDate) {
+		this.ruleCreateDate = ruleCreateDate;
+	}
+
+	public Integer getRuleStatus() {
+		return ruleStatus;
+	}
+
+	public void setRuleStatus(Integer ruleStatus) {
+		this.ruleStatus = ruleStatus;
+	}
+}

watero-common-core/src/main/java/com/iamberry/wechat/core/entity/agent/AgentMemberDto.java

@@ -0,0 +1,72 @@
+package com.iamberry.wechat.core.entity.agent;
+
+import java.io.Serializable;
+
+/**
+ * 微代理会员中心 实体类
+ * 2016年4月20日
+ * @author 穆再兴
+ *
+ */
+public class AgentMemberDto implements Serializable{
+	private static final long serialVersionUID = 1137540642134509956L;
+
+	private Integer userId;					//会员ID
+	private String userOpenid;				//用户openid
+	private String userHead;				//用户头像
+	private String userNickname;			//用户昵称
+	
+	private Integer userIncome;				//收入金额，单位为分
+	private int willIncome; 				//待返还金额，单位元
+	private Integer shareType;				//是否显示分享二维码	 	1:不显示	2：显示
+	private OrderStatusDto orderStatusDto;	//订单状态
+	
+	public Integer getUserId() {
+		return userId;
+	}
+	public void setUserId(Integer userId) {
+		this.userId = userId;
+	}
+	public String getUserOpenid() {
+		return userOpenid;
+	}
+	public void setUserOpenid(String userOpenid) {
+		this.userOpenid = userOpenid;
+	}
+	public String getUserHead() {
+		return userHead;
+	}
+	public void setUserHead(String userHead) {
+		this.userHead = userHead;
+	}
+	public String getUserNickname() {
+		return userNickname;
+	}
+	public void setUserNickname(String userNickname) {
+		this.userNickname = userNickname;
+	}
+	public Integer getUserIncome() {
+		return userIncome;
+	}
+	public void setUserIncome(Integer userIncome) {
+		this.userIncome = userIncome;
+	}
+	public int getWillIncome() {
+		return willIncome;
+	}
+	public void setWillIncome(int willIncome) {
+		this.willIncome = willIncome;
+	}
+	public OrderStatusDto getOrderStatusDto() {
+		return orderStatusDto;
+	}
+	public void setOrderStatusDto(OrderStatusDto orderStatusDto) {
+		this.orderStatusDto = orderStatusDto;
+	}
+	public Integer getShareType() {
+		return shareType;
+	}
+	public void setShareType(Integer shareType) {
+		this.shareType = shareType;
+	}
+}

watero-common-core/src/main/java/com/iamberry/wechat/core/entity/agent/AgentOrderDto.java

@@ -0,0 +1,132 @@
+package com.iamberry.wechat.core.entity.agent;
+
+import java.io.Serializable;
+import java.util.ArrayList;
+import java.util.Date;
+import java.util.List;
+
+import org.springframework.format.annotation.DateTimeFormat;
+
+import com.fasterxml.jackson.annotation.JsonFormat;
+import com.iamberry.wechat.core.entity.PageBean;
+import com.iamberry.wechat.core.entity.order.OrderItem;
+
+/**
+ * 微代理订单 实体类
+ * @author 穆再兴
+ *
+ */
+public class AgentOrderDto implements Serializable{
+
+	private static final long serialVersionUID = -4121940495260101824L;
+
+	private String orderId;		//单号
+	
+	private Integer userId;		//用户的userid
+	
+	private String userHead;	//用户头像
+	
+	private String orderOpenid;	//用户openid
+	
+	private String orderName;	//用户名
+	
+	private String userNickName;//用户昵称
+	
+	@DateTimeFormat(pattern="yyyy-MM-dd")  
+	@JsonFormat(pattern="yyyy-MM-dd",timezone = "GMT+8")  
+	private Date orderCreateDate;//创建时间
+	
+	private Integer orderIntegral;//返还积分
+	
+	private Integer cashLogsNum;	//返还金额
+	
+	private Integer rebackStatus;	//是否返利
+	
+	private List<OrderItem> orderItemList = new ArrayList<OrderItem>();	//订单项实体类
+	
+	private PageBean page = new PageBean();		//分页
+	
+	public String getOrderId() {
+		return orderId;
+	}
+	public void setOrderId(String orderId) {
+		this.orderId = orderId;
+	}
+	public Integer getUserId() {
+		return userId;
+	}
+	public void setUserId(Integer userId) {
+		this.userId = userId;
+	}
+	public String getUserHead() {
+		return userHead;
+	}
+	public void setUserHead(String userHead) {
+		this.userHead = userHead;
+	}
+	public String getOrderOpenid() {
+		return orderOpenid;
+	}
+	public void setOrderOpenid(String orderOpenid) {
+		this.orderOpenid = orderOpenid;
+	}
+	public String getOrderName() {
+		return orderName;
+	}
+	public void setOrderName(String orderName) {
+		this.orderName = orderName;
+	}
+	public String getUserNickName() {
+		return userNickName;
+	}
+	public void setUserNickName(String userNickName) {
+		this.userNickName = userNickName;
+	}
+	public Date getOrderCreateDate() {
+		return orderCreateDate;
+	}
+	public void setOrderCreateDate(Date orderCreateDate) {
+		this.orderCreateDate = orderCreateDate;
+	}
+	public Integer getOrderIntegral() {
+		return orderIntegral;
+	}
+	public void setOrderIntegral(Integer orderIntegral) {
+		this.orderIntegral = orderIntegral;
+	}
+	public Integer getCashLogsNum() {
+		return cashLogsNum;
+	}
+	public void setCashLogsNum(Integer cashLogsNum) {
+		this.cashLogsNum = cashLogsNum;
+	}
+	public PageBean getPage() {
+		return page;
+	}
+	public void setPage(PageBean page) {
+		this.page = page;
+	}
+	public List<OrderItem> getOrderItemList() {
+		return orderItemList;
+	}
+	public void setOrderItemList(List<OrderItem> orderItemList) {
+		this.orderItemList = orderItemList;
+	}
+	
+	public Integer getRebackStatus() {
+		return rebackStatus;
+	}
+	public void setRebackStatus(Integer rebackStatus) {
+		this.rebackStatus = rebackStatus;
+	}
+	@Override
+	public String toString() {
+		return "AgentOrderDto [orderId=" + orderId + ", userId=" + userId
+				+ ", userHead=" + userHead + ", orderOpenid=" + orderOpenid
+				+ ", orderName=" + orderName + ", userNickName=" + userNickName
+				+ ", orderCreateDate=" + orderCreateDate + ", orderIntegral="
+				+ orderIntegral + ", cashLogsNum=" + cashLogsNum + ", page="
+				+ page + "]";
+	}
+
+}

watero-common-core/src/main/java/com/iamberry/wechat/core/entity/agent/OrderStatusDto.java

@@ -0,0 +1,81 @@
+package com.iamberry.wechat.core.entity.agent;
+
+import java.io.Serializable;
+
+/**
+ * 各种状态的订单数量
+ * 2016年4月20日
+ * @author 穆再兴
+ *
+ */
+public class OrderStatusDto implements Serializable{
+	private static final long serialVersionUID = 1637633818732877341L;
+
+	private int payCount;			//待支付数量	订单状态：1
+	
+	private int deliverCount;		//待发货数量	订单状态：2
+	
+	private int returnMoneyCount;	//退款中数量	订单状态：3
+	
+	private int deliveredCount;		//已发货数量	订单状态：5
+	
+	private int returnGoodsCount;	//退货中数量	订单状态：7
+	
+	private int finishCount;		//订单完成数量	订单状态：11
+	
+	private int allCount;
+	
+	public int getPayCount() {
+		return payCount;
+	}
+	public void setPayCount(int payCount) {
+		this.payCount = payCount;
+	}
+	public int getDeliverCount() {
+		return deliverCount;
+	}
+	public void setDeliverCount(int deliverCount) {
+		this.deliverCount = deliverCount;
+	}
+	public int getReturnMoneyCount() {
+		return returnMoneyCount;
+	}
+	public void setReturnMoneyCount(int returnMoneyCount) {
+		this.returnMoneyCount = returnMoneyCount;
+	}
+	
+	public int getDeliveredCount() {
+		return deliveredCount;
+	}
+	public void setDeliveredCount(int deliveredCount) {
+		this.deliveredCount = deliveredCount;
+	}
+	public int getReturnGoodsCount() {
+		return returnGoodsCount;
+	}
+	public void setReturnGoodsCount(int returnGoodsCount) {
+		this.returnGoodsCount = returnGoodsCount;
+	}
+	public int getFinishCount() {
+		return finishCount;
+	}
+	public void setFinishCount(int finishCount) {
+		this.finishCount = finishCount;
+	}
+	
+	public int getAllCount() {
+		return allCount;
+	}
+	public void setAllCount(int allCount) {
+		this.allCount = allCount;
+	}
+	@Override
+	public String toString() {
+		return "OrderStatusDto [payCount=" + payCount + ", deliverCount="
+				+ deliverCount + ", returnMoneyCount=" + returnMoneyCount
+				+ ", deliveredCount=" + deliveredCount + ", returnGoodsCount="
+				+ returnGoodsCount + ", finishCount=" + finishCount
+				+ ", allCount=" + allCount + "]";
+	}
+	
+}

watero-common-core/src/main/java/com/iamberry/wechat/core/entity/banner/ActionBanner.java

@@ -0,0 +1,117 @@
+package com.iamberry.wechat.core.entity.banner;
+
+import java.util.Date;
+import java.util.List;
+
+/**
+ * @author 何秀刚
+ * Introduction to the ： 活动banner类
+ * create date: 2016年1月8日
+ */
+public class ActionBanner implements java.io.Serializable{
+	
+	/**
+	 * 
+	 */
+	private static final long serialVersionUID = -8757437044535284624L;
+
+	private Integer bannerId; // banner数据唯一标识
+	
+	private Date bannerStartDate; // 开始时间
+	
+	private Date bannerEndDate; // 结束时间
+	
+	private Integer bannerStatus; // banner状态，1:使用中；2:已经停用
+	
+	private Date bannerCreateDate; // banner创建时间
+	
+	private String bannerName; // banner名称
+	
+	private String bannerDesc; // banner简介
+	
+	private Integer bannerType; // banner类型
+	
+	private List<ActionBannerImage> actionBannerImage;//banner图片
+	
+	public Integer getBannerType() {
+		return bannerType;
+	}
+
+	public void setBannerType(Integer bannerType) {
+		this.bannerType = bannerType;
+	}
+
+	public Integer getBannerId() {
+		return bannerId;
+	}
+
+	public void setBannerId(Integer bannerId) {
+		this.bannerId = bannerId;
+	}
+
+	public Date getBannerStartDate() {
+		return bannerStartDate;
+	}
+
+	public void setBannerStartDate(Date bannerStartDate) {
+		this.bannerStartDate = bannerStartDate;
+	}
+
+	public Date getBannerEndDate() {
+		return bannerEndDate;
+	}
+
+	public void setBannerEndDate(Date bannerEndDate) {
+		this.bannerEndDate = bannerEndDate;
+	}
+
+	public Integer getBannerStatus() {
+		return bannerStatus;
+	}
+
+	public void setBannerStatus(Integer bannerStatus) {
+		this.bannerStatus = bannerStatus;
+	}
+
+	public Date getBannerCreateDate() {
+		return bannerCreateDate;
+	}
+
+	public void setBannerCreateDate(Date bannerCreateDate) {
+		this.bannerCreateDate = bannerCreateDate;
+	}
+
+	public String getBannerName() {
+		return bannerName;
+	}
+
+	public void setBannerName(String bannerName) {
+		this.bannerName = bannerName;
+	}
+
+	public String getBannerDesc() {
+		return bannerDesc;
+	}
+
+	public void setBannerDesc(String bannerDesc) {
+		this.bannerDesc = bannerDesc;
+	}
+
+	
+	public List<ActionBannerImage> getActionBannerImage() {
+		return actionBannerImage;
+	}
+
+	public void setActionBannerImage(List<ActionBannerImage> actionBannerImage) {
+		this.actionBannerImage = actionBannerImage;
+	}
+
+	@Override
+	public String toString() {
+		return "ActionBanner [bannerId=" + bannerId + ", bannerStartDate=" + bannerStartDate + ", bannerEndDate="
+				+ bannerEndDate + ", bannerStatus=" + bannerStatus + ", bannerCreateDate=" + bannerCreateDate
+				+ ", bannerName=" + bannerName + ", bannerDesc=" + bannerDesc + ", bannerType=" + bannerType
+				+ ", actionBannerImage=" + actionBannerImage + "]";
+	}
+	
+}

watero-common-core/src/main/java/com/iamberry/wechat/core/entity/banner/ActionBannerImage.java

@@ -0,0 +1,75 @@
+package com.iamberry.wechat.core.entity.banner;
+
+import java.util.Date;
+
+/**
+ * @author 何秀刚
+ * Introduction to the ： 活动bannerIMG
+ * create date: 2016年1月8日
+ */
+public class ActionBannerImage implements java.io.Serializable{
+
+	/**
+	 * 
+	 */
+	private static final long serialVersionUID = -1111415961864850045L;
+
+	private Integer bannerImageId; // ID
+	
+	private String bannerImageUrl; // 图片链接，eg:/common/banner/a.png
+	
+	private String bannerImageCheckOutUrl; // banner外链
+	
+	private Date bannerCreateDate; // banner创建时间
+	
+	private Integer bannerId; // 所属ID
+
+	public Integer getBannerImageId() {
+		return bannerImageId;
+	}
+
+	public void setBannerImageId(Integer bannerImageId) {
+		this.bannerImageId = bannerImageId;
+	}
+
+	public String getBannerImageUrl() {
+		return bannerImageUrl;
+	}
+
+	public void setBannerImageUrl(String bannerImageUrl) {
+		this.bannerImageUrl = bannerImageUrl;
+	}
+
+	public String getBannerImageCheckOutUrl() {
+		return bannerImageCheckOutUrl;
+	}
+
+	public void setBannerImageCheckOutUrl(String bannerImageCheckOutUrl) {
+		this.bannerImageCheckOutUrl = bannerImageCheckOutUrl;
+	}
+
+	public Date getBannerCreateDate() {
+		return bannerCreateDate;
+	}
+
+	public void setBannerCreateDate(Date bannerCreateDate) {
+		this.bannerCreateDate = bannerCreateDate;
+	}
+
+	public Integer getBannerId() {
+		return bannerId;
+	}
+
+	public void setBannerId(Integer bannerId) {
+		this.bannerId = bannerId;
+	}
+
+	@Override
+	public String toString() {
+		return "ActionBannerImage [bannerImageId=" + bannerImageId
+				+ ", bannerImageUrl=" + bannerImageUrl
+				+ ", bannerImageCheckOutUrl=" + bannerImageCheckOutUrl
+				+ ", bannerCreateDate=" + bannerCreateDate + ", bannerId="
+				+ bannerId + "]";
+	}
+}

watero-common-core/src/main/java/com/iamberry/wechat/core/entity/banner/BannerDTO.java

@@ -0,0 +1,103 @@
+package com.iamberry.wechat.core.entity.banner;
+
+import java.util.Date;
+
+import org.springframework.format.annotation.DateTimeFormat;
+
+public class BannerDTO implements java.io.Serializable{
+	
+	/**
+	 * 
+	 */
+	private static final long serialVersionUID = 7336123086282657473L;
+
+	private Integer bannerId;
+
+	@DateTimeFormat(pattern="yyyy-MM-dd HH:mm:ss")
+	private Date bannerStartDate; // 开始时间
+
+	@DateTimeFormat(pattern="yyyy-MM-dd HH:mm:ss")
+	private Date bannerEndDate; // 结束时间
+	
+	private Integer bannerStatus; // banner状态，1:使用中；2:已经停用
+	
+	private String bannerName; // banner名称
+	
+	private String bannerDesc; // banner简介
+	
+	private Integer bannerType; // banner类型
+	
+	private String token; // token
+	
+	public Integer getBannerId() {
+		return bannerId;
+	}
+
+	public void setBannerId(Integer bannerId) {
+		this.bannerId = bannerId;
+	}
+
+	public String getToken() {
+		return token;
+	}
+
+	public void setToken(String token) {
+		this.token = token;
+	}
+
+	public Date getBannerStartDate() {
+		return bannerStartDate;
+	}
+
+	public void setBannerStartDate(Date bannerStartDate) {
+		this.bannerStartDate = bannerStartDate;
+	}
+
+	public Date getBannerEndDate() {
+		return bannerEndDate;
+	}
+
+	public void setBannerEndDate(Date bannerEndDate) {
+		this.bannerEndDate = bannerEndDate;
+	}
+
+	public Integer getBannerStatus() {
+		return bannerStatus;
+	}
+
+	public void setBannerStatus(Integer bannerStatus) {
+		this.bannerStatus = bannerStatus;
+	}
+
+	public String getBannerName() {
+		return bannerName;
+	}
+
+	public void setBannerName(String bannerName) {
+		this.bannerName = bannerName;
+	}
+
+	public String getBannerDesc() {
+		return bannerDesc;
+	}
+
+	public void setBannerDesc(String bannerDesc) {
+		this.bannerDesc = bannerDesc;
+	}
+
+	public Integer getBannerType() {
+		return bannerType;
+	}
+
+	public void setBannerType(Integer bannerType) {
+		this.bannerType = bannerType;
+	}
+
+	@Override
+	public String toString() {
+		return "BannerDTO [bannerStartDate=" + bannerStartDate
+				+ ", bannerEndDate=" + bannerEndDate + ", bannerStatus="
+				+ bannerStatus + ", bannerName=" + bannerName + ", bannerDesc="
+				+ bannerDesc + ", bannerType=" + bannerType + "]";
+	}
+}

watero-common-core/src/main/java/com/iamberry/wechat/core/entity/banner/JSONDTO.java

@@ -0,0 +1,34 @@
+package com.iamberry.wechat.core.entity.banner;
+
+public class JSONDTO implements java.io.Serializable{
+	/**
+	 * 
+	 */
+	private static final long serialVersionUID = -4629653381824473322L;
+
+	private boolean flag; // 状态
+	
+	private String info; // 信息
+
+	public boolean isFlag() {
+		return flag;
+	}
+
+	public void setFlag(boolean flag) {
+		this.flag = flag;
+	}
+
+	public String getInfo() {
+		return info;
+	}
+
+	public void setInfo(String info) {
+		this.info = info;
+	}
+
+	@Override
+	public String toString() {
+		return "JSONDTO [flag=" + flag + ", info=" + info + "]";
+	}
+	
+}

watero-common-core/src/main/java/com/iamberry/wechat/core/entity/banner/MessageDTO.java

@@ -0,0 +1,60 @@
+package com.iamberry.wechat.core.entity.banner;
+/**
+ * @author 何秀刚
+ * Introduction to the ： 通知类
+ * create date: 2016年1月3日
+ */
+public class MessageDTO implements java.io.Serializable{
+	
+	/**
+	 * 
+	 */
+	private static final long serialVersionUID = -1741616520659726756L;
+
+	private boolean flag; // 是否成功，true成功，false失败
+	
+	private String title; // 通知标题
+	
+	private String info; // 通知具体内容
+
+	public MessageDTO() {
+		super();
+	}
+
+	public MessageDTO(boolean flag, String title, String info) {
+		super();
+		this.flag = flag;
+		this.title = title;
+		this.info = info;
+	}
+
+	public boolean isFlag() {
+		return flag;
+	}
+
+	public void setFlag(boolean flag) {
+		this.flag = flag;
+	}
+
+	public String getTitle() {
+		return title;
+	}
+
+	public void setTitle(String title) {
+		this.title = title;
+	}
+
+	public String getInfo() {
+		return info;
+	}
+
+	public void setInfo(String info) {
+		this.info = info;
+	}
+
+	@Override
+	public String toString() {
+		return "MessageDTO [flag=" + flag + ", title=" + title + ", info="
+				+ info + "]";
+	}
+}

watero-common-core/src/main/java/com/iamberry/wechat/core/entity/bindingApp/BindingMac.java

@@ -0,0 +1,76 @@
+package com.iamberry.wechat.core.entity.bindingApp;
+
+import java.util.Date;
+
+import com.iamberry.wechat.core.entity.PageBean;
+
+/**
+ * description 绑定机器码的实体类
+ * @author 欧阳明
+ * @date：2016-6-12
+ */
+public class BindingMac implements java.io.Serializable{
+
+	/**
+	 * 
+	 */
+	private static final long serialVersionUID = 9127785683533623943L;
+	private int id;
+	private String macId;
+	private String openid;
+	private int drpId;
+	private Date createDate;    //创建时间 首次绑定时间
+	private Date updateDate;    //更新时间 绑定时间
+	
+	private PageBean page = new PageBean();
+	
+	public int getId() {
+		return id;
+	}
+	public void setId(int id) {
+		this.id = id;
+	}
+	public String getMacId() {
+		return macId;
+	}
+	public void setMacId(String macId) {
+		this.macId = macId;
+	}
+	public String getOpenid() {
+		return openid;
+	}
+	public void setOpenid(String openid) {
+		this.openid = openid;
+	}
+	public int getDrpId() {
+		return drpId;
+	}
+	public void setDrpId(int drpId) {
+		this.drpId = drpId;
+	}
+	public Date getCreateDate() {
+		return createDate;
+	}
+	public void setCreateDate(Date createDate) {
+		this.createDate = createDate;
+	}
+	public Date getUpdateDate() {
+		return updateDate;
+	}
+	public void setUpdateDate(Date updateDate) {
+		this.updateDate = updateDate;
+	}
+	public PageBean getPage() {
+		return page;
+	}
+	public void setPage(PageBean page) {
+		this.page = page;
+	}
+	@Override
+	public String toString() {
+		return "BindingMac [id=" + id + ", macId=" + macId + ", openid="
+				+ openid + ", drpId=" + drpId + ", createDate=" + createDate
+				+ ", updateDate=" + updateDate + ", page=" + page + "]";
+	}
+	
+}

watero-common-core/src/main/java/com/iamberry/wechat/core/entity/bindingApp/BindingMacInfo.java

@@ -0,0 +1,120 @@
+package com.iamberry.wechat.core.entity.bindingApp;
+
+import java.util.Date;
+
+import com.iamberry.wechat.core.entity.PageBean;
+
+
+/**
+ * description 绑定机器码的后台传输实体
+ * @author 欧阳明
+ * @date：2016-6-12
+ */
+public class BindingMacInfo implements java.io.Serializable{
+	
+	/**
+	 * 
+	 */
+	private static final long serialVersionUID = 7668914350973161845L;
+	private int id;
+	private String  macId;
+	private String  openid;
+	private String userNickName;
+	private String  drpName;
+	private String  drpId;
+	private String  imgHead;
+	private String  drpPhone;
+	private Date  bindTime;
+	
+	private String beginDate;
+	private String endDate;
+	private PageBean page = new PageBean();
+	
+	public int getId() {
+		return id;
+	}
+	public void setId(int id) {
+		this.id = id;
+	}
+	public String getMacId() {
+		return macId;
+	}
+	public void setMacId(String macId) {
+		this.macId = macId;
+	}
+	public String getOpenid() {
+		return openid;
+	}
+	public void setOpenid(String openid) {
+		this.openid = openid;
+	}
+	public String getUserNickName() {
+		return userNickName;
+	}
+	public void setUserNickName(String userNickName) {
+		this.userNickName = userNickName;
+	}
+	public String getDrpName() {
+		return drpName;
+	}
+	public void setDrpName(String drpName) {
+		this.drpName = drpName;
+	}
+	public String getPhone() {
+		return drpPhone;
+	}
+	public void setPhone(String phone) {
+		this.drpPhone = phone;
+	}
+	public String getDrpPhone() {
+		return drpPhone;
+	}
+	public void setDrpPhone(String drpPhone) {
+		this.drpPhone = drpPhone;
+	}
+	public String getDrpId() {
+		return drpId;
+	}
+	public void setDrpId(String drpId) {
+		this.drpId = drpId;
+	}
+	public String getImgHead() {
+		return imgHead;
+	}
+	public void setImgHead(String imgHead) {
+		this.imgHead = imgHead;
+	}
+	public Date getBindTime() {
+		return bindTime;
+	}
+	public void setBindTime(Date bindTime) {
+		this.bindTime = bindTime;
+	}
+	public String getBeginDate() {
+		return beginDate;
+	}
+	public void setBeginDate(String beginDate) {
+		this.beginDate = beginDate;
+	}
+	public String getEndDate() {
+		return endDate;
+	}
+	public void setEndDate(String endDate) {
+		this.endDate = endDate;
+	}
+	public PageBean getPage() {
+		return page;
+	}
+	public void setPage(PageBean page) {
+		this.page = page;
+	}
+	@Override
+	public String toString() {
+		return "BindingMacInfo [id=" + id + ", macId=" + macId + ", openid="
+				+ openid + ", userNickName=" + userNickName + ", drpName="
+				+ drpName + ", drpId=" + drpId + ", imgHead=" + imgHead
+				+ ", drpPhone=" + drpPhone + ", bindTime=" + bindTime
+				+ ", beginDate=" + beginDate + ", endDate=" + endDate
+				+ ", page=" + page + "]";
+	}
+}

watero-common-core/src/main/java/com/iamberry/wechat/core/entity/cart/CartDto.java

@@ -0,0 +1,171 @@
+package com.iamberry.wechat.core.entity.cart;
+
+import java.io.Serializable;
+import java.util.Date;
+
+/**
+ * 
+ * @author 刘志伟
+ *	购物车类
+ */
+public class CartDto implements Serializable{
+	
+	/**
+	 * 
+	 */
+	private static final long serialVersionUID = -6707356515030325930L;
+
+	private Integer cartId;					//购物车id
+	
+	private String cartOpenId;			//所属用户
+	
+	private Integer cartProductId;		//商品id
+	
+	private Integer cartColorId;			//商品颜色id
+	
+	private Integer cartNum;				//商品数量
+	
+	private Date cartCreateDate;		//时间
+	
+	private String productName;		//商品名称
+	
+	private Integer productType;		//商品类型id
+	
+	private Integer productPrice;		//商品原价
+	
+	private Integer productStatus;		//商品状态
+	
+	private String productIntroduceImg;	//介绍图
+	
+	private double total;					//在售商品总价
+	
+	private Integer productDiscount; // 折扣价
+	
+	private String productRemark; //商品备注
+	
+	private String productColor;			//产品颜色
+
+	
+	public String getProductColor() {
+		return productColor;
+	}
+
+	public void setProductColor(String productColor) {
+		this.productColor = productColor;
+	}
+
+	public Integer getCartColorId() {
+		return cartColorId;
+	}
+
+	public void setCartColorId(Integer cartColorId) {
+		this.cartColorId = cartColorId;
+	}
+
+	public Integer getProductType() {
+		return productType;
+	}
+
+	public void setProductType(Integer productType) {
+		this.productType = productType;
+	}
+
+	public String getProductRemark() {
+		return productRemark;
+	}
+
+	public void setProductRemark(String productRemark) {
+		this.productRemark = productRemark;
+	}
+
+	public Integer getProductDiscount() {
+		return productDiscount;
+	}
+
+	public void setProductDiscount(Integer productDiscount) {
+		this.productDiscount = productDiscount;
+	}
+
+	public double getTotal() {
+		return total;
+	}
+
+	public void setTotal(double total) {
+		this.total = total;
+	}
+
+	public Integer getCartId() {
+		return cartId;
+	}
+
+	public void setCartId(Integer cartId) {
+		this.cartId = cartId;
+	}
+
+	public Integer getCartProductId() {
+		return cartProductId;
+	}
+
+	public void setCartProductId(Integer cartProductId) {
+		this.cartProductId = cartProductId;
+	}
+
+	public Integer getCartNum() {
+		return cartNum;
+	}
+
+	public void setCartNum(Integer cartNum) {
+		this.cartNum = cartNum;
+	}
+
+	public Date getCartCreateDate() {
+		return cartCreateDate;
+	}
+
+	public void setCartCreateDate(Date cartCreateDate) {
+		this.cartCreateDate = cartCreateDate;
+	}
+
+
+	public String getCartOpenId() {
+		return cartOpenId;
+	}
+
+	public void setCartOpenId(String cartOpenId) {
+		this.cartOpenId = cartOpenId;
+	}
+
+	public String getProductName() {
+		return productName;
+	}
+
+	public void setProductName(String productName) {
+		this.productName = productName;
+	}
+
+	public Integer getProductPrice() {
+		return productPrice;
+	}
+
+	public void setProductPrice(Integer productPrice) {
+		this.productPrice = productPrice;
+	}
+
+	public Integer getProductStatus() {
+		return productStatus;
+	}
+
+	public void setProductStatus(Integer productStatus) {
+		this.productStatus = productStatus;
+	}
+
+	public String getProductIntroduceImg() {
+		return productIntroduceImg;
+	}
+
+	public void setProductIntroduceImg(String productIntroduceImg) {
+		this.productIntroduceImg = productIntroduceImg;
+	}
+	
+	
+}

watero-common-core/src/main/java/com/iamberry/wechat/core/entity/cart/OrderPayDto.java

@@ -0,0 +1,124 @@
+package com.iamberry.wechat.core.entity.cart;
+
+import java.util.HashMap;
+import java.util.List;
+
+import com.iamberry.wechat.core.entity.coupon.CouponItemDto;
+
+/**
+ * @author 何秀刚
+ * Class Description: 支付页面DTO
+ * Create Date:2016年4月20日
+ * Update Date:2016年4月20日
+ */
+public class OrderPayDto implements java.io.Serializable{
+	
+	/**
+	 * 
+	 */
+	private static final long serialVersionUID = -381691465912815339L;
+
+	private List<CartDto> cartItems; // 订单项
+	
+	private Integer payTotal; // 支付金额, 单位为分
+	
+	private boolean isSuccess; // 是否请求成功
+	
+	private String errorInfo; // 错误信息
+	
+	private int meonyProportion; // 积分和人民币的比例 一个积分抵扣多少元人民币
+	
+	private String cartId; // 购物车ID，点击去支付时，需要传回来
+	
+	private int balance ; //账户余额
+	
+	private HashMap addressInfo;//收货地址
+	
+	private List<CouponItemDto>  couponItems ;//优惠券集合
+	
+	private boolean disable;	//是否可以使用优惠券
+
+	public boolean isDisable() {
+		return disable;
+	}
+
+	public void setDisable(boolean disable) {
+		this.disable = disable;
+	}
+
+	public String getCartId() {
+		return cartId;
+	}
+
+	public void setCartId(String cartId) {
+		this.cartId = cartId;
+	}
+
+	public int getMeonyProportion() {
+		return meonyProportion;
+	}
+
+	public void setMeonyProportion(int meonyProportion) {
+		this.meonyProportion = meonyProportion;
+	}
+
+	public boolean isSuccess() {
+		return isSuccess;
+	}
+
+	public void setSuccess(boolean isSuccess) {
+		this.isSuccess = isSuccess;
+	}
+
+	public String getErrorInfo() {
+		return errorInfo;
+	}
+
+	public void setErrorInfo(String errorInfo) {
+		this.errorInfo = errorInfo;
+	}
+
+	public List<CartDto> getCartItems() {
+		return cartItems;
+	}
+
+	public void setCartItems(List<CartDto> cartItems) {
+		this.cartItems = cartItems;
+	}
+
+	public Integer getPayTotal() {
+		return payTotal;
+	}
+
+	public void setPayTotal(Integer payTotal) {
+		this.payTotal = payTotal;
+	}
+
+	public int getBalance() {
+		return balance;
+	}
+
+	public void setBalance(int balance) {
+		this.balance = balance;
+	}
+
+	public List<CouponItemDto> getCouponItems() {
+		return couponItems;
+	}
+
+	public void setCouponItems(List<CouponItemDto> couponItems) {
+		this.couponItems = couponItems;
+	}
+
+	public HashMap getAddressInfo() {
+		return addressInfo;
+	}
+
+	public void setAddressInfo(HashMap addressInfo) {
+		this.addressInfo = addressInfo;
+	}
+
+	
+	
+	
+}

watero-common-core/src/main/java/com/iamberry/wechat/core/entity/cart/SendPayDto.java

@@ -0,0 +1,44 @@
+package com.iamberry.wechat.core.entity.cart;
+/**
+ * @author 何秀刚
+ * Class Description: 发起支付请求的DTO
+ * Create Date:2016年4月20日
+ * Update Date:2016年4月20日
+ */
+public class SendPayDto implements java.io.Serializable{
+
+	/**
+	 * 
+	 */
+	private static final long serialVersionUID = -2610930324732845716L;
+
+	private boolean isSuccess; // 是否请求成功
+	
+	private String info; // 如果isSuccess=true,info=支付参数信息,否则为错误信息
+	
+	private String orderId; // 订单号
+
+	public String getOrderId() {
+		return orderId;
+	}
+
+	public void setOrderId(String orderId) {
+		this.orderId = orderId;
+	}
+
+	public boolean isSuccess() {
+		return isSuccess;
+	}
+
+	public void setSuccess(boolean isSuccess) {
+		this.isSuccess = isSuccess;
+	}
+
+	public String getInfo() {
+		return info;
+	}
+
+	public void setInfo(String info) {
+		this.info = info;
+	}
+}

watero-common-core/src/main/java/com/iamberry/wechat/core/entity/cart/ShopOrderAndItemDto.java

@@ -0,0 +1,276 @@
+package com.iamberry.wechat.core.entity.cart;
+
+import java.io.Serializable;
+import java.util.ArrayList;
+import java.util.Date;
+import java.util.List;
+
+import com.iamberry.wechat.core.entity.order.OrderItem;
+
+/**
+ * 用于封装订单和订单项数据的Dto
+ * @author 刘志伟
+ *
+ */
+
+public class ShopOrderAndItemDto implements Serializable{
+	
+/**
+	 * 
+	 */
+	private static final long serialVersionUID = -14653877180516372L;
+
+private String salesOrderid;								//订单id
+	
+	private String salesOpenid;								//所属用户
+	
+	private Integer salesYetAmount;						//付款金额
+	
+	private Integer salesAmount;							//订单总额
+	
+	private Integer salesIntegralNum;					//使用积分数量
+	
+	private Integer salesRateAmount;					//积分抵扣金额
+	
+	private Date salesCreateDate;							//订单创建时间
+	
+	private String salesPostNum;							//快递单号
+	
+	private String salesPostFirm;							//快递公司
+	
+	private String salesStatus;								//状态
+	
+	private Date salesSendDate;							//发货时间
+	
+	private String salesAddressInfo;						//详细地址
+	
+	private String salesAddressPostnum;				//邮编
+	
+	private String salesAddressTel;							//收件人电话
+	
+	private String salesAddressName;					//收件人姓名
+	
+	private String salesReturnDes;							//退款备注
+	
+	private String salesAdminRemark;					//后台的备注
+	
+	private String salesUserRemark;						//用户备注
+	
+	private String salesTransactionId;					//微信订单号
+	
+	private Date salesTransactionDate;					//微信支付时间
+	
+	private String salesRefundNo;							//系统退款ID
+	
+	private String salesTransactionRefundId;			//微信退款ID
+	
+	private Integer salesColorType;						//颜色图标
+	
+	private boolean efficacious;							//是否存在下架商品
+	
+	private List<OrderItem> orderItemList = new ArrayList<OrderItem>();	//订单项实体类
+
+
+
+	public boolean isEfficacious() {
+		return efficacious;
+	}
+
+	public void setEfficacious(boolean efficacious) {
+		this.efficacious = efficacious;
+	}
+
+	public List<OrderItem> getOrderItemList() {
+		return orderItemList;
+	}
+
+	public void setOrderItemList(List<OrderItem> orderItemList) {
+		this.orderItemList = orderItemList;
+	}
+
+	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 getSalesYetAmount() {
+		return salesYetAmount;
+	}
+
+	public void setSalesYetAmount(Integer salesYetAmount) {
+		this.salesYetAmount = salesYetAmount;
+	}
+
+	public Integer getSalesAmount() {
+		return salesAmount;
+	}
+
+	public void setSalesAmount(Integer salesAmount) {
+		this.salesAmount = salesAmount;
+	}
+
+	public Integer getSalesIntegralNum() {
+		return salesIntegralNum;
+	}
+
+	public void setSalesIntegralNum(Integer salesIntegralNum) {
+		this.salesIntegralNum = salesIntegralNum;
+	}
+
+	public Integer getSalesRateAmount() {
+		return salesRateAmount;
+	}
+
+	public void setSalesRateAmount(Integer salesRateAmount) {
+		this.salesRateAmount = salesRateAmount;
+	}
+
+	public Date getSalesCreateDate() {
+		return salesCreateDate;
+	}
+
+	public void setSalesCreateDate(Date salesCreateDate) {
+		this.salesCreateDate = salesCreateDate;
+	}
+
+	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 getSalesStatus() {
+		return salesStatus;
+	}
+
+	public void setSalesStatus(String salesStatus) {
+		this.salesStatus = salesStatus;
+	}
+
+	public Date getSalesSendDate() {
+		return salesSendDate;
+	}
+
+	public void setSalesSendDate(Date salesSendDate) {
+		this.salesSendDate = salesSendDate;
+	}
+
+	public String getSalesAddressInfo() {
+		return salesAddressInfo;
+	}
+
+	public void setSalesAddressInfo(String salesAddressInfo) {
+		this.salesAddressInfo = salesAddressInfo;
+	}
+
+	public String getSalesAddressPostnum() {
+		return salesAddressPostnum;
+	}
+
+	public void setSalesAddressPostnum(String salesAddressPostnum) {
+		this.salesAddressPostnum = salesAddressPostnum;
+	}
+
+	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 String getSalesReturnDes() {
+		return salesReturnDes;
+	}
+
+	public void setSalesReturnDes(String salesReturnDes) {
+		this.salesReturnDes = salesReturnDes;
+	}
+
+	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 getSalesTransactionId() {
+		return salesTransactionId;
+	}
+
+	public void setSalesTransactionId(String salesTransactionId) {
+		this.salesTransactionId = salesTransactionId;
+	}
+
+	public Date getSalesTransactionDate() {
+		return salesTransactionDate;
+	}
+
+	public void setSalesTransactionDate(Date salesTransactionDate) {
+		this.salesTransactionDate = salesTransactionDate;
+	}
+
+	public String getSalesRefundNo() {
+		return salesRefundNo;
+	}
+
+	public void setSalesRefundNo(String salesRefundNo) {
+		this.salesRefundNo = salesRefundNo;
+	}
+
+	public String getSalesTransactionRefundId() {
+		return salesTransactionRefundId;
+	}
+
+	public void setSalesTransactionRefundId(String salesTransactionRefundId) {
+		this.salesTransactionRefundId = salesTransactionRefundId;
+	}
+
+	public Integer getSalesColorType() {
+		return salesColorType;
+	}
+
+	public void setSalesColorType(Integer salesColorType) {
+		this.salesColorType = salesColorType;
+	}
+	
+	
+}

watero-common-core/src/main/java/com/iamberry/wechat/core/entity/cart/ShopOrderItemDto.java

@@ -0,0 +1,151 @@
+package com.iamberry.wechat.core.entity.cart;
+
+import java.io.Serializable;
+
+/**
+ * 
+ * @author 刘志伟
+ * 销售订单项类
+ */
+public class ShopOrderItemDto implements Serializable{
+	
+	/**
+	 * 
+	 */
+	private static final long serialVersionUID = -2373805406215436318L;
+
+	private Integer itemId;								//订单条目id
+	
+	private String itemSalesOrderid;				//所属订单
+	
+	private Integer itemColorId;						//商品颜色表id
+	
+	private Integer itemProductId;					//购物商品
+	
+	private Integer itemNum;						//商品数量
+	
+	private Integer itemTotal;						//小结
+	
+	private String itemProductName;			//商品名称
+	
+	private Integer itemProductDiscount;		//商品优惠价
+	
+	private Integer itemProductPrice;			//商品原价
+	
+	private String itemProductPic;					//介绍图
+	
+	private String productStatus;					//产品状态
+	
+	private Integer itemProductType;			//产品类型id
+	
+	private String productColor;			//产品颜色
+	
+	
+
+	public Integer getItemColorId() {
+		return itemColorId;
+	}
+
+	public void setItemColorId(Integer itemColorId) {
+		this.itemColorId = itemColorId;
+	}
+
+	public String getProductStatus() {
+		return productStatus;
+	}
+
+	public Integer getItemProductType() {
+		return itemProductType;
+	}
+
+	public void setItemProductType(Integer itemProductType) {
+		this.itemProductType = itemProductType;
+	}
+
+	public String getProductColor() {
+		return productColor;
+	}
+
+	public void setProductColor(String productColor) {
+		this.productColor = productColor;
+	}
+
+	public void setProductStatus(String productStatus) {
+		this.productStatus = productStatus;
+	}
+
+	public Integer getItemId() {
+		return itemId;
+	}
+
+	public void setItemId(Integer itemId) {
+		this.itemId = itemId;
+	}
+
+	public String getItemSalesOrderid() {
+		return itemSalesOrderid;
+	}
+
+	public void setItemSalesOrderid(String itemSalesOrderid) {
+		this.itemSalesOrderid = itemSalesOrderid;
+	}
+
+	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 String getItemProductName() {
+		return itemProductName;
+	}
+
+	public void setItemProductName(String itemProductName) {
+		this.itemProductName = itemProductName;
+	}
+
+	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;
+	}
+
+	public Integer getItemProductId() {
+		return itemProductId;
+	}
+
+	public void setItemProductId(Integer itemProductId) {
+		this.itemProductId = itemProductId;
+	}
+	
+	
+	
+}

watero-common-core/src/main/java/com/iamberry/wechat/core/entity/cart/ShopSalesOrderDto.java

@@ -0,0 +1,330 @@
+package com.iamberry.wechat.core.entity.cart;
+
+import java.io.Serializable;
+import java.util.ArrayList;
+import java.util.Date;
+import java.util.List;
+
+import org.springframework.format.annotation.DateTimeFormat;
+
+import com.fasterxml.jackson.annotation.JsonFormat;
+import com.iamberry.wechat.core.entity.PageBean;
+
+/**
+ * 销售订单表
+ * @author 刘志伟
+ *
+ */
+public class ShopSalesOrderDto implements Serializable{
+	
+	/**
+	 * 
+	 */
+	private static final long serialVersionUID = -3940967789709058116L;
+
+	private String salesOrderid;								//订单id
+	
+	private String salesOpenid;								//所属用户
+	
+	private Integer salesYetAmount;						//付款金额
+	
+	private Integer salesAmount;							//订单总额
+	
+	private Integer salesIntegralNum;					//使用积分数量
+	
+	private Integer salesRateAmount;					//积分抵扣金额
+	
+	@DateTimeFormat(pattern="yyyy-MM-dd HH:mm:ss")  
+	@JsonFormat(pattern="yyyy-MM-dd HH:mm:ss",timezone = "GMT+8") 
+	private Date salesCreateDate;							//订单创建时间
+	
+	private String salesPostNum;							//快递单号
+	
+	private String salesPostFirm;							//快递公司
+	
+	private String salesStatus;								//状态
+	
+	private Date salesSendDate;							//发货时间
+	
+	private String salesAddressInfo;						//详细地址
+	
+	private String salesAddressPostnum;				//邮编
+	
+	private String salesAddressTel;							//收件人电话
+	
+	private String salesAddressName;					//收件人姓名
+	
+	private String salesReturnDes;							//退款备注
+	
+	private String salesAdminRemark;					//后台的备注
+	
+	private String salesUserRemark;						//用户备注
+	
+	private String salesTransactionId;					//微信订单号
+	
+	private Date salesTransactionDate;					//微信支付时间
+	
+	private String salesRefundNo;							//系统退款ID
+	
+	private String salesTransactionRefundId;			//微信退款ID
+	
+	private Integer salesColorType;						//颜色图标
+	
+	private Integer salesLockType;							//订单锁，该值等于2时，不能进行退换货
+	
+	private String salesCouponReceiveId;				//使用优惠券id
+	
+	private Integer couponReduce;						//优惠券抵扣金额
+	
+	private Integer balancePayAmount;					//余额支付金额
+	
+	private List<ShopOrderItemDto> orderItemList = new ArrayList<ShopOrderItemDto>();	//销售订单项
+	
+	private PageBean page = new PageBean();		//分页
+	
+	private boolean efficacious;							//是否存在下架商品
+	
+	
+
+	public boolean isEfficacious() {
+		return efficacious;
+	}
+
+	public void setEfficacious(boolean efficacious) {
+		this.efficacious = efficacious;
+	}
+
+	public Integer getBalancePayAmount() {
+		return balancePayAmount;
+	}
+
+	public void setBalancePayAmount(Integer balancePayAmount) {
+		this.balancePayAmount = balancePayAmount;
+	}
+
+	public Integer getCouponReduce() {
+		return couponReduce;
+	}
+
+	public void setCouponReduce(Integer couponReduce) {
+		this.couponReduce = couponReduce;
+	}
+
+	public String getSalesCouponReceiveId() {
+		return salesCouponReceiveId;
+	}
+
+	public void setSalesCouponReceiveId(String salesCouponReceiveId) {
+		this.salesCouponReceiveId = salesCouponReceiveId;
+	}
+
+	public Integer getSalesLockType() {
+		return salesLockType;
+	}
+
+	public void setSalesLockType(Integer salesLockType) {
+		this.salesLockType = salesLockType;
+	}
+
+	public String getSalesUserRemark() {
+		return salesUserRemark;
+	}
+
+	public void setSalesUserRemark(String salesUserRemark) {
+		this.salesUserRemark = salesUserRemark;
+	}
+
+	public PageBean getPage() {
+		return page;
+	}
+
+	public void setPage(PageBean page) {
+		this.page = page;
+	}
+
+	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 getSalesYetAmount() {
+		return salesYetAmount;
+	}
+
+	public void setSalesYetAmount(Integer salesYetAmount) {
+		this.salesYetAmount = salesYetAmount;
+	}
+
+	public Integer getSalesAmount() {
+		return salesAmount;
+	}
+
+	public void setSalesAmount(Integer salesAmount) {
+		this.salesAmount = salesAmount;
+	}
+
+	public Integer getSalesIntegralNum() {
+		return salesIntegralNum;
+	}
+
+	public void setSalesIntegralNum(Integer salesIntegralNum) {
+		this.salesIntegralNum = salesIntegralNum;
+	}
+
+	public Integer getSalesRateAmount() {
+		return salesRateAmount;
+	}
+
+	public void setSalesRateAmount(Integer salesRateAmount) {
+		this.salesRateAmount = salesRateAmount;
+	}
+
+	public Date getSalesCreateDate() {
+		return salesCreateDate;
+	}
+
+	public void setSalesCreateDate(Date salesCreateDate) {
+		this.salesCreateDate = salesCreateDate;
+	}
+
+	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 getSalesStatus() {
+		return salesStatus;
+	}
+
+	public void setSalesStatus(String salesStatus) {
+		this.salesStatus = salesStatus;
+	}
+
+	public Date getSalesSendDate() {
+		return salesSendDate;
+	}
+
+	public void setSalesSendDate(Date salesSendDate) {
+		this.salesSendDate = salesSendDate;
+	}
+
+	public String getSalesAddressInfo() {
+		return salesAddressInfo;
+	}
+
+	public void setSalesAddressInfo(String salesAddressInfo) {
+		this.salesAddressInfo = salesAddressInfo;
+	}
+
+	public String getSalesAddressPostnum() {
+		return salesAddressPostnum;
+	}
+
+	public void setSalesAddressPostnum(String salesAddressPostnum) {
+		this.salesAddressPostnum = salesAddressPostnum;
+	}
+
+	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 String getSalesReturnDes() {
+		return salesReturnDes;
+	}
+
+	public void setSalesReturnDes(String salesReturnDes) {
+		this.salesReturnDes = salesReturnDes;
+	}
+
+	public String getSalesAdminRemark() {
+		return salesAdminRemark;
+	}
+
+	public void setSalesAdminRemark(String salesAdminRemark) {
+		this.salesAdminRemark = salesAdminRemark;
+	}
+
+	public String getSalesTransactionId() {
+		return salesTransactionId;
+	}
+
+	public void setSalesTransactionId(String salesTransactionId) {
+		this.salesTransactionId = salesTransactionId;
+	}
+
+	public Date getSalesTransactionDate() {
+		return salesTransactionDate;
+	}
+
+	public void setSalesTransactionDate(Date salesTransactionDate) {
+		this.salesTransactionDate = salesTransactionDate;
+	}
+
+	public String getSalesRefundNo() {
+		return salesRefundNo;
+	}
+
+	public void setSalesRefundNo(String salesRefundNo) {
+		this.salesRefundNo = salesRefundNo;
+	}
+
+	public String getSalesTransactionRefundId() {
+		return salesTransactionRefundId;
+	}
+
+	public void setSalesTransactionRefundId(String salesTransactionRefundId) {
+		this.salesTransactionRefundId = salesTransactionRefundId;
+	}
+
+	public Integer getSalesColorType() {
+		return salesColorType;
+	}
+
+	public void setSalesColorType(Integer salesColorType) {
+		this.salesColorType = salesColorType;
+	}
+
+	public List<ShopOrderItemDto> getOrderItemList() {
+		return orderItemList;
+	}
+
+	public void setOrderItemList(List<ShopOrderItemDto> orderItemList) {
+		this.orderItemList = orderItemList;
+	}
+	
+	
+}

watero-common-core/src/main/java/com/iamberry/wechat/core/entity/cart/TempOrderDto.java

@@ -0,0 +1,126 @@
+package com.iamberry.wechat.core.entity.cart;
+
+import com.iamberry.app.verify.ValidatorInterface;
+
+/**
+ * @author 何秀刚
+ * Class Description: 临时订单实体类，用来接受支付时的参数信息
+ * Create Date:2016年4月20日
+ * Update Date:2016年4月20日
+ */
+public class TempOrderDto implements java.io.Serializable{
+	
+	/**
+	 * 
+	 */
+	private static final long serialVersionUID = 2192693576838754406L;
+
+	@ValidatorInterface(validatorIsRule = "[^\\s]{1,}", isEnable = true)
+	private String orderAddressInfo; // 收货人详细地址
+
+	@ValidatorInterface(validatorIsRule = "^[0-9]+[0-9]*]*$", isEnable = true)
+	private String orderAddressPostNum; // 收货地址邮编
+	
+	@ValidatorInterface(validatorIsRule = "^[1]([3][0-9]{1}|50|51|52|53|55|56|57|58|59|77|80|81|82|83|85|84|86|87|88|89|)[0-9]{8}$", isEnable = true)
+	private String orderAddressMoblie; // 收货人电话
+
+	@ValidatorInterface(validatorIsRule = "[^\\s]{1,}", isEnable = true)
+	private String orderAddressName; // 收件人姓名
+
+	@ValidatorInterface(validatorIsRule = "[^\\s]{1,}", isEnable = true)
+	private String cartIdStr; // 购物车条目id,使用-分割
+	
+	private int orderIntegralNum; // 使用积分
+	
+	private String orderUserRemark; // 备注
+	
+	private String couponId; //优惠券id
+	
+	private int balancePayAmount ; //账户余额支付额度
+
+	public String getOrderAddressInfo() {
+		return orderAddressInfo;
+	}
+
+	public void setOrderAddressInfo(String orderAddressInfo) {
+		this.orderAddressInfo = orderAddressInfo;
+	}
+
+	public String getOrderAddressPostNum() {
+		return orderAddressPostNum;
+	}
+
+	public void setOrderAddressPostNum(String orderAddressPostNum) {
+		this.orderAddressPostNum = orderAddressPostNum;
+	}
+
+	public String getOrderAddressMoblie() {
+		return orderAddressMoblie;
+	}
+
+	public void setOrderAddressMoblie(String orderAddressMoblie) {
+		this.orderAddressMoblie = orderAddressMoblie;
+	}
+
+	public String getOrderAddressName() {
+		return orderAddressName;
+	}
+
+	public void setOrderAddressName(String orderAddressName) {
+		this.orderAddressName = orderAddressName;
+	}
+
+	public String getCartIdStr() {
+		return cartIdStr;
+	}
+
+	public void setCartIdStr(String cartIdStr) {
+		this.cartIdStr = cartIdStr;
+	}
+
+	public int getOrderIntegralNum() {
+		return orderIntegralNum;
+	}
+
+	public void setOrderIntegralNum(int orderIntegralNum) {
+		this.orderIntegralNum = orderIntegralNum;
+	}
+
+	public String getOrderUserRemark() {
+		return orderUserRemark;
+	}
+
+	public void setOrderUserRemark(String orderUserRemark) {
+		this.orderUserRemark = orderUserRemark;
+	}
+
+	public String getCouponId() {
+		return couponId;
+	}
+
+	public void setCouponId(String couponId) {
+		this.couponId = couponId;
+	}
+
+	public int getBalancePayAmount() {
+		return balancePayAmount;
+	}
+
+	public void setBalancePayAmount(int balancePayAmount) {
+		this.balancePayAmount = balancePayAmount;
+	}
+
+	@Override
+	public String toString() {
+		return "TempOrderDto [orderAddressInfo=" + orderAddressInfo
+				+ ", orderAddressPostNum=" + orderAddressPostNum
+				+ ", orderAddressMoblie=" + orderAddressMoblie
+				+ ", orderAddressName=" + orderAddressName + ", cartIdStr="
+				+ cartIdStr + ", orderIntegralNum=" + orderIntegralNum
+				+ ", orderUserRemark=" + orderUserRemark + ", couponId="
+				+ couponId + ", balancePayAmount=" + balancePayAmount + "]";
+	}
+	
+	
+	
+}

watero-common-core/src/main/java/com/iamberry/wechat/core/entity/cart/UserGiftDto.java

@@ -0,0 +1,118 @@
+package com.iamberry.wechat.core.entity.cart;
+
+import java.io.Serializable;
+import java.util.Date;
+
+/**
+ * 赠送礼物信息表
+ * @author 刘志伟
+ *
+ */
+public class UserGiftDto  implements Serializable {
+
+	/**
+	 * 
+	 */
+	private static final long serialVersionUID = 1405038652823092989L;
+	
+	private Integer userId;						//id
+	
+	private Integer userProductId;			//产品id
+	
+	private Integer userGiftId;				//赠送礼品id
+	
+	private Integer userGiftColor;			//礼品颜色id
+	
+	private Integer userColorId;				//赠送商品颜色id
+	
+	private Integer userLevel;				//会员等级
+	
+	private Integer userDiscount;			//优惠价
+	
+	private Integer userGiftCount;			//礼品数量
+	
+	private Integer userStatus;				//状态 1：在用，0：禁用
+	
+	private Date userCreateTime;			//创建时间
+
+	public Integer getUserGiftColor() {
+		return userGiftColor;
+	}
+
+	public void setUserGiftColor(Integer userGiftColor) {
+		this.userGiftColor = userGiftColor;
+	}
+
+	public Integer getUserId() {
+		return userId;
+	}
+
+	public void setUserId(Integer userId) {
+		this.userId = userId;
+	}
+
+	public Integer getUserProductId() {
+		return userProductId;
+	}
+
+	public void setUserProductId(Integer userProductId) {
+		this.userProductId = userProductId;
+	}
+
+	public Integer getUserGiftId() {
+		return userGiftId;
+	}
+
+	public void setUserGiftId(Integer userGiftId) {
+		this.userGiftId = userGiftId;
+	}
+
+	public Integer getUserLevel() {
+		return userLevel;
+	}
+
+	public void setUserLevel(Integer userLevel) {
+		this.userLevel = userLevel;
+	}
+
+	public Integer getUserDiscount() {
+		return userDiscount;
+	}
+
+	public void setUserDiscount(Integer userDiscount) {
+		this.userDiscount = userDiscount;
+	}
+
+	public Integer getUserGiftCount() {
+		return userGiftCount;
+	}
+
+	public void setUserGiftCount(Integer userGiftCount) {
+		this.userGiftCount = userGiftCount;
+	}
+
+	public Integer getUserStatus() {
+		return userStatus;
+	}
+
+	public void setUserStatus(Integer userStatus) {
+		this.userStatus = userStatus;
+	}
+
+	public Date getUserCreateTime() {
+		return userCreateTime;
+	}
+
+	public void setUserCreateTime(Date userCreateTime) {
+		this.userCreateTime = userCreateTime;
+	}
+
+	public Integer getUserColorId() {
+		return userColorId;
+	}
+
+	public void setUserColorId(Integer userColorId) {
+		this.userColorId = userColorId;
+	}
+
+}

watero-common-core/src/main/java/com/iamberry/wechat/core/entity/coupon/AdminCouponItemDto.java

@@ -0,0 +1,143 @@
+package com.iamberry.wechat.core.entity.coupon;
+
+import java.io.Serializable;
+import java.util.Date;
+
+import org.springframework.format.annotation.DateTimeFormat;
+
+import com.fasterxml.jackson.annotation.JsonFormat;
+import com.iamberry.wechat.core.entity.PageBean;
+
+/**
+ * 优惠券使用情况dto
+ * @author liuzhiwei
+ *
+ */
+
+public class AdminCouponItemDto implements Serializable{
+	
+
+	/**
+	 * 
+	 */
+	private static final long serialVersionUID = -5403675300113959258L;
+
+	private String couponItemId;						//id
+	
+	private String couponId;								//优惠券分类id
+	
+	private String couponItemUserOpenId;		//领取券的openid
+	
+	@DateTimeFormat(pattern="yyyy-MM-dd HH:mm:ss")
+	@JsonFormat(pattern="yyyy-MM-dd",timezone = "GMT+8") 
+	private Date couponUseEndDate;				//券截止使用时间
+	
+	@DateTimeFormat(pattern="yyyy-MM-dd HH:mm:ss")
+	@JsonFormat(pattern="yyyy-MM-dd",timezone = "GMT+8") 
+	private Date couponReceiveDate;				//领取优惠券时间
+	
+	private Integer couponUseStatus;				//使用状态
+	
+	@DateTimeFormat(pattern="yyyy-MM-dd HH:mm:ss")  
+	@JsonFormat(pattern="yyyy-MM-dd",timezone = "GMT+8") 
+	private Date couponUseDate;						//使用时间
+	
+	private String couponItemRemark;				//优惠券备注
+	
+	private String couponName;						//优惠券名称
+	
+	private String userName;						//优惠券领取人
+	
+	private PageBean page = new PageBean(); //分页信息
+
+	public String getCouponId() {
+		return couponId;
+	}
+
+	public void setCouponId(String couponId) {
+		this.couponId = couponId;
+	}
+
+	public String getCouponItemUserOpenId() {
+		return couponItemUserOpenId;
+	}
+
+	public void setCouponItemUserOpenId(String couponItemUserOpenId) {
+		this.couponItemUserOpenId = couponItemUserOpenId;
+	}
+
+	public Date getCouponUseEndDate() {
+		return couponUseEndDate;
+	}
+
+	public void setCouponUseEndDate(Date couponUseEndDate) {
+		this.couponUseEndDate = couponUseEndDate;
+	}
+
+	public Date getCouponReceiveDate() {
+		return couponReceiveDate;
+	}
+
+	public void setCouponReceiveDate(Date couponReceiveDate) {
+		this.couponReceiveDate = couponReceiveDate;
+	}
+
+	public Integer getCouponUseStatus() {
+		return couponUseStatus;
+	}
+
+	public void setCouponUseStatus(Integer couponUseStatus) {
+		this.couponUseStatus = couponUseStatus;
+	}
+
+	public Date getCouponUseDate() {
+		return couponUseDate;
+	}
+
+	public void setCouponUseDate(Date couponUseDate) {
+		this.couponUseDate = couponUseDate;
+	}
+
+	public String getCouponItemRemark() {
+		return couponItemRemark;
+	}
+
+	public void setCouponItemRemark(String couponItemRemark) {
+		this.couponItemRemark = couponItemRemark;
+	}
+
+	public String getCouponName() {
+		return couponName;
+	}
+
+	public void setCouponName(String couponName) {
+		this.couponName = couponName;
+	}
+
+
+	public String getUserName() {
+		return userName;
+	}
+
+	public void setUserName(String userName) {
+		this.userName = userName;
+	}
+
+	public String getCouponItemId() {
+		return couponItemId;
+	}
+
+	public void setCouponItemId(String couponItemId) {
+		this.couponItemId = couponItemId;
+	}
+
+	public PageBean getPage() {
+		return page;
+	}
+
+	public void setPage(PageBean page) {
+		this.page = page;
+	}
+	
+	
+}

watero-common-core/src/main/java/com/iamberry/wechat/core/entity/coupon/CouponItem.java

@@ -0,0 +1,104 @@
+package com.iamberry.wechat.core.entity.coupon;
+
+import java.io.Serializable;
+import java.util.Date;
+
+import org.springframework.format.annotation.DateTimeFormat;
+
+import com.fasterxml.jackson.annotation.JsonFormat;
+import com.iamberry.wechat.core.entity.PageBean;
+
+/**
+ * 优惠券详情 实体类
+ * 2016年7月6日
+ * @author 穆再兴
+ *
+ */
+public class CouponItem implements Serializable{
+	/**
+	 * 
+	 */
+	private static final long serialVersionUID = -5156827900555021972L;
+	
+	private String couponItemId;				//id
+	private Integer couponId; 						//优惠券分类id
+	private String couponItemUseropenid;		//领取券的openid
+	@DateTimeFormat(pattern="yyyy-MM-dd")  
+	@JsonFormat(pattern="yyyy-MM-dd",timezone = "GMT+8") 
+	private Date couponUseEndDate;				//券截止使用时间
+	@DateTimeFormat(pattern="yyyy-MM-dd")  
+	@JsonFormat(pattern="yyyy-MM-dd",timezone = "GMT+8") 
+	private Date couponReceiveDate;				//领取优惠券时间
+	
+	private Integer couponUseStatus;				//使用状态
+	private Integer oldCouponUseStatus;			//当前的使用状态
+	@DateTimeFormat(pattern="yyyy-MM-dd")  
+	@JsonFormat(pattern="yyyy-MM-dd",timezone = "GMT+8") 
+	private Date couponUseDate;					//使用时间
+	private String couponItemRemark;			//优惠券详情备注
+	private PageBean page;						//分页
+	public String getCouponItemId() {
+		return couponItemId;
+	}
+	public void setCouponItemId(String couponItemId) {
+		this.couponItemId = couponItemId;
+	}
+	public Integer getCouponId() {
+		return couponId;
+	}
+	public void setCouponId(Integer couponId) {
+		this.couponId = couponId;
+	}
+	public String getCouponItemUseropenid() {
+		return couponItemUseropenid;
+	}
+	public void setCouponItemUseropenid(String couponItemUseropenid) {
+		this.couponItemUseropenid = couponItemUseropenid;
+	}
+	public Date getCouponUseEndDate() {
+		return couponUseEndDate;
+	}
+	public void setCouponUseEndDate(Date couponUseEndDate) {
+		this.couponUseEndDate = couponUseEndDate;
+	}
+	public Date getCouponReceiveDate() {
+		return couponReceiveDate;
+	}
+	public void setCouponReceiveDate(Date couponReceiveDate) {
+		this.couponReceiveDate = couponReceiveDate;
+	}
+	public Integer getCouponUseStatus() {
+		return couponUseStatus;
+	}
+	public void setCouponUseStatus(Integer couponUseStatus) {
+		this.couponUseStatus = couponUseStatus;
+	}
+	public Date getCouponUseDate() {
+		return couponUseDate;
+	}
+	public void setCouponUseDate(Date couponUseDate) {
+		this.couponUseDate = couponUseDate;
+	}
+	public String getCouponItemRemark() {
+		return couponItemRemark;
+	}
+	public void setCouponItemRemark(String couponItemRemark) {
+		this.couponItemRemark = couponItemRemark;
+	}
+	public PageBean getPage() {
+		return page;
+	}
+	public void setPage(PageBean page) {
+		this.page = page;
+	}
+	public static long getSerialversionuid() {
+		return serialVersionUID;
+	}
+	public Integer getOldCouponUseStatus() {
+		return oldCouponUseStatus;
+	}
+	public void setOldCouponUseStatus(Integer oldCouponUseStatus) {
+		this.oldCouponUseStatus = oldCouponUseStatus;
+	}
+	
+}

watero-common-core/src/main/java/com/iamberry/wechat/core/entity/coupon/CouponItemDto.java

@@ -0,0 +1,132 @@
+package com.iamberry.wechat.core.entity.coupon;
+
+import java.util.Date;
+
+import org.springframework.format.annotation.DateTimeFormat;
+
+import com.fasterxml.jackson.annotation.JsonFormat;
+import com.iamberry.wechat.core.entity.PageBean;
+
+public class CouponItemDto implements java.io.Serializable{
+	/**
+	 * 
+	 */
+	private static final long serialVersionUID = -6935453801410812596L;
+	private String couponItemId;				//id
+	private Integer couponId; 					//优惠券类型id
+	private String couponName;					//优惠券类型名称
+	private String useropenid;					//领取券的openid
+	private Integer couponUseStatus;			//使用状态
+	private Integer couponType;                 //优惠券类型
+	
+	private Integer couponReduce;				//减免额/减免率
+	private Integer couponConsumeEnough;		//消费总金额要求（满足这个条件才能领券）
+	@DateTimeFormat(pattern="yyyy-MM-dd")  
+	@JsonFormat(pattern="yyyy-MM-dd",timezone = "GMT+8") 
+	private Date couponReceiveDate;				//领取优惠券时间
+	@DateTimeFormat(pattern="yyyy-MM-dd")  
+	@JsonFormat(pattern="yyyy-MM-dd",timezone = "GMT+8") 
+	private Date couponUseEndDate;				//券截止使用时间
+	@DateTimeFormat(pattern="yyyy-MM-dd")  
+	@JsonFormat(pattern="yyyy-MM-dd",timezone = "GMT+8") 
+	private Date couponUseDate;					//使用时间
+	
+	private Date beginDate;						//开始时间
+	private Date endDate;						//结束时间
+	private String couponItemRemark;			//优惠券详情备注
+	private PageBean page;						//分页
+	
+	public String getCouponItemId() {
+		return couponItemId;
+	}
+	public void setCouponItemId(String couponItemId) {
+		this.couponItemId = couponItemId;
+	}
+	public Integer getCouponId() {
+		return couponId;
+	}
+	public void setCouponId(Integer couponId) {
+		this.couponId = couponId;
+	}
+	public String getCouponName() {
+		return couponName;
+	}
+	public void setCouponName(String couponName) {
+		this.couponName = couponName;
+	}
+	public String getUseropenid() {
+		return useropenid;
+	}
+	public void setUseropenid(String useropenid) {
+		this.useropenid = useropenid;
+	}
+	public Integer getCouponUseStatus() {
+		return couponUseStatus;
+	}
+	public void setCouponUseStatus(Integer couponUseStatus) {
+		this.couponUseStatus = couponUseStatus;
+	}
+	public Integer getCouponReduce() {
+		return couponReduce;
+	}
+	public void setCouponReduce(Integer couponReduce) {
+		this.couponReduce = couponReduce;
+	}
+	public Integer getCouponConsumeEnough() {
+		return couponConsumeEnough;
+	}
+	public void setCouponConsumeEnough(Integer couponConsumeEnough) {
+		this.couponConsumeEnough = couponConsumeEnough;
+	}
+	public Date getCouponReceiveDate() {
+		return couponReceiveDate;
+	}
+	public void setCouponReceiveDate(Date couponReceiveDate) {
+		this.couponReceiveDate = couponReceiveDate;
+	}
+	public Date getCouponUseEndDate() {
+		return couponUseEndDate;
+	}
+	public void setCouponUseEndDate(Date couponUseEndDate) {
+		this.couponUseEndDate = couponUseEndDate;
+	}
+	public Date getCouponUseDate() {
+		return couponUseDate;
+	}
+	public void setCouponUseDate(Date couponUseDate) {
+		this.couponUseDate = couponUseDate;
+	}
+	public Date getBeginDate() {
+		return beginDate;
+	}
+	public void setBeginDate(Date beginDate) {
+		this.beginDate = beginDate;
+	}
+	public Date getEndDate() {
+		return endDate;
+	}
+	public void setEndDate(Date endDate) {
+		this.endDate = endDate;
+	}
+	public String getCouponItemRemark() {
+		return couponItemRemark;
+	}
+	public void setCouponItemRemark(String couponItemRemark) {
+		this.couponItemRemark = couponItemRemark;
+	}
+	public PageBean getPage() {
+		return page;
+	}
+	public void setPage(PageBean page) {
+		this.page = page;
+	}
+	public Integer getCouponType() {
+		return couponType;
+	}
+	public void setCouponType(Integer couponType) {
+		this.couponType = couponType;
+	}
+	
+	
+	
+}

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

@@ -0,0 +1,190 @@
+package com.iamberry.wechat.core.entity.coupon;
+
+import java.io.Serializable;
+import java.util.Date;
+
+import org.springframework.format.annotation.DateTimeFormat;
+
+import com.fasterxml.jackson.annotation.JsonFormat;
+import com.iamberry.wechat.core.entity.PageBean;
+
+/**
+ * 优惠券类型 实体
+ * 2016年7月6日
+ * @author Administrator
+ *
+ */
+public class CouponType implements Serializable{
+	/**
+	 * 
+	 */
+	private static final long serialVersionUID = 6892613958003836843L;
+	
+	private Integer couponId;					//id
+	private String couponName;				//优惠券名称
+	private Integer couponTotal;				//优惠券总数
+	private Integer couponUsedNum;				//已经领取券数量
+	private Integer couponRemainingNum;			//剩余券数
+	
+	private Integer couponGetLimit;				//每人限领多少张
+	private Integer couponType;					//优惠券折扣类型
+	private Integer couponIsConcern;			//是否必须关注
+	private Integer couponIsPurchase;			//是否必须购买		
+	private Integer couponConsumeEnough;		//消费总金额要求（满足这个条件才能领券）
+
+	private Integer couponReduce;				//减免率或者减免额
+	private Integer couponGetDays;				//领取有效天数
+	private Integer couponLimitHours;			//领券后有效时间（小时为单位）
+	@DateTimeFormat(pattern="yyyy-MM-dd")  
+	@JsonFormat(pattern="yyyy-MM-dd",timezone = "GMT+8") 
+	private Date couponEndDate;				//券截止时间
+	@DateTimeFormat(pattern="yyyy-MM-dd")  
+	@JsonFormat(pattern="yyyy-MM-dd",timezone = "GMT+8") 
+	private Date couponCreateDate;			//创建时间
+
+	@DateTimeFormat(pattern="yyyy-MM-dd")  
+	@JsonFormat(pattern="yyyy-MM-dd",timezone = "GMT+8") 
+	private Date couponUpdateDate;			//更新时间
+	private Integer couponIsGive;				//可否赠送他人
+	private Integer couponPriorityLevels;		//券优先级别
+	private String couponRemark;			//优惠券备注
+	private PageBean page;					//分页
+	public Integer getCouponId() {
+		return couponId;
+	}
+	public void setCouponId(Integer couponId) {
+		this.couponId = couponId;
+	}
+	public String getCouponName() {
+		return couponName;
+	}
+	public void setCouponName(String couponName) {
+		this.couponName = couponName;
+	}
+	public Integer getCouponTotal() {
+		return couponTotal;
+	}
+	public void setCouponTotal(Integer couponTotal) {
+		this.couponTotal = couponTotal;
+	}
+	public Integer getCouponUsedNum() {
+		return couponUsedNum;
+	}
+	public void setCouponUsedNum(Integer couponUsedNum) {
+		this.couponUsedNum = couponUsedNum;
+	}
+	public Integer getCouponRemainingNum() {
+		return couponRemainingNum;
+	}
+	public void setCouponRemainingNum(Integer couponRemainingNum) {
+		this.couponRemainingNum = couponRemainingNum;
+	}
+	public Integer getCouponGetLimit() {
+		return couponGetLimit;
+	}
+	public void setCouponGetLimit(Integer couponGetLimit) {
+		this.couponGetLimit = couponGetLimit;
+	}
+	public Integer getCouponType() {
+		return couponType;
+	}
+	public void setCouponType(Integer couponType) {
+		this.couponType = couponType;
+	}
+	public Integer getCouponIsConcern() {
+		return couponIsConcern;
+	}
+	public void setCouponIsConcern(Integer couponIsConcern) {
+		this.couponIsConcern = couponIsConcern;
+	}
+	public Integer getCouponIsPurchase() {
+		return couponIsPurchase;
+	}
+	public void setCouponIsPurchase(Integer couponIsPurchase) {
+		this.couponIsPurchase = couponIsPurchase;
+	}
+	public Integer getCouponConsumeEnough() {
+		return couponConsumeEnough;
+	}
+	public void setCouponConsumeEnough(Integer couponConsumeEnough) {
+		this.couponConsumeEnough = couponConsumeEnough;
+	}
+	public Integer getCouponReduce() {
+		return couponReduce;
+	}
+	public void setCouponReduce(Integer couponReduce) {
+		this.couponReduce = couponReduce;
+	}
+	public Integer getCouponGetDays() {
+		return couponGetDays;
+	}
+	public void setCouponGetDays(Integer couponGetDays) {
+		this.couponGetDays = couponGetDays;
+	}
+	public Integer getCouponLimitHours() {
+		return couponLimitHours;
+	}
+	public void setCouponLimitHours(Integer couponLimitHours) {
+		this.couponLimitHours = couponLimitHours;
+	}
+	public Date getCouponEndDate() {
+		return couponEndDate;
+	}
+	public void setCouponEndDate(Date couponEndDate) {
+		this.couponEndDate = couponEndDate;
+	}
+	public Date getCouponCreateDate() {
+		return couponCreateDate;
+	}
+	public void setCouponCreateDate(Date couponCreateDate) {
+		this.couponCreateDate = couponCreateDate;
+	}
+	public Date getCouponUpdateDate() {
+		return couponUpdateDate;
+	}
+	public void setCouponUpdateDate(Date couponUpdateDate) {
+		this.couponUpdateDate = couponUpdateDate;
+	}
+	public Integer getCouponIsGive() {
+		return couponIsGive;
+	}
+	public void setCouponIsGive(Integer couponIsGive) {
+		this.couponIsGive = couponIsGive;
+	}
+	public Integer getCouponPriorityLevels() {
+		return couponPriorityLevels;
+	}
+	public void setCouponPriorityLevels(Integer couponPriorityLevels) {
+		this.couponPriorityLevels = couponPriorityLevels;
+	}
+	public String getCouponRemark() {
+		return couponRemark;
+	}
+	public void setCouponRemark(String couponRemark) {
+		this.couponRemark = couponRemark;
+	}
+	public PageBean getPage() {
+		return page;
+	}
+	public void setPage(PageBean page) {
+		this.page = page;
+	}
+	@Override
+	public String toString() {
+		return "CouponType [couponId=" + couponId + ", couponName="
+				+ couponName + ", couponTotal=" + couponTotal
+				+ ", couponUsedNum=" + couponUsedNum + ", couponRemainingNum="
+				+ couponRemainingNum + ", couponGetLimit=" + couponGetLimit
+				+ ", couponType=" + couponType + ", couponIsConcern="
+				+ couponIsConcern + ", couponIsPurchase=" + couponIsPurchase
+				+ ", couponConsumeEnough=" + couponConsumeEnough
+				+ ", couponReduce=" + couponReduce + ", couponGetDays="
+				+ couponGetDays + ", couponLimitHours=" + couponLimitHours
+				+ ", couponEndDate=" + couponEndDate + ", couponCreateDate="
+				+ couponCreateDate + ", couponUpdateDate=" + couponUpdateDate
+				+ ", couponIsGive=" + couponIsGive + ", couponPriorityLevels="
+				+ couponPriorityLevels + ", couponRemark=" + couponRemark
+				+ ", page=" + page + "]";
+	}
+	
+}

watero-common-core/src/main/java/com/iamberry/wechat/core/entity/coupon/Exchange.java

@@ -0,0 +1,52 @@
+package com.iamberry.wechat.core.entity.coupon;
+
+import  java.util.Date;
+import  java.io.Serializable;
+/**
+ *  兑换表类
+ * @author
+ * @Date 2018-12-11
+ */
+public class Exchange  implements  Serializable{
+    private static final long serialVersionUID = 4161577323724581015L;
+    //
+    private Integer exchangeId;
+    //
+    private Integer couponId;
+    //创建时间
+    private Date exchangeCreateTime;
+    //修改时间'
+    private Date exchangeUpdateTime;
+
+    public Integer getExchangeId(){
+        return exchangeId;
+    }
+
+    public void setExchangeId(Integer  exchangeId){
+        this.exchangeId=exchangeId;
+    }
+
+    public Integer getCouponId(){
+        return couponId;
+    }
+
+    public void setCouponId(Integer  couponId){
+        this.couponId=couponId;
+    }
+
+    public Date getExchangeCreateTime(){
+        return exchangeCreateTime;
+    }
+
+    public void setExchangeCreateTime(Date  exchangeCreateTime){
+        this.exchangeCreateTime=exchangeCreateTime;
+    }
+
+    public Date getExchangeUpdateTime(){
+        return exchangeUpdateTime;
+    }
+
+    public void setExchangeUpdateTime(Date  exchangeUpdateTime){
+        this.exchangeUpdateTime=exchangeUpdateTime;
+    }
+}

watero-common-core/src/main/java/com/iamberry/wechat/core/entity/coupon/ExchangeItem.java

@@ -0,0 +1,52 @@
+package com.iamberry.wechat.core.entity.coupon;
+
+
+import  java.io.Serializable;
+/**
+ *  兑换子表类
+ * @author
+ * @Date 2018-12-11
+ */
+public class ExchangeItem  implements  Serializable{
+    private static final long serialVersionUID = 5940933839681811215L;
+    //
+    private Integer exchangeItemId;
+    //兑换表id
+    private Integer exchangeId;
+    //颜色id
+    private Integer colorId;
+    //数量'
+    private Integer exchangeItemNum;
+
+    public Integer getExchangeItemId(){
+        return exchangeItemId;
+    }
+
+    public void setExchangeItemId(Integer  exchangeItemId){
+        this.exchangeItemId=exchangeItemId;
+    }
+
+    public Integer getExchangeId(){
+        return exchangeId;
+    }
+
+    public void setExchangeId(Integer  exchangeId){
+        this.exchangeId=exchangeId;
+    }
+
+    public Integer getColorId(){
+        return colorId;
+    }
+
+    public void setColorId(Integer  colorId){
+        this.colorId=colorId;
+    }
+
+    public Integer getExchangeItemNum(){
+        return exchangeItemNum;
+    }
+
+    public void setExchangeItemNum(Integer  exchangeItemNum){
+        this.exchangeItemNum=exchangeItemNum;
+    }
+}

watero-common-core/src/main/java/com/iamberry/wechat/core/entity/drp/ApplyPlaceLogs.java

@@ -0,0 +1,124 @@
+package com.iamberry.wechat.core.entity.drp;
+
+import java.io.Serializable;
+import java.util.Date;
+
+import com.iamberry.app.verify.ValidatorInterface;
+
+/**
+ * @company	深圳爱贝源科技有限公司
+ * @website www.iamberry.com
+ * @author 	献
+ * @tel		18271840547
+ * @date	2016年9月5日
+ * @explain	商户申请更新信息记录
+ */
+public class ApplyPlaceLogs implements Serializable {
+
+	private static final long serialVersionUID = -1188547919271216860L;
+
+	private Integer applyID;						// ID
+	
+	private String applyOpenID;						// 申请openID
+	
+	private Integer applyToPlaceID;					// 申请更新的placeID
+	
+	@ValidatorInterface(validatorIsRule = "[a-zA-Z0-9\u4E00-\u9FA5_]+", fieldLengthScope = {5, 30})
+	private String applyName;						// 公司名称
+
+	@ValidatorInterface(validatorIsRule = "[a-zA-Z0-9\u4E00-\u9FA5_]+", fieldLengthScope={2, 10})
+	private String applyUserName;					// 姓名
+	
+	@ValidatorInterface(validatorIsRule = "^((13[0-9])|(14[5|7])|(15([0-3]|[5-9]))|(18[0,5-9]))\\d{8}$")
+	private String applyTel;						// 申请的电话号码
+
+	@ValidatorInterface(validatorIsRule = "[a-zA-Z0-9\u4E00-\u9FA5_]+", fieldLengthScope={5, 30})
+	private String applyArea;						// 申请的地址
+	
+	private Date applyDate;							// 申请时间
+	
+	private Integer applyStatus;					// 申请状态 默认1， 1:申请中;2:审核通过;3:审核未通过,管理员驳回
+
+	@ValidatorInterface(validatorIsRule = "[a-zA-Z0-9\u4E00-\u9FA5_]+", fieldLengthScope={10, 90})
+	private String applyAddr;						// 详细地址
+	
+	public String getApplyAddr() {
+		return applyAddr;
+	}
+
+	public void setApplyAddr(String applyAddr) {
+		this.applyAddr = applyAddr;
+	}
+
+	public Integer getApplyID() {
+		return applyID;
+	}
+
+	public void setApplyID(Integer applyID) {
+		this.applyID = applyID;
+	}
+
+	public String getApplyOpenID() {
+		return applyOpenID;
+	}
+
+	public void setApplyOpenID(String applyOpenID) {
+		this.applyOpenID = applyOpenID;
+	}
+
+	public Integer getApplyToPlaceID() {
+		return applyToPlaceID;
+	}
+
+	public void setApplyToPlaceID(Integer applyToPlaceID) {
+		this.applyToPlaceID = applyToPlaceID;
+	}
+
+	public String getApplyName() {
+		return applyName;
+	}
+
+	public void setApplyName(String applyName) {
+		this.applyName = applyName;
+	}
+
+	public String getApplyUserName() {
+		return applyUserName;
+	}
+
+	public void setApplyUserName(String applyUserName) {
+		this.applyUserName = applyUserName;
+	}
+
+	public String getApplyTel() {
+		return applyTel;
+	}
+
+	public void setApplyTel(String applyTel) {
+		this.applyTel = applyTel;
+	}
+
+	public String getApplyArea() {
+		return applyArea;
+	}
+
+	public void setApplyArea(String applyArea) {
+		this.applyArea = applyArea;
+	}
+
+	public Date getApplyDate() {
+		return applyDate;
+	}
+
+	public void setApplyDate(Date applyDate) {
+		this.applyDate = applyDate;
+	}
+
+	public Integer getApplyStatus() {
+		return applyStatus;
+	}
+
+	public void setApplyStatus(Integer applyStatus) {
+		this.applyStatus = applyStatus;
+	}
+}

watero-common-core/src/main/java/com/iamberry/wechat/core/entity/drp/ApplyUserInfo.java

@@ -0,0 +1,71 @@
+package com.iamberry.wechat.core.entity.drp;
+
+import java.util.Date;
+
+import com.iamberry.wechat.core.entity.PageBean;
+
+
+public class ApplyUserInfo implements java.io.Serializable{
+
+	/**
+	 * 
+	 */
+	private static final long serialVersionUID = 145712946561420943L;
+	private int userId ; //id
+	private String userName; //姓名 
+	private String userTel;//电话
+	private String  userMail; //邮箱
+	private String  userCity ; //地址
+	private String  userTc ; //不知
+	private Date  userDate ; //申请时间
+	private PageBean page = new PageBean(); //分页信息
+	public int getUserId() {
+		return userId;
+	}
+	public void setUserId(int userId) {
+		this.userId = userId;
+	}
+	public String getUserName() {
+		return userName;
+	}
+	public void setUserName(String userName) {
+		this.userName = userName;
+	}
+	public String getUserMail() {
+		return userMail;
+	}
+	public void setUserMail(String userMail) {
+		this.userMail = userMail;
+	}
+	public String getUserCity() {
+		return userCity;
+	}
+	public void setUserCity(String userCity) {
+		this.userCity = userCity;
+	}
+	public String getUserTc() {
+		return userTc;
+	}
+	public void setUserTc(String userTc) {
+		this.userTc = userTc;
+	}
+	public Date getUserDate() {
+		return userDate;
+	}
+	public void setUserDate(Date userDate) {
+		this.userDate = userDate;
+	}
+	public String getUserTel() {
+		return userTel;
+	}
+	public void setUserTel(String userTel) {
+		this.userTel = userTel;
+	}
+	public PageBean getPage() {
+		return page;
+	}
+	public void setPage(PageBean page) {
+		this.page = page;
+	}
+	
+}

watero-common-core/src/main/java/com/iamberry/wechat/core/entity/drp/EarningLogs.java

@@ -0,0 +1,105 @@
+package com.iamberry.wechat.core.entity.drp;
+
+import java.util.Date;
+
+import com.iamberry.wechat.core.entity.PageBean;
+
+public class EarningLogs implements java.io.Serializable{
+
+	/**
+	 * 
+	 */
+	private static final long serialVersionUID = 2944507966590212959L;
+	private int placeId; //分销商id
+	private String drpName ; //分销商
+	private String userName ; //分销商姓名
+	private String openid ; //分销商openid
+	private String salesOrderid; //订单号
+	private int salesRewardNum ; //奖励金额
+	private Date salesCreateDate ; //创建日期
+	private int rewardStatus ;  //是否入账
+	private String openids ; // 被分销的客户openid
+	
+	private String beginDate ; //开始查询时间
+	private String endDate ; //结束查询时间
+	
+	private PageBean page;
+	
+	public int getPlaceId() {
+		return placeId;
+	}
+	public void setPlaceId(int placeId) {
+		this.placeId = placeId;
+	}
+	public String getDrpName() {
+		return drpName;
+	}
+	public void setDrpName(String drpName) {
+		this.drpName = drpName;
+	}
+	public String getOpenid() {
+		return openid;
+	}
+	public void setOpenid(String openid) {
+		this.openid = openid;
+	}
+	public String getSalesOrderid() {
+		return salesOrderid;
+	}
+	public void setSalesOrderid(String salesOrderid) {
+		this.salesOrderid = salesOrderid;
+	}
+	public int getSalesRewardNum() {
+		return salesRewardNum;
+	}
+	public void setSalesRewardNum(int salesRewardNum) {
+		this.salesRewardNum = salesRewardNum;
+	}
+	public Date getSalesCreateDate() {
+		return salesCreateDate;
+	}
+	public void setSalesCreateDate(Date salesCreateDate) {
+		this.salesCreateDate = salesCreateDate;
+	}
+	public int getRewardStatus() {
+		return rewardStatus;
+	}
+	public void setRewardStatus(int rewardStatus) {
+		this.rewardStatus = rewardStatus;
+	}
+	public String getOpenids() {
+		return openids;
+	}
+	public void setOpenids(String openids) {
+		this.openids = openids;
+	}
+	public String getBeginDate() {
+		return beginDate;
+	}
+	public void setBeginDate(String beginDate) {
+		this.beginDate = beginDate;
+	}
+	public String getEndDate() {
+		return endDate;
+	}
+	public void setEndDate(String endDate) {
+		this.endDate = endDate;
+	}
+	public PageBean getPage() {
+		return page;
+	}
+	public void setPage(PageBean page) {
+		this.page = page;
+	}
+	public String getUserName() {
+		return userName;
+	}
+	public void setUserName(String userName) {
+		this.userName = userName;
+	}
+	
+	
+	
+	
+	
+}

watero-common-core/src/main/java/com/iamberry/wechat/core/entity/drp/EasyPage.java

@@ -0,0 +1,65 @@
+package com.iamberry.wechat.core.entity.drp;
+
+public class EasyPage implements java.io.Serializable{
+	
+	/**
+	 * 
+	 */
+	private static final long serialVersionUID = -8534699854312924101L;
+	private int pageSize;
+	private int pageNumber;
+	private int pageCount;
+	private String openid ;
+	private int id ;
+	private String strId;
+	private int status;
+	
+	
+	public int getPageSize() {
+		return pageSize;
+	}
+	public void setPageSize(int pageSize) {
+		this.pageSize = pageSize;
+	}
+	public int getPageNumber() {
+		if(pageNumber==0) pageNumber=1;
+		return pageNumber;
+	}
+	public void setPageNumber(int pageNumber) {
+		this.pageNumber = pageNumber;
+	}
+	public int getPageCount() {
+		return pageCount;
+	}
+	public void setPageCount(int pageCount) {
+		this.pageCount = pageCount;
+	}
+	public String getOpenid() {
+		return openid;
+	}
+	public void setOpenid(String openid) {
+		this.openid = openid;
+	}
+	public int getId() {
+		return id;
+	}
+	public void setId(int id) {
+		this.id = id;
+	}
+	public String getStrId() {
+		return strId;
+	}
+	public void setStrId(String strId) {
+		this.strId = strId;
+	}
+	public int getStatus() {
+		return status;
+	}
+	public void setStatus(int status) {
+		this.status = status;
+	}
+    
+	
+	
+
+}

watero-common-core/src/main/java/com/iamberry/wechat/core/entity/drp/IncomeRecord.java

@@ -0,0 +1,61 @@
+package com.iamberry.wechat.core.entity.drp;
+
+import java.util.Date;
+
+public class IncomeRecord implements java.io.Serializable{
+
+	/**
+	 * 
+	 */
+	private static final long serialVersionUID = -8825721137139845829L;
+	private String orderNo;
+	private Date createDate;
+	private String strDate;
+	private String amount;
+	private String name;
+	private int isReward;
+	private int status;
+	public String getOrderNo() {
+		return orderNo;
+	}
+	public void setOrderNo(String orderNo) {
+		this.orderNo = orderNo;
+	}
+	public Date getCreateDate() {
+		return createDate;
+	}
+	public void setCreateDate(Date createDate) {
+		this.createDate = createDate;
+	}
+	public String getStrDate() {
+		return strDate;
+	}
+	public void setStrDate(String strDate) {
+		this.strDate = strDate;
+	}
+	public String getAmount() {
+		return amount;
+	}
+	public void setAmount(String amount) {
+		this.amount = amount;
+	}
+	public String getName() {
+		return name;
+	}
+	public void setName(String name) {
+		this.name = name;
+	}
+	public int getIsReward() {
+		return isReward;
+	}
+	public void setIsReward(int isReward) {
+		this.isReward = isReward;
+	}
+	public int getStatus() {
+		return status;
+	}
+	public void setStatus(int status) {
+		this.status = status;
+	}
+	
+}

watero-common-core/src/main/java/com/iamberry/wechat/core/entity/drp/ObjRecord.java

@@ -0,0 +1,107 @@
+package com.iamberry.wechat.core.entity.drp;
+
+import java.util.Date;
+
+import org.apache.commons.lang3.time.DateFormatUtils;
+
+import com.fasterxml.jackson.databind.annotation.JsonSerialize;
+
+
+/**
+ * @decription 用于当前端单条记录的返回容器
+ * @author 欧阳明
+ * @date 2016-4-19
+ */
+public class ObjRecord implements java.io.Serializable{
+
+	/**
+	 * 
+	 */
+	private static final long serialVersionUID = 6385577251096107853L;
+	private int amount;             //金额
+	private String orderNo;         //订单号
+	private String strDate;         //日期
+	private String name;           //项目及名称
+	private String img ;           //图片
+	private Date createDate;
+	private String roleName;  //角色名
+	private String salesNumber;  //销售条数
+	
+	public int getAmount() {
+		return amount;
+	}
+	public void setAmount(int amount) {
+		this.amount = amount;
+	}
+	public String getOrderNo() {
+		return orderNo;
+	}
+	public void setOrderNo(String orderNo) {
+		this.orderNo = orderNo;
+	}
+	
+	public String getStrDate() {
+		return strDate;
+	}
+	public void setStrDate(String strDate) {
+		this.strDate = strDate;
+	}
+	public String getName() {
+		return name;
+	}
+	public void setName(String name) {
+		this.name = name;
+	}
+	
+	/**
+	 * 格式日期为指定的格式
+	 * @param date 日期
+	 * @param pattern 格式化样式 如 yyyy-MM-dd HH:mm:ss
+	 */
+	public void initStrDate(Date date, String pattern){
+		strDate=DateFormatUtils.format(date, pattern);
+	}
+	
+	/**
+	 * 格式日期为指定的格式  ,默认格式为 MM.dd
+	 * @param date 日期
+	 */
+	public void initStrDateMMdd(Date date){
+		strDate=DateFormatUtils.format(date, "MM.dd");
+	}
+	
+	/**
+	 * 格式日期为指定的格式  ,默认格式为 MM.dd
+	 * @param date 日期
+	 */
+	public void initStrDate(Date date){
+		strDate=DateFormatUtils.format(date, "yyyy-MM-dd");
+	}
+	public String getImg() {
+		return img;
+	}
+	public void setImg(String img) {
+		this.img = img;
+	}
+//	@JsonSerialize(using = JsonDateFormat.class) 
+	public Date getCreateDate() {
+		return createDate;
+	}
+	public void setCreateDate(Date createDate) {
+		this.createDate = createDate;
+	}
+	public String getRoleName() {
+		return roleName;
+	}
+	public void setRoleName(String roleName) {
+		this.roleName = roleName;
+	}
+	public String getSalesNumber() {
+		return salesNumber;
+	}
+	public void setSalesNumber(String salesNumber) {
+		this.salesNumber = salesNumber;
+	}
+	
+	
+}

watero-common-core/src/main/java/com/iamberry/wechat/core/entity/drp/ObjRecord2.java

@@ -0,0 +1,107 @@
+package com.iamberry.wechat.core.entity.drp;
+
+import java.util.Date;
+
+import org.apache.commons.lang3.time.DateFormatUtils;
+
+import com.fasterxml.jackson.databind.annotation.JsonSerialize;
+
+
+/**
+ * @decription 用于当前端单条记录的返回容器
+ * @author 欧阳明
+ * @date 2016-4-19
+ */
+public class ObjRecord2 implements java.io.Serializable{
+
+	/**
+	 * 
+	 */
+	private static final long serialVersionUID = -8694834013611253117L;
+	private int amount;             //金额
+	private String openid;         //openid
+	private String strDate;         //日期
+	private String name;           //项目及名称
+	private String img ;           //图片
+	private Date createDate;
+	private String roleName;  //角色名
+	private String num; //总数
+	
+	public int getAmount() {
+		return amount;
+	}
+	public void setAmount(int amount) {
+		this.amount = amount;
+	}
+	
+	public String getOpenid() {
+		return openid;
+	}
+	public void setOpenid(String openid) {
+		this.openid = openid;
+	}
+	public String getStrDate() {
+		return strDate;
+	}
+	public void setStrDate(String strDate) {
+		this.strDate = strDate;
+	}
+	public String getName() {
+		return name;
+	}
+	public void setName(String name) {
+		this.name = name;
+	}
+	
+	/**
+	 * 格式日期为指定的格式
+	 * @param date 日期
+	 * @param pattern 格式化样式 如 yyyy-MM-dd HH:mm:ss
+	 */
+	public void initStrDate(Date date, String pattern){
+		strDate=DateFormatUtils.format(date, pattern);
+	}
+	
+	/**
+	 * 格式日期为指定的格式  ,默认格式为 MM.dd
+	 * @param date 日期
+	 */
+	public void initStrDateMMdd(Date date){
+		strDate=DateFormatUtils.format(date, "MM.dd");
+	}
+	
+	/**
+	 * 格式日期为指定的格式  ,默认格式为 MM.dd
+	 * @param date 日期
+	 */
+	public void initStrDate(Date date){
+		strDate=DateFormatUtils.format(date, "yyyy-MM-dd");
+	}
+	public String getImg() {
+		return img;
+	}
+	public void setImg(String img) {
+		this.img = img;
+	}
+//	@JsonSerialize(using = JsonDateFormat.class) 
+	public Date getCreateDate() {
+		return createDate;
+	}
+	public void setCreateDate(Date createDate) {
+		this.createDate = createDate;
+	}
+	public String getRoleName() {
+		return roleName;
+	}
+	public void setRoleName(String roleName) {
+		this.roleName = roleName;
+	}
+	public String getNum() {
+		return num;
+	}
+	public void setNum(String num) {
+		this.num = num;
+	}
+	
+	
+}

watero-common-core/src/main/java/com/iamberry/wechat/core/entity/drp/PageBeanEarningLogs.java

@@ -0,0 +1,112 @@
+	package com.iamberry.wechat.core.entity.drp;
+
+
+public class PageBeanEarningLogs implements java.io.Serializable{
+
+	
+	/**
+	 * 
+	 */
+	private static final long serialVersionUID = -2538758270678877235L;
+	private int count;      //记录总数
+	private int pageSize;   //每一页的记录数
+	private int pageNumber;  //页码
+	private int pageCount;   //总页数
+	private int recordBegin ; //查询的开始记录数
+	
+	private Object condition;
+	
+	public PageBeanEarningLogs(){
+		
+	}
+	
+	public PageBeanEarningLogs(int count,int pageSize,int recordBegin){
+		this.count=count;
+		this.pageSize=pageSize;
+		this.recordBegin=recordBegin;
+	}
+	
+	public void init(int count,int pageSize,int pageNumber){
+		this.count=count;
+		this.pageSize=pageSize;
+		this.pageNumber=pageNumber;
+		initRecordBegin();
+	}
+	
+	public int getCount() {
+		return count;
+	}
+	public void setCount(int count) {
+		this.count = count;
+	}
+	public int getPageSize() {
+		if(pageSize==0) return 6;
+		return pageSize;
+	}
+	public void setPageSize(int pageSize) {
+		this.pageSize = pageSize;
+	}
+	public int getPageNumber() {
+		if(this.pageNumber==0)
+			this.pageNumber=1;
+		return pageNumber;
+	}
+	public void setPageNumber(int pageNumber) {
+		this.pageNumber = pageNumber;
+	}
+	public int getPageCount() {
+		if(pageSize>0 && count>0 ){
+			this.pageCount=(int) Math.ceil((double)count/pageSize);
+		}else{
+			this.pageCount=0;
+		}
+		return pageCount;
+	}
+	public void setPageCount(int pageCount) {
+		this.pageCount = pageCount;
+	}
+	public int getRecordBegin() {
+		return recordBegin;
+	}
+	public void setRecordBegin(int recordBegin) {
+		this.recordBegin = recordBegin;
+	}
+	/**
+	 * @decription 初始化分页查询的开始记录数
+	 */
+	public void initRecordBegin(){
+		if(pageNumber==1) this.recordBegin = 0;
+		if(pageNumber>1){
+			this.recordBegin=this.getPageSize()*(this.pageNumber-1);
+		}
+	}
+	
+	//获取下一页内容设置
+	public void setTurnToNextPage(){
+		pageNumber=pageNumber+1;
+		initRecordBegin();
+	}
+
+	public Object getCondition() {
+		return condition;
+	}
+
+	public void setCondition(Object condition) {
+		this.condition = condition;
+	}
+
+	public static long getSerialversionuid() {
+		return serialVersionUID;
+	}
+
+	
+	
+	
+
+
+
+	
+	
+	
+	
+}

watero-common-core/src/main/java/com/iamberry/wechat/core/entity/drp/PageBeanPlaceInfo.java

@@ -0,0 +1,107 @@
+package com.iamberry.wechat.core.entity.drp;
+
+
+public class PageBeanPlaceInfo implements java.io.Serializable{
+
+	
+	/**
+	 * 
+	 */
+	private static final long serialVersionUID = 3149179992372119411L;
+	private int count;      //记录总数
+	private int pageSize;   //每一页的记录数
+	private int pageNumber;  //页码
+	private int pageCount;   //总页数
+	private int recordBegin ; //查询的开始记录数
+	
+	private PlaceInfo condition;
+	
+	public PageBeanPlaceInfo(){
+		
+	}
+	
+	public PageBeanPlaceInfo(int count,int pageSize,int recordBegin){
+		this.count=count;
+		this.pageSize=pageSize;
+		this.recordBegin=recordBegin;
+	}
+	
+	public void init(int count,int pageSize,int pageNumber){
+		this.count=count;
+		this.pageSize=pageSize;
+		this.pageNumber=pageNumber;
+		initRecordBegin();
+	}
+	
+	public int getCount() {
+		return count;
+	}
+	public void setCount(int count) {
+		this.count = count;
+	}
+	public int getPageSize() {
+		if(pageSize==0) return 6;
+		return pageSize;
+	}
+	public void setPageSize(int pageSize) {
+		this.pageSize = pageSize;
+	}
+	public int getPageNumber() {
+		if(this.pageNumber==0)
+			this.pageNumber=1;
+		return pageNumber;
+	}
+	public void setPageNumber(int pageNumber) {
+		this.pageNumber = pageNumber;
+	}
+	public int getPageCount() {
+		if(pageSize>0 && count>0 ){
+			this.pageCount=(int) Math.ceil((double)count/pageSize);
+		}else{
+			this.pageCount=0;
+		}
+		return pageCount;
+	}
+	public void setPageCount(int pageCount) {
+		this.pageCount = pageCount;
+	}
+	public int getRecordBegin() {
+		return recordBegin;
+	}
+	public void setRecordBegin(int recordBegin) {
+		this.recordBegin = recordBegin;
+	}
+	/**
+	 * @decription 初始化分页查询的开始记录数
+	 */
+	public void initRecordBegin(){
+		if(pageNumber==1) this.recordBegin = 0;
+		if(pageNumber>1){
+			this.recordBegin=this.getPageSize()*(this.pageNumber-1);
+		}
+	}
+	
+	//获取下一页内容设置
+	public void setTurnToNextPage(){
+		pageNumber=pageNumber+1;
+		initRecordBegin();
+	}
+
+	public PlaceInfo getCondition() {
+		return condition;
+	}
+
+	public void setCondition(PlaceInfo condition) {
+		this.condition = condition;
+	}
+
+	
+	
+
+
+
+	
+	
+	
+	
+}

watero-common-core/src/main/java/com/iamberry/wechat/core/entity/drp/PageBeanPlaceLogs.java

@@ -0,0 +1,97 @@
+package com.iamberry.wechat.core.entity.drp;
+
+
+public class PageBeanPlaceLogs implements java.io.Serializable{
+
+	/**
+	 * 
+	 */
+	private static final long serialVersionUID = 8498474755431184288L;
+	private int count;      //记录总数
+	private int pageSize;   //每一页的记录数
+	private int pageNumber;  //页码
+	private int pageCount;   //总页数
+	private int recordBegin ; //查询的开始记录数
+	
+	private PlaceLogs condition;
+	
+	public PageBeanPlaceLogs(){
+		
+	}
+	
+	public PageBeanPlaceLogs(int count,int pageSize,int recordBegin){
+		this.count=count;
+		this.pageSize=pageSize;
+		this.recordBegin=recordBegin;
+	}
+	
+	public void init(int count,int pageSize,int pageNumber){
+		this.count=count;
+		this.pageSize=pageSize;
+		this.pageNumber=pageNumber;
+		initRecordBegin();
+	}
+	
+	public int getCount() {
+		return count;
+	}
+	public void setCount(int count) {
+		this.count = count;
+	}
+	public int getPageSize() {
+		if(pageSize==0) return 6;
+		return pageSize;
+	}
+	public void setPageSize(int pageSize) {
+		this.pageSize = pageSize;
+	}
+	public int getPageNumber() {
+		if(this.pageNumber==0)
+			this.pageNumber=1;
+		return pageNumber;
+	}
+	public void setPageNumber(int pageNumber) {
+		this.pageNumber = pageNumber;
+	}
+	public int getPageCount() {
+		if(pageSize>0 && count>0 ){
+			this.pageCount=(int) Math.ceil((double)count/pageSize);
+		}else{
+			this.pageCount=0;
+		}
+		return pageCount;
+	}
+	public void setPageCount(int pageCount) {
+		this.pageCount = pageCount;
+	}
+	public int getRecordBegin() {
+		return recordBegin;
+	}
+	public void setRecordBegin(int recordBegin) {
+		this.recordBegin = recordBegin;
+	}
+	/**
+	 * @decription 初始化分页查询的开始记录数
+	 */
+	public void initRecordBegin(){
+		if(pageNumber==1) this.recordBegin = 0;
+		if(pageNumber>1){
+			this.recordBegin=this.getPageSize()*(this.pageNumber-1);
+		}
+	}
+	
+	//获取下一页内容设置
+	public void setTurnToNextPage(){
+		pageNumber=pageNumber+1;
+		initRecordBegin();
+	}
+
+	public PlaceLogs getCondition() {
+		return condition;
+	}
+
+	public void setCondition(PlaceLogs condition) {
+		this.condition = condition;
+	}
+
+}

watero-common-core/src/main/java/com/iamberry/wechat/core/entity/drp/PageBeanWithdraw.java

@@ -0,0 +1,108 @@
+package com.iamberry.wechat.core.entity.drp;
+
+
+public class PageBeanWithdraw implements java.io.Serializable{
+
+	
+	/**
+	 * 
+	 */
+	private static final long serialVersionUID = -1300804460545142806L;
+	private int count;      //记录总数
+	private int pageSize;   //每一页的记录数
+	private int pageNumber;  //页码
+	private int pageCount;   //总页数
+	private int recordBegin ; //查询的开始记录数
+	
+	private PlaceWithDrawalsLogs condition;
+	
+	public PageBeanWithdraw(){
+		
+	}
+	
+	public PageBeanWithdraw(int count,int pageSize,int recordBegin){
+		this.count=count;
+		this.pageSize=pageSize;
+		this.recordBegin=recordBegin;
+	}
+	
+	public void init(int count,int pageSize,int pageNumber){
+		this.count=count;
+		this.pageSize=pageSize;
+		this.pageNumber=pageNumber;
+		initRecordBegin();
+	}
+	
+	public int getCount() {
+		return count;
+	}
+	public void setCount(int count) {
+		this.count = count;
+	}
+	public int getPageSize() {
+		if(pageSize==0) return 6;
+		return pageSize;
+	}
+	public void setPageSize(int pageSize) {
+		this.pageSize = pageSize;
+	}
+	public int getPageNumber() {
+		if(this.pageNumber==0)
+			this.pageNumber=1;
+		return pageNumber;
+	}
+	public void setPageNumber(int pageNumber) {
+		this.pageNumber = pageNumber;
+	}
+	public int getPageCount() {
+		if(pageSize>0 && count>0 ){
+			this.pageCount=(int) Math.ceil((double)count/pageSize);
+		}else{
+			this.pageCount=0;
+		}
+		return pageCount;
+	}
+	public void setPageCount(int pageCount) {
+		this.pageCount = pageCount;
+	}
+	public int getRecordBegin() {
+		return recordBegin;
+	}
+	public void setRecordBegin(int recordBegin) {
+		this.recordBegin = recordBegin;
+	}
+	/**
+	 * @decription 初始化分页查询的开始记录数
+	 */
+	public void initRecordBegin(){
+		if(pageNumber==1) this.recordBegin = 0;
+		if(pageNumber>1){
+			this.recordBegin=this.getPageSize()*(this.pageNumber-1);
+		}
+	}
+	
+	//获取下一页内容设置
+	public void setTurnToNextPage(){
+		pageNumber=pageNumber+1;
+		initRecordBegin();
+	}
+
+	public PlaceWithDrawalsLogs getCondition() {
+		return condition;
+	}
+
+	public void setCondition(PlaceWithDrawalsLogs condition) {
+		this.condition = condition;
+	}
+
+	
+	
+	
+
+
+
+	
+	
+	
+	
+}

watero-common-core/src/main/java/com/iamberry/wechat/core/entity/drp/PlaceInfo.java

@@ -0,0 +1,255 @@
+package com.iamberry.wechat.core.entity.drp;
+
+import java.util.Date;
+
+import javax.validation.constraints.Min;
+import javax.validation.constraints.Pattern;
+
+import org.hibernate.validator.constraints.NotBlank;
+
+import com.iamberry.wechat.core.entity.PageBean;
+
+
+/**
+ * description ： 代理者实体类
+ * @author 欧阳明
+ * @date：2016-4-18
+ */
+public class PlaceInfo implements java.io.Serializable{
+
+	/**
+	 * 
+	 */
+	private static final long serialVersionUID = -7433227675461997618L;
+	
+	private int id;     						//主键
+	@Min(value=1,message="顶级分销商不能为空")
+	private int supperId;  						//顶级分销商
+	private String supperName ; 				//顶级分销商名称
+	private String parentName ; 				//父级名称
+	@NotBlank(message="昵称至少两个汉字符")
+	@Pattern(regexp="^[a-zA-Z0-9\u4E00-\u9FA5]{4,}$",message="昵称必须是汉字，英文，数字，不能有特殊符号！")
+	private String name ;   					//公司名称
+	
+	@Pattern(regexp="^[a-zA-Z0-9\u4E00-\u9FA5]{4,}$",message="地址必须是汉字，英文，数字，不能有特殊符号！")
+	private String userNickname;				//微信昵称
+	private String addr;    					//地址
+	private String userName;  					//联系人姓名
+	//@Pattern(regexp="((\\d{3}-\\d{8}|\\d{4}-\\d{7,8})|(1[3|5|7|8][0-9]{9}))",message="地址格式不正确！")
+	@Pattern(regexp="(1[0-9]{10})",message="电话号码格式不正确！")
+	private String tel;      					// 电话号码
+	private int amount;      					//金额
+	@Min(value=1,message="状态不能为空，而且必须是数字")
+	private int  status;     					// 状态 	1，使用中，2,停止使用
+	
+	private String openid;  					//用户全局标识-微信id
+	private String initCode;    				//激活码
+	private Date createDate;    				//创建时间
+	private Date updateDate;    				//更新时间
+	@Min(value=1,message="角色不能为空，而且必须是数字")
+	private int roleId ; 						//角色
+	
+	@Min(value=1,message="父节点不能为空，而且必须是数字")
+	private int placePid ; 						//父节点
+	private Integer placeIds; 					//父节点集合
+	private int templateId ; 					//模板id 
+	private int  hasQrcode; 					//是否有二维码		1:没有		2：有
+	private String roleName; 					//角色名称
+	
+	private String templateName;				//模板名称
+	private String areaName;    				//区域名
+	private String remark; 						//备注
+	
+	private PageBean page; 						//分页信息
+	private String qrcodeUrl;					//二维码链接
+	private String userHead;					//用户头像
+	private Integer placeInfoStus;				//用户信息是否完善	1:待完善；2：已完善
+	
+	public String getQrcodeUrl() {
+		return qrcodeUrl;
+	}
+	public void setQrcodeUrl(String qrcodeUrl) {
+		this.qrcodeUrl = qrcodeUrl;
+	}
+	public int getId() {
+		return id;
+	}
+	public void setId(int id) {
+		this.id = id;
+	}
+	public int getSupperId() {
+		return supperId;
+	}
+	public void setSupperId(int supperId) {
+		this.supperId = supperId;
+	}
+	public String getName() {
+		return name;
+	}
+	public void setName(String name) {
+		this.name = name;
+	}
+	public String getAddr() {
+		return addr;
+	}
+	public void setAddr(String addr) {
+		this.addr = addr;
+	}
+	public String getUserName() {
+		return userName;
+	}
+	public void setUserName(String userName) {
+		this.userName = userName;
+	}
+	public String getTel() {
+		return tel;
+	}
+	public void setTel(String tel) {
+		this.tel = tel;
+	}
+	public int getAmount() {
+		return amount;
+	}
+	public void setAmount(int amount) {
+		this.amount = amount;
+	}
+	public int getStatus() {
+		return status;
+	}
+	public void setStatus(int status) {
+		this.status = status;
+	}
+	
+	public String getOpenid() {
+		return openid;
+	}
+	public void setOpenid(String openid) {
+		this.openid = openid;
+	}
+	public String getInitCode() {
+		return initCode;
+	}
+	public void setInitCode(String initCode) {
+		this.initCode = initCode;
+	}
+//	@JsonSerialize(using = JsonDateFormat.class)
+	public Date getCreateDate() {
+		return createDate;
+	}
+	public void setCreateDate(Date createDate) {
+		this.createDate = createDate;
+	}
+	public Date getUpdateDate() {
+		return updateDate;
+	}
+	public void setUpdateDate(Date updateDate) {
+		this.updateDate = updateDate;
+	}
+	public PageBean getPage() {
+		return page;
+	}
+	public void setPage(PageBean page) {
+		this.page = page;
+	}
+	public String getSupperName() {
+		return supperName;
+	}
+	public void setSupperName(String supperName) {
+		this.supperName = supperName;
+	}
+	public int getPlacePid() {
+		return placePid;
+	}
+	public void setPlacePid(int placePid) {
+		this.placePid = placePid;
+	}
+	public String getParentName() {
+		return parentName;
+	}
+	public void setParentName(String parentName) {
+		this.parentName = parentName;
+	}
+	public int getRoleId() {
+		return roleId;
+	}
+	public void setRoleId(int roleId) {
+		this.roleId = roleId;
+	}
+	public Integer getPlaceIds() {
+		return placeIds;
+	}
+	public void setPlaceIds(Integer placeIds) {
+		this.placeIds = placeIds;
+	}
+	public int getTemplateId() {
+		return templateId;
+	}
+	public void setTemplateId(int templateId) {
+		this.templateId = templateId;
+	}
+	public int getHasQrcode() {
+		return hasQrcode;
+	}
+	public void setHasQrcode(int hasQrcode) {
+		this.hasQrcode = hasQrcode;
+	}
+	public String getRoleName() {
+		return roleName;
+	}
+	public void setRoleName(String roleName) {
+		this.roleName = roleName;
+	}
+	public String getTemplateName() {
+		return templateName;
+	}
+	public void setTemplateName(String templateName) {
+		this.templateName = templateName;
+	}
+	public String getAreaName() {
+		return areaName;
+	}
+	public void setAreaName(String areaName) {
+		this.areaName = areaName;
+	}
+	public String getRemark() {
+		return remark;
+	}
+	public void setRemark(String remark) {
+		this.remark = remark;
+	}
+	public String getUserHead() {
+		return userHead;
+	}
+	public void setUserHead(String userHead) {
+		this.userHead = userHead;
+	}
+	public Integer getPlaceInfoStus() {
+		return placeInfoStus;
+	}
+	public void setPlaceInfoStus(Integer placeInfoStus) {
+		this.placeInfoStus = placeInfoStus;
+	}
+	public String getUserNickname() {
+		return userNickname;
+	}
+	public void setUserNickname(String userNickname) {
+		this.userNickname = userNickname;
+	}
+	@Override
+	public String toString() {
+		return "PlaceInfo [id=" + id + ", supperId=" + supperId
+				+ ", supperName=" + supperName + ", parentName=" + parentName
+				+ ", name=" + name + ", userNickname=" + userNickname
+				+ ", addr=" + addr + ", userName=" + userName + ", tel=" + tel
+				+ ", amount=" + amount + ", status=" + status + ", openid="
+				+ openid + ", initCode=" + initCode + ", createDate="
+				+ createDate + ", updateDate=" + updateDate + ", roleId="
+				+ roleId + ", placePid=" + placePid + ", placeIds=" + placeIds
+				+ ", templateId=" + templateId + ", hasQrcode=" + hasQrcode
+				+ ", roleName=" + roleName + ", templateName=" + templateName
+				+ ", areaName=" + areaName + ", remark=" + remark + ", page="
+				+ page + ", qrcodeUrl=" + qrcodeUrl
+				+ ", userHead=" + userHead + ", placeInfoStus=" + placeInfoStus
+				+ "]";
+	}
+}

watero-common-core/src/main/java/com/iamberry/wechat/core/entity/drp/PlaceInfoBattleDto.java

@@ -0,0 +1,49 @@
+package com.iamberry.wechat.core.entity.drp;
+
+public class PlaceInfoBattleDto implements java.io.Serializable{
+
+	/**
+	 * 
+	 */
+	private static final long serialVersionUID = 145712946561420943L;
+	private int roleId ; //角色
+	private int placePid ; //父节点
+	private int templateId ; //模板id 
+	private int  hasQrcode; //是否支持二维码
+	private int  num ; //预计生成数量
+	
+	
+	public int getRoleId() {
+		return roleId;
+	}
+	public void setRoleId(int roleId) {
+		this.roleId = roleId;
+	}
+	public int getPlacePid() {
+		return placePid;
+	}
+	public void setPlacePid(int placePid) {
+		this.placePid = placePid;
+	}
+	public int getTemplateId() {
+		return templateId;
+	}
+	public void setTemplateId(int templateId) {
+		this.templateId = templateId;
+	}
+	public int getHasQrcode() {
+		return hasQrcode;
+	}
+	public void setHasQrcode(int hasQrcode) {
+		this.hasQrcode = hasQrcode;
+	}
+	public int getNum() {
+		return num;
+	}
+	public void setNum(int num) {
+		this.num = num;
+	}
+	
+	
+	
+}

watero-common-core/src/main/java/com/iamberry/wechat/core/entity/drp/PlaceLogs.java

@@ -0,0 +1,126 @@
+package com.iamberry.wechat.core.entity.drp;
+
+import java.util.Date;
+
+import com.iamberry.wechat.core.entity.PageBean;
+
+
+
+/**
+ * @description ：分销的现金记录，记录收入，支出，提现的情况
+ * @author 欧阳明
+ *  @date：2016-4-18
+ */
+public class PlaceLogs implements java.io.Serializable{
+	/**
+	 * 
+	 */
+	private static final long serialVersionUID = 2344165037592472619L;
+	private int id;     //主键
+	private int placeId;  //代理对象id
+	private int nums;     //总金额，单位为分
+	private int type;     //类型：1，收入；2，支出；
+	private String introduction;  // 记录描述
+	private int resType;   //记录来源类型：1：订单收入；2，提现支出；3，购买支出
+	private Date createDate;    //创建时间
+	private Date updateDate;    //更新时间
+	private PageBean page;  //分页
+	
+	private String drpName; //分销商
+	private int drpType ; //分销商类型
+	
+	private String endDate; //查询的结束时间
+	private String beginDate; //查询的结束时间
+	
+	private String remark ; //备注
+
+	public int getId() {
+		return id;
+	}
+	public void setId(int id) {
+		this.id = id;
+	}
+	public int getPlaceId() {
+		return placeId;
+	}
+	public void setPlaceId(int placeId) {
+		this.placeId = placeId;
+	}
+	public int getNums() {
+		return nums;
+	}
+	public void setNums(int nums) {
+		this.nums = nums;
+	}
+	public int getType() {
+		return type;
+	}
+	public void setType(int type) {
+		this.type = type;
+	}
+	public String getIntroduction() {
+		return introduction;
+	}
+	public void setIntroduction(String introduction) {
+		this.introduction = introduction;
+	}
+	
+	public int getResType() {
+		return resType;
+	}
+	public void setResType(int resType) {
+		this.resType = resType;
+	}
+	public Date getCreateDate() {
+		return createDate;
+	}
+	public void setCreateDate(Date createDate) {
+		this.createDate = createDate;
+	}
+	public Date getUpdateDate() {
+		return updateDate;
+	}
+	public void setUpdateDate(Date updateDate) {
+		this.updateDate = updateDate;
+	}
+	public PageBean getPage() {
+		return page;
+	}
+	public void setPage(PageBean page) {
+		this.page = page;
+	}
+	
+	public String getDrpName() {
+		return drpName;
+	}
+	public void setDrpName(String drpName) {
+		this.drpName = drpName;
+	}
+	public int getDrpType() {
+		return drpType;
+	}
+	public void setDrpType(int drpType) {
+		this.drpType = drpType;
+	}
+	public String getEndDate() {
+		return endDate;
+	}
+	public void setEndDate(String endDate) {
+		this.endDate = endDate;
+	}
+	public String getBeginDate() {
+		return beginDate;
+	}
+	public void setBeginDate(String beginDate) {
+		this.beginDate = beginDate;
+	}
+	public String getRemark() {
+		return remark;
+	}
+	public void setRemark(String remark) {
+		this.remark = remark;
+	}
+	
+	
+	
+}

watero-common-core/src/main/java/com/iamberry/wechat/core/entity/drp/PlaceRoleInfo.java

@@ -0,0 +1,83 @@
+package com.iamberry.wechat.core.entity.drp;
+
+import java.io.Serializable;
+import java.util.Date;
+
+import com.iamberry.wechat.core.entity.PageBean;
+
+public class PlaceRoleInfo implements Serializable{
+
+	private static final long serialVersionUID = -1147297727949629824L;
+
+	private Integer roleId;		//角色id
+	
+	private String roleName;		//角色名称
+	
+	private Date roleCreateDate;		//创建时间
+	
+	private Date roleUpdateDate;		//更新时间
+	
+	private Integer roleStatus;			//状态	1：使用中		2：停用		3：删除
+
+	private Integer roleType;				//角色类型  1：商户层；2：微代理
+	
+	
+	public Integer getRoleType() {
+		return roleType;
+	}
+
+	public void setRoleType(Integer roleType) {
+		this.roleType = roleType;
+	}
+
+	private PageBean page = new PageBean(); //分页信息
+
+	public Integer getRoleId() {
+		return roleId;
+	}
+
+	public void setRoleId(Integer roleId) {
+		this.roleId = roleId;
+	}
+
+	public String getRoleName() {
+		return roleName;
+	}
+
+	public void setRoleName(String roleName) {
+		this.roleName = roleName;
+	}
+
+	public Date getRoleCreateDate() {
+		return roleCreateDate;
+	}
+
+	public void setRoleCreateDate(Date roleCreateDate) {
+		this.roleCreateDate = roleCreateDate;
+	}
+
+	public Date getRoleUpdateDate() {
+		return roleUpdateDate;
+	}
+
+	public void setRoleUpdateDate(Date roleUpdateDate) {
+		this.roleUpdateDate = roleUpdateDate;
+	}
+
+	public Integer getRoleStatus() {
+		return roleStatus;
+	}
+
+	public void setRoleStatus(Integer roleStatus) {
+		this.roleStatus = roleStatus;
+	}
+
+	public PageBean getPage() {
+		return page;
+	}
+
+	public void setPage(PageBean page) {
+		this.page = page;
+	}
+	
+}

watero-common-core/src/main/java/com/iamberry/wechat/core/entity/drp/PlaceWithDrawalsLogs.java

@@ -0,0 +1,161 @@
+package com.iamberry.wechat.core.entity.drp;
+
+import java.util.Date;
+
+import javax.validation.constraints.Min;
+import javax.validation.constraints.Pattern;
+
+import org.hibernate.validator.constraints.NotBlank;
+
+import com.fasterxml.jackson.databind.annotation.JsonSerialize;
+import com.iamberry.wechat.core.entity.PageBean;
+
+
+/**
+ * @description ：分销代理提现申请
+ * @author 欧阳明
+ * @date：2016-4-18
+ */
+public class PlaceWithDrawalsLogs implements java.io.Serializable{
+
+	/**
+	 * 
+	 */
+	private static final long serialVersionUID = -3366057605770079694L;
+	private int id;             //主键
+	private String openid;      //微信号
+	private int placeId;         //分销的唯一标识
+	@Min(value=100,message="提现金额必须大于100")
+	private int withDrawalsNum;   //提现金额
+	@NotBlank(message="提现人不能为空")
+	private String withDrawalsName; //提现者姓名
+	@Pattern(regexp="^[1][0-9]{10}$",message="手机号码不正确")
+	private String tel ;               //提现号码
+	
+	private int status;          //状态1，申请中，2，申请完成，3，申请失败
+	private Date createDate;
+	private Date updateDate;
+	
+	@NotBlank(message="提现账户不能为空")
+	private String accountNo ; //提现账户
+	@NotBlank(message="提现支行不能为空")
+	private String bankLocal ; //提现银行分局
+	
+	private String remark; //备注
+	
+	private PageBean page ; //分页的考虑
+	
+	private String  roleName; //分销商角色
+	private String name ; //分销商昵称
+	
+	private String beginDate;   //查询条件开始时间
+	private String endDate;     //查询条件结束时间
+
+	public int getId() {
+		return id;
+	}
+	public void setId(int id) {
+		this.id = id;
+	}
+	public String getOpenid() {
+		return openid;
+	}
+	public void setOpenid(String openid) {
+		this.openid = openid;
+	}
+	public int getPlaceId() {
+		return placeId;
+	}
+	public void setPlaceId(int placeId) {
+		this.placeId = placeId;
+	}
+	public int getWithDrawalsNum() {
+		return withDrawalsNum;
+	}
+	public void setWithDrawalsNum(int withDrawalsNum) {
+		this.withDrawalsNum = withDrawalsNum;
+	}
+	public String getWithDrawalsName() {
+		return withDrawalsName;
+	}
+	public void setWithDrawalsName(String withDrawalsName) {
+		this.withDrawalsName = withDrawalsName;
+	}
+	public String getTel() {
+		return tel;
+	}
+	public void setTel(String tel) {
+		this.tel = tel;
+	}
+	public int getStatus() {
+		return status;
+	}
+	public void setStatus(int status) {
+		this.status = status;
+	}
+//	@JsonSerialize(using = JsonDateFormat.class) 
+	public Date getCreateDate() {
+		return createDate;
+	}
+	public void setCreateDate(Date createDate) {
+		this.createDate = createDate;
+	}
+	public Date getUpdateDate() {
+		return updateDate;
+	}
+	public void setUpdateDate(Date updateDate) {
+		this.updateDate = updateDate;
+	}
+	public PageBean getPage() {
+		return page;
+	}
+	public void setPage(PageBean page) {
+		this.page = page;
+	}
+	
+	public String getAccountNo() {
+		return accountNo;
+	}
+	public void setAccountNo(String accountNo) {
+		this.accountNo = accountNo;
+	}
+	public String getBankLocal() {
+		return bankLocal;
+	}
+	public void setBankLocal(String bankLocal) {
+		this.bankLocal = bankLocal;
+	}
+	public String getRemark() {
+		return remark;
+	}
+	public void setRemark(String remark) {
+		this.remark = remark;
+	}
+	public String getRoleName() {
+		return roleName;
+	}
+	public void setRoleName(String roleName) {
+		this.roleName = roleName;
+	}
+	public String getName() {
+		return name;
+	}
+	public void setName(String name) {
+		this.name = name;
+	}
+	public String getBeginDate() {
+		return beginDate;
+	}
+	public void setBeginDate(String beginDate) {
+		this.beginDate = beginDate;
+	}
+	public String getEndDate() {
+		return endDate;
+	}
+	public void setEndDate(String endDate) {
+		this.endDate = endDate;
+	}
+	
+	
+
+}

watero-common-core/src/main/java/com/iamberry/wechat/core/entity/flow/TemplateFlowInfo.java

@@ -0,0 +1,138 @@
+package com.iamberry.wechat.core.entity.flow;
+
+import java.util.Date;
+
+/**
+ * 模板表，用于建立返利流程节点定义表
+ * @author liuzhiwei
+ * @date 2016-7-5
+ */
+public class TemplateFlowInfo implements java.io.Serializable{
+	
+	/**
+	 * 
+	 */
+	private static final long serialVersionUID = 3075376006843403648L;
+
+	private Integer flowId;							//流程节点id
+	
+	private Integer templateId;					//模板id
+	
+	private Integer flowLevel;					//层次
+	
+	private Integer flowSkipStep;				//是否跳过
+	
+	private Integer flowMoney;					//返利金额
+	
+	private Integer flowRoleId;					//角色id
+	
+	private Integer flowType;					//角色类型
+	
+	private Date flowCreateDate;				//创建时间
+	
+	private Date flowUpdateDate;				//更新时间
+	
+	private Integer flowState;					//状态
+	
+	private String flowNo;						//存放坐标，用于标识存放页面具体位置
+	
+	private Integer flowProductType;			// 产品类型
+	
+	public Integer getFlowProductType() {
+		return flowProductType;
+	}
+
+	public void setFlowProductType(Integer flowProductType) {
+		this.flowProductType = flowProductType;
+	}
+
+	public String getFlowNo() {
+		return flowNo;
+	}
+
+	public void setFlowNo(String flowNo) {
+		this.flowNo = flowNo;
+	}
+
+	public Integer getFlowId() {
+		return flowId;
+	}
+
+	public void setFlowId(Integer flowId) {
+		this.flowId = flowId;
+	}
+
+	public Integer getTemplateId() {
+		return templateId;
+	}
+
+	public void setTemplateId(Integer templateId) {
+		this.templateId = templateId;
+	}
+
+	public Integer getFlowLevel() {
+		return flowLevel;
+	}
+
+	public void setFlowLevel(Integer flowLevel) {
+		this.flowLevel = flowLevel;
+	}
+
+	public Integer getFlowSkipStep() {
+		return flowSkipStep;
+	}
+
+	public void setFlowSkipStep(Integer flowSkipStep) {
+		this.flowSkipStep = flowSkipStep;
+	}
+
+	public Integer getFlowMoney() {
+		return flowMoney;
+	}
+
+	public void setFlowMoney(Integer flowMoney) {
+		this.flowMoney = flowMoney;
+	}
+
+	public Integer getFlowRoleId() {
+		return flowRoleId;
+	}
+
+	public void setFlowRoleId(Integer flowRoleId) {
+		this.flowRoleId = flowRoleId;
+	}
+
+	public Integer getFlowType() {
+		return flowType;
+	}
+
+	public void setFlowType(Integer flowType) {
+		this.flowType = flowType;
+	}
+
+	public Date getFlowCreateDate() {
+		return flowCreateDate;
+	}
+
+	public void setFlowCreateDate(Date flowCreateDate) {
+		this.flowCreateDate = flowCreateDate;
+	}
+
+	public Date getFlowUpdateDate() {
+		return flowUpdateDate;
+	}
+
+	public void setFlowUpdateDate(Date flowUpdateDate) {
+		this.flowUpdateDate = flowUpdateDate;
+	}
+
+	public Integer getFlowState() {
+		return flowState;
+	}
+
+	public void setFlowState(Integer flowState) {
+		this.flowState = flowState;
+	}
+	
+	
+}

watero-common-core/src/main/java/com/iamberry/wechat/core/entity/flow/TemplateInfo.java

@@ -0,0 +1,118 @@
+package com.iamberry.wechat.core.entity.flow;
+
+import java.util.Date;
+
+import com.iamberry.wechat.core.entity.PageBean;
+
+
+/**
+ * 模板表，用于建立返利流程的定义
+ * @author 欧阳明
+ * @date 2016-7-4
+ */
+public class TemplateInfo implements java.io.Serializable{
+
+	/**
+	 * 
+	 */
+	private static final long serialVersionUID = 4403175141201307709L;
+	private int templateId;
+	private int placeId;
+	private int isGlogal; //是否是全局
+	private String templateName; //模板名字
+	private Date createDate ;
+	private Date updateDate;
+	private int createrId; //创建者-管理员
+	private String creater; //创建者-管理员
+	
+	private int count; //最多返利几级
+	private int state; //模板状态		1：使用中		2：停用		3：删除
+
+	private Integer flowProductType;		// 产品类型ID
+	
+	private int flowNum;
+	
+	private PageBean page = new PageBean(); //分页信息
+	
+	public Integer getFlowProductType() {
+		return flowProductType;
+	}
+	public void setFlowProductType(Integer flowProductType) {
+		this.flowProductType = flowProductType;
+	}
+	public int getFlowNum() {
+		return flowNum;
+	}
+	public void setFlowNum(int flowNum) {
+		this.flowNum = flowNum;
+	}
+	public PageBean getPage() {
+		return page;
+	}
+	public void setPage(PageBean page) {
+		this.page = page;
+	}
+	public int getTemplateId() {
+		return templateId;
+	}
+	public void setTemplateId(int templateId) {
+		this.templateId = templateId;
+	}
+	public int getPlaceId() {
+		return placeId;
+	}
+	public void setPlaceId(int placeId) {
+		this.placeId = placeId;
+	}
+	public int getIsGlogal() {
+		return isGlogal;
+	}
+	public void setIsGlogal(int isGlogal) {
+		this.isGlogal = isGlogal;
+	}
+	public String getTemplateName() {
+		return templateName;
+	}
+	public void setTemplateName(String templateName) {
+		this.templateName = templateName;
+	}
+	public Date getCreateDate() {
+		return createDate;
+	}
+	public void setCreateDate(Date createDate) {
+		this.createDate = createDate;
+	}
+	public Date getUpdateDate() {
+		return updateDate;
+	}
+	public void setUpdateDate(Date updateDate) {
+		this.updateDate = updateDate;
+	}
+	public int getCount() {
+		return count;
+	}
+	public void setCount(int count) {
+		this.count = count;
+	}
+	public int getState() {
+		return state;
+	}
+	public void setState(int state) {
+		this.state = state;
+	}
+	public int getCreaterId() {
+		return createrId;
+	}
+	public void setCreaterId(int createrId) {
+		this.createrId = createrId;
+	}
+	public String getCreater() {
+		return creater;
+	}
+	public void setCreater(String creater) {
+		this.creater = creater;
+	}
+	
+	
+	
+}

watero-common-core/src/main/java/com/iamberry/wechat/core/entity/flow/TemplateReward.java

@@ -0,0 +1,97 @@
+package com.iamberry.wechat.core.entity.flow;
+
+import java.util.Date;
+
+/**
+ * 返利奖励任务表
+ * @author 刘志伟
+ *
+ */
+public class TemplateReward implements java.io.Serializable{
+
+	/**
+	 * 
+	 */
+	private static final long serialVersionUID = -5238485121901520940L;
+	
+	private Integer rewardId;							//id
+	
+	private Integer rewardRoleId;					//角色id
+	
+	private Integer rewardProductType;			//产品类型id
+	
+	private Integer rewardNum;					//销售数量
+	
+	private Integer rewardMoney;					//奖励金额
+	
+	private Integer rewardStatus;					//状态0：禁用，1：启用
+	
+	private String rewardDesc;						//奖励描述
+	
+	private Date rewardCreateTime;				//创建时间
+
+	public Integer getRewardId() {
+		return rewardId;
+	}
+
+	public void setRewardId(Integer rewardId) {
+		this.rewardId = rewardId;
+	}
+
+	public Integer getRewardRoleId() {
+		return rewardRoleId;
+	}
+
+	public void setRewardRoleId(Integer rewardRoleId) {
+		this.rewardRoleId = rewardRoleId;
+	}
+
+	public Integer getRewardProductType() {
+		return rewardProductType;
+	}
+
+	public void setRewardProductType(Integer rewardProductType) {
+		this.rewardProductType = rewardProductType;
+	}
+
+	public Integer getRewardNum() {
+		return rewardNum;
+	}
+
+	public void setRewardNum(Integer rewardNum) {
+		this.rewardNum = rewardNum;
+	}
+
+	public Integer getRewardMoney() {
+		return rewardMoney;
+	}
+
+	public void setRewardMoney(Integer rewardMoney) {
+		this.rewardMoney = rewardMoney;
+	}
+
+	public Integer getRewardStatus() {
+		return rewardStatus;
+	}
+
+	public void setRewardStatus(Integer rewardStatus) {
+		this.rewardStatus = rewardStatus;
+	}
+
+	public String getRewardDesc() {
+		return rewardDesc;
+	}
+
+	public void setRewardDesc(String rewardDesc) {
+		this.rewardDesc = rewardDesc;
+	}
+
+	public Date getRewardCreateTime() {
+		return rewardCreateTime;
+	}
+
+	public void setRewardCreateTime(Date rewardCreateTime) {
+		this.rewardCreateTime = rewardCreateTime;
+	}
+
+}

watero-common-core/src/main/java/com/iamberry/wechat/core/entity/game/GameLogsDto.java

@@ -0,0 +1,141 @@
+package com.iamberry.wechat.core.entity.game;
+
+import java.io.Serializable;
+import java.util.Date;
+
+import com.fasterxml.jackson.annotation.JsonFormat;
+import com.iamberry.wechat.core.entity.PageBean;
+
+/**
+ * 创建游戏记录的日志实体类dto
+ * @author 刘志伟
+ *
+ */
+public class GameLogsDto implements Serializable{
+
+	/**
+	 * 
+	 */
+	private static final long serialVersionUID = 1041015670263651761L;
+	
+	private Integer logsGameId;		//游戏id
+	
+	private String logsGameName;	//游戏名称
+	
+	private String logsOpenId;			//游戏参与人openid
+	@JsonFormat(pattern="yyyy-MM-dd HH:mm:ss",timezone = "GMT+8")  
+	private Date logsDate;					//参与游戏时间
+	
+	private String logsOrderId;			//订单id
+	
+	private Integer logsState;			//是否中奖
+	
+	private Integer logsPrizeId;		//奖品id
+	
+	private String logsPrizeName;		//奖品名称
+	
+	private Integer logsPrizeLevel;		//中奖等级
+	
+	private String logsPrizeImage;		//奖品图片
+	
+	private String logsSum;				//奖品个数
+	
+	private PageBean page = new PageBean(); 		//分页信息
+
+	public PageBean getPage() {
+		return page;
+	}
+
+	public void setPage(PageBean page) {
+		this.page = page;
+	}
+
+	public String getLogsPrizeImage() {
+		return logsPrizeImage;
+	}
+
+	public void setLogsPrizeImage(String logsPrizeImage) {
+		this.logsPrizeImage = logsPrizeImage;
+	}
+
+	public Integer getLogsPrizeLevel() {
+		return logsPrizeLevel;
+	}
+
+	public void setLogsPrizeLevel(Integer logsPrizeLevel) {
+		this.logsPrizeLevel = logsPrizeLevel;
+	}
+
+	public Integer getLogsGameId() {
+		return logsGameId;
+	}
+
+	public void setLogsGameId(Integer logsGameId) {
+		this.logsGameId = logsGameId;
+	}
+
+	public String getLogsGameName() {
+		return logsGameName;
+	}
+
+	public void setLogsGameName(String logsGameName) {
+		this.logsGameName = logsGameName;
+	}
+
+	public String getLogsOpenId() {
+		return logsOpenId;
+	}
+
+	public void setLogsOpenId(String logsOpenId) {
+		this.logsOpenId = logsOpenId;
+	}
+
+	public Date getLogsDate() {
+		return logsDate;
+	}
+
+	public void setLogsDate(Date logsDate) {
+		this.logsDate = logsDate;
+	}
+
+	public String getLogsOrderId() {
+		return logsOrderId;
+	}
+
+	public void setLogsOrderId(String logsOrderId) {
+		this.logsOrderId = logsOrderId;
+	}
+
+	public Integer getLogsState() {
+		return logsState;
+	}
+
+	public void setLogsState(Integer logsState) {
+		this.logsState = logsState;
+	}
+
+	public Integer getLogsPrizeId() {
+		return logsPrizeId;
+	}
+
+	public void setLogsPrizeId(Integer logsPrizeId) {
+		this.logsPrizeId = logsPrizeId;
+	}
+
+	public String getLogsPrizeName() {
+		return logsPrizeName;
+	}
+
+	public void setLogsPrizeName(String logsPrizeName) {
+		this.logsPrizeName = logsPrizeName;
+	}
+
+	public String getLogsSum() {
+		return logsSum;
+	}
+
+	public void setLogsSum(String logsSum) {
+		this.logsSum = logsSum;
+	}
+
+}

watero-common-core/src/main/java/com/iamberry/wechat/core/entity/game/GamePrizeDto.java

@@ -0,0 +1,138 @@
+package com.iamberry.wechat.core.entity.game;
+
+import java.io.Serializable;
+
+/**
+ * 创建游戏奖品信息实体类dto
+ * @author 刘志伟
+ *
+ */
+public class GamePrizeDto implements Serializable{
+
+	/**
+	 * 
+	 */
+	private static final long serialVersionUID = 6467774464989770236L;
+	
+	private String prizeName;				//奖品名称
+	
+	private Integer prizeNum;				//奖品数量
+	
+	private Integer prizeProbability;		//中奖概率
+	
+	private String prizeDesc;					//奖品简介
+	
+	private Integer prizeLevel;				//中奖等级 1：第一等奖；2：第二等奖；3：第三等奖
+	
+	private String prizeImage;				//产品图片
+	
+	private double prizePrice;				//产品价格
+	
+	private Integer prizeGameId;			//gameId
+	
+	private Integer prizeType;				//中奖后的操作 1:中奖后及时同步；2:其他
+	
+	private double prizeWinningNum;	//中奖奖励的积分数量
+	
+	private Integer prizeWinningType;	//中奖奖励类型 1:积分；2:其他
+	
+	private Integer prizeId;				// 奖品id
+	
+	public Integer getPrizeId() {
+		return prizeId;
+	}
+
+	public void setPrizeId(Integer prizeId) {
+		this.prizeId = prizeId;
+	}
+
+	public String getPrizeName() {
+		return prizeName;
+	}
+
+	public void setPrizeName(String prizeName) {
+		this.prizeName = prizeName;
+	}
+
+	public Integer getPrizeNum() {
+		return prizeNum;
+	}
+
+	public void setPrizeNum(Integer prizeNum) {
+		this.prizeNum = prizeNum;
+	}
+
+	public Integer getPrizeProbability() {
+		return prizeProbability;
+	}
+
+	public void setPrizeProbability(Integer prizeProbability) {
+		this.prizeProbability = prizeProbability;
+	}
+
+	public String getPrizeDesc() {
+		return prizeDesc;
+	}
+
+	public void setPrizeDesc(String prizeDesc) {
+		this.prizeDesc = prizeDesc;
+	}
+
+	public Integer getPrizeLevel() {
+		return prizeLevel;
+	}
+
+	public void setPrizeLevel(Integer prizeLevel) {
+		this.prizeLevel = prizeLevel;
+	}
+
+	public String getPrizeImage() {
+		return prizeImage;
+	}
+
+	public void setPrizeImage(String prizeImage) {
+		this.prizeImage = prizeImage;
+	}
+
+	public double getPrizePrice() {
+		return prizePrice;
+	}
+
+	public void setPrizePrice(double prizePrice) {
+		this.prizePrice = prizePrice;
+	}
+
+	public Integer getPrizeGameId() {
+		return prizeGameId;
+	}
+
+	public void setPrizeGameId(Integer prizeGameId) {
+		this.prizeGameId = prizeGameId;
+	}
+
+	public Integer getPrizeType() {
+		return prizeType;
+	}
+
+	public void setPrizeType(Integer prizeType) {
+		this.prizeType = prizeType;
+	}
+
+	public double getPrizeWinningNum() {
+		return prizeWinningNum;
+	}
+
+	public void setPrizeWinningNum(double prizeWinningNum) {
+		this.prizeWinningNum = prizeWinningNum;
+	}
+
+	public Integer getPrizeWinningType() {
+		return prizeWinningType;
+	}
+
+	public void setPrizeWinningType(Integer prizeWinningType) {
+		this.prizeWinningType = prizeWinningType;
+	}
+	
+
+}

watero-common-core/src/main/java/com/iamberry/wechat/core/entity/game/GameSystemDto.java

@@ -0,0 +1,100 @@
+package com.iamberry.wechat.core.entity.game;
+
+import java.io.Serializable;
+import java.util.Date;
+
+import com.fasterxml.jackson.annotation.JsonFormat;
+
+/**
+ * 游戏信息实体类dto
+ * @author 刘志伟
+ *
+ */
+public class GameSystemDto implements Serializable{
+
+	/**
+	 * 
+	 */
+	private static final long serialVersionUID = -6409382409380045844L;
+	
+	private Integer gameId;							//id
+	
+	private String gameName;						//游戏名称
+	@JsonFormat(pattern="yyyy-MM-dd HH:mm:ss",timezone = "GMT+8")  
+	private Date gameStartDate;					//游戏开始时间
+	@JsonFormat(pattern="yyyy-MM-dd HH:mm:ss",timezone = "GMT+8")  
+	private Date gameEndDate;						//游戏结束时间
+	
+	private String gameDesc;						//游戏说明
+	
+	private Integer gameType;						//游戏类型 1:大转盘;2:刮刮卡
+	
+	private Integer gameThreshold;				//1:无门槛游戏;2:需要消费积分才能游戏;3:需要今天内有购物才能游戏，每个订单可以玩三次
+	
+	private Integer gameThresholdNum;		//如果g_type为2的情况下，那么此项必须填写，此为游戏一次的积分数
+
+	public Integer getGameId() {
+		return gameId;
+	}
+
+	public void setGameId(Integer gameId) {
+		this.gameId = gameId;
+	}
+
+	public String getGameName() {
+		return gameName;
+	}
+
+	public void setGameName(String gameName) {
+		this.gameName = gameName;
+	}
+
+	public Date getGameStartDate() {
+		return gameStartDate;
+	}
+
+	public void setGameStartDate(Date gameStartDate) {
+		this.gameStartDate = gameStartDate;
+	}
+
+	public Date getGameEndDate() {
+		return gameEndDate;
+	}
+
+	public void setGameEndDate(Date gameEndDate) {
+		this.gameEndDate = gameEndDate;
+	}
+
+	public String getGameDesc() {
+		return gameDesc;
+	}
+
+	public void setGameDesc(String gameDesc) {
+		this.gameDesc = gameDesc;
+	}
+
+	public Integer getGameType() {
+		return gameType;
+	}
+
+	public void setGameType(Integer gameType) {
+		this.gameType = gameType;
+	}
+
+	public Integer getGameThreshold() {
+		return gameThreshold;
+	}
+
+	public void setGameThreshold(Integer gameThreshold) {
+		this.gameThreshold = gameThreshold;
+	}
+
+	public Integer getGameThresholdNum() {
+		return gameThresholdNum;
+	}
+
+	public void setGameThresholdNum(Integer gameThresholdNum) {
+		this.gameThresholdNum = gameThresholdNum;
+	}
+
+}

watero-common-core/src/main/java/com/iamberry/wechat/core/entity/giftCard/AgentInfo.java

@@ -0,0 +1,140 @@
+package com.iamberry.wechat.core.entity.giftCard;
+
+import java.io.Serializable;
+import java.util.Date;
+
+import com.iamberry.wechat.core.entity.PageBean;
+
+/**
+ * 付费代理商	实体类
+ * 2017年2月15日
+ * @author muzx
+ *
+ */
+public class AgentInfo implements Serializable{
+	private static final long serialVersionUID = 6749690948566353650L;
+	private Integer agentId;				//代理商id
+	private String agentOpenId;				//代理商openid
+	private String agentNickname;			//微信昵称
+	private String agentHead;				//头像
+	private String agentArea;				//地区
+	
+	private Integer agentSex;				//性别	1:男（默认）；	0：女
+	private String agentTel;				//电话
+	private String agentReferrerOpenid;		//推荐人openid
+	private String agentReferrerName;		//推荐人昵称
+	private Date agentCreateTime;			//创建时间
+	private String agentRemark;				//备注
+	
+	private Integer agentCardSum;			//售出礼品卡总数，达到8张后清零
+	private Integer agentIsHudredAgent;     //是否是百台代理      0:万元代理      1：百台代理
+	private PageBean page = new PageBean();		//分页
+	private Integer payStatus;	//是否已支付
+	
+	public Integer getAgentCardSum() {
+		return agentCardSum;
+	}
+	public void setAgentCardSum(Integer agentCardSum) {
+		this.agentCardSum = agentCardSum;
+	}
+	public Integer getAgentId() {
+		return agentId;
+	}
+	public void setAgentId(Integer agentId) {
+		this.agentId = agentId;
+	}
+	public String getAgentOpenId() {
+		return agentOpenId;
+	}
+	public void setAgentOpenId(String agentOpenId) {
+		this.agentOpenId = agentOpenId;
+	}
+	public String getAgentNickname() {
+		return agentNickname;
+	}
+	public void setAgentNickname(String agentNickname) {
+		this.agentNickname = agentNickname;
+	}
+	public String getAgentHead() {
+		return agentHead;
+	}
+	public void setAgentHead(String agentHead) {
+		this.agentHead = agentHead;
+	}
+	public String getAgentArea() {
+		return agentArea;
+	}
+	public void setAgentArea(String agentArea) {
+		this.agentArea = agentArea;
+	}
+	public Integer getAgentSex() {
+		return agentSex;
+	}
+	public void setAgentSex(Integer agentSex) {
+		this.agentSex = agentSex;
+	}
+	public String getAgentTel() {
+		return agentTel;
+	}
+	public void setAgentTel(String agentTel) {
+		this.agentTel = agentTel;
+	}
+	public String getAgentReferrerOpenid() {
+		return agentReferrerOpenid;
+	}
+	public void setAgentReferrerOpenid(String agentReferrerOpenid) {
+		this.agentReferrerOpenid = agentReferrerOpenid;
+	}
+	public String getAgentReferrerName() {
+		return agentReferrerName;
+	}
+	public void setAgentReferrerName(String agentReferrerName) {
+		this.agentReferrerName = agentReferrerName;
+	}
+	public Date getAgentCreateTime() {
+		return agentCreateTime;
+	}
+	public void setAgentCreateTime(Date agentCreateTime) {
+		this.agentCreateTime = agentCreateTime;
+	}
+	public String getAgentRemark() {
+		return agentRemark;
+	}
+	public void setAgentRemark(String agentRemark) {
+		this.agentRemark = agentRemark;
+	}
+	
+	public PageBean getPage() {
+		return page;
+	}
+	public void setPage(PageBean page) {
+		this.page = page;
+	}
+	
+	public Integer getPayStatus() {
+		return payStatus;
+	}
+	public void setPayStatus(Integer payStatus) {
+		this.payStatus = payStatus;
+	}
+    public Integer getAgentIsHudredAgent() {
+        return agentIsHudredAgent;
+    }
+    public void setAgentIsHudredAgent(Integer agentIsHudredAgent) {
+        this.agentIsHudredAgent = agentIsHudredAgent;
+    }
+    @Override
+    public String toString() {
+        return "AgentInfo [agentId=" + agentId + ", agentOpenId=" + agentOpenId
+                + ", agentNickname=" + agentNickname + ", agentHead="
+                + agentHead + ", agentArea=" + agentArea + ", agentSex="
+                + agentSex + ", agentTel=" + agentTel
+                + ", agentReferrerOpenid=" + agentReferrerOpenid
+                + ", agentReferrerName=" + agentReferrerName
+                + ", agentCreateTime=" + agentCreateTime + ", agentRemark="
+                + agentRemark + ", agentCardSum=" + agentCardSum
+                + ", agentIsHudredAgent=" + agentIsHudredAgent + ", page="
+                + page + ", payStatus=" + payStatus + "]";
+    }
+	
+}

watero-common-core/src/main/java/com/iamberry/wechat/core/entity/giftCard/AgentMachine.java

@@ -0,0 +1,187 @@
+package com.iamberry.wechat.core.entity.giftCard;
+
+import java.io.Serializable;
+import java.util.Date;
+
+import com.iamberry.wechat.core.entity.Page;
+
+/**
+ * 代理商赠送机器	实体类
+ * 2017年2月15日
+ * @author muzx
+ *
+ */
+public class AgentMachine implements Serializable{
+	
+	/**
+	 * 
+	 */
+	private static final long serialVersionUID = -1950481061235963040L;
+	
+	private Integer agentMachineId;					//赠送记录id
+	private String agentMachineOpenId;				//代理商openid
+	private Integer agentMachineType;				//代理商类型	1:付费代理商;	2:推荐人;      3:售出8台机器赠送一台
+	private Integer agentMachineStatus;				//赠送状态		0:未支付	1:待确定(代理商需确定收货地址)；	2：已确定；	3：已发货
+	private Integer agentMachineProductId;			//产品id
+	
+	private String agentMachineProductName;			//产品名称
+	private Integer agentMachineColorId;			//产品颜色id
+	private String agentMachineColorName;			//产品颜色名称
+	private String agentMachine69code;				//机器69码
+	private String agentMachineAddressInfo;			//收件人地址
+	
+	private String agentMachineAddressName;			//收件人姓名
+	private String agentMachineAddressTel;			//收件人电话
+	private String agentMachinePostName;			//快递名称
+	private String agentMachinePostNum;				//快递单号
+	private Date agentMachineCreateDate;			//创建时间 
+	private String agentMachineRemark;				//备注
+	
+	private String agentNameInfo;					// 名称
+	private Page page = new Page();
+	private String beginDate; // 搜索开始时间
+
+	private String endDate; // 搜索介绍时间
+	public Integer getAgentMachineId() {
+		return agentMachineId;
+	}
+	public void setAgentMachineId(Integer agentMachineId) {
+		this.agentMachineId = agentMachineId;
+	}
+	public String getAgentMachineOpenId() {
+		return agentMachineOpenId;
+	}
+	public void setAgentMachineOpenId(String agentMachineOpenId) {
+		this.agentMachineOpenId = agentMachineOpenId;
+	}
+	public Integer getAgentMachineType() {
+		return agentMachineType;
+	}
+	public void setAgentMachineType(Integer agentMachineType) {
+		this.agentMachineType = agentMachineType;
+	}
+	public Integer getAgentMachineStatus() {
+		return agentMachineStatus;
+	}
+	public void setAgentMachineStatus(Integer agentMachineStatus) {
+		this.agentMachineStatus = agentMachineStatus;
+	}
+	public Integer getAgentMachineProductId() {
+		return agentMachineProductId;
+	}
+	public void setAgentMachineProductId(Integer agentMachineProductId) {
+		this.agentMachineProductId = agentMachineProductId;
+	}
+	public String getAgentMachineProductName() {
+		return agentMachineProductName;
+	}
+	public void setAgentMachineProductName(String agentMachineProductName) {
+		this.agentMachineProductName = agentMachineProductName;
+	}
+	public Integer getAgentMachineColorId() {
+		return agentMachineColorId;
+	}
+	public void setAgentMachineColorId(Integer agentMachineColorId) {
+		this.agentMachineColorId = agentMachineColorId;
+	}
+	public String getAgentMachineColorName() {
+		return agentMachineColorName;
+	}
+	public void setAgentMachineColorName(String agentMachineColorName) {
+		this.agentMachineColorName = agentMachineColorName;
+	}
+	public String getAgentMachine69code() {
+		return agentMachine69code;
+	}
+	public void setAgentMachine69code(String agentMachine69code) {
+		this.agentMachine69code = agentMachine69code;
+	}
+	public String getAgentMachineAddressInfo() {
+		return agentMachineAddressInfo;
+	}
+	public void setAgentMachineAddressInfo(String agentMachineAddressInfo) {
+		this.agentMachineAddressInfo = agentMachineAddressInfo;
+	}
+	public String getAgentMachineAddressName() {
+		return agentMachineAddressName;
+	}
+	public void setAgentMachineAddressName(String agentMachineAddressName) {
+		this.agentMachineAddressName = agentMachineAddressName;
+	}
+	public String getAgentMachineAddressTel() {
+		return agentMachineAddressTel;
+	}
+	public void setAgentMachineAddressTel(String agentMachineAddressTel) {
+		this.agentMachineAddressTel = agentMachineAddressTel;
+	}
+	public String getAgentMachinePostName() {
+		return agentMachinePostName;
+	}
+	public void setAgentMachinePostName(String agentMachinePostName) {
+		this.agentMachinePostName = agentMachinePostName;
+	}
+	public String getAgentMachinePostNum() {
+		return agentMachinePostNum;
+	}
+	public void setAgentMachinePostNum(String agentMachinePostNum) {
+		this.agentMachinePostNum = agentMachinePostNum;
+	}
+	public Date getAgentMachineCreateDate() {
+		return agentMachineCreateDate;
+	}
+	public void setAgentMachineCreateDate(Date agentMachineCreateDate) {
+		this.agentMachineCreateDate = agentMachineCreateDate;
+	}
+	public String getAgentMachineRemark() {
+		return agentMachineRemark;
+	}
+	public void setAgentMachineRemark(String agentMachineRemark) {
+		this.agentMachineRemark = agentMachineRemark;
+	}
+	
+	public Page getPage() {
+		return page;
+	}
+	public void setPage(Page page) {
+		this.page = page;
+	}
+
+	
+	public String getBeginDate() {
+		return beginDate;
+	}
+	public void setBeginDate(String beginDate) {
+		this.beginDate = beginDate;
+	}
+	public String getEndDate() {
+		return endDate;
+	}
+	public void setEndDate(String endDate) {
+		this.endDate = endDate;
+	}
+	@Override
+	public String toString() {
+		return "AgentMachine [agentMachineId=" + agentMachineId
+				+ ", agentMachineOpenId=" + agentMachineOpenId
+				+ ", agentMachineType=" + agentMachineType
+				+ ", agentMachineStatus=" + agentMachineStatus
+				+ ", agentMachineProductId=" + agentMachineProductId
+				+ ", agentMachineProductName=" + agentMachineProductName
+				+ ", agentMachineColorId=" + agentMachineColorId
+				+ ", agentMachineColorName=" + agentMachineColorName
+				+ ", agentMachine69code=" + agentMachine69code
+				+ ", agentMachineAddressInfo=" + agentMachineAddressInfo
+				+ ", agentMachineAddressName=" + agentMachineAddressName
+				+ ", agentMachineAddressTel=" + agentMachineAddressTel
+				+ ", agentMachinePostName=" + agentMachinePostName
+				+ ", agentMachinePostNum=" + agentMachinePostNum
+				+ ", agentMachineCreateDate=" + agentMachineCreateDate
+				+ ", agentMachineRemark=" + agentMachineRemark + "]";
+	}
+	public String getAgentNameInfo() {
+		return agentNameInfo;
+	}
+	public void setAgentNameInfo(String agentNameInfo) {
+		this.agentNameInfo = agentNameInfo;
+	}
+}

watero-common-core/src/main/java/com/iamberry/wechat/core/entity/giftCard/AgentPayLogs.java

@@ -0,0 +1,93 @@
+package com.iamberry.wechat.core.entity.giftCard;
+
+import java.io.Serializable;
+import java.util.Date;
+
+/**
+ * 代理商支付记录	实体类
+ * 2017年2月15日
+ * @author muzx
+ *
+ */
+public class AgentPayLogs implements Serializable{
+
+	/**
+	 * 
+	 */
+	private static final long serialVersionUID = -5449832401064431197L;
+	private Integer payId;					//支付记录id
+	private String payOpenId;				//代理商openid
+	private Integer payMoney;				//支付金额
+	private Integer payStatus;				//支付状态			1:待支付；	2：已支付
+	private String payTransactionId;		//微信支付订单号
+	
+	private Date payTransactionDate;		//微信支付时间
+	private Integer payGiftCardNum;			//赠送礼品卡张数    (实际生成的时候没有用到,直接冲规则表取的)
+	private Date payCreateDate;				//创建时间
+	private String payRemark;				//备注
+	
+	public Integer getPayId() {
+		return payId;
+	}
+	public void setPayId(Integer payId) {
+		this.payId = payId;
+	}
+	public String getPayOpenId() {
+		return payOpenId;
+	}
+	public void setPayOpenId(String payOpenId) {
+		this.payOpenId = payOpenId;
+	}
+	public Integer getPayMoney() {
+		return payMoney;
+	}
+	public void setPayMoney(Integer payMoney) {
+		this.payMoney = payMoney;
+	}
+	public Integer getPayStatus() {
+		return payStatus;
+	}
+	public void setPayStatus(Integer payStatus) {
+		this.payStatus = payStatus;
+	}
+	public String getPayTransactionId() {
+		return payTransactionId;
+	}
+	public void setPayTransactionId(String payTransactionId) {
+		this.payTransactionId = payTransactionId;
+	}
+	public Date getPayTransactionDate() {
+		return payTransactionDate;
+	}
+	public void setPayTransactionDate(Date payTransactionDate) {
+		this.payTransactionDate = payTransactionDate;
+	}
+	public Integer getPayGiftCardNum() {
+		return payGiftCardNum;
+	}
+	public void setPayGiftCardNum(Integer payGiftCardNum) {
+		this.payGiftCardNum = payGiftCardNum;
+	}
+	public Date getPayCreateDate() {
+		return payCreateDate;
+	}
+	public void setPayCreateDate(Date payCreateDate) {
+		this.payCreateDate = payCreateDate;
+	}
+	public String getPayRemark() {
+		return payRemark;
+	}
+	public void setPayRemark(String payRemark) {
+		this.payRemark = payRemark;
+	}
+	@Override
+	public String toString() {
+		return "AgentPayLogs [payId=" + payId + ", payOpenId=" + payOpenId
+				+ ", payMoney=" + payMoney + ", payStatus=" + payStatus
+				+ ", payTransactionId=" + payTransactionId
+				+ ", payTransactionDate=" + payTransactionDate
+				+ ", payGiftCardNum=" + payGiftCardNum + ", payCreateDate="
+				+ payCreateDate + ", payRemark=" + payRemark + "]";
+	}
+	
+}

watero-common-core/src/main/java/com/iamberry/wechat/core/entity/giftCard/CardCashInfo.java

@@ -0,0 +1,109 @@
+package com.iamberry.wechat.core.entity.giftCard;
+
+import java.io.Serializable;
+import java.util.Date;
+
+import com.iamberry.wechat.core.entity.PageBean;
+
+public class CardCashInfo implements Serializable{
+
+
+	/**
+	 * 1.6	礼品卡兑现表
+	 */
+	private static final long serialVersionUID = 3116177567931500101L;
+	private Integer cardCashId;									//兑现id
+	private String cardCashOpenId;		//用户openid
+	private String cardCashCardId;//礼品卡id
+	private String cardCashSalesNickname;//用户昵称
+	private Integer CardCashStatus;//退款状态1:退款中；2：驳回；3：退款成功
+	private Date cardCashCreateDate;//创建时间 
+	private Date cardCashCheckDate;//审核时间
+	private String cardCashRemark;//备注 
+	private Integer cardCashOldStatus;
+	private PageBean page = new PageBean();//分页
+	
+	private String agentArea;				//地区
+	private String agentTel;				//电话
+	private String cardPassword;		//礼品卡密码
+	
+	public Integer getCardCashOldStatus() {
+		return cardCashOldStatus;
+	}
+	public void setCardCashOldStatus(Integer cardCashOldStatus) {
+		this.cardCashOldStatus = cardCashOldStatus;
+	}
+	public String getAgentArea() {
+		return agentArea;
+	}
+	public void setAgentArea(String agentArea) {
+		this.agentArea = agentArea;
+	}
+	public String getAgentTel() {
+		return agentTel;
+	}
+	public void setAgentTel(String agentTel) {
+		this.agentTel = agentTel;
+	}
+	public String getCardPassword() {
+		return cardPassword;
+	}
+	public void setCardPassword(String cardPassword) {
+		this.cardPassword = cardPassword;
+	}
+	public PageBean getPage() {
+		return page;
+	}
+	public void setPage(PageBean page) {
+		this.page = page;
+	}
+	public Integer getCardCashId() {
+		return cardCashId;
+	}
+	public void setCardCashId(Integer cardCashId) {
+		this.cardCashId = cardCashId;
+	}
+	public String getCardCashOpenId() {
+		return cardCashOpenId;
+	}
+	public void setCardCashOpenId(String cardCashOpenId) {
+		this.cardCashOpenId = cardCashOpenId;
+	}
+	public String getCardCashCardId() {
+		return cardCashCardId;
+	}
+	public void setCardCashCardId(String cardCashCardId) {
+		this.cardCashCardId = cardCashCardId;
+	}
+	public String getCardCashSalesNickname() {
+		return cardCashSalesNickname;
+	}
+	public void setCardCashSalesNickname(String cardCashSalesNickname) {
+		this.cardCashSalesNickname = cardCashSalesNickname;
+	}
+	public Integer getCardCashStatus() {
+		return CardCashStatus;
+	}
+	public void setCardCashStatus(Integer cardCashStatus) {
+		CardCashStatus = cardCashStatus;
+	}
+	public Date getCardCashCreateDate() {
+		return cardCashCreateDate;
+	}
+	public void setCardCashCreateDate(Date cardCashCreateDate) {
+		this.cardCashCreateDate = cardCashCreateDate;
+	}
+	public Date getCardCashCheckDate() {
+		return cardCashCheckDate;
+	}
+	public void setCardCashCheckDate(Date cardCashCheckDate) {
+		this.cardCashCheckDate = cardCashCheckDate;
+	}
+	public String getCardCashRemark() {
+		return cardCashRemark;
+	}
+	public void setCardCashRemark(String cardCashRemark) {
+		this.cardCashRemark = cardCashRemark;
+	}
+	
+}

watero-common-core/src/main/java/com/iamberry/wechat/core/entity/giftCard/GiftCardDto.java

@@ -0,0 +1,108 @@
+package com.iamberry.wechat.core.entity.giftCard;
+
+import java.io.Serializable;
+import java.util.Date;
+
+import com.iamberry.wechat.core.entity.PageBean;
+/**
+ * 礼品卡Dto
+ * @author 刘志伟
+ *
+ */
+public class GiftCardDto implements Serializable{
+
+/**
+	 * 
+	 */
+	private static final long serialVersionUID = -5094060294118133012L;
+
+	private Integer cardId;				//礼品卡id
+	
+	private String cardOpenId;			//代理商openid
+	
+	private String cardPassword;		//礼品卡密码
+	
+	private Integer cardStatus;			//礼品卡使用状态
+	
+	private Date cardCreateDate;		//创建时间 
+	
+	private Date cardUseDate;			//使用时间
+	
+	private Integer cardOldStatus;		//礼品卡之前的使用状态
+	
+	private Integer cardOldSalesStatus;//礼品卡之前的出售状态
+	
+	private PageBean page = new PageBean();		//分页
+
+	public PageBean getPage() {
+		return page;
+	}
+
+	public void setPage(PageBean page) {
+		this.page = page;
+	}
+
+	public Integer getCardOldStatus() {
+		return cardOldStatus;
+	}
+
+	public void setCardOldStatus(Integer cardOldStatus) {
+		this.cardOldStatus = cardOldStatus;
+	}
+
+	public Integer getCardOldSalesStatus() {
+		return cardOldSalesStatus;
+	}
+
+	public void setCardOldSalesStatus(Integer cardOldSalesStatus) {
+		this.cardOldSalesStatus = cardOldSalesStatus;
+	}
+
+	public Integer getCardId() {
+		return cardId;
+	}
+
+	public void setCardId(Integer cardId) {
+		this.cardId = cardId;
+	}
+
+	public String getCardOpenId() {
+		return cardOpenId;
+	}
+
+	public void setCardOpenId(String cardOpenId) {
+		this.cardOpenId = cardOpenId;
+	}
+
+	public String getCardPassword() {
+		return cardPassword;
+	}
+
+	public void setCardPassword(String cardPassword) {
+		this.cardPassword = cardPassword;
+	}
+
+	public Integer getCardStatus() {
+		return cardStatus;
+	}
+
+	public void setCardStatus(Integer cardStatus) {
+		this.cardStatus = cardStatus;
+	}
+
+	public Date getCardCreateDate() {
+		return cardCreateDate;
+	}
+
+	public void setCardCreateDate(Date cardCreateDate) {
+		this.cardCreateDate = cardCreateDate;
+	}
+
+	public Date getCardUseDate() {
+		return cardUseDate;
+	}
+
+	public void setCardUseDate(Date cardUseDate) {
+		this.cardUseDate = cardUseDate;
+	}
+}

watero-common-core/src/main/java/com/iamberry/wechat/core/entity/giftCard/GiftCardInfo.java

@@ -0,0 +1,145 @@
+package com.iamberry.wechat.core.entity.giftCard;
+
+import java.io.Serializable;
+import java.util.Date;
+
+public class GiftCardInfo implements Serializable{
+
+	/**
+	 * 1.4	礼品卡表
+	 */
+	private static final long serialVersionUID = -8586695194238446199L;
+
+	private Integer cardId;				//礼品卡id
+	
+	private String cardOpenId;			//代理商openid
+	
+	private String cardPassword;		//礼品卡密码
+	
+	private Integer cardStatus;			//礼品卡使用状态
+	
+	private Date cardCreateDate;		//创建时间 
+	
+	private Date cardUseDate;			//使用时间
+
+	// ----------------------------------------------------------
+	
+	private Integer machineStatus;		// 礼品卡兑换后状态表
+	
+	private String machineColor;		// 机器颜色
+	
+	private String userMachineAddressName;	//收件人姓名
+	
+	private String userMachineAddressTel;		//收件人电话
+	
+	private String userMachineAddressInfo;		//收件人地址
+	
+	private String userMachinePostName;//快递名称
+	
+	private String userMachinePostNum;//快递单号
+
+	public String getUserMachinePostName() {
+		return userMachinePostName;
+	}
+
+	public void setUserMachinePostName(String userMachinePostName) {
+		this.userMachinePostName = userMachinePostName;
+	}
+
+	public String getUserMachinePostNum() {
+		return userMachinePostNum;
+	}
+
+	public void setUserMachinePostNum(String userMachinePostNum) {
+		this.userMachinePostNum = userMachinePostNum;
+	}
+
+	public String getUserMachineAddressName() {
+		return userMachineAddressName;
+	}
+
+	public void setUserMachineAddressName(String userMachineAddressName) {
+		this.userMachineAddressName = userMachineAddressName;
+	}
+
+	public String getUserMachineAddressTel() {
+		return userMachineAddressTel;
+	}
+
+	public void setUserMachineAddressTel(String userMachineAddressTel) {
+		this.userMachineAddressTel = userMachineAddressTel;
+	}
+
+	public String getUserMachineAddressInfo() {
+		return userMachineAddressInfo;
+	}
+
+	public void setUserMachineAddressInfo(String userMachineAddressInfo) {
+		this.userMachineAddressInfo = userMachineAddressInfo;
+	}
+
+	public Integer getCardId() {
+		return cardId;
+	}
+
+	public void setCardId(Integer cardId) {
+		this.cardId = cardId;
+	}
+
+	public String getCardOpenId() {
+		return cardOpenId;
+	}
+
+	public void setCardOpenId(String cardOpenId) {
+		this.cardOpenId = cardOpenId;
+	}
+
+	public String getCardPassword() {
+		return cardPassword;
+	}
+
+	public void setCardPassword(String cardPassword) {
+		this.cardPassword = cardPassword;
+	}
+
+	public Integer getCardStatus() {
+		return cardStatus;
+	}
+
+	public void setCardStatus(Integer cardStatus) {
+		this.cardStatus = cardStatus;
+	}
+
+	public Date getCardCreateDate() {
+		return cardCreateDate;
+	}
+
+	public void setCardCreateDate(Date cardCreateDate) {
+		this.cardCreateDate = cardCreateDate;
+	}
+
+	public Date getCardUseDate() {
+		return cardUseDate;
+	}
+
+	public void setCardUseDate(Date cardUseDate) {
+		this.cardUseDate = cardUseDate;
+	}
+
+	public Integer getMachineStatus() {
+		return machineStatus;
+	}
+
+	public void setMachineStatus(Integer machineStatus) {
+		this.machineStatus = machineStatus;
+	}
+
+	public String getMachineColor() {
+		return machineColor;
+	}
+
+	public void setMachineColor(String machineColor) {
+		this.machineColor = machineColor;
+	}
+	
+}

watero-common-core/src/main/java/com/iamberry/wechat/core/entity/giftCard/GiftCardPayCode.java

@@ -0,0 +1,105 @@
+package com.iamberry.wechat.core.entity.giftCard;
+
+import java.io.Serializable;
+import java.util.Date;
+
+import com.iamberry.wechat.core.entity.PageBean;
+
+/**
+ * 抵扣密码 实体类
+ * 2017年3月1日
+ * @author muzx
+ */
+public class GiftCardPayCode implements Serializable{
+    /**
+     * 
+     */
+    private static final long serialVersionUID = -3148029103703379917L;
+    private Integer codeId;                    //id
+    private String codePassword;               //抵扣密码
+    private Integer codeStatus;                //使用状态
+    private String codeReferrerOpenid;         //推荐人openid
+    private String  codeUseOpenid;             //使用人openid
+    
+    private String codeReferrerName;          //推荐人姓名
+    private String  codeUseOpenName;           //使用人姓名
+    private Date codeCreateDate;               //创建时间 
+    private Date codeUpdateDate;               //修改时间
+    private String codeRemark;                 //备注
+    private PageBean page = new PageBean();    //分页
+    public Integer getCodeId() {
+        return codeId;
+    }
+    public void setCodeId(Integer codeId) {
+        this.codeId = codeId;
+    }
+    public String getCodePassword() {
+        return codePassword;
+    }
+    public void setCodePassword(String codePassword) {
+        this.codePassword = codePassword;
+    }
+    public Integer getCodeStatus() {
+        return codeStatus;
+    }
+    public void setCodeStatus(Integer codeStatus) {
+        this.codeStatus = codeStatus;
+    }
+    public String getCodeReferrerOpenid() {
+        return codeReferrerOpenid;
+    }
+    public void setCodeReferrerOpenid(String codeReferrerOpenid) {
+        this.codeReferrerOpenid = codeReferrerOpenid;
+    }
+    public String getCodeUseOpenid() {
+        return codeUseOpenid;
+    }
+    public void setCodeUseOpenid(String codeUseOpenid) {
+        this.codeUseOpenid = codeUseOpenid;
+    }
+    public String getCodeReferrerName() {
+        return codeReferrerName;
+    }
+    public void setCodeReferrerName(String codeReferrerName) {
+        this.codeReferrerName = codeReferrerName;
+    }
+    public String getCodeUseOpenName() {
+        return codeUseOpenName;
+    }
+    public void setCodeUseOpenName(String codeUseOpenName) {
+        this.codeUseOpenName = codeUseOpenName;
+    }
+    public Date getCodeCreateDate() {
+        return codeCreateDate;
+    }
+    public void setCodeCreateDate(Date codeCreateDate) {
+        this.codeCreateDate = codeCreateDate;
+    }
+    public Date getCodeUpdateDate() {
+        return codeUpdateDate;
+    }
+    public void setCodeUpdateDate(Date codeUpdateDate) {
+        this.codeUpdateDate = codeUpdateDate;
+    }
+    public String getCodeRemark() {
+        return codeRemark;
+    }
+    public void setCodeRemark(String codeRemark) {
+        this.codeRemark = codeRemark;
+    }
+    public PageBean getPage() {
+        return page;
+    }
+    public void setPage(PageBean page) {
+        this.page = page;
+    }
+    @Override
+    public String toString() {
+        return "GiftCardPayCode [codeId=" + codeId + ", codePassword="
+                + codePassword + ", codeStatus=" + codeStatus
+                + ", codeReferrerOpenid=" + codeReferrerOpenid
+                + ", codeUseOpenid=" + codeUseOpenid + ", codeCreateDate="
+                + codeCreateDate + ", codeUpdateDate=" + codeUpdateDate
+                + ", codeRemark=" + codeRemark + ", page=" + page + "]";
+    }
+}

watero-common-core/src/main/java/com/iamberry/wechat/core/entity/giftCard/UserMachineInfo.java

@@ -0,0 +1,193 @@
+package com.iamberry.wechat.core.entity.giftCard;
+
+import java.io.Serializable;
+import java.util.Date;
+
+public class UserMachineInfo implements Serializable{
+
+	private static final long serialVersionUID = -7747912238861538091L;
+
+	/**
+	 * 1.5	用户兑换机器表
+	 */
+	private Integer userMachineId;						//用户兑换记录id
+	
+	private String userMachineOpenId;				//用户openid
+	
+	private String userNickName;		//用户昵称
+	
+	private String userMachineTel;	//用户手机号
+	
+	private Integer userMachineCardId;					//礼品卡id
+	
+	private Integer userMachineStatus;	//兑换状态
+	
+	private Integer userMachineProductId;//产品id
+	
+	private String userMachineProductName;//产品名称
+	
+	private Integer userMachineColorId;//产品颜色id
+	
+	private String userMachineColorName;//产品颜色名称
+	
+	private String userMachine69code;//机器69码
+	
+	private String userMachineAddressInfo;//收件人地址
+	
+	private String userMachineAddressName;//收件人姓名
+	
+	private String userMachineAddressTel;//收件人电话
+	
+	private String userMachinePostName;//快递名称
+	
+	private String userMachinePostNum;//快递单号
+	
+	private Date userMachineCreateDate;//创建时间 
+	
+	// -----------------------------------
+	
+	private String cardPwd;				// 礼品卡密码
+
+	public String getUserNickName() {
+		return userNickName;
+	}
+
+	public void setUserNickName(String userNickName) {
+		this.userNickName = userNickName;
+	}
+
+	public Integer getUserMachineId() {
+		return userMachineId;
+	}
+
+	public void setUserMachineId(Integer userMachineId) {
+		this.userMachineId = userMachineId;
+	}
+
+	public String getUserMachineOpenId() {
+		return userMachineOpenId;
+	}
+
+	public void setUserMachineOpenId(String userMachineOpenId) {
+		this.userMachineOpenId = userMachineOpenId;
+	}
+
+	public String getUserMachineTel() {
+		return userMachineTel;
+	}
+
+	public void setUserMachineTel(String userMachineTel) {
+		this.userMachineTel = userMachineTel;
+	}
+
+	public Integer getUserMachineCardId() {
+		return userMachineCardId;
+	}
+
+	public void setUserMachineCardId(Integer userMachineCardId) {
+		this.userMachineCardId = userMachineCardId;
+	}
+
+	public Integer getUserMachineStatus() {
+		return userMachineStatus;
+	}
+
+	public void setUserMachineStatus(Integer userMachineStatus) {
+		this.userMachineStatus = userMachineStatus;
+	}
+
+	public Integer getUserMachineProductId() {
+		return userMachineProductId;
+	}
+
+	public void setUserMachineProductId(Integer userMachineProductId) {
+		this.userMachineProductId = userMachineProductId;
+	}
+
+	public String getUserMachineProductName() {
+		return userMachineProductName;
+	}
+
+	public void setUserMachineProductName(String userMachineProductName) {
+		this.userMachineProductName = userMachineProductName;
+	}
+
+	public Integer getUserMachineColorId() {
+		return userMachineColorId;
+	}
+
+	public void setUserMachineColorId(Integer userMachineColorId) {
+		this.userMachineColorId = userMachineColorId;
+	}
+
+	public String getUserMachineColorName() {
+		return userMachineColorName;
+	}
+
+	public void setUserMachineColorName(String userMachineColorName) {
+		this.userMachineColorName = userMachineColorName;
+	}
+
+	public String getUserMachine69code() {
+		return userMachine69code;
+	}
+
+	public void setUserMachine69code(String userMachine69code) {
+		this.userMachine69code = userMachine69code;
+	}
+
+	public String getUserMachineAddressInfo() {
+		return userMachineAddressInfo;
+	}
+
+	public void setUserMachineAddressInfo(String userMachineAddressInfo) {
+		this.userMachineAddressInfo = userMachineAddressInfo;
+	}
+	public String getUserMachineAddressName() {
+		return userMachineAddressName;
+	}
+
+	public void setUserMachineAddressName(String userMachineAddressName) {
+		this.userMachineAddressName = userMachineAddressName;
+	}
+
+	public Date getUserMachineCreateDate() {
+		return userMachineCreateDate;
+	}
+
+	public void setUserMachineCreateDate(Date userMachineCreateDate) {
+		this.userMachineCreateDate = userMachineCreateDate;
+	}
+
+	public String getCardPwd() {
+		return cardPwd;
+	}
+
+	public void setCardPwd(String cardPwd) {
+		this.cardPwd = cardPwd;
+	}
+
+	public String getUserMachineAddressTel() {
+		return userMachineAddressTel;
+	}
+
+	public void setUserMachineAddressTel(String userMachineAddressTel) {
+		this.userMachineAddressTel = userMachineAddressTel;
+	}
+
+	public String getUserMachinePostName() {
+		return userMachinePostName;
+	}
+
+	public void setUserMachinePostName(String userMachinePostName) {
+		this.userMachinePostName = userMachinePostName;
+	}
+
+	public String getUserMachinePostNum() {
+		return userMachinePostNum;
+	}
+
+	public void setUserMachinePostNum(String userMachinePostNum) {
+		this.userMachinePostNum = userMachinePostNum;
+	}
+}

watero-common-core/src/main/java/com/iamberry/wechat/core/entity/lease/LeaseOrder.java

@@ -0,0 +1,317 @@
+package com.iamberry.wechat.core.entity.lease;
+
+import java.util.Date;
+
+/**
+ * 租赁订单实体类
+ * @author 刘志伟
+ * 2017-02-07
+ */
+public class LeaseOrder implements java.io.Serializable{
+	
+	/**
+	 * 
+	 */
+	private static final long serialVersionUID = 4791742716362487912L;
+
+	private String orderId;									//订单id
+	
+	private String orderOpenid;							//所属用户
+	
+	private Integer orderProductId;					//产品id
+	
+	private Integer orderColorId;						//产品颜色id
+	
+	private Integer orderDeposit;						//押金
+	
+	private Integer orderProductPrice;				//产品原价
+	
+	private Integer orderProductDiscount;		//产品折扣价
+	
+	private Integer orderAmount;						//订单总额
+	
+	private String orderPostNum;						//快递单号
+	
+	private String orderPostFirm;						//快递公司
+	
+	private Integer orderStatus;							//状态
+	
+	private Date orderSendDate;						//发货时间
+	
+	private Date orderReturnDate;						//申请退货时间/申请退款时间
+	
+	private String orderReturnPost;					//退货订单号
+	
+	private String orderAddressInfo;					//详细地址
+	
+	private String orderAddressPostnum;			//邮编
+	
+	private String orderAddressTel;					//收件人电话
+	
+	private String orderAddressName;				//收件人姓名
+	
+	private String orderReturnDes;					//退款备注
+	
+	private String orderAdminRemark;				//后台的备注
+	
+	private String orderUserRemark;					//用户备注
+	
+	private String orderTransactionId;				//微信订单号
+	
+	private Date orderTransactionDate;				//微信支付时间
+	
+	private Date orderCreateDate;						//订单创建时间
+	
+	private String orderRentTel;							//租用人电话
+	
+	private String orderInitCode;						//激活码
+	
+	private Integer orderCodeState;					//激活码状态
+	
+	private String orderProductName;				//商品名称
+	
+	private String orderProductPic;					//介绍图
+	
+	private String orderProductColor;				//产品颜色
+
+	public String getOrderId() {
+		return orderId;
+	}
+
+	public void setOrderId(String orderId) {
+		this.orderId = orderId;
+	}
+
+	public String getOrderOpenid() {
+		return orderOpenid;
+	}
+
+	public void setOrderOpenid(String orderOpenid) {
+		this.orderOpenid = orderOpenid;
+	}
+
+	public Integer getOrderProductId() {
+		return orderProductId;
+	}
+
+	public void setOrderProductId(Integer orderProductId) {
+		this.orderProductId = orderProductId;
+	}
+
+	public Integer getOrderColorId() {
+		return orderColorId;
+	}
+
+	public void setOrderColorId(Integer orderColorId) {
+		this.orderColorId = orderColorId;
+	}
+
+	public Integer getOrderDeposit() {
+		return orderDeposit;
+	}
+
+	public void setOrderDeposit(Integer orderDeposit) {
+		this.orderDeposit = orderDeposit;
+	}
+
+	public Integer getOrderProductPrice() {
+		return orderProductPrice;
+	}
+
+	public void setOrderProductPrice(Integer orderProductPrice) {
+		this.orderProductPrice = orderProductPrice;
+	}
+
+	public Integer getOrderProductDiscount() {
+		return orderProductDiscount;
+	}
+
+	public void setOrderProductDiscount(Integer orderProductDiscount) {
+		this.orderProductDiscount = orderProductDiscount;
+	}
+
+	public Integer getOrderAmount() {
+		return orderAmount;
+	}
+
+	public void setOrderAmount(Integer orderAmount) {
+		this.orderAmount = orderAmount;
+	}
+
+	public String getOrderPostNum() {
+		return orderPostNum;
+	}
+
+	public void setOrderPostNum(String orderPostNum) {
+		this.orderPostNum = orderPostNum;
+	}
+
+	public String getOrderPostFirm() {
+		return orderPostFirm;
+	}
+
+	public void setOrderPostFirm(String orderPostFirm) {
+		this.orderPostFirm = orderPostFirm;
+	}
+
+	public Integer getOrderStatus() {
+		return orderStatus;
+	}
+
+	public void setOrderStatus(Integer orderStatus) {
+		this.orderStatus = orderStatus;
+	}
+
+	public Date getOrderSendDate() {
+		return orderSendDate;
+	}
+
+	public void setOrderSendDate(Date orderSendDate) {
+		this.orderSendDate = orderSendDate;
+	}
+
+	public Date getOrderReturnDate() {
+		return orderReturnDate;
+	}
+
+	public void setOrderReturnDate(Date orderReturnDate) {
+		this.orderReturnDate = orderReturnDate;
+	}
+
+	public String getOrderReturnPost() {
+		return orderReturnPost;
+	}
+
+	public void setOrderReturnPost(String orderReturnPost) {
+		this.orderReturnPost = orderReturnPost;
+	}
+
+	public String getOrderAddressInfo() {
+		return orderAddressInfo;
+	}
+
+	public void setOrderAddressInfo(String orderAddressInfo) {
+		this.orderAddressInfo = orderAddressInfo;
+	}
+
+	public String getOrderAddressPostnum() {
+		return orderAddressPostnum;
+	}
+
+	public void setOrderAddressPostnum(String orderAddressPostnum) {
+		this.orderAddressPostnum = orderAddressPostnum;
+	}
+
+	public String getOrderAddressTel() {
+		return orderAddressTel;
+	}
+
+	public void setOrderAddressTel(String orderAddressTel) {
+		this.orderAddressTel = orderAddressTel;
+	}
+
+	public String getOrderAddressName() {
+		return orderAddressName;
+	}
+
+	public void setOrderAddressName(String orderAddressName) {
+		this.orderAddressName = orderAddressName;
+	}
+
+	public String getOrderReturnDes() {
+		return orderReturnDes;
+	}
+
+	public void setOrderReturnDes(String orderReturnDes) {
+		this.orderReturnDes = orderReturnDes;
+	}
+
+	public String getOrderAdminRemark() {
+		return orderAdminRemark;
+	}
+
+	public void setOrderAdminRemark(String orderAdminRemark) {
+		this.orderAdminRemark = orderAdminRemark;
+	}
+
+	public String getOrderUserRemark() {
+		return orderUserRemark;
+	}
+
+	public void setOrderUserRemark(String orderUserRemark) {
+		this.orderUserRemark = orderUserRemark;
+	}
+
+	public String getOrderTransactionId() {
+		return orderTransactionId;
+	}
+
+	public void setOrderTransactionId(String orderTransactionId) {
+		this.orderTransactionId = orderTransactionId;
+	}
+
+	public Date getOrderTransactionDate() {
+		return orderTransactionDate;
+	}
+
+	public void setOrderTransactionDate(Date orderTransactionDate) {
+		this.orderTransactionDate = orderTransactionDate;
+	}
+
+	public Date getOrderCreateDate() {
+		return orderCreateDate;
+	}
+
+	public void setOrderCreateDate(Date orderCreateDate) {
+		this.orderCreateDate = orderCreateDate;
+	}
+
+	public String getOrderRentTel() {
+		return orderRentTel;
+	}
+
+	public void setOrderRentTel(String orderRentTel) {
+		this.orderRentTel = orderRentTel;
+	}
+
+	public String getOrderInitCode() {
+		return orderInitCode;
+	}
+
+	public void setOrderInitCode(String orderInitCode) {
+		this.orderInitCode = orderInitCode;
+	}
+
+	public Integer getOrderCodeState() {
+		return orderCodeState;
+	}
+
+	public void setOrderCodeState(Integer orderCodeState) {
+		this.orderCodeState = orderCodeState;
+	}
+
+	public String getOrderProductName() {
+		return orderProductName;
+	}
+
+	public void setOrderProductName(String orderProductName) {
+		this.orderProductName = orderProductName;
+	}
+
+	public String getOrderProductPic() {
+		return orderProductPic;
+	}
+
+	public void setOrderProductPic(String orderProductPic) {
+		this.orderProductPic = orderProductPic;
+	}
+
+	public String getOrderProductColor() {
+		return orderProductColor;
+	}
+
+	public void setOrderProductColor(String orderProductColor) {
+		this.orderProductColor = orderProductColor;
+	}
+	
+}

watero-common-core/src/main/java/com/iamberry/wechat/core/entity/machine/Machine.java

@@ -0,0 +1,137 @@
+package com.iamberry.wechat.core.entity.machine;
+
+import java.util.Date;
+
+/**
+ * 机器信息
+ * @author 刘志伟
+ *	2017-02-08
+ */
+public class Machine implements java.io.Serializable {
+
+	/**
+	 * 
+	 */
+	private static final long serialVersionUID = 5277373380145774598L;
+
+	private Integer machineId;						//机器id
+	
+	private String machineOrderId;				//订单号
+	
+	private String machineOpenid;				//机器所属人
+	
+	private String machineDeviceId;				//设备id（微信）
+	
+	private Integer machineSurplusWater;		//剩余水量
+	
+	private Date machineUpdateTime;			//水量更新时间
+	
+	private String machineNextCommand;	//机器下一条指令
+	
+	private Integer machineConnectState;		//机器连接状态
+	
+	private Integer machineInitState;				//激活状态
+	
+	private Integer machineState;					//机器状态
+	
+	private String machineInitCode;				//激活码
+	
+	private Date machineCreateTime;			//创建时间
+
+	public Integer getMachineId() {
+		return machineId;
+	}
+
+	public void setMachineId(Integer machineId) {
+		this.machineId = machineId;
+	}
+
+	public String getMachineOrderId() {
+		return machineOrderId;
+	}
+
+	public void setMachineOrderId(String machineOrderId) {
+		this.machineOrderId = machineOrderId;
+	}
+
+	public String getMachineOpenid() {
+		return machineOpenid;
+	}
+
+	public void setMachineOpenid(String machineOpenid) {
+		this.machineOpenid = machineOpenid;
+	}
+
+	public String getMachineDeviceId() {
+		return machineDeviceId;
+	}
+
+	public void setMachineDeviceId(String machineDeviceId) {
+		this.machineDeviceId = machineDeviceId;
+	}
+
+	public Integer getMachineSurplusWater() {
+		return machineSurplusWater;
+	}
+
+	public void setMachineSurplusWater(Integer machineSurplusWater) {
+		this.machineSurplusWater = machineSurplusWater;
+	}
+
+	public Date getMachineUpdateTime() {
+		return machineUpdateTime;
+	}
+
+	public void setMachineUpdateTime(Date machineUpdateTime) {
+		this.machineUpdateTime = machineUpdateTime;
+	}
+
+	public String getMachineNextCommand() {
+		return machineNextCommand;
+	}
+
+	public void setMachineNextCommand(String machineNextCommand) {
+		this.machineNextCommand = machineNextCommand;
+	}
+
+	public Integer getMachineConnectState() {
+		return machineConnectState;
+	}
+
+	public void setMachineConnectState(Integer machineConnectState) {
+		this.machineConnectState = machineConnectState;
+	}
+
+	public Integer getMachineInitState() {
+		return machineInitState;
+	}
+
+	public void setMachineInitState(Integer machineInitState) {
+		this.machineInitState = machineInitState;
+	}
+
+	public Integer getMachineState() {
+		return machineState;
+	}
+
+	public void setMachineState(Integer machineState) {
+		this.machineState = machineState;
+	}
+
+	public String getMachineInitCode() {
+		return machineInitCode;
+	}
+
+	public void setMachineInitCode(String machineInitCode) {
+		this.machineInitCode = machineInitCode;
+	}
+
+	public Date getMachineCreateTime() {
+		return machineCreateTime;
+	}
+
+	public void setMachineCreateTime(Date machineCreateTime) {
+		this.machineCreateTime = machineCreateTime;
+	}
+	
+}

watero-common-core/src/main/java/com/iamberry/wechat/core/entity/machine/MachineDto.java

@@ -0,0 +1,149 @@
+package com.iamberry.wechat.core.entity.machine;
+
+import java.util.Date;
+
+import com.iamberry.wechat.core.entity.PageBean;
+
+/**
+ * 机器信息Dto
+ * @author 刘志伟
+ *	2017-02-10
+ */
+public class MachineDto implements java.io.Serializable {
+	
+/**
+	 * 
+	 */
+	private static final long serialVersionUID = 1662491641351580540L;
+
+private Integer machineId;						//机器id
+	
+	private String machineOrderId;				//订单号
+	
+	private String machineOpenid;				//机器所属人
+	
+	private String machineDeviceId;				//设备id（微信）
+	
+	private Integer machineSurplusWater;		//剩余水量
+	
+	private Date machineUpdateTime;			//水量更新时间
+	
+	private String machineNextCommand;	//机器下一条指令
+	
+	private Integer machineConnectState;		//机器连接状态
+	
+	private Integer machineInitState;				//激活状态
+	
+	private Integer machineState;					//机器状态
+	
+	private String machineInitCode;				//激活码
+	
+	private Date machineCreateTime;			//创建时间
+	
+	private PageBean page = new PageBean();		//分页
+
+	public PageBean getPage() {
+		return page;
+	}
+
+	public void setPage(PageBean page) {
+		this.page = page;
+	}
+
+	public Integer getMachineId() {
+		return machineId;
+	}
+
+	public void setMachineId(Integer machineId) {
+		this.machineId = machineId;
+	}
+
+	public String getMachineOrderId() {
+		return machineOrderId;
+	}
+
+	public void setMachineOrderId(String machineOrderId) {
+		this.machineOrderId = machineOrderId;
+	}
+
+	public String getMachineOpenid() {
+		return machineOpenid;
+	}
+
+	public void setMachineOpenid(String machineOpenid) {
+		this.machineOpenid = machineOpenid;
+	}
+
+	public String getMachineDeviceId() {
+		return machineDeviceId;
+	}
+
+	public void setMachineDeviceId(String machineDeviceId) {
+		this.machineDeviceId = machineDeviceId;
+	}
+
+	public Integer getMachineSurplusWater() {
+		return machineSurplusWater;
+	}
+
+	public void setMachineSurplusWater(Integer machineSurplusWater) {
+		this.machineSurplusWater = machineSurplusWater;
+	}
+
+	public Date getMachineUpdateTime() {
+		return machineUpdateTime;
+	}
+
+	public void setMachineUpdateTime(Date machineUpdateTime) {
+		this.machineUpdateTime = machineUpdateTime;
+	}
+
+	public String getMachineNextCommand() {
+		return machineNextCommand;
+	}
+
+	public void setMachineNextCommand(String machineNextCommand) {
+		this.machineNextCommand = machineNextCommand;
+	}
+
+	public Integer getMachineConnectState() {
+		return machineConnectState;
+	}
+
+	public void setMachineConnectState(Integer machineConnectState) {
+		this.machineConnectState = machineConnectState;
+	}
+
+	public Integer getMachineInitState() {
+		return machineInitState;
+	}
+
+	public void setMachineInitState(Integer machineInitState) {
+		this.machineInitState = machineInitState;
+	}
+
+	public Integer getMachineState() {
+		return machineState;
+	}
+
+	public void setMachineState(Integer machineState) {
+		this.machineState = machineState;
+	}
+
+	public String getMachineInitCode() {
+		return machineInitCode;
+	}
+
+	public void setMachineInitCode(String machineInitCode) {
+		this.machineInitCode = machineInitCode;
+	}
+
+	public Date getMachineCreateTime() {
+		return machineCreateTime;
+	}
+
+	public void setMachineCreateTime(Date machineCreateTime) {
+		this.machineCreateTime = machineCreateTime;
+	}
+	
+}

watero-common-core/src/main/java/com/iamberry/wechat/core/entity/machine/MachineRechargeDto.java

@@ -0,0 +1,107 @@
+package com.iamberry.wechat.core.entity.machine;
+
+import java.util.Date;
+
+/**
+ * 充值记录DTO
+ * @author liuzhiwei
+ *	2017-02-10
+ */
+public class MachineRechargeDto implements java.io.Serializable {
+
+	/**
+	 * 
+	 */
+	private static final long serialVersionUID = -1197046859217262780L;
+
+	private Integer rechargeId;					//Id
+	
+	private String rechargeOpenId;			//所属用户
+	
+	private Integer rechargeMachineId;		//所属机器
+	
+	private Integer rechargeMaount;			//充值金额
+	
+	private Date rechargeTime;					//充值时间
+	
+	private Integer rechargeWater;			//充值水量
+	
+	private Integer rechargeState;				//状态
+	
+	private String rechargeOrderId;			//充值订单号
+	
+	private Date rechargePayTime;			//支付时间
+
+	public Integer getRechargeId() {
+		return rechargeId;
+	}
+
+	public void setRechargeId(Integer rechargeId) {
+		this.rechargeId = rechargeId;
+	}
+
+	public String getRechargeOpenId() {
+		return rechargeOpenId;
+	}
+
+	public void setRechargeOpenId(String rechargeOpenId) {
+		this.rechargeOpenId = rechargeOpenId;
+	}
+
+	public Integer getRechargeMachineId() {
+		return rechargeMachineId;
+	}
+
+	public void setRechargeMachineId(Integer rechargeMachineId) {
+		this.rechargeMachineId = rechargeMachineId;
+	}
+
+	public Integer getRechargeMaount() {
+		return rechargeMaount;
+	}
+
+	public void setRechargeMaount(Integer rechargeMaount) {
+		this.rechargeMaount = rechargeMaount;
+	}
+
+	public Date getRechargeTime() {
+		return rechargeTime;
+	}
+
+	public void setRechargeTime(Date rechargeTime) {
+		this.rechargeTime = rechargeTime;
+	}
+
+	public Integer getRechargeWater() {
+		return rechargeWater;
+	}
+
+	public void setRechargeWater(Integer rechargeWater) {
+		this.rechargeWater = rechargeWater;
+	}
+
+	public Integer getRechargeState() {
+		return rechargeState;
+	}
+
+	public void setRechargeState(Integer rechargeState) {
+		this.rechargeState = rechargeState;
+	}
+
+	public String getRechargeOrderId() {
+		return rechargeOrderId;
+	}
+
+	public void setRechargeOrderId(String rechargeOrderId) {
+		this.rechargeOrderId = rechargeOrderId;
+	}
+
+	public Date getRechargePayTime() {
+		return rechargePayTime;
+	}
+
+	public void setRechargePayTime(Date rechargePayTime) {
+		this.rechargePayTime = rechargePayTime;
+	}
+	
+}

watero-common-core/src/main/java/com/iamberry/wechat/core/entity/machine/MachineShareRecord.java

@@ -0,0 +1,48 @@
+package com.iamberry.wechat.core.entity.machine;
+
+import java.io.Serializable;
+import java.util.Date;
+
+public class MachineShareRecord implements Serializable{
+
+	/**
+	 * 
+	 */
+	private static final long serialVersionUID = -8314833135174703738L;
+	private Integer shareId;
+	private String shareUserOpenid;
+	private Date createTime;
+	private String shareContent;//分享内容
+	private Integer shareType;//分享类型 0：机器
+	public Integer getShareId() {
+		return shareId;
+	}
+	public void setShareId(Integer shareId) {
+		this.shareId = shareId;
+	}
+	public String getShareUserOpenid() {
+		return shareUserOpenid;
+	}
+	public void setShareUserOpenid(String shareUserOpenid) {
+		this.shareUserOpenid = shareUserOpenid;
+	}
+	public Date getCreateTime() {
+		return createTime;
+	}
+	public void setCreateTime(Date createTime) {
+		this.createTime = createTime;
+	}
+	public String getShareContent() {
+		return shareContent;
+	}
+	public void setShareContent(String shareContent) {
+		this.shareContent = shareContent;
+	}
+	public Integer getShareType() {
+		return shareType;
+	}
+	public void setShareType(Integer shareType) {
+		this.shareType = shareType;
+	}
+	
+}

watero-common-core/src/main/java/com/iamberry/wechat/core/entity/member/ApplyDto.java

@@ -0,0 +1,71 @@
+package com.iamberry.wechat.core.entity.member;
+
+import com.iamberry.app.verify.ValidatorInterface;
+
+/**
+ * @author 何秀刚
+ * Class Description: 申请积分提现功能
+ * Create Date:2016年4月21日
+ * Update Date:2016年4月21日
+ */
+public class ApplyDto implements java.io.Serializable{
+
+	/**
+	 * 
+	 */
+	private static final long serialVersionUID = -5358406467846253616L;
+
+	@ValidatorInterface(validatorIsRule = "[^\\s]{1,}", isEnable = true)
+	private String username; // 用户名
+
+	@ValidatorInterface(validatorIsRule = "^[1]([3][0-9]{1}|50|51|52|53|55|56|57|58|59|77|80|81|82|83|85|84|86|87|88|89|)[0-9]{8}$", isEnable = true)
+	private String tel; // 电话
+	
+	private int integralNum; // 申请数量
+
+	@ValidatorInterface(validatorIsRule = "[^\\s]{1,}", isEnable = true)
+	private String bankName; // 银行名称
+
+	@ValidatorInterface(validatorIsRule = "[^\\s]{1,}", isEnable = true)
+	private String branch; // 支行名称
+
+	public String getUsername() {
+		return username;
+	}
+
+	public void setUsername(String username) {
+		this.username = username;
+	}
+
+	public String getTel() {
+		return tel;
+	}
+
+	public void setTel(String tel) {
+		this.tel = tel;
+	}
+
+	public int getIntegralNum() {
+		return integralNum;
+	}
+
+	public void setIntegralNum(int integralNum) {
+		this.integralNum = integralNum;
+	}
+
+	public String getBankName() {
+		return bankName;
+	}
+
+	public void setBankName(String bankName) {
+		this.bankName = bankName;
+	}
+
+	public String getBranch() {
+		return branch;
+	}
+
+	public void setBranch(String branch) {
+		this.branch = branch;
+	}
+}

watero-common-core/src/main/java/com/iamberry/wechat/core/entity/member/CashLog.java

@@ -0,0 +1,96 @@
+package com.iamberry.wechat.core.entity.member;
+
+import java.io.Serializable;
+import java.util.Date;
+
+import org.springframework.format.annotation.DateTimeFormat;
+
+import com.fasterxml.jackson.annotation.JsonFormat;
+import com.iamberry.wechat.core.entity.PageBean;
+
+public class CashLog implements Serializable{
+	/**
+	 * 
+	 */
+	private static final long serialVersionUID = -881495696660817166L;
+	
+	private Integer cashLogsId;					//id
+	private String cashLogsOpenid;				//所属用户
+	private Integer cashLogsNum;				//记录金额
+	private Integer cashLogsType;				//记录类型		1:收入	2:支出
+	
+	private String cashLogsIntroduction;		//记录简介
+	private Integer cashLogsResType;			//记录来源类型	1:订单收入 2:提现支出 3:订单支出 4:线下返利 5:退订返还;6任务奖励
+	@DateTimeFormat(pattern="yyyy-MM-dd HH:mm:ss")  
+	@JsonFormat(pattern="yyyy-MM-dd HH:mm:ss",timezone = "GMT+8")  
+	private Date cashLogsCreateDate;			//创建时间
+	private String cashLogsOrderid;				//现金操作的单号 如：返利的订单号、提现的Id
+	
+	private PageBean page = new PageBean();
+	
+	public Integer getCashLogsId() {
+		return cashLogsId;
+	}
+	public void setCashLogsId(Integer cashLogsId) {
+		this.cashLogsId = cashLogsId;
+	}
+	public String getCashLogsOpenid() {
+		return cashLogsOpenid;
+	}
+	public void setCashLogsOpenid(String cashLogsOpenid) {
+		this.cashLogsOpenid = cashLogsOpenid;
+	}
+	public Integer getCashLogsNum() {
+		return cashLogsNum;
+	}
+	public void setCashLogsNum(Integer cashLogsNum) {
+		this.cashLogsNum = cashLogsNum;
+	}
+	public Integer getCashLogsType() {
+		return cashLogsType;
+	}
+	public void setCashLogsType(Integer cashLogsType) {
+		this.cashLogsType = cashLogsType;
+	}
+	public String getCashLogsIntroduction() {
+		return cashLogsIntroduction;
+	}
+	public void setCashLogsIntroduction(String cashLogsIntroduction) {
+		this.cashLogsIntroduction = cashLogsIntroduction;
+	}
+	public Integer getCashLogsResType() {
+		return cashLogsResType;
+	}
+	public void setCashLogsResType(Integer cashLogsResType) {
+		this.cashLogsResType = cashLogsResType;
+	}
+	public Date getCashLogsCreateDate() {
+		return cashLogsCreateDate;
+	}
+	public void setCashLogsCreateDate(Date cashLogsCreateDate) {
+		this.cashLogsCreateDate = cashLogsCreateDate;
+	}
+	public PageBean getPage() {
+		return page;
+	}
+	public void setPage(PageBean page) {
+		this.page = page;
+	}
+	public String getCashLogsOrderid() {
+		return cashLogsOrderid;
+	}
+	public void setCashLogsOrderid(String cashLogsOrderid) {
+		this.cashLogsOrderid = cashLogsOrderid;
+	}
+	@Override
+	public String toString() {
+		return "CashLog [cashLogsId=" + cashLogsId + ", cashLogsOpenid="
+				+ cashLogsOpenid + ", cashLogsNum=" + cashLogsNum
+				+ ", cashLogsType=" + cashLogsType + ", cashLogsIntroduction="
+				+ cashLogsIntroduction + ", cashLogsResType=" + cashLogsResType
+				+ ", cashLogsCreateDate=" + cashLogsCreateDate
+				+ ", cashLogsOrderid=" + cashLogsOrderid + ", page=" + page
+				+ "]";
+	}
+	
+}

watero-common-core/src/main/java/com/iamberry/wechat/core/entity/member/Integral.java

@@ -0,0 +1,104 @@
+package com.iamberry.wechat.core.entity.member;
+
+import java.io.Serializable;
+import java.util.Date;
+
+import com.iamberry.wechat.core.entity.PageBean;
+/**
+ * 
+ *		description: 会员积分实体类
+ * 	   		@author: 张应真
+ *	    @createDate: 2016年4月19日
+ */
+public class Integral implements Serializable{
+	/**
+	 * 
+	 */
+	private static final long serialVersionUID = 5301819915321786026L;
+	private Integer integralLogsId;					//记录ID
+	private String integralLogsOpenid;				//所属用户,外键
+	private Integer integralLogsNum;				//记录积分数量
+	private Integer integralLogsType;				//记录类型		1支出		2收入
+	private String integralLogsIntroduction;		//记录简介
+	private Integer integralLogsResType;	//记录来源类型 	1:订单收入 2:提现支出 3:订单支出  4:线下返利5:订单奖励6:退订返还
+	private Date integralLogsCreateDate;			//创建时间
+	
+	private PageBean page;
+	public Integer getIntegralLogsId() {
+		return integralLogsId;
+	}
+	public void setIntegralLogsId(Integer integralLogsId) {
+		this.integralLogsId = integralLogsId;
+	}
+	public String getIntegralLogsOpenid() {
+		return integralLogsOpenid;
+	}
+	public void setIntegralLogsOpenid(String integralLogsOpenid) {
+		this.integralLogsOpenid = integralLogsOpenid;
+	}
+	public Integer getIntegralLogsNum() {
+		return integralLogsNum;
+	}
+	public void setIntegralLogsNum(Integer integralLogsNum) {
+		this.integralLogsNum = integralLogsNum;
+	}
+	public Integer getIntegralLogsType() {
+		return integralLogsType;
+	}
+	public void setIntegralLogsType(Integer integralLogsType) {
+		this.integralLogsType = integralLogsType;
+	}
+	public String getIntegralLogsIntroduction() {
+		return integralLogsIntroduction;
+	}
+	public void setIntegralLogsIntroduction(String integralLogsIntroduction) {
+		this.integralLogsIntroduction = integralLogsIntroduction;
+	}
+	public Integer getIntegralLogsResType() {
+		return integralLogsResType;
+	}
+	public void setIntegralLogsResType(Integer integralLogsResType) {
+		this.integralLogsResType = integralLogsResType;
+	}
+	public Date getIntegralLogsCreateDate() {
+		return integralLogsCreateDate;
+	}
+	public void setIntegralLogsCreateDate(Date integralLogsCreateDate) {
+		this.integralLogsCreateDate = integralLogsCreateDate;
+	}
+	public PageBean getPage() {
+		return page;
+	}
+	public void setPage(PageBean page) {
+		this.page = page;
+	}
+	public Integral(Integer integralLogsId, String integralLogsOpenid,
+			Integer integralLogsNum, Integer integralLogsType,
+			String integralLogsIntroduction, Integer integralLogsResType,
+			Date integralLogsCreateDate) {
+		super();
+		this.integralLogsId = integralLogsId;
+		this.integralLogsOpenid = integralLogsOpenid;
+		this.integralLogsNum = integralLogsNum;
+		this.integralLogsType = integralLogsType;
+		this.integralLogsIntroduction = integralLogsIntroduction;
+		this.integralLogsResType = integralLogsResType;
+		this.integralLogsCreateDate = integralLogsCreateDate;
+	}
+	public Integral() {
+		super();
+		// TODO Auto-generated constructor stub
+	}
+	@Override
+	public String toString() {
+		return "Integral [integralLogsId=" + integralLogsId
+				+ ", integralLogsOpenid=" + integralLogsOpenid
+				+ ", integralLogsNum=" + integralLogsNum
+				+ ", integralLogsType=" + integralLogsType
+				+ ", integralLogsIntroduction=" + integralLogsIntroduction
+				+ ", integralLogsResType=" + integralLogsResType
+				+ ", integralLogsCreateDate=" + integralLogsCreateDate + "]";
+	}
+	
+	
+} 

watero-common-core/src/main/java/com/iamberry/wechat/core/entity/member/IntegralDto.java

@@ -0,0 +1,84 @@
+package com.iamberry.wechat.core.entity.member;
+
+import java.io.Serializable;
+import java.util.Date;
+
+public class IntegralDto implements Serializable{
+	private String userName;						//用户名
+	private String telNo;							//用户电话
+	private Integer integralNum;					//操作数量
+	private Integer integralLogsType;				//积分类型
+	private String integralLogsIntroduction;		//描述
+	private Integer integralLogsResType;			//记录来源类型
+	private Date integralLogsCreateDate;			//创建时间
+	public String getUserName() {
+		return userName;
+	}
+	public void setUserName(String userName) {
+		this.userName = userName;
+	}
+	public String getTelNo() {
+		return telNo;
+	}
+	public void setTelNo(String telNo) {
+		this.telNo = telNo;
+	}
+	public Integer getIntegralNum() {
+		return integralNum;
+	}
+	public void setIntegralNum(Integer integralNum) {
+		this.integralNum = integralNum;
+	}
+	public Integer getIntegralLogsType() {
+		return integralLogsType;
+	}
+	public void setIntegralLogsType(Integer integralLogsType) {
+		this.integralLogsType = integralLogsType;
+	}
+	public String getIntegralLogsIntroduction() {
+		return integralLogsIntroduction;
+	}
+	public void setIntegralLogsIntroduction(String integralLogsIntroduction) {
+		this.integralLogsIntroduction = integralLogsIntroduction;
+	}
+	public Integer getIntegralLogsResType() {
+		return integralLogsResType;
+	}
+	public void setIntegralLogsResType(Integer integralLogsResType) {
+		this.integralLogsResType = integralLogsResType;
+	}
+	public Date getIntegralLogsCreateDate() {
+		return integralLogsCreateDate;
+	}
+	public void setIntegralLogsCreateDate(Date integralLogsCreateDate) {
+		this.integralLogsCreateDate = integralLogsCreateDate;
+	}
+	@Override
+	public String toString() {
+		return "IntegralDto [userName=" + userName + ", telNo=" + telNo
+				+ ", integralNum=" + integralNum + ", integralLogsType="
+				+ integralLogsType + ", integralLogsIntroduction="
+				+ integralLogsIntroduction + ", integralLogsResType="
+				+ integralLogsResType + ", integralLogsCreateDate="
+				+ integralLogsCreateDate + "]";
+	}
+	public IntegralDto(String userName, String telNo, Integer integralNum,
+			Integer integralLogsType, String integralLogsIntroduction,
+			Integer integralLogsResType, Date integralLogsCreateDate) {
+		super();
+		this.userName = userName;
+		this.telNo = telNo;
+		this.integralNum = integralNum;
+		this.integralLogsType = integralLogsType;
+		this.integralLogsIntroduction = integralLogsIntroduction;
+		this.integralLogsResType = integralLogsResType;
+		this.integralLogsCreateDate = integralLogsCreateDate;
+	}
+	public IntegralDto() {
+		super();
+		// TODO Auto-generated constructor stub
+	}
+	
+	
+	
+}

watero-common-core/src/main/java/com/iamberry/wechat/core/entity/member/Member.java

@@ -0,0 +1,271 @@
+package com.iamberry.wechat.core.entity.member;
+
+import java.io.Serializable;
+import java.util.Date;
+
+import com.iamberry.wechat.core.entity.Page;
+
+/**
+ * description: 会员信息实休类
+ * 	   @author: 张应真
+ * @createDate: 2016年4月18日
+ */
+public class Member implements Serializable{
+	/**
+	 * 
+	 */
+	private static final long serialVersionUID = -1480503773318576718L;
+	public static long getSerialversionuid() {
+		return serialVersionUID;
+	}
+	private Integer userId;					//会员ID
+	private String userOpenid;				//用户openid
+	private String userHead;				//用户头像
+	private String userNickname;			//用户昵称
+	private String userAddr;				//用户区域
+	
+	private Integer userSex;				//用户性别		default 1; 1:男   2:女   0:未知
+	private String userAccountNum;			//用户账号
+	private Date userBirthDate;				//生日
+	private Date userCreateDate;			//创建时间
+	
+	private Integer userIdentity;			//会员身份			1:会员   2:微代理
+	private Integer userIsFlag;				//关系是否绑定		1:没有2:绑定
+	private String userName;				//姓名
+	private String userPwd;					//用户密码
+	private String userTel;					//用户电话
+	
+	private String userQrcode;				//二维码
+	private Integer userResType;			//来源       		1:默认  	 2:会员	3:商户
+	private Integer userStatus;				//用户状态		1:未关注，默认  2:已关注     0:已取消关注
+	private Date userSubDate;				//关注/取消时间	（每次扫二维码都会更新）
+	private Integer userSurplusIntegral;	//剩余积分
+	
+	private Integer userUseIntegral;		//已用积分
+	private Integer userIncome;				//收入金额，单位为分
+	private Integer templateId;				//返利模板id
+	private Integer userDealers;			//代理商层级id
+	private Integer userIsBought;			//用户是否已经购买过		1：未购买(默认)	2：已购买
+	private Page page;						//分页
+
+	private Integer userIntegral;			//jifen
+	private Integer userCoupon;			//
+	private Integer userTemplateId;			//
+
+	public Page getPage() {
+		return page;
+	}
+	
+	public Integer getUserIncome() {
+		return userIncome;
+	}
+
+	public void setUserIncome(Integer userIncome) {
+		this.userIncome = userIncome;
+	}
+
+	public void setPage(Page page) {
+		this.page = page;
+	}
+
+	public Member() {
+		super();
+	}
+
+	public String getUserAccountNum() {
+		return userAccountNum;
+	}
+
+	public String getUserAddr() {
+		return userAddr;
+	}
+
+	public Date getUserBirthDate() {
+		return userBirthDate;
+	}
+
+	public Date getUserCreateDate() {
+		return userCreateDate;
+	}
+
+	public String getUserHead() {
+		return userHead;
+	}
+
+	public Integer getUserId() {
+		return userId;
+	}
+
+	public Integer getUserIdentity() {
+		return userIdentity;
+	}
+
+	public Integer getUserIsFlag() {
+		return userIsFlag;
+	}
+
+	public String getUserName() {
+		return userName;
+	}
+
+	public String getUserNickname() {
+		return userNickname;
+	}
+
+	public String getUserOpenid() {
+		return userOpenid;
+	}
+
+	public String getUserPwd() {
+		return userPwd;
+	}
+	
+	public String getUserTel() {
+		return userTel;
+	}
+	public void setUserTel(String userTel) {
+		this.userTel = userTel;
+	}
+
+	public String getUserQrcode() {
+		return userQrcode;
+	}
+	public Integer getUserResType() {
+		return userResType;
+	}
+	public Integer getUserSex() {
+		return userSex;
+	}
+	public Integer getUserStatus() {
+		return userStatus;
+	}
+	public Date getUserSubDate() {
+		return userSubDate;
+	}
+	public Integer getUserSurplusIntegral() {
+		return userSurplusIntegral;
+	}
+	public Integer getUserUseIntegral() {
+		return userUseIntegral;
+	}
+	public void setUserAccountNum(String userAccountNum) {
+		this.userAccountNum = userAccountNum;
+	}
+	public void setUserAddr(String userAddr) {
+		this.userAddr = userAddr;
+	}
+	public void setUserBirthDate(Date userBirthDate) {
+		this.userBirthDate = userBirthDate;
+	}
+	public void setUserCreateDate(Date userCreateDate) {
+		this.userCreateDate = userCreateDate;
+	}
+	public void setUserHead(String userHead) {
+		this.userHead = userHead;
+	}
+	public void setUserId(Integer userId) {
+		this.userId = userId;
+	}
+	public void setUserIdentity(Integer userIdentity) {
+		this.userIdentity = userIdentity;
+	}
+	public void setUserIsFlag(Integer userIsFlag) {
+		this.userIsFlag = userIsFlag;
+	}
+	public void setUserName(String userName) {
+		this.userName = userName;
+	}
+	public void setUserNickname(String userNickname) {
+		this.userNickname = userNickname;
+	}
+	public void setUserOpenid(String userOpenid) {
+		this.userOpenid = userOpenid;
+	}
+	public void setUserPwd(String userPwd) {
+		this.userPwd = userPwd;
+	}
+	public void setUserQrcode(String userQrcode) {
+		this.userQrcode = userQrcode;
+	}
+	public void setUserResType(Integer userResType) {
+		this.userResType = userResType;
+	}
+	public void setUserSex(Integer userSex) {
+		this.userSex = userSex;
+	}
+	public void setUserStatus(Integer userStatus) {
+		this.userStatus = userStatus;
+	}
+	public void setUserSubDate(Date userSubDate) {
+		this.userSubDate = userSubDate;
+	}
+	public void setUserSurplusIntegral(Integer userSurplusIntegral) {
+		this.userSurplusIntegral = userSurplusIntegral;
+	}
+	public void setUserUseIntegral(Integer userUseIntegral) {
+		this.userUseIntegral = userUseIntegral;
+	}
+	public Integer getTemplateId() {
+		return templateId;
+	}
+
+	public void setTemplateId(Integer templateId) {
+		this.templateId = templateId;
+	}
+	public Integer getUserDealers() {
+		return userDealers;
+	}
+	public void setUserDealers(Integer userDealers) {
+		this.userDealers = userDealers;
+	}
+
+	public Integer getUserIsBought() {
+		return userIsBought;
+	}
+	public void setUserIsBought(Integer userIsBought) {
+		this.userIsBought = userIsBought;
+	}
+
+	public Integer getUserIntegral() {
+		return userIntegral;
+	}
+
+	public void setUserIntegral(Integer userIntegral) {
+		this.userIntegral = userIntegral;
+	}
+
+	public Integer getUserCoupon() {
+		return userCoupon;
+	}
+
+	public void setUserCoupon(Integer userCoupon) {
+		this.userCoupon = userCoupon;
+	}
+
+	public Integer getUserTemplateId() {
+		return userTemplateId;
+	}
+
+	public void setUserTemplateId(Integer userTemplateId) {
+		this.userTemplateId = userTemplateId;
+	}
+
+	@Override
+	public String toString() {
+		return "Member [userId=" + userId + ", userOpenid=" + userOpenid
+				+ ", userHead=" + userHead + ", userNickname=" + userNickname
+				+ ", userAddr=" + userAddr + ", userSex=" + userSex
+				+ ", userAccountNum=" + userAccountNum + ", userBirthDate="
+				+ userBirthDate + ", userCreateDate=" + userCreateDate
+				+ ", userIdentity=" + userIdentity + ", userIsFlag="
+				+ userIsFlag + ", userName=" + userName + ", userPwd="
+				+ userPwd + ", userTel=" + userTel + ", userQrcode="
+				+ userQrcode + ", userResType=" + userResType + ", userStatus="
+				+ userStatus + ", userSubDate=" + userSubDate
+				+ ", userSurplusIntegral=" + userSurplusIntegral
+				+ ", userUseIntegral=" + userUseIntegral + ", userIncome="
+				+ userIncome + ", templateId=" + templateId + ", userDealers="
+				+ userDealers + ", userIsBought=" + userIsBought + ", page="
+				+ page + "]";
+	}
+}

watero-common-core/src/main/java/com/iamberry/wechat/core/entity/member/ShareInfo.java

@@ -0,0 +1,69 @@
+package com.iamberry.wechat.core.entity.member;
+
+import java.io.Serializable;
+import java.util.Date;
+
+/**
+ * 链接分享 实体
+ * create date 2016年5月26日
+ * @author 穆再兴
+ *
+ */
+public class ShareInfo implements Serializable{
+	/**
+	 * 
+	 */
+	private static final long serialVersionUID = -1359675239744704009L;
+	
+	private Integer shareId;				//Id
+	private String shareImgUrl;				//分享图片
+	private String shareMessage;			//分享内容
+	private Integer shareUserType;			//分享人类型
+	private String shareUserOpenid;			//分享人openid
+	private Date createDate;				//创建时间
+	
+	public Integer getShareId() {
+		return shareId;
+	}
+	public void setShareId(Integer shareId) {
+		this.shareId = shareId;
+	}
+	public String getShareImgUrl() {
+		return shareImgUrl;
+	}
+	public void setShareImgUrl(String shareImgUrl) {
+		this.shareImgUrl = shareImgUrl;
+	}
+	public String getShareMessage() {
+		return shareMessage;
+	}
+	public void setShareMessage(String shareMessage) {
+		this.shareMessage = shareMessage;
+	}
+	public Integer getShareUserType() {
+		return shareUserType;
+	}
+	public void setShareUserType(Integer shareUserType) {
+		this.shareUserType = shareUserType;
+	}
+	public String getShareUserOpenid() {
+		return shareUserOpenid;
+	}
+	public void setShareUserOpenid(String shareUserOpenid) {
+		this.shareUserOpenid = shareUserOpenid;
+	}
+	public Date getCreateDate() {
+		return createDate;
+	}
+	public void setCreateDate(Date createDate) {
+		this.createDate = createDate;
+	}
+	@Override
+	public String toString() {
+		return "QrcodeShare [shareId=" + shareId + ", shareImgUrl="
+				+ shareImgUrl + ", shareMessage=" + shareMessage
+				+ ", shareUserType=" + shareUserType + ", shareUserOpenid="
+				+ shareUserOpenid + ", createDate=" + createDate + "]";
+	} 
+	
+}

watero-common-core/src/main/java/com/iamberry/wechat/core/entity/member/Withdraw.java

@@ -0,0 +1,194 @@
+package com.iamberry.wechat.core.entity.member;
+
+import java.io.Serializable;
+import java.util.Date;
+
+import org.springframework.format.annotation.DateTimeFormat;
+
+import com.alibaba.dubbo.container.page.Page;
+import com.fasterxml.jackson.annotation.JsonFormat;
+/**
+ * 
+ *		description: 微代理提现记录实体类
+ * 	   		@author: 张应真
+ *	    @createDate: 2016年4月19日
+ */
+public class Withdraw implements Serializable{
+	/**
+	 * 
+	 */
+	private static final long serialVersionUID = -3434880654377628921L;
+	private Integer withdrawalsLogsId;						//ID
+	private String withdrawalsOpenid;						//用户ID
+	private Integer withdrawalsLogsIntegralNum;				//兑换积分
+	private Integer withdrawalsLogsAmount;					//积分换算人民币
+	
+	@DateTimeFormat(pattern="yyyy-MM-dd HH:mm:ss")  
+	@JsonFormat(pattern="yyyy-MM-dd HH:mm:ss",timezone = "GMT+8")
+	private Date withdrawalsLogsDate;						//兑换时间
+	private String withdrawalsUsername;						//兑换人姓名
+	private String withdrawalsTel;							//对换人电话
+	private Integer withdrawalsStatus;						//状态	1:兑换成功 2:处理中 3:兑换失败
+	private String withdrawalsCardNo;						//提现人卡号
+	private String withdrawalsBankName;						//提现人卡号所属银行
+	private String withdrawalsRemark; 						//提款备注
+	
+	private String sumMoney; 						//总金额
+	
+	
+	private Page page;						//分页
+
+	public Page getPage() {
+		return page;
+	}
+
+	public void setPage(Page page) {
+		this.page = page;
+	}
+
+	public Withdraw() {
+		super();
+		// TODO Auto-generated constructor stub
+	}
+	
+	public Withdraw(Integer withdrawalsLogsId, String withdrawalsOpenid,
+			Integer withdrawalsLogsIntegralNum, Integer withdrawalsLogsAmount,
+			Date withdrawalsLogsDate, String withdrawalsUsername,
+			String withdrawalsTel, Integer withdrawalsStatus) {
+		super();
+		this.withdrawalsLogsId = withdrawalsLogsId;
+		this.withdrawalsOpenid = withdrawalsOpenid;
+		this.withdrawalsLogsIntegralNum = withdrawalsLogsIntegralNum;
+		this.withdrawalsLogsAmount = withdrawalsLogsAmount;
+		this.withdrawalsLogsDate = withdrawalsLogsDate;
+		this.withdrawalsUsername = withdrawalsUsername;
+		this.withdrawalsTel = withdrawalsTel;
+		this.withdrawalsStatus = withdrawalsStatus;
+	}
+
+
+	
+	
+	public String getSumMoney() {
+		return sumMoney;
+	}
+
+	public void setSumMoney(String sumMoney) {
+		this.sumMoney = sumMoney;
+	}
+
+	public Integer getWithdrawalsLogsId() {
+		return withdrawalsLogsId;
+	}
+
+
+	public void setWithdrawalsLogsId(Integer withdrawalsLogsId) {
+		this.withdrawalsLogsId = withdrawalsLogsId;
+	}
+
+
+	public String getWithdrawalsOpenid() {
+		return withdrawalsOpenid;
+	}
+
+
+	public void setWithdrawalsOpenid(String withdrawalsOpenid) {
+		this.withdrawalsOpenid = withdrawalsOpenid;
+	}
+
+
+	public Integer getWithdrawalsLogsIntegralNum() {
+		return withdrawalsLogsIntegralNum;
+	}
+
+
+	public void setWithdrawalsLogsIntegralNum(Integer withdrawalsLogsIntegralNum) {
+		this.withdrawalsLogsIntegralNum = withdrawalsLogsIntegralNum;
+	}
+
+
+	public Integer getWithdrawalsLogsAmount() {
+		return withdrawalsLogsAmount;
+	}
+
+
+	public void setWithdrawalsLogsAmount(Integer withdrawalsLogsAmount) {
+		this.withdrawalsLogsAmount = withdrawalsLogsAmount;
+	}
+
+
+	public Date getWithdrawalsLogsDate() {
+		return withdrawalsLogsDate;
+	}
+
+
+	public void setWithdrawalsLogsDate(Date withdrawalsLogsDate) {
+		this.withdrawalsLogsDate = withdrawalsLogsDate;
+	}
+
+
+	public String getWithdrawalsUsername() {
+		return withdrawalsUsername;
+	}
+
+
+	public void setWithdrawalsUsername(String withdrawalsUsername) {
+		this.withdrawalsUsername = withdrawalsUsername;
+	}
+
+
+	public String getWithdrawalsTel() {
+		return withdrawalsTel;
+	}
+
+
+	public void setWithdrawalsTel(String withdrawalsTel) {
+		this.withdrawalsTel = withdrawalsTel;
+	}
+
+
+	public Integer getWithdrawalsStatus() {
+		return withdrawalsStatus;
+	}
+
+
+	public void setWithdrawalsStatus(Integer withdrawalsStatus) {
+		this.withdrawalsStatus = withdrawalsStatus;
+	}
+	public String getWithdrawalsCardNo() {
+		return withdrawalsCardNo;
+	}
+	public void setWithdrawalsCardNo(String withdrawalsCardNo) {
+		this.withdrawalsCardNo = withdrawalsCardNo;
+	}
+	public String getWithdrawalsBankName() {
+		return withdrawalsBankName;
+	}
+	public void setWithdrawalsBankName(String withdrawalsBankName) {
+		this.withdrawalsBankName = withdrawalsBankName;
+	}
+	
+	
+	
+
+	public String getWithdrawalsRemark() {
+		return withdrawalsRemark;
+	}
+
+
+	public void setWithdrawalsRemark(String withdrawalsRemark) {
+		this.withdrawalsRemark = withdrawalsRemark;
+	}
+
+	@Override
+	public String toString() {
+		return "Withdraw [withdrawalsLogsId=" + withdrawalsLogsId
+				+ ", withdrawalsOpenid=" + withdrawalsOpenid
+				+ ", withdrawalsLogsIntegralNum=" + withdrawalsLogsIntegralNum
+				+ ", withdrawalsLogsAmount=" + withdrawalsLogsAmount
+				+ ", withdrawalsLogsDate=" + withdrawalsLogsDate
+				+ ", withdrawalsUsername=" + withdrawalsUsername
+				+ ", withdrawalsTel=" + withdrawalsTel + ", withdrawalsStatus="
+				+ withdrawalsStatus + "]";
+	}
+} 

watero-common-core/src/main/java/com/iamberry/wechat/core/entity/mq/MQMessage.java

@@ -0,0 +1,131 @@
+package com.iamberry.wechat.core.entity.mq;
+
+import java.io.Serializable;
+import java.util.Date;
+
+/**
+ * @author:何秀刚
+ * @description: 消息队列服务器数据库实体类
+ * @createDate:2016年5月25日
+ */
+public class MQMessage implements Serializable {
+	private static final long serialVersionUID = -3169542287905992343L;
+
+	private Integer serviceId;						// ID
+	
+	private String serviceToMessage;				// type为1、2、3时，此为订单ID
+													// type为4时，此为电话号码
+													// type为5时，此为微信openid
+	
+	private Integer serviceIsSend;					// 1:已推送 ; 2:未推送;
+	
+	private Integer serviceStatus;					// 1:推送成功；2:推送失败
+ 
+	private Integer serviceType;					// 1:添加订单信息
+													// 2:更新订单信息(将我们的信息更新同步到百胜系统)
+													// 3：获取订单信息，从百胜获取订单信息并更新到我们数据库
+													// 4：发送电话号码
+													// 5：发生微信消息
+	
+	private String serviceOtherMessage;				// 其他消息，type为4时，此为验证码
+	
+	private Date serviceCreateDate;					// 创建时间
+	
+	private String serviceHandlerObjectName;		// 对象名称
+	
+	private String serviceHandlerMethodName;		// 方法名称
+	
+	private String serviceErrorMessage;				// 失败时的消息
+	
+	public String getServiceErrorMessage() {
+		return serviceErrorMessage;
+	}
+
+	public void setServiceErrorMessage(String serviceErrorMessage) {
+		this.serviceErrorMessage = serviceErrorMessage;
+	}
+
+	public Integer getServiceId() {
+		return serviceId;
+	}
+
+	public void setServiceId(Integer serviceId) {
+		this.serviceId = serviceId;
+	}
+
+	public String getServiceToMessage() {
+		return serviceToMessage;
+	}
+
+	public void setServiceToMessage(String serviceToMessage) {
+		this.serviceToMessage = serviceToMessage;
+	}
+
+	public Integer getServiceIsSend() {
+		return serviceIsSend;
+	}
+
+	public void setServiceIsSend(Integer serviceIsSend) {
+		this.serviceIsSend = serviceIsSend;
+	}
+
+	public Integer getServiceType() {
+		return serviceType;
+	}
+
+	public void setServiceType(Integer serviceType) {
+		this.serviceType = serviceType;
+	}
+
+	public String getServiceOtherMessage() {
+		return serviceOtherMessage;
+	}
+
+	public void setServiceOtherMessage(String serviceOtherMessage) {
+		this.serviceOtherMessage = serviceOtherMessage;
+	}
+
+	public Date getServiceCreateDate() {
+		return serviceCreateDate;
+	}
+
+	public void setServiceCreateDate(Date serviceCreateDate) {
+		this.serviceCreateDate = serviceCreateDate;
+	}
+
+	public String getServiceHandlerObjectName() {
+		return serviceHandlerObjectName;
+	}
+
+	public void setServiceHandlerObjectName(String serviceHandlerObjectName) {
+		this.serviceHandlerObjectName = serviceHandlerObjectName;
+	}
+
+	public String getServiceHandlerMethodName() {
+		return serviceHandlerMethodName;
+	}
+
+	public void setServiceHandlerMethodName(String serviceHandlerMethodName) {
+		this.serviceHandlerMethodName = serviceHandlerMethodName;
+	}
+
+	public Integer getServiceStatus() {
+		return serviceStatus;
+	}
+
+	public void setServiceStatus(Integer serviceStatus) {
+		this.serviceStatus = serviceStatus;
+	}
+
+	@Override
+	public String toString() {
+		return "MQMessage [serviceId=" + serviceId + ", serviceToMessage="
+				+ serviceToMessage + ", serviceIsSend=" + serviceIsSend
+				+ ", serviceStatus=" + serviceStatus + ", serviceType="
+				+ serviceType + ", serviceOtherMessage=" + serviceOtherMessage
+				+ ", serviceCreateDate=" + serviceCreateDate
+				+ ", serviceHandlerObjectName=" + serviceHandlerObjectName
+				+ ", serviceHandlerMethodName=" + serviceHandlerMethodName
+				+ "]";
+	}
+}

watero-common-core/src/main/java/com/iamberry/wechat/core/entity/news/News.java

@@ -0,0 +1,143 @@
+package com.iamberry.wechat.core.entity.news;
+
+import java.io.Serializable;
+import java.util.Date;
+
+import com.iamberry.app.verify.ValidatorInterface;
+
+/**
+ * @author 何秀刚
+ * @description ： 官网新闻 
+ * @createDate : 2016年6月13日
+ */
+public class News implements Serializable {
+
+	private static final long serialVersionUID = 3082345867459862877L;
+	
+	private Integer newsId;					// 新闻ID
+
+	@ValidatorInterface(validatorIsRule = "[^\\s]{6,30}", isEnable = true)
+	private String newsTitle;				// 标题
+
+	@ValidatorInterface(validatorIsRule = "[^\\s]{1,}", isEnable = true)
+	private String newsContexts;			// 内容
+
+	@ValidatorInterface(validatorIsRule = "[^\\s]{4,100}", isEnable = true)
+	private String newsDesc;				// 内容简介
+
+	@ValidatorInterface(validatorIsRule = "[^\\s]{1,9}", isEnable = true)
+	private String newsAuthor;				// 新闻作者
+
+	@ValidatorInterface(validatorIsRule = "[^\\s]{1,}", isEnable = true)
+	private String newsImage;				// 封面图
+
+	@ValidatorInterface(validatorIsRule = "[^\\s]{1,9}", isEnable = true)
+	private String newsSource;				//  来源
+
+	@ValidatorInterface(validatorIsRule = "[^\\s]{1,200}", isEnable = true)
+	private String newsSourceUrl;			// 来源链接
+	
+	private Integer newsAccessNum;			// 访问次数
+	
+	private Integer newsShareNum;			// 分享次数
+	
+	private Date newsCreateDate;			// 创建时间
+	
+	private String newsSn;					// 对外ID
+	
+	public String getNewsSn() {
+		return newsSn;
+	}
+
+	public void setNewsSn(String newsSn) {
+		this.newsSn = newsSn;
+	}
+
+	public String getNewsSourceUrl() {
+		return newsSourceUrl;
+	}
+
+	public void setNewsSourceUrl(String newsSourceUrl) {
+		this.newsSourceUrl = newsSourceUrl;
+	}
+
+	public Integer getNewsId() {
+		return newsId;
+	}
+
+	public void setNewsId(Integer newsId) {
+		this.newsId = newsId;
+	}
+
+	public String getNewsTitle() {
+		return newsTitle;
+	}
+
+	public void setNewsTitle(String newsTitle) {
+		this.newsTitle = newsTitle;
+	}
+
+	public String getNewsContexts() {
+		return newsContexts;
+	}
+
+	public void setNewsContexts(String newsContexts) {
+		this.newsContexts = newsContexts;
+	}
+
+	public String getNewsDesc() {
+		return newsDesc;
+	}
+
+	public void setNewsDesc(String newsDesc) {
+		this.newsDesc = newsDesc;
+	}
+
+	public String getNewsAuthor() {
+		return newsAuthor;
+	}
+
+	public void setNewsAuthor(String newsAuthor) {
+		this.newsAuthor = newsAuthor;
+	}
+
+	public String getNewsImage() {
+		return newsImage;
+	}
+
+	public void setNewsImage(String newsImage) {
+		this.newsImage = newsImage;
+	}
+
+	public String getNewsSource() {
+		return newsSource;
+	}
+
+	public void setNewsSource(String newsSource) {
+		this.newsSource = newsSource;
+	}
+
+	public Integer getNewsAccessNum() {
+		return newsAccessNum;
+	}
+
+	public void setNewsAccessNum(Integer newsAccessNum) {
+		this.newsAccessNum = newsAccessNum;
+	}
+
+	public Integer getNewsShareNum() {
+		return newsShareNum;
+	}
+
+	public void setNewsShareNum(Integer newsShareNum) {
+		this.newsShareNum = newsShareNum;
+	}
+
+	public Date getNewsCreateDate() {
+		return newsCreateDate;
+	}
+
+	public void setNewsCreateDate(Date newsCreateDate) {
+		this.newsCreateDate = newsCreateDate;
+	}
+}

watero-common-core/src/main/java/com/iamberry/wechat/core/entity/order/MessageDto.java

@@ -0,0 +1,47 @@
+package com.iamberry.wechat.core.entity.order;
+
+public class MessageDto {
+
+	private boolean flag; // 是否成功，true成功，false失败
+	
+	private String title; // 通知标题
+	
+	private String info; // 通知具体内容
+	
+	public MessageDto(boolean flag, String title, String info) {
+		super();
+		this.flag = flag;
+		this.title = title;
+		this.info = info;
+	}
+
+	public boolean isFlag() {
+		return flag;
+	}
+
+	public void setFlag(boolean flag) {
+		this.flag = flag;
+	}
+
+	public String getTitle() {
+		return title;
+	}
+
+	public void setTitle(String title) {
+		this.title = title;
+	}
+
+	public String getInfo() {
+		return info;
+	}
+
+	public void setInfo(String info) {
+		this.info = info;
+	}
+	
+	@Override
+	public String toString() {
+		return "MessageDTO [flag=" + flag + ", title=" + title + ", info="
+				+ info + "]";
+	}
+}

watero-common-core/src/main/java/com/iamberry/wechat/core/entity/order/Order.java

@@ -0,0 +1,379 @@
+package com.iamberry.wechat.core.entity.order;
+
+import java.util.ArrayList;
+import java.util.Date;
+import java.util.List;
+
+import com.iamberry.wechat.core.entity.PageBean;
+import com.iamberry.wechat.core.entity.order.OrderItem;
+
+/**
+ * 销售订单表 实体类
+ * @author 穆再兴
+ * 2016年4月18日18:44:59
+ *
+ */
+public class Order implements java.io.Serializable{
+	/**
+	 * 
+	 */
+	private static final long serialVersionUID = 3739078664644789471L;
+	private String salesOrderid;							//订单id
+	private String salesOpenid;							//所属用户
+	private Integer salesYetAmount;					//付款金额
+	private Integer salesAmount;						//订单总额
+	private Integer salesIntegralNum;				//使用积分数量
+	
+	private Integer salesRateAmount;				//积分抵扣金额
+	private Date salesCreateDate;						//订单创建时间
+	private Integer salesRewardIntegralNum;		//奖励积分
+	private String salesPostNum;						//快递单号
+	private String salesPostFirm;						//快递公司
+	
+	private Integer salesStatus;							//状态  0：取消订单  1：待支付  2：已支付、待发货  3：退款申请中  4：已退款  5：已发货  6：申请退货中  7：退货中  8：订单退货，订单关闭  9：换货中  10：换货完成
+	private Date salesSendDate;						//发货时间
+	private Date salesReturnDate;						//申请退货时间
+	private String salesAddressInfo;					//详细地址
+	private String salesAddressPostnum;			//邮编
+	
+	private String salesAddressTel;						//收件人电话
+	private String salesAddressName;				//收件人姓名
+	private String salesReturnDes;						//退款备注
+	private String salesAdminRemark;				//后台的备注
+	private String salesUserRemark;					//用户备注
+	
+	private String salesTransactionId;				//微信订单号
+	private Date salesTransactionDate;				//微信支付时间
+	private String salesRefundNo;						//系统退款ID
+	private String salesTransactionRefundId;		//微信退款ID
+	private Integer salesColorType;					//颜色图标
+	
+	private Integer salesProxyReward;				//代理入账		1:未入账  2：入账
+	private int salesRewardNum ;                  //分销奖励多少钱
+	private String userNickname;						//昵称
+	private Integer itemTotal;							//商品总额
+	private Integer balancePayAmount;                     //账户余额支付额度
+	
+	private String couponId ;  //优惠券id
+	private String salesChangeOrderid;				//退货或换货的单号
+	private PageBean page = new PageBean(); 								//分页信息
+	private List<OrderItem> orderItemList = new ArrayList<OrderItem>();	//订单项实体类
+	private List<OrderOperation> operations;	//订单操作工具类
+	private String orderLinkStatus;			//订单状态描述
+	
+	private Date beginDate;	//开始时间
+	private Date endDate;		//结束时间
+	private int deadline;		//返利期限，以秒为单位，必须大于此时间才能返利
+	private Integer placeId;		//线下代理信息表id，奖励积分时要用到
+	private Integer itemSum;			//商品总数，定时任务按订单商品数量总数量奖励积分和金额
+	private Integer oldStatus;		//订单未改之前的状态
+	
+	private String salesPorderid;		//试用订单id
+	private Integer salesOrderType;		//订单类型		1：正常订单（默认）	2：试用订单
+	
+	// -------------------------------------------- 新增
+	private String storesName;			// 用户第二级上线
+	
+	private String vipName;				// 用户第一级上线
+	
+	private String vipRole;				// 用户第一级上线的角色ID
+	
+	private String placeOpenID;			// 商户的openid
+	
+	private String userResource;		// 用户来源
+
+	public Integer getOldStatus() {
+		return oldStatus;
+	}
+	public void setOldStatus(Integer oldStatus) {
+		this.oldStatus = oldStatus;
+	}
+	public int getDeadline() {
+		return deadline;
+	}
+	public void setDeadline(int deadline) {
+		this.deadline = deadline;
+	}
+	public Integer getItemSum() {
+		return itemSum;
+	}
+	public void setItemSum(Integer itemSum) {
+		this.itemSum = itemSum;
+	}
+	public Integer getPlaceId() {
+		return placeId;
+	}
+	public void setPlaceId(Integer placeId) {
+		this.placeId = placeId;
+	}
+	public Date getBeginDate() {
+		return beginDate;
+	}
+	public void setBeginDate(Date beginDate) {
+		this.beginDate = beginDate;
+	}
+	public Date getEndDate() {
+		return endDate;
+	}
+	public void setEndDate(Date endDate) {
+		this.endDate = endDate;
+	}
+	public String getOrderLinkStatus() {
+		return orderLinkStatus;
+	}
+	public void setOrderLinkStatus(String orderLinkStatus) {
+		this.orderLinkStatus = orderLinkStatus;
+	}
+	public List<OrderOperation> getOperations() {
+		return operations;
+	}
+	public void setOperations(List<OrderOperation> operations) {
+		this.operations = operations;
+	}
+	public List<OrderItem> getOrderItemList() {
+		return orderItemList;
+	}
+	public void setOrderItemList(List<OrderItem> orderItemList) {
+		this.orderItemList = orderItemList;
+	}
+	public PageBean getPage() {
+		return page;
+	}
+	public void setPage(PageBean page) {
+		this.page = page;
+	}
+	public Integer getSalesProxyReward() {
+		return salesProxyReward;
+	}
+	public void setSalesProxyReward(Integer salesProxyReward) {
+		this.salesProxyReward = salesProxyReward;
+	}
+	public String getUserNickname() {
+		return userNickname;
+	}
+	public void setUserNickname(String userNickname) {
+		this.userNickname = userNickname;
+	}
+	public Integer getItemTotal() {
+		return itemTotal;
+	}
+	public void setItemTotal(Integer itemTotal) {
+		this.itemTotal = itemTotal;
+	}
+	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 getSalesYetAmount() {
+		return salesYetAmount;
+	}
+	public void setSalesYetAmount(Integer salesYetAmount) {
+		this.salesYetAmount = salesYetAmount;
+	}
+	public Integer getSalesAmount() {
+		return salesAmount;
+	}
+	public void setSalesAmount(Integer salesAmount) {
+		this.salesAmount = salesAmount;
+	}
+	public Integer getSalesIntegralNum() {
+		return salesIntegralNum;
+	}
+	public void setSalesIntegralNum(Integer salesIntegralNum) {
+		this.salesIntegralNum = salesIntegralNum;
+	}
+	public Integer getSalesRateAmount() {
+		return salesRateAmount;
+	}
+	public void setSalesRateAmount(Integer salesRateAmount) {
+		this.salesRateAmount = salesRateAmount;
+	}
+	public Date getSalesCreateDate() {
+		return salesCreateDate;
+	}
+	public void setSalesCreateDate(Date salesCreateDate) {
+		this.salesCreateDate = salesCreateDate;
+	}
+	public Integer getSalesRewardIntegralNum() {
+		return salesRewardIntegralNum;
+	}
+	public void setSalesRewardIntegralNum(Integer salesRewardIntegralNum) {
+		this.salesRewardIntegralNum = salesRewardIntegralNum;
+	}
+	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 Integer getSalesStatus() {
+		return salesStatus;
+	}
+	public void setSalesStatus(Integer salesStatus) {
+		this.salesStatus = salesStatus;
+	}
+	public Date getSalesSendDate() {
+		return salesSendDate;
+	}
+	public void setSalesSendDate(Date salesSendDate) {
+		this.salesSendDate = salesSendDate;
+	}
+	public Date getSalesReturnDate() {
+		return salesReturnDate;
+	}
+	public void setSalesReturnDate(Date salesReturnDate) {
+		this.salesReturnDate = salesReturnDate;
+	}
+	public String getSalesAddressInfo() {
+		return salesAddressInfo;
+	}
+	public void setSalesAddressInfo(String salesAddressInfo) {
+		this.salesAddressInfo = salesAddressInfo;
+	}
+	public String getSalesAddressPostnum() {
+		return salesAddressPostnum;
+	}
+	public void setSalesAddressPostnum(String salesAddressPostnum) {
+		this.salesAddressPostnum = salesAddressPostnum;
+	}
+	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 String getSalesReturnDes() {
+		return salesReturnDes;
+	}
+	public void setSalesReturnDes(String salesReturnDes) {
+		this.salesReturnDes = salesReturnDes;
+	}
+	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 getSalesTransactionId() {
+		return salesTransactionId;
+	}
+	public void setSalesTransactionId(String salesTransactionId) {
+		this.salesTransactionId = salesTransactionId;
+	}
+	public Date getSalesTransactionDate() {
+		return salesTransactionDate;
+	}
+	public void setSalesTransactionDate(Date salesTransactionDate) {
+		this.salesTransactionDate = salesTransactionDate;
+	}
+	public String getSalesRefundNo() {
+		return salesRefundNo;
+	}
+	public void setSalesRefundNo(String salesRefundNo) {
+		this.salesRefundNo = salesRefundNo;
+	}
+	public String getSalesTransactionRefundId() {
+		return salesTransactionRefundId;
+	}
+	public void setSalesTransactionRefundId(String salesTransactionRefundId) {
+		this.salesTransactionRefundId = salesTransactionRefundId;
+	}
+	public Integer getSalesColorType() {
+		return salesColorType;
+	}
+	public void setSalesColorType(Integer salesColorType) {
+		this.salesColorType = salesColorType;
+	}
+	public int getSalesRewardNum() {
+		return salesRewardNum;
+	}
+	public void setSalesRewardNum(int salesRewardNum) {
+		this.salesRewardNum = salesRewardNum;
+	}
+	public Integer getBalancePayAmount() {
+		return balancePayAmount;
+	}
+	public void setBalancePayAmount(Integer balancePayAmount) {
+		this.balancePayAmount = balancePayAmount;
+	}
+	public String getCouponId() {
+		return couponId;
+	}
+	public void setCouponId(String couponId) {
+		this.couponId = couponId;
+	}
+	public String getSalesChangeOrderid() {
+		return salesChangeOrderid;
+	}
+	public void setSalesChangeOrderid(String salesChangeOrderid) {
+		this.salesChangeOrderid = salesChangeOrderid;
+	}
+	public String getSalesPorderid() {
+		return salesPorderid;
+	}
+	public void setSalesPorderid(String salesPorderid) {
+		this.salesPorderid = salesPorderid;
+	}
+	public Integer getSalesOrderType() {
+		return salesOrderType;
+	}
+	public void setSalesOrderType(Integer salesOrderType) {
+		this.salesOrderType = salesOrderType;
+	}
+	public String getStoresName() {
+		return storesName;
+	}
+	public void setStoresName(String storesName) {
+		this.storesName = storesName;
+	}
+	public String getVipName() {
+		return vipName;
+	}
+	public void setVipName(String vipName) {
+		this.vipName = vipName;
+	}
+	public String getVipRole() {
+		return vipRole;
+	}
+	public void setVipRole(String vipRole) {
+		this.vipRole = vipRole;
+	}
+	public String getPlaceOpenID() {
+		return placeOpenID;
+	}
+	public void setPlaceOpenID(String placeOpenID) {
+		this.placeOpenID = placeOpenID;
+	}
+	public String getUserResource() {
+		return userResource;
+	}
+	public void setUserResource(String userResource) {
+		this.userResource = userResource;
+	}
+}

watero-common-core/src/main/java/com/iamberry/wechat/core/entity/order/OrderActionDto.java

@@ -0,0 +1,169 @@
+package com.iamberry.wechat.core.entity.order;
+
+import java.util.Date;
+
+import org.springframework.format.annotation.DateTimeFormat;
+
+public class OrderActionDto implements java.io.Serializable{
+
+	/**
+	 * 
+	 */
+	private static final long serialVersionUID = 5765643847595107889L;
+
+	private String orderStatus; // 要操作的订单的当前状态
+	private String toOrderStatus; // 要将当前订单修改成的状态
+	private String osid; // 订单操作流程加密
+	
+	// ----------------- 发货需要字段
+	private String postNum; // 物流编号
+	private String postFirm; // 物流公司
+	
+	// ----------------- 订单备注需要字段
+	private String remark; // 备注信息
+	private Integer remarkColor; // 备注颜色
+	
+	// ----------------- 搜索的字段
+	private String text; // 搜索输入的信息
+	@DateTimeFormat(pattern="yyyy-MM-dd")
+	private Date beginDate; // 搜索开始时间
+	@DateTimeFormat(pattern="yyyy-MM-dd")
+	private Date endDate; // 搜索介绍时间
+	private String probationSendName;		//派送员姓名
+	private String probationSendTel;			//派送员电话号码
+	private String sendAddress;
+	@DateTimeFormat(pattern="yyyy-MM-dd HH:mm:ss")
+	private Date probationEndTime;			//试用订单结束时间
+	private String probationUserRemark;	//试用订单备注，存放礼品信息
+
+	public Date getProbationEndTime() {
+		return probationEndTime;
+	}
+
+	public void setProbationEndTime(Date probationEndTime) {
+		this.probationEndTime = probationEndTime;
+	}
+
+	public String getProbationUserRemark() {
+		return probationUserRemark;
+	}
+
+	public void setProbationUserRemark(String probationUserRemark) {
+		this.probationUserRemark = probationUserRemark;
+	}
+
+	public String getProbationSendName() {
+		return probationSendName;
+	}
+
+	public void setProbationSendName(String probationSendName) {
+		this.probationSendName = probationSendName;
+	}
+
+	public String getProbationSendTel() {
+		return probationSendTel;
+	}
+
+	public void setProbationSendTel(String probationSendTel) {
+		this.probationSendTel = probationSendTel;
+	}
+	public String getSendAddress() {
+        return sendAddress;
+    }
+    public void setSendAddress(String sendAddress) {
+        this.sendAddress = sendAddress;
+    }
+
+    public String getOrderStatus() {
+		return orderStatus;
+	}
+
+	public void setOrderStatus(String orderStatus) {
+		this.orderStatus = orderStatus;
+	}
+
+	public String getToOrderStatus() {
+		return toOrderStatus;
+	}
+
+	public void setToOrderStatus(String toOrderStatus) {
+		this.toOrderStatus = toOrderStatus;
+	}
+
+	public String getOsid() {
+		return osid;
+	}
+
+	public void setOsid(String osid) {
+		this.osid = osid;
+	}
+
+	public String getPostNum() {
+		return postNum;
+	}
+
+	public void setPostNum(String postNum) {
+		this.postNum = postNum;
+	}
+
+	public String getPostFirm() {
+		return postFirm;
+	}
+
+	public void setPostFirm(String postFirm) {
+		this.postFirm = postFirm;
+	}
+
+	public String getRemark() {
+		return remark;
+	}
+
+	public void setRemark(String remark) {
+		this.remark = remark;
+	}
+
+	public Integer getRemarkColor() {
+		return remarkColor;
+	}
+
+	public void setRemarkColor(Integer remarkColor) {
+		this.remarkColor = remarkColor;
+	}
+
+	public String getText() {
+		return text;
+	}
+
+	public void setText(String text) {
+		this.text = text;
+	}
+
+	public Date getBeginDate() {
+		return beginDate;
+	}
+
+	public void setBeginDate(Date beginDate) {
+		this.beginDate = beginDate;
+	}
+
+	public Date getEndDate() {
+		return endDate;
+	}
+
+	public void setEndDate(Date endDate) {
+		this.endDate = endDate;
+	}
+
+    @Override
+    public String toString() {
+        return "OrderActionDto [orderStatus=" + orderStatus
+                + ", toOrderStatus=" + toOrderStatus + ", osid=" + osid
+                + ", postNum=" + postNum + ", postFirm=" + postFirm
+                + ", remark=" + remark + ", remarkColor=" + remarkColor
+                + ", text=" + text + ", beginDate=" + beginDate + ", endDate="
+                + endDate + ", probationSendName=" + probationSendName
+                + ", probationSendTel=" + probationSendTel + ", sendAddress="
+                + sendAddress + ", probationEndTime=" + probationEndTime
+                + ", probationUserRemark=" + probationUserRemark + "]";
+    }
+}

watero-common-core/src/main/java/com/iamberry/wechat/core/entity/order/OrderItem.java

@@ -0,0 +1,176 @@
+package com.iamberry.wechat.core.entity.order;
+
+import java.io.Serializable;
+
+/**
+ * @author 何秀刚
+ * Class Description: 订单项实体类
+ * Create Date:2016年4月20日
+ * Update Date:2016年4月20日
+ */
+public class OrderItem implements Serializable {
+	private static final long serialVersionUID = 5076601528251971617L;
+	
+	private Integer itemId;								//订单条目id
+	
+	private String itemSalesOrderid;				//所属订单
+	
+	private Integer itemProductId;					//购物商品
+	
+	private Integer itemColorId;						//商品颜色表id
+	
+	private Integer itemProductType;			//产品类型id
+	
+	private Integer itemNum;						//商品数量
+	
+	private Integer itemTotal;						//小结
+	
+	private String itemProductName;			//商品名称
+	
+	private Integer itemProductDiscount;		//商品优惠价
+	
+	private Integer itemProductPrice;			//商品原价
+	
+	private String itemProductPic;					//介绍图
+	
+	private Integer productDiscount;		//产品表中商品折扣价
+	
+	private Integer productPrice;			//产品表中商品原价
+
+	private Integer productStatus;			//商品状态		1:在售	2:停止销售	3:删除
+	
+	private String productColor;			//产品颜色		1：红色	2：橙色	3：黄色	4：绿色
+	//			5：青色	6：蓝色	7：紫色	8：白色
+	
+	private String produectRemark;		//产品备注，存放百胜商品69码的
+	
+	
+	
+	
+	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 getProduectRemark() {
+		return produectRemark;
+	}
+
+	public void setProduectRemark(String produectRemark) {
+		this.produectRemark = produectRemark;
+	}
+
+	public Integer getItemId() {
+		return itemId;
+	}
+
+	public String getProductColor() {
+		return productColor;
+	}
+
+	public void setProductColor(String productColor) {
+		this.productColor = productColor;
+	}
+
+	public void setItemId(Integer itemId) {
+		this.itemId = itemId;
+	}
+
+	public String getItemSalesOrderid() {
+		return itemSalesOrderid;
+	}
+
+	public void setItemSalesOrderid(String itemSalesOrderid) {
+		this.itemSalesOrderid = itemSalesOrderid;
+	}
+
+	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 getItemTotal() {
+		return itemTotal;
+	}
+
+	public void setItemTotal(Integer itemTotal) {
+		this.itemTotal = itemTotal;
+	}
+
+	public String getItemProductName() {
+		return itemProductName;
+	}
+
+	public void setItemProductName(String itemProductName) {
+		this.itemProductName = itemProductName;
+	}
+
+	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;
+	}
+
+	public Integer getProductDiscount() {
+		return productDiscount;
+	}
+
+	public void setProductDiscount(Integer productDiscount) {
+		this.productDiscount = productDiscount;
+	}
+	public Integer getProductPrice() {
+		return productPrice;
+	}
+	public void setProductPrice(Integer productPrice) {
+		this.productPrice = productPrice;
+	}
+
+	public Integer getProductStatus() {
+		return productStatus;
+	}
+	public void setProductStatus(Integer productStatus) {
+		this.productStatus = productStatus;
+	}
+	
+	
+}