整理微信项目

iamberry-parent.iml

@@ -6,7 +6,7 @@
     <content url="file://$MODULE_DIR$">
       <excludeFolder url="file://$MODULE_DIR$/target" />
     </content>
-    <orderEntry type="inheritedJdk" />
+    <orderEntry type="jdk" jdkName="1.8" jdkType="JavaSDK" />
     <orderEntry type="sourceFolder" forTests="false" />
     <orderEntry type="library" name="Maven: com.google.zxing:core:3.2.0" level="project" />
     <orderEntry type="library" name="Maven: com.google.zxing:javase:3.2.0" level="project" />

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

@@ -1,112 +0,0 @@
-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();
-    }
- 
-}

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

@@ -1,122 +0,0 @@
-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;
-	}
-
-}

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

@@ -1,105 +0,0 @@
-package com.iamberry.wechat.core.entity.member;
-
-import com.iamberry.wechat.core.entity.PageBean;
-
-import java.io.Serializable;
-import java.util.Date;
-
-/**
- * 
- *		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 + "]";
-	}
-	
-	
-} 

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

@@ -1,84 +0,0 @@
-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
-	}
-	
-	
-	
-}

wechat-common-core/src/main/java/com/iamberry/wechat/core/entity/questionnaire/BMIReference.java

@@ -1,411 +0,0 @@
-package com.iamberry.wechat.core.entity.questionnaire;
-
-import java.io.Serializable;
-import java.util.HashMap;
-import java.util.Map;
-import java.util.concurrent.ExecutorService;
-import java.util.concurrent.Executors;
-
-/**
- * @company	深圳爱贝源科技有限公司
- * @website www.iamberry.com
- * @author 	献
- * @tel		18271840547
- * @date	2016年10月28日
- * @explain	BMI结果参照表
- */
-public final class BMIReference implements Serializable {
-
-	private static final long serialVersionUID = -8346520212337911708L;
-
-	private int age;		// 月龄
-	
-	private int sex;		// 宝宝性别
-	
-	private double N3SD;	// 低于三个标准值
-	
-	private double N2SD;	// 低于两个标准值
-	
-	private double N1SD;	// 低于一个标准值
-	
-	private double N0SD;	// 正常值
-	
-	private double P1SD;	// 高于一个正常值
-	
-	private double P2SD;	// 高于两个正常值
-	
-	private double P3SD;	// 高于三个正常值
-	
-	/**
-	 * 根据用户性别、月龄获取BMI
-	 * @param age
-	 * @param sex	1:男孩；2：女孩
-	 * @return
-	 */
-	public static BMIReference getBMI(int age, int sex) {
-		// 如果BMI数据为空，那么初始化
-		if (bmi.isEmpty()) {
-			synchronized (bmi) {
-				initBMI();
-			}
-		}
-		return bmi.get(age + "-" + sex);
-	}
-
-	/**
-	 * 缓存对应的BMI，因为只是获取，那么不需要保证多线程安全，只是需要在数据初始化的时候保证多线程安全问题
-	 */
-	private static final Map<String, BMIReference> bmi = new HashMap<String, BMIReference>();
-	
-	/**
-	 * 初始化BMI数据
-	 */
-	private static void initBMI() {
-		
-		// 如果上级调用方法getBMI()调用时出现已经初始化过但是还是在调用时，本方法内的处理
-		if (!bmi.isEmpty()) {
-			return;
-		}
-		
-		// 男童
-		BMIReference age0 = new BMIReference(0, 1, 10.2, 11.1, 12.2, 13.4, 14.8, 16.3, 18.1);
-		bmi.put("0-1", age0);
-		BMIReference age1 = new BMIReference(1, 1, 11.3, 12.4, 13.6, 14.9, 16.3, 17.8, 19.4);
-		bmi.put("1-1", age1);
-		BMIReference age2 = new BMIReference(2, 1, 12.5, 13.7, 15.0, 16.3, 17.8, 19.4, 21.1);
-		bmi.put("2-1", age2);
-		BMIReference age3 = new BMIReference(3, 1, 13.1, 14.3, 15.5, 16.9, 18.4, 20.0, 21.8);
-		bmi.put("3-1", age3);
-		BMIReference age4 = new BMIReference(4, 1, 13.4, 14.5, 15.8, 17.2, 18.7, 20.3, 22.1);
-		bmi.put("4-1", age4);
-		BMIReference age5 = new BMIReference(5, 1, 13.5, 14.7, 15.9, 17.3, 18.8, 20.5, 22.3);
-		bmi.put("5-1", age5);
-		BMIReference age6 = new BMIReference(6, 1, 13.6, 14.7, 16.0, 17.3, 18.8, 20.5, 22.3);
-		bmi.put("6-1", age6);
-		BMIReference age7 = new BMIReference(7, 1, 13.7, 14.8, 16.0, 17.3, 18.8, 20.5, 22.3);
-		bmi.put("7-1", age7);
-		BMIReference age8 = new BMIReference(8, 1, 13.6, 14.7, 15.9, 17.3, 18.7, 20.4, 22.2);
-		bmi.put("8-1", age8);
-		BMIReference age9 = new BMIReference(9, 1, 13.6, 14.7, 15.8, 17.2, 18.6, 20.3, 22.1);
-		bmi.put("9-1", age9);
-		BMIReference age10 = new BMIReference(10, 1, 13.5, 14.6, 15.7, 17.0, 18.5, 20.1, 22.0);
-		bmi.put("10-1", age10);
-		BMIReference age11 = new BMIReference(11, 1, 13.4, 14.5, 15.6, 16.9, 18.4, 20.0, 21.8);
-		bmi.put("11-1", age11);
-		BMIReference age12 = new BMIReference(12, 1, 13.4, 14.4, 15.5, 16.8, 18.2, 19.8, 21.6);
-		bmi.put("12-1", age12);
-		BMIReference age13 = new BMIReference(13, 1, 13.3, 14.3, 15.4, 16.7, 18.1, 19.7, 21.5);
-		bmi.put("13-1", age13);
-		BMIReference age14 = new BMIReference(14, 1, 13.2, 14.2, 15.3, 16.6, 18.0, 19.5, 21.3);
-		bmi.put("14-1", age14);
-		BMIReference age15 = new BMIReference(15, 1, 13.1, 14.1, 15.2, 16.4, 17.8, 19.4, 21.2);
-		bmi.put("15-1", age15);
-		BMIReference age16 = new BMIReference(16, 1, 13.1, 14.0, 15.1, 16.3, 17.7, 19.3, 21.0);
-		bmi.put("16-1", age16);
-		BMIReference age17 = new BMIReference(17, 1, 13.0, 13.9, 15.0, 16.2, 17.6, 19.1, 20.9);
-		bmi.put("17-1", age17);
-		BMIReference age18 = new BMIReference(18, 1, 12.9, 13.9, 14.9, 16.1, 17.5, 19.0, 20.8);
-		bmi.put("18-1", age18);
-		BMIReference age19 = new BMIReference(19, 1, 12.9, 13.8, 14.9, 16.1, 17.4, 18.9, 20.7);
-		bmi.put("19-1", age19);
-		BMIReference age20 = new BMIReference(20, 1, 12.8, 13.7, 14.8, 16.0, 17.3, 18.8, 20.6);
-		bmi.put("20-1", age20);
-		BMIReference age21 = new BMIReference(21, 1, 12.8, 13.7, 14.7, 15.9, 17.2, 18.7, 20.5);
-		bmi.put("21-1", age21);
-		BMIReference age22 = new BMIReference(22, 1, 12.7, 13.6, 14.7, 15.8, 17.2, 18.7, 20.4);
-		bmi.put("22-1", age22);
-		BMIReference age23 = new BMIReference(23, 1, 12.7, 13.6, 14.6, 15.8, 17.1, 18.6, 20.3);
-		bmi.put("23-1", age23);
-		BMIReference age24 = new BMIReference(24, 1, 12.9, 13.8, 14.8, 16.0, 17.3, 18.9, 20.6);
-		bmi.put("24-1", age24);
-		BMIReference age25 = new BMIReference(25, 1, 12.8, 13.8, 14.8, 16.0, 17.3, 18.8, 20.5);
-		bmi.put("25-1", age25);
-		BMIReference age26 = new BMIReference(26, 1, 12.8, 13.7, 14.8, 15.9, 17.3, 18.8, 20.5);
-		bmi.put("26-1", age26);
-		BMIReference age27 = new BMIReference(27, 1, 12.7, 13.7, 14.7, 15.9, 17.2, 18.7, 20.4);
-		bmi.put("27-1", age27);
-		BMIReference age28 = new BMIReference(28, 1, 12.7, 13.6, 14.7, 15.9, 17.2, 18.7, 20.4);
-		bmi.put("28-1", age28);
-		BMIReference age29 = new BMIReference(29, 1, 12.7, 13.6, 14.7, 15.8, 17.1, 18.6, 20.3);
-		bmi.put("29-1", age29);
-		BMIReference age30 = new BMIReference(30, 1, 12.6, 13.6, 14.6, 15.8, 17.1, 18.6, 20.2);
-		bmi.put("30-1", age30);
-		BMIReference age31 = new BMIReference(31, 1, 12.6, 13.5, 14.6, 15.8, 17.1, 18.5, 20.2);
-		bmi.put("31-1", age31);
-		BMIReference age32 = new BMIReference(32, 1, 12.5, 13.5, 14.6, 15.7, 17.0, 18.5, 20.1);
-		bmi.put("32-1", age32);
-		BMIReference age33 = new BMIReference(33, 1, 12.5, 13.5, 14.5, 15.7, 17.0, 18.5, 20.1);
-		bmi.put("33-1", age33);
-		BMIReference age34 = new BMIReference(34, 1, 12.5, 13.4, 14.5, 15.7, 17.0, 18.4, 20.0);
-		bmi.put("34-1", age34);
-		BMIReference age35 = new BMIReference(35, 1, 12.4, 13.4, 14.5, 15.6, 16.9, 18.4, 20.0);
-		bmi.put("35-1", age35);
-		BMIReference age36 = new BMIReference(36, 1, 12.4, 13.4, 14.4, 15.6, 16.9, 18.4, 20.0);
-		bmi.put("36-1", age36);
-		BMIReference age37 = new BMIReference(37, 1, 12.4, 13.3, 14.4, 15.6, 16.9, 18.3, 19.9);
-		bmi.put("37-1", age37);
-		BMIReference age38 = new BMIReference(38, 1, 12.3, 13.3, 14.4, 15.5, 16.8, 18.3, 19.9);
-		bmi.put("38-1", age38);
-		BMIReference age39 = new BMIReference(39, 1, 12.3, 13.3, 14.3, 15.5, 16.8, 18.3, 19.9);
-		bmi.put("39-1", age39);
-		BMIReference age40 = new BMIReference(40, 1, 12.3, 13.2, 14.3, 15.5, 16.8, 18.2, 19.9);
-		bmi.put("40-1", age40);
-		BMIReference age41 = new BMIReference(41, 1, 12.2, 13.2, 14.3, 15.5, 16.8, 18.2, 19.9);
-		bmi.put("41-1", age41);
-		BMIReference age42 = new BMIReference(42, 1, 12.2, 13.2, 14.3, 15.4, 16.8, 18.2, 19.8);
-		bmi.put("42-1", age42);
-		BMIReference age43 = new BMIReference(43, 1, 12.2, 13.2, 14.2, 15.4, 16.7, 18.2, 19.8);
-		bmi.put("43-1", age43);
-		BMIReference age44 = new BMIReference(44, 1, 12.2, 13.1, 14.2, 15.4, 16.7, 18.2, 19.8);
-		bmi.put("44-1", age44);
-		BMIReference age45 = new BMIReference(45, 1, 12.2, 13.1, 14.2, 15.4, 16.7, 18.2, 19.8);
-		bmi.put("45-1", age45);
-		BMIReference age46 = new BMIReference(46, 1, 12.1, 13.1, 14.2, 15.4, 16.7, 18.2, 19.8);
-		bmi.put("46-1", age46);
-		BMIReference age47 = new BMIReference(47, 1, 12.1, 13.1, 14.2, 15.3, 16.7, 18.2, 19.9);
-		bmi.put("47-1", age47);
-		BMIReference age48 = new BMIReference(48, 1, 12.1, 13.1, 14.1, 15.3, 16.7, 18.2, 19.9);
-		bmi.put("48-1", age48);
-		BMIReference age49 = new BMIReference(49, 1, 12.1, 13.0, 14.1, 15.3, 16.7, 18.2, 19.9);
-		bmi.put("49-1", age49);
-		BMIReference age50 = new BMIReference(50, 1, 12.1, 13.0, 14.1, 15.3, 16.7, 18.2, 19.9);
-		bmi.put("50-1", age50);
-		BMIReference age51 = new BMIReference(51, 1, 12.1, 13.0, 14.1, 15.3, 16.6, 18.2, 19.9);
-		bmi.put("51-1", age51);
-		BMIReference age52 = new BMIReference(52, 1, 12.0, 13.0, 14.1, 15.3, 16.6, 18.2, 19.9);
-		bmi.put("52-1", age52);
-		BMIReference age53 = new BMIReference(53, 1, 12.0, 13.0, 14.1, 15.3, 16.6, 18.2, 20.0);
-		bmi.put("53-1", age53);
-		BMIReference age54 = new BMIReference(54, 1, 12.0, 13.0, 14.0, 15.3, 16.6, 18.2, 20.0);
-		bmi.put("54-1", age54);
-		BMIReference age55 = new BMIReference(55, 1, 12.0, 13.0, 14.0, 15.2, 16.6, 18.2, 20.0);
-		bmi.put("55-1", age55);
-		BMIReference age56 = new BMIReference(56, 1, 12.0, 12.9, 14.0, 15.2, 16.6, 18.2, 20.1);
-		bmi.put("56-1", age56);
-		BMIReference age57 = new BMIReference(57, 1, 12.0, 12.9, 14.0, 15.2, 16.6, 18.2, 20.1);
-		bmi.put("57-1", age57);
-		BMIReference age58 = new BMIReference(58, 1, 12.0, 12.9, 14.0, 15.2, 16.6, 18.3, 20.2);
-		bmi.put("58-1", age58);
-		BMIReference age59 = new BMIReference(59, 1, 12.0, 12.9, 14.0, 15.2, 16.6, 18.3, 20.2);
-		bmi.put("59-1", age59);
-		BMIReference age60 = new BMIReference(60, 1, 12.0, 12.9, 14.0, 15.2, 16.6, 18.3, 20.3);
-		bmi.put("60-1", age60);
-
-		// 女童
-		BMIReference ageG0 = new BMIReference(0, 2, 10.1, 11.1, 12.2, 13.3, 14.6, 16.1, 17.7);
-		bmi.put("0-2", ageG0);
-		BMIReference ageG1 = new BMIReference(1, 2, 10.8, 12.0, 13.2, 14.6, 16.0, 17.5, 19.1);
-		bmi.put("1-2", ageG1);
-		BMIReference ageG2 = new BMIReference(2, 2, 11.8, 13.0, 14.3, 15.8, 17.3, 19.0, 20.7);
-		bmi.put("2-2", ageG2);
-		BMIReference ageG3 = new BMIReference(3, 2, 12.4, 13.6, 14.9, 16.4, 17.9, 19.7, 21.5);
-		bmi.put("3-2", ageG3);
-		BMIReference ageG4 = new BMIReference(4, 2, 12.7, 13.9, 15.2, 16.7, 18.3, 20.0, 22.0);
-		bmi.put("4-2", ageG4);
-		BMIReference ageG5 = new BMIReference(5, 2, 12.9, 14.1, 15.4, 16.8, 18.4, 20.2, 22.2);
-		bmi.put("5-2", ageG5);
-		BMIReference ageG6 = new BMIReference(6, 2, 13.0, 14.1, 15.5, 16.9, 18.5, 20.3, 22.3);
-		bmi.put("6-2", ageG6);
-		BMIReference ageG7 = new BMIReference(7, 2, 13.0, 14.2, 15.5, 16.9, 18.5, 20.3, 22.3);
-		bmi.put("7-2", ageG7);
-		BMIReference ageG8 = new BMIReference(8, 2, 13.0, 14.1, 15.4, 16.8, 18.4, 20.2, 22.2);
-		bmi.put("8-2", ageG8);
-		BMIReference ageG9 = new BMIReference(9, 2, 12.9, 14.1, 15.3, 16.7, 18.3, 20.1, 22.1);
-		bmi.put("9-2", ageG9);
-		BMIReference ageG10 = new BMIReference(10, 2, 12.9, 14.0, 15.2, 16.6, 18.2, 19.9, 21.9);
-		bmi.put("10-2", ageG10);
-		BMIReference ageG11 = new BMIReference(11, 2, 12.8, 13.9, 15.1, 16.5, 18.0, 19.8, 21.8);
-		bmi.put("11-2", ageG11);
-		BMIReference ageG12 = new BMIReference(12, 2, 12.7, 13.8, 15.0, 16.4, 17.9, 19.6, 21.6);
-		bmi.put("12-2", ageG12);
-		BMIReference ageG13 = new BMIReference(13, 2, 12.6, 13.7, 14.9, 16.2, 17.7, 19.5, 21.4);
-		bmi.put("13-2", ageG13);
-		BMIReference ageG14 = new BMIReference(14, 2, 12.6, 13.6, 14.8, 16.1, 17.6, 19.3, 21.3);
-		bmi.put("14-2", ageG14);
-		BMIReference ageG15 = new BMIReference(15, 2, 12.5, 13.5, 14.7, 16.0, 17.5, 19.2, 21.1);
-		bmi.put("15-2", ageG15);
-		BMIReference ageG16 = new BMIReference(16, 2, 12.4, 13.5, 14.6, 15.9, 17.4, 19.1, 21.0);
-		bmi.put("16-2", ageG16);
-		BMIReference ageG17 = new BMIReference(17, 2, 12.4, 13.4, 14.5, 15.8, 17.3, 18.9, 20.9);
-		bmi.put("17-2", ageG17);
-		BMIReference ageG18 = new BMIReference(18, 2, 12.3, 13.3, 14.4, 15.7, 17.2, 18.8, 20.8);
-		bmi.put("18-2", ageG18);
-		BMIReference ageG19 = new BMIReference(19, 2, 12.3, 13.3, 14.4, 15.7, 17.1, 18.8, 20.7);
-		bmi.put("19-2", ageG19);
-		BMIReference ageG20 = new BMIReference(20, 2, 12.2, 13.2, 14.3, 15.6, 17.0, 18.7, 20.6);
-		bmi.put("20-2", ageG20);
-		BMIReference ageG21 = new BMIReference(21, 2, 12.2, 13.2, 14.3, 15.5, 17.0, 18.6, 20.5);
-		bmi.put("21-2", ageG21);
-		BMIReference ageG22 = new BMIReference(22, 2, 12.2, 13.1, 14.2, 15.5, 16.9, 18.5, 20.4);
-		bmi.put("22-2", ageG22);
-		BMIReference ageG23 = new BMIReference(23, 2, 12.2, 13.1, 14.2, 15.4, 16.9, 18.5, 20.4);
-		bmi.put("23-2", ageG23);
-		BMIReference ageG24 = new BMIReference(24, 2, 12.1, 13.1, 14.2, 15.4, 16.8, 18.4, 20.3);
-		bmi.put("24-2", ageG24);
-		BMIReference ageG25 = new BMIReference(25, 2, 12.4, 13.3, 14.4, 15.7, 17.1, 18.7, 20.6);
-		bmi.put("25-2", ageG25);
-		BMIReference ageG26 = new BMIReference(26, 2, 12.3, 13.3, 14.4, 15.6, 17.0, 18.7, 20.6);
-		bmi.put("26-2", ageG26);
-		BMIReference ageG27 = new BMIReference(27, 2, 12.3, 13.3, 14.4, 15.6, 17.0, 18.6, 20.5);
-		bmi.put("27-2", ageG27);
-		BMIReference ageG28 = new BMIReference(28, 2, 12.3, 13.3, 14.3, 15.6, 17.0, 18.6, 20.5);
-		bmi.put("28-2", ageG28);
-		BMIReference ageG29 = new BMIReference(29, 2, 12.3, 13.2, 14.3, 15.6, 17.0, 18.6, 20.4);
-		bmi.put("29-2", ageG29);
-		BMIReference ageG30 = new BMIReference(30, 2, 12.3, 13.2, 14.3, 15.5, 16.9, 18.5, 20.4);
-		bmi.put("30-2", ageG30);
-		BMIReference ageG31 = new BMIReference(31, 2, 12.2, 13.2, 14.3, 15.5, 16.9, 18.5, 20.4);
-		bmi.put("31-2", ageG31);
-		BMIReference ageG32 = new BMIReference(32, 2, 12.2, 13.2, 14.3, 15.5, 16.9, 18.5, 20.4);
-		bmi.put("32-2", ageG32);
-		BMIReference ageG33 = new BMIReference(33, 2, 12.2, 13.1, 14.2, 15.5, 16.9, 18.5, 20.3);
-		bmi.put("33-2", ageG33);
-		BMIReference ageG34 = new BMIReference(34, 2, 12.2, 13.1, 14.2, 15.4, 16.8, 18.5, 20.3);
-		bmi.put("34-2", ageG34);
-		BMIReference ageG35 = new BMIReference(35, 2, 12.1, 13.1, 14.2, 15.4, 16.8, 18.4, 20.3);
-		bmi.put("35-2", ageG35);
-		BMIReference ageG36 = new BMIReference(36, 2, 12.1, 13.1, 14.2, 15.4, 16.8, 18.4, 20.3);
-		bmi.put("36-2", ageG36);
-		BMIReference ageG37 = new BMIReference(37, 2, 12.1, 13.1, 14.1, 15.4, 16.8, 18.4, 20.3);
-		bmi.put("37-2", ageG37);
-		BMIReference ageG38 = new BMIReference(38, 2, 12.1, 13.0, 14.1, 15.4, 16.8, 18.4, 20.3);
-		bmi.put("38-2", ageG38);
-		BMIReference ageG39 = new BMIReference(39, 2, 12.0, 13.0, 14.1, 15.3, 16.8, 18.4, 20.3);
-		bmi.put("39-2", ageG39);
-		BMIReference ageG40 = new BMIReference(40, 2, 12.0, 13.0, 14.1, 15.3, 16.8, 18.4, 20.3);
-		bmi.put("40-2", ageG40);
-		BMIReference ageG41 = new BMIReference(41, 2, 12.0, 13.0, 14.1, 15.3, 16.8, 18.4, 20.4);
-		bmi.put("41-2", ageG41);
-		BMIReference ageG42 = new BMIReference(42, 2, 12.0, 12.9, 14.0, 15.3, 16.8, 18.4, 20.4);
-		bmi.put("42-2", ageG42);
-		BMIReference ageG43 = new BMIReference(43, 2, 11.9, 12.9, 14.0, 15.3, 16.8, 18.4, 20.4);
-		bmi.put("43-2", ageG43);
-		BMIReference ageG44 = new BMIReference(44, 2, 11.9, 12.9, 14.0, 15.3, 16.8, 18.5, 20.4);
-		bmi.put("44-2", ageG44);
-		BMIReference ageG45 = new BMIReference(45, 2, 11.9, 12.9, 14.0, 15.3, 16.8, 18.5, 20.5);
-		bmi.put("45-2", ageG45);
-		BMIReference ageG46 = new BMIReference(46, 2, 11.9, 12.9, 14.0, 15.3, 16.8, 18.5, 20.5);
-		bmi.put("46-2", ageG46);
-		BMIReference ageG47 = new BMIReference(47, 2, 11.8, 12.8, 14.0, 15.3, 16.8, 18.5, 20.5);
-		bmi.put("47-2", ageG47);
-		BMIReference ageG48 = new BMIReference(48, 2, 11.8, 12.8, 14.0, 15.3, 16.8, 18.5, 20.6);
-		bmi.put("48-2", ageG48);
-		BMIReference ageG49 = new BMIReference(49, 2, 11.8, 12.8, 13.9, 15.3, 16.8, 18.5, 20.6);
-		bmi.put("49-2", ageG49);
-		BMIReference ageG50 = new BMIReference(50, 2, 11.8, 12.8, 13.9, 15.3, 16.8, 18.6, 20.7);
-		bmi.put("50-2", ageG50);
-		BMIReference ageG51 = new BMIReference(51, 2, 11.8, 12.8, 13.9, 15.3, 16.8, 18.6, 20.7);
-		bmi.put("51-2", ageG51);
-		BMIReference ageG52 = new BMIReference(52, 2, 11.7, 12.8, 13.9, 15.2, 16.8, 18.6, 20.7);
-		bmi.put("52-2", ageG52);
-		BMIReference ageG53 = new BMIReference(53, 2, 11.7, 12.7, 13.9, 15.3, 16.8, 18.6, 20.8);
-		bmi.put("53-2", ageG53);
-		BMIReference ageG54 = new BMIReference(54, 2, 11.7, 12.7, 13.9, 15.3, 16.8, 18.7, 20.8);
-		bmi.put("54-2", ageG54);
-		BMIReference ageG55 = new BMIReference(55, 2, 11.7, 12.7, 13.9, 15.3, 16.8, 18.7, 20.9);
-		bmi.put("55-2", ageG55);
-		BMIReference ageG56 = new BMIReference(56, 2, 11.7, 12.7, 13.9, 15.3, 16.8, 18.7, 20.9);
-		bmi.put("56-2", ageG56);
-		BMIReference ageG57 = new BMIReference(57, 2, 11.7, 12.7, 13.9, 15.3, 16.9, 18.7, 21.0);
-		bmi.put("57-2", ageG57);
-		BMIReference ageG58 = new BMIReference(58, 2, 11.7, 12.7, 13.9, 15.3, 16.9, 18.8, 21.0);
-		bmi.put("58-2", ageG58);
-		BMIReference ageG59 = new BMIReference(59, 2, 11.6, 12.7, 13.9, 15.3, 16.9, 18.8, 21.0);
-		bmi.put("59-2", ageG59);
-		BMIReference ageG60 = new BMIReference(60, 2, 11.6, 12.7, 13.9, 15.3, 16.9, 18.8, 21.1);
-		bmi.put("60-2", ageG60);
-	}
-
-	private BMIReference(int age, int sex, double n3sd, double n2sd,
-			double n1sd, double n0sd, double p1sd, double p2sd, double p3sd) {
-		super();
-		this.age = age;
-		this.sex = sex;
-		N3SD = n3sd;
-		N2SD = n2sd;
-		N1SD = n1sd;
-		N0SD = n0sd;
-		P1SD = p1sd;
-		P2SD = p2sd;
-		P3SD = p3sd;
-	}
-
-	public int getAge() {
-		return age;
-	}
-
-	public void setAge(int age) {
-		this.age = age;
-	}
-
-	public int getSex() {
-		return sex;
-	}
-
-	public void setSex(int sex) {
-		this.sex = sex;
-	}
-
-	public double getN3SD() {
-		return N3SD;
-	}
-
-	public void setN3SD(double n3sd) {
-		N3SD = n3sd;
-	}
-
-	public double getN2SD() {
-		return N2SD;
-	}
-
-	public void setN2SD(double n2sd) {
-		N2SD = n2sd;
-	}
-
-	public double getN1SD() {
-		return N1SD;
-	}
-
-	public void setN1SD(double n1sd) {
-		N1SD = n1sd;
-	}
-
-	public double getN0SD() {
-		return N0SD;
-	}
-
-	public void setN0SD(double n0sd) {
-		N0SD = n0sd;
-	}
-
-	public double getP1SD() {
-		return P1SD;
-	}
-
-	public void setP1SD(double p1sd) {
-		P1SD = p1sd;
-	}
-
-	public double getP2SD() {
-		return P2SD;
-	}
-
-	public void setP2SD(double p2sd) {
-		P2SD = p2sd;
-	}
-
-	public double getP3SD() {
-		return P3SD;
-	}
-
-	public void setP3SD(double p3sd) {
-		P3SD = p3sd;
-	}
-
-	@Override
-	public String toString() {
-		return "BMIReference [age=" + age + ", sex=" + sex + ", N3SD=" + N3SD
-				+ ", N2SD=" + N2SD + ", N1SD=" + N1SD + ", N0SD=" + N0SD
-				+ ", P1SD=" + P1SD + ", P2SD=" + P2SD + ", P3SD=" + P3SD + "]";
-	}
-}

wechat-common-core/src/main/java/com/iamberry/wechat/core/entity/questionnaire/QuestionDto.java

@@ -1,88 +0,0 @@
-package com.iamberry.wechat.core.entity.questionnaire;
-
-import java.io.Serializable;
-
-public class QuestionDto implements Serializable {
-
-	private static final long serialVersionUID = 5755477782918536218L;
-
-	private Integer questionID;
-	
-	private Integer optionID;
-	
-	private String questionName;
-	
-	private String optionName;
-	
-	private String questionIDStr;
-	
-	private String optionIDStr;
-	
-	private int checkBox;
-	
-	private String questionPic;
-	
-	public String getQuestionPic() {
-		return questionPic;
-	}
-
-	public void setQuestionPic(String questionPic) {
-		this.questionPic = questionPic;
-	}
-
-	public int getCheckBox() {
-		return checkBox;
-	}
-
-	public void setCheckBox(int checkBox) {
-		this.checkBox = checkBox;
-	}
-
-	public String getQuestionIDStr() {
-		return questionIDStr;
-	}
-
-	public void setQuestionIDStr(String questionIDStr) {
-		this.questionIDStr = questionIDStr;
-	}
-
-	public String getOptionIDStr() {
-		return optionIDStr;
-	}
-
-	public void setOptionIDStr(String optionIDStr) {
-		this.optionIDStr = optionIDStr;
-	}
-
-	public Integer getQuestionID() {
-		return questionID;
-	}
-
-	public void setQuestionID(Integer questionID) {
-		this.questionID = questionID;
-	}
-
-	public Integer getOptionID() {
-		return optionID;
-	}
-
-	public void setOptionID(Integer optionID) {
-		this.optionID = optionID;
-	}
-
-	public String getQuestionName() {
-		return questionName;
-	}
-
-	public void setQuestionName(String questionName) {
-		this.questionName = questionName;
-	}
-
-	public String getOptionName() {
-		return optionName;
-	}
-
-	public void setOptionName(String optionName) {
-		this.optionName = optionName;
-	}
-}

wechat-common-core/src/main/java/com/iamberry/wechat/core/entity/questionnaire/QuestionTypeScore.java

@@ -1,36 +0,0 @@
-package com.iamberry.wechat.core.entity.questionnaire;
-
-import java.io.Serializable;
-
-/**
- * @company	深圳爱贝源科技有限公司
- * @website www.iamberry.com
- * @author 	献
- * @tel		18271840547
- * @date	2016年10月28日
- * @explain	答完题目后，分数的统计
- */
-public class QuestionTypeScore implements Serializable {
-
-	private static final long serialVersionUID = 2568715113499438235L;
-
-	private Integer questionType;
-	
-	private int typeScore;
-
-	public Integer getQuestionType() {
-		return questionType;
-	}
-
-	public void setQuestionType(Integer questionType) {
-		this.questionType = questionType;
-	}
-
-	public int getTypeScore() {
-		return typeScore;
-	}
-
-	public void setTypeScore(int typeScore) {
-		this.typeScore = typeScore;
-	}
-}

wechat-common-core/src/main/java/com/iamberry/wechat/core/entity/questionnaire/QuestionnaireAnswer.java

@@ -1,214 +0,0 @@
-package com.iamberry.wechat.core.entity.questionnaire;
-
-import java.io.Serializable;
-import java.util.Date;
-
-import com.iamberry.wechat.core.entity.PageBean;
-
-/**
- * 答题人信息表
- * @author Administrator
- *
- */
-public class QuestionnaireAnswer implements Serializable{
-	
-	private static final long serialVersionUID = -4324573455622843356L;
-	
-	private Integer 	answerId;				//回答id answer_id
-	private String 	answerBabyPic;			//宝宝头像 answer_baby_pic
-	private String 	answerBabyName;			//宝宝昵称 answer_baby_name
-	private Integer answerHeadWith;			//宝宝头围 answer_head_with
-	private Integer answerBabyAge;			//宝宝月龄 answer_baby_age
-	private Integer answerIsEutocia;		//宝宝月龄 answer_is_eutocia
-	private Integer answerIsFullmoon;		//宝宝顺产 1:顺产 2非顺产 answer_is_fullmoon
-	private Date 	answerCreateDate;		//时间 answer_create_date
-	private Integer answer_baby_sex;		//1:男宝宝 2:女宝宝
-	private Integer answer_baby_height;		//宝宝身长 单位是毫米
-	private Integer answer_baby_weight;		//宝宝体重 单位是克
-	private Integer answerUserScore;		//用户分数 answer_user_score
-	private Integer answerScannedNumber;	//分数浏览次数 answer _scanned_number
-	private Integer answerShareNumber;		//分数用户分享分数 answer_user_score
-	private String 	answerRemark;			//答题备注
-	private PageBean page = new PageBean(); //分页信息
-	
-	public QuestionnaireAnswer() {
-		super();
-		// TODO Auto-generated constructor stub
-	}
-
-	public QuestionnaireAnswer(Integer answerId, String answerBabyPic,
-			String answerBabyName, Integer answerHeadWith,
-			Integer answerBabyAge, Integer answerIsEutocia,
-			Integer answerIsFullmoon, Date answerCreateDate,
-			Integer answer_baby_sex, Integer answer_baby_height,
-			Integer answer_baby_weight, Integer answerUserScore,
-			Integer answerScannedNumber, Integer answerShareNumber,
-			String answerRemark, PageBean page) {
-		super();
-		this.answerId = answerId;
-		this.answerBabyPic = answerBabyPic;
-		this.answerBabyName = answerBabyName;
-		this.answerHeadWith = answerHeadWith;
-		this.answerBabyAge = answerBabyAge;
-		this.answerIsEutocia = answerIsEutocia;
-		this.answerIsFullmoon = answerIsFullmoon;
-		this.answerCreateDate = answerCreateDate;
-		this.answer_baby_sex = answer_baby_sex;
-		this.answer_baby_height = answer_baby_height;
-		this.answer_baby_weight = answer_baby_weight;
-		this.answerUserScore = answerUserScore;
-		this.answerScannedNumber = answerScannedNumber;
-		this.answerShareNumber = answerShareNumber;
-		this.answerRemark = answerRemark;
-		this.page = page;
-	}
-
-	public Integer getAnswerId() {
-		return answerId;
-	}
-
-	public void setAnswerId(Integer answerId) {
-		this.answerId = answerId;
-	}
-
-	public String getAnswerBabyPic() {
-		return answerBabyPic;
-	}
-
-	public void setAnswerBabyPic(String answerBabyPic) {
-		this.answerBabyPic = answerBabyPic;
-	}
-
-	public String getAnswerBabyName() {
-		return answerBabyName;
-	}
-
-	public void setAnswerBabyName(String answerBabyName) {
-		this.answerBabyName = answerBabyName;
-	}
-
-	public Integer getAnswerHeadWith() {
-		return answerHeadWith;
-	}
-
-	public void setAnswerHeadWith(Integer answerHeadWith) {
-		this.answerHeadWith = answerHeadWith;
-	}
-
-	public Integer getAnswerBabyAge() {
-		return answerBabyAge;
-	}
-
-	public void setAnswerBabyAge(Integer answerBabyAge) {
-		this.answerBabyAge = answerBabyAge;
-	}
-
-	public Integer getAnswerIsEutocia() {
-		return answerIsEutocia;
-	}
-
-	public void setAnswerIsEutocia(Integer answerIsEutocia) {
-		this.answerIsEutocia = answerIsEutocia;
-	}
-
-	public Integer getAnswerIsFullmoon() {
-		return answerIsFullmoon;
-	}
-
-	public void setAnswerIsFullmoon(Integer answerIsFullmoon) {
-		this.answerIsFullmoon = answerIsFullmoon;
-	}
-
-	public Date getAnswerCreateDate() {
-		return answerCreateDate;
-	}
-
-	public void setAnswerCreateDate(Date answerCreateDate) {
-		this.answerCreateDate = answerCreateDate;
-	}
-
-	public Integer getAnswer_baby_sex() {
-		return answer_baby_sex;
-	}
-
-	public void setAnswer_baby_sex(Integer answer_baby_sex) {
-		this.answer_baby_sex = answer_baby_sex;
-	}
-
-	public Integer getAnswer_baby_height() {
-		return answer_baby_height;
-	}
-
-	public void setAnswer_baby_height(Integer answer_baby_height) {
-		this.answer_baby_height = answer_baby_height;
-	}
-
-	public Integer getAnswer_baby_weight() {
-		return answer_baby_weight;
-	}
-
-	public void setAnswer_baby_weight(Integer answer_baby_weight) {
-		this.answer_baby_weight = answer_baby_weight;
-	}
-
-	public Integer getAnswerUserScore() {
-		return answerUserScore;
-	}
-
-	public void setAnswerUserScore(Integer answerUserScore) {
-		this.answerUserScore = answerUserScore;
-	}
-
-	public Integer getAnswerScannedNumber() {
-		return answerScannedNumber;
-	}
-
-	public void setAnswerScannedNumber(Integer answerScannedNumber) {
-		this.answerScannedNumber = answerScannedNumber;
-	}
-
-	public Integer getAnswerShareNumber() {
-		return answerShareNumber;
-	}
-
-	public void setAnswerShareNumber(Integer answerShareNumber) {
-		this.answerShareNumber = answerShareNumber;
-	}
-
-	public String getAnswerRemark() {
-		return answerRemark;
-	}
-
-	public void setAnswerRemark(String answerRemark) {
-		this.answerRemark = answerRemark;
-	}
-
-	public PageBean getPage() {
-		return page;
-	}
-
-	public void setPage(PageBean page) {
-		this.page = page;
-	}
-
-	@Override
-	public String toString() {
-		return "QuestionnaireAnswer [answerId=" + answerId + ", answerBabyPic="
-				+ answerBabyPic + ", answerBabyName=" + answerBabyName
-				+ ", answerHeadWith=" + answerHeadWith + ", answerBabyAge="
-				+ answerBabyAge + ", answerIsEutocia=" + answerIsEutocia
-				+ ", answerIsFullmoon=" + answerIsFullmoon
-				+ ", answerCreateDate=" + answerCreateDate
-				+ ", answer_baby_sex=" + answer_baby_sex
-				+ ", answer_baby_height=" + answer_baby_height
-				+ ", answer_baby_weight=" + answer_baby_weight
-				+ ", answerUserScore=" + answerUserScore
-				+ ", answerScannedNumber=" + answerScannedNumber
-				+ ", answerShareNumber=" + answerShareNumber
-				+ ", answerRemark=" + answerRemark + ", page=" + page + "]";
-	}
-
-	
-	
-	
-}

wechat-common-core/src/main/java/com/iamberry/wechat/core/entity/questionnaire/QuestionnaireAnswerDetailed.java

@@ -1,180 +0,0 @@
-package com.iamberry.wechat.core.entity.questionnaire;
-
-import java.io.Serializable;
-import java.util.Date;
-
-import com.iamberry.wechat.core.entity.PageBean;
-
-/**
- * 答题结果信息表
- * @author Administrator
- *
- */
-public class QuestionnaireAnswerDetailed implements Serializable{
-	
-	private static final long serialVersionUID = -4407130342986068540L;
-	private Integer detailedId;			//数据ID detailed_id
-	private Integer detailedAnswerId;	//答题人-外间 detailed_answer_id
-	private Integer detailedQuestionId;	//题目-外间 detailed_question_id
-	private Integer detailedOptionId;	//选项-外间 detailed_option_id
-	private Date 	detailedCreateDate;	//时间 detailed_create_date
-	private Integer detailedScore;		//得分 detailed_score
-	private Integer detailedStatus;		// 状态detailed_status 1:正常；2：删除
-	
-	private PageBean page = new PageBean(); //分页信息
-
-	
-
-	public QuestionnaireAnswerDetailed() {
-		super();
-		// TODO Auto-generated constructor stub
-	}
-
-
-
-
-	public QuestionnaireAnswerDetailed(Integer detailedId,
-			Integer detailedAnswerId, Integer detailedQuestionId,
-			Integer detailedOptionId, Date detailedCreateDate,
-			Integer detailedScore, Integer detailedStatus) {
-		super();
-		this.detailedId = detailedId;
-		this.detailedAnswerId = detailedAnswerId;
-		this.detailedQuestionId = detailedQuestionId;
-		this.detailedOptionId = detailedOptionId;
-		this.detailedCreateDate = detailedCreateDate;
-		this.detailedScore = detailedScore;
-		this.detailedStatus = detailedStatus;
-	}
-
-
-
-
-	public PageBean getPage() {
-		return page;
-	}
-
-
-
-
-	public void setPage(PageBean page) {
-		this.page = page;
-	}
-
-
-
-
-	public Integer getDetailedId() {
-		return detailedId;
-	}
-
-
-
-
-	public void setDetailedId(Integer detailedId) {
-		this.detailedId = detailedId;
-	}
-
-
-
-
-	public Integer getDetailedAnswerId() {
-		return detailedAnswerId;
-	}
-
-
-
-
-	public void setDetailedAnswerId(Integer detailedAnswerId) {
-		this.detailedAnswerId = detailedAnswerId;
-	}
-
-
-
-
-	public Integer getDetailedQuestionId() {
-		return detailedQuestionId;
-	}
-
-
-
-
-	public void setDetailedQuestionId(Integer detailedQuestionId) {
-		this.detailedQuestionId = detailedQuestionId;
-	}
-
-
-
-
-	public Integer getDetailedOptionId() {
-		return detailedOptionId;
-	}
-
-
-
-
-	public void setDetailedOptionId(Integer detailedOptionId) {
-		this.detailedOptionId = detailedOptionId;
-	}
-
-
-
-
-	public Date getDetailedCreateDate() {
-		return detailedCreateDate;
-	}
-
-
-
-
-	public void setDetailedCreateDate(Date detailedCreateDate) {
-		this.detailedCreateDate = detailedCreateDate;
-	}
-
-
-
-
-	public Integer getDetailedScore() {
-		return detailedScore;
-	}
-
-
-
-
-	public void setDetailedScore(Integer detailedScore) {
-		this.detailedScore = detailedScore;
-	}
-
-
-
-
-	public Integer getDetailedStatus() {
-		return detailedStatus;
-	}
-
-
-
-
-	public void setDetailedStatus(Integer detailedStatus) {
-		this.detailedStatus = detailedStatus;
-	}
-
-
-
-
-	@Override
-	public String toString() {
-		return "QuestionnaireAnswerDetailed [detailedId=" + detailedId
-				+ ", detailedAnswerId=" + detailedAnswerId
-				+ ", detailedQuestionId=" + detailedQuestionId
-				+ ", detailedOptionId=" + detailedOptionId
-				+ ", detailedCreateDate=" + detailedCreateDate
-				+ ", detailedScore=" + detailedScore + ", detailedStatus="
-				+ detailedStatus + "]";
-	}
-	
-	
-	
-
-
-}

wechat-common-core/src/main/java/com/iamberry/wechat/core/entity/questionnaire/QuestionnaireOption.java

@@ -1,148 +0,0 @@
-package com.iamberry.wechat.core.entity.questionnaire;
-
-import java.io.Serializable;
-import java.util.Date;
-
-import com.iamberry.wechat.core.entity.PageBean;
-
-/**
- * 题目选项表
- * @author Administrator
- *
- */
-public class QuestionnaireOption implements Serializable{
-	
-
-	private static final long serialVersionUID = -6326223576843442228L;
-
-	private Integer 	optionId;				//选项id option_id
-	private Integer 	optionQuesionId;		//所属题目-外检  option_quesion_id
-	private String 	optionName;				//选项名称 option_name
-	private Integer optionOrder;			//选项排序 option_order
-	private Integer optionScore;			//选项分数 option_score
-	private Date 	optionCreateDate;	
-	private Date 	optionUpdateDate;	
-	private Integer optionStatus;			//1:正常 2失效 option_status
-	private Integer optionNumber; 			//选择次数 option_number
-	
-	
-	private PageBean page;					//分页
-	
-	public QuestionnaireOption() {
-		super();
-		// TODO Auto-generated constructor stub
-	}
-
-	public QuestionnaireOption(Integer optionId, Integer optionQuesionId,
-			String optionName, Integer optionOrder, Integer optionScore,
-			Date optionCreateDate, Date optionUpdateDate, Integer optionStatus,
-			Integer optionNumber, PageBean page) {
-		super();
-		this.optionId = optionId;
-		this.optionQuesionId = optionQuesionId;
-		this.optionName = optionName;
-		this.optionOrder = optionOrder;
-		this.optionScore = optionScore;
-		this.optionCreateDate = optionCreateDate;
-		this.optionUpdateDate = optionUpdateDate;
-		this.optionStatus = optionStatus;
-		this.optionNumber = optionNumber;
-		this.page = page;
-	}
-
-	public Integer getOptionId() {
-		return optionId;
-	}
-
-	public void setOptionId(Integer optionId) {
-		this.optionId = optionId;
-	}
-
-	public Integer getOptionQuesionId() {
-		return optionQuesionId;
-	}
-
-	public void setOptionQuesionId(Integer optionQuesionId) {
-		this.optionQuesionId = optionQuesionId;
-	}
-
-	public String getOptionName() {
-		return optionName;
-	}
-
-	public void setOptionName(String optionName) {
-		this.optionName = optionName;
-	}
-
-	public Integer getOptionOrder() {
-		return optionOrder;
-	}
-
-	public void setOptionOrder(Integer optionOrder) {
-		this.optionOrder = optionOrder;
-	}
-
-	public Integer getOptionScore() {
-		return optionScore;
-	}
-
-	public void setOptionScore(Integer optionScore) {
-		this.optionScore = optionScore;
-	}
-
-	public Date getOptionCreateDate() {
-		return optionCreateDate;
-	}
-
-	public void setOptionCreateDate(Date optionCreateDate) {
-		this.optionCreateDate = optionCreateDate;
-	}
-
-	public Date getOptionUpdateDate() {
-		return optionUpdateDate;
-	}
-
-	public void setOptionUpdateDate(Date optionUpdateDate) {
-		this.optionUpdateDate = optionUpdateDate;
-	}
-
-	public Integer getOptionStatus() {
-		return optionStatus;
-	}
-
-	public void setOptionStatus(Integer optionStatus) {
-		this.optionStatus = optionStatus;
-	}
-
-	public Integer getOptionNumber() {
-		return optionNumber;
-	}
-
-	public void setOptionNumber(Integer optionNumber) {
-		this.optionNumber = optionNumber;
-	}
-
-	public PageBean getPage() {
-		return page;
-	}
-
-	public void setPage(PageBean page) {
-		this.page = page;
-	}
-
-	@Override
-	public String toString() {
-		return "QuestionnaireOption [optionId=" + optionId
-				+ ", optionQuesionId=" + optionQuesionId + ", optionName="
-				+ optionName + ", optionOrder=" + optionOrder
-				+ ", optionScore=" + optionScore + ", optionCreateDate="
-				+ optionCreateDate + ", optionUpdateDate=" + optionUpdateDate
-				+ ", optionStatus=" + optionStatus + ", optionNumber="
-				+ optionNumber + ", page=" + page + "]";
-	}
-
-
-	
-	
-	
-}

wechat-common-core/src/main/java/com/iamberry/wechat/core/entity/questionnaire/QuestionnairePaper.java

@@ -1,158 +0,0 @@
-package com.iamberry.wechat.core.entity.questionnaire;
-
-import java.io.Serializable;
-import java.util.Date;
-
-import org.springframework.format.annotation.DateTimeFormat;
-
-import com.iamberry.wechat.core.entity.PageBean;
-
-/**
- * 试卷表
- * @author Administrator
- *
- */
-public class QuestionnairePaper implements Serializable{
-	
-	
-	private static final long serialVersionUID = -8394580482131757563L;
-	
-	private Integer   	paperId;				//试卷id paper_id
-	private String 	paperName;			//试卷名称 paper_name
-	private String 	paperPic;			//试卷图标 paper_pic
-	private Integer paperNumber;		//试卷回答次数 paper_number
-	private Integer paperShareNumber;	//分享次数 paper_share_number
-	
-	@DateTimeFormat(pattern="yyyy-MM-dd HH:mm:ss")
-	private Date 	paperCreateDate;		//创建时间  paper_create_date
-	private Integer paperStatus;		//试卷状态1、正常2不正常 paper_status
-	
-	private PageBean page;					//分页
-
-	public QuestionnairePaper() {
-		super();
-		// TODO Auto-generated constructor stub
-	}
-
-	
-	
-	
-	public QuestionnairePaper(Integer paperId, String paperName, String paperPic,
-			Integer paperNumber, Integer paperShareNumber,
-			Date paperCreateDate, Integer paperStatus, PageBean page) {
-		super();
-		this.paperId = paperId;
-		this.paperName = paperName;
-		this.paperPic = paperPic;
-		this.paperNumber = paperNumber;
-		this.paperShareNumber = paperShareNumber;
-		this.paperCreateDate = paperCreateDate;
-		this.paperStatus = paperStatus;
-		this.page = page;
-	}
-
-
-
-
-	public PageBean getPage() {
-		return page;
-	}
-
-
-	public void setPage(PageBean page) {
-		this.page = page;
-	}
-
-
-	public Integer getPaperId() {
-		return paperId;
-	}
-
-
-	public void setPaperId(Integer paperId) {
-		this.paperId = paperId;
-	}
-
-
-	public String getPaperName() {
-		return paperName;
-	}
-
-
-	public void setPaperName(String paperName) {
-		this.paperName = paperName;
-	}
-
-
-	public String getPaperPic() {
-		return paperPic;
-	}
-
-
-	public void setPaperPic(String paperPic) {
-		this.paperPic = paperPic;
-	}
-
-
-	public Integer getPaperNumber() {
-		return paperNumber;
-	}
-
-
-	public void setPaperNumber(Integer paperNumber) {
-		this.paperNumber = paperNumber;
-	}
-
-
-	public Integer getPaperShareNumber() {
-		return paperShareNumber;
-	}
-
-
-	public void setPaperShareNumber(Integer paperShareNumber) {
-		this.paperShareNumber = paperShareNumber;
-	}
-
-
-
-
-
-	public Date getPaperCreateDate() {
-		return paperCreateDate;
-	}
-
-
-	public void setPaperCreateDate(Date paperCreateDate) {
-		this.paperCreateDate = paperCreateDate;
-	}
-
-
-	public Integer getPaperStatus() {
-		return paperStatus;
-	}
-
-
-	public void setPaperStatus(Integer paperStatus) {
-		this.paperStatus = paperStatus;
-	}
-
-
-
-
-	@Override
-	public String toString() {
-		return "QuestionnairePaper [paperId=" + paperId + ", paperName="
-				+ paperName + ", paperPic=" + paperPic + ", paperNumber="
-				+ paperNumber + ", paperShareNumber=" + paperShareNumber
-				+ ", paperCreateDate=" + paperCreateDate + ", paperStatus="
-				+ paperStatus + ", page=" + page + "]";
-	}
-
-
-
-
-
-	
-	
-	
-}

wechat-common-core/src/main/java/com/iamberry/wechat/core/entity/questionnaire/QuestionnairePaperDto.java

@@ -1,159 +0,0 @@
-package com.iamberry.wechat.core.entity.questionnaire;
-
-import java.io.Serializable;
-
-
-
-/**
- * 试卷
- * @author Administrator
- *
- */
-public class QuestionnairePaperDto implements Serializable{
-
-	private static final long serialVersionUID = -8187169207936723445L;
-	
-	private String paperId;			//试卷id paper_id
-	private String paperName;			//试卷名称 paper_name
-	private String questionId;			//题目id question_id
-	private String questionName;		//题目名称 question_name
-	private String optionId;			//选项id option_id
-	private String optionName;			//选项名称 option_name
-	private String testScore;			//选项分数 test_score
-	private String testIsChekcbox;	//是否多选 test_is_chekcbox
-	private String testId;	//   试卷题目表id test_id
-	
-	private String id;
-	private String type;
-	private String content;
-	
-	
-	public QuestionnairePaperDto() {
-		super();
-		// TODO Auto-generated constructor stub
-	}
-	
-	
-	
-	
-	public String getId() {
-		return id;
-	}
-
-
-
-
-	public void setId(String id) {
-		this.id = id;
-	}
-
-
-
-
-	public String getType() {
-		return type;
-	}
-
-
-
-
-	public void setType(String type) {
-		this.type = type;
-	}
-
-
-
-
-	public String getContent() {
-		return content;
-	}
-
-
-
-
-	public void setContent(String content) {
-		this.content = content;
-	}
-
-
-
-
-	public String getTestId() {
-		return testId;
-	}
-
-
-
-
-	public void setTestId(String testId) {
-		this.testId = testId;
-	}
-
-
-
-
-	public String getPaperId() {
-		return paperId;
-	}
-	public void setPaperId(String paperId) {
-		this.paperId = paperId;
-	}
-	public String getPaperName() {
-		return paperName;
-	}
-	public void setPaperName(String paperName) {
-		this.paperName = paperName;
-	}
-	public String getQuestionId() {
-		return questionId;
-	}
-	public void setQuestionId(String questionId) {
-		this.questionId = questionId;
-	}
-	public String getQuestionName() {
-		return questionName;
-	}
-	public void setQuestionName(String questionName) {
-		this.questionName = questionName;
-	}
-	public String getOptionId() {
-		return optionId;
-	}
-	public void setOptionId(String optionId) {
-		this.optionId = optionId;
-	}
-	public String getOptionName() {
-		return optionName;
-	}
-	public void setOptionName(String optionName) {
-		this.optionName = optionName;
-	}
-	public String getTestScore() {
-		return testScore;
-	}
-	public void setTestScore(String testScore) {
-		this.testScore = testScore;
-	}
-	public String getTestIsChekcbox() {
-		return testIsChekcbox;
-	}
-	public void setTestIsChekcbox(String testIsChekcbox) {
-		this.testIsChekcbox = testIsChekcbox;
-	}
-	@Override
-	public String toString() {
-		return "QuestionnairePaperDto [paperId=" + paperId + ", paperName="
-				+ paperName + ", questionId=" + questionId + ", questionName="
-				+ questionName + ", optionId=" + optionId + ", optionName="
-				+ optionName + ", testScore=" + testScore + ", testIsChekcbox="
-				+ testIsChekcbox + "]";
-	}
-	
-	
-	
-	
-	
-	
-	
-	
-}

wechat-common-core/src/main/java/com/iamberry/wechat/core/entity/questionnaire/QuestionnaireQuestion.java

@@ -1,251 +0,0 @@
-package com.iamberry.wechat.core.entity.questionnaire;
-
-import java.io.Serializable;
-import java.util.Date;
-
-import com.iamberry.wechat.core.entity.PageBean;
-
-/**
- * 题目-表
- * @author Administrator
- *
- */
-public class QuestionnaireQuestion implements Serializable{
-	
-	private static final long serialVersionUID = 1667164673597708491L;
-	private Integer   	questionId;			//题目id question_id
-	private String 	questionName;		//题目名称 question_name
-	private String 	questionPic ; 		//题目图标 question_pic
-	private String 	questionDesc;		//题目简介 question_desc
-	private String 	questionType;		//题目类型 question_type 请求类型、1饮食、2健康 3、营养
-	private Date 	questionUpdateDate;	//修改时间  question_update_date
-	private Date 	questionCreateDate;	//创建时间 question_create_date
-	private Integer questionStatu;		//1:正常使用 2:已经停止使用 question_statu
-	private Integer questionIsChekcbox;	//题目是否多选 1:多选 2:单选 question_is_chekcbox
-	private Integer questionCalculation;//题目计算方式 1累计，2最高分 question_calculation
-	private Integer questionPaperId;	//所属试卷  question_paper_id
-	
-	private PageBean page;					//分页
-	
-	
-	
-
-	public QuestionnaireQuestion() {
-		super();
-		// TODO Auto-generated constructor stub
-	}
-
-
-
-
-	public QuestionnaireQuestion(Integer questionId, String questionName,
-			String questionPic, String questionDesc, String questionType,
-			Date questionUpdateDate, Date questionCreateDate,
-			Integer questionStatu, Integer questionIsChekcbox,
-			Integer questionCalculation, Integer questionPaperId, PageBean page) {
-		super();
-		this.questionId = questionId;
-		this.questionName = questionName;
-		this.questionPic = questionPic;
-		this.questionDesc = questionDesc;
-		this.questionType = questionType;
-		this.questionUpdateDate = questionUpdateDate;
-		this.questionCreateDate = questionCreateDate;
-		this.questionStatu = questionStatu;
-		this.questionIsChekcbox = questionIsChekcbox;
-		this.questionCalculation = questionCalculation;
-		this.questionPaperId = questionPaperId;
-		this.page = page;
-	}
-
-
-
-
-	public Integer getQuestionId() {
-		return questionId;
-	}
-
-
-
-
-	public void setQuestionId(Integer questionId) {
-		this.questionId = questionId;
-	}
-
-
-
-
-	public String getQuestionName() {
-		return questionName;
-	}
-
-
-
-
-	public void setQuestionName(String questionName) {
-		this.questionName = questionName;
-	}
-
-
-
-
-	public String getQuestionPic() {
-		return questionPic;
-	}
-
-
-
-
-	public void setQuestionPic(String questionPic) {
-		this.questionPic = questionPic;
-	}
-
-
-
-
-	public String getQuestionDesc() {
-		return questionDesc;
-	}
-
-
-
-
-	public void setQuestionDesc(String questionDesc) {
-		this.questionDesc = questionDesc;
-	}
-
-
-
-
-	public String getQuestionType() {
-		return questionType;
-	}
-
-
-
-
-	public void setQuestionType(String questionType) {
-		this.questionType = questionType;
-	}
-
-
-
-
-	public Date getQuestionUpdateDate() {
-		return questionUpdateDate;
-	}
-
-
-
-
-	public void setQuestionUpdateDate(Date questionUpdateDate) {
-		this.questionUpdateDate = questionUpdateDate;
-	}
-
-
-
-
-	public Date getQuestionCreateDate() {
-		return questionCreateDate;
-	}
-
-
-
-
-	public void setQuestionCreateDate(Date questionCreateDate) {
-		this.questionCreateDate = questionCreateDate;
-	}
-
-
-
-
-	public Integer getQuestionStatu() {
-		return questionStatu;
-	}
-
-
-
-
-	public void setQuestionStatu(Integer questionStatu) {
-		this.questionStatu = questionStatu;
-	}
-
-
-
-
-	public Integer getQuestionIsChekcbox() {
-		return questionIsChekcbox;
-	}
-
-
-
-
-	public void setQuestionIsChekcbox(Integer questionIsChekcbox) {
-		this.questionIsChekcbox = questionIsChekcbox;
-	}
-
-
-
-
-	public Integer getQuestionCalculation() {
-		return questionCalculation;
-	}
-
-
-
-
-	public void setQuestionCalculation(Integer questionCalculation) {
-		this.questionCalculation = questionCalculation;
-	}
-
-
-
-
-	public Integer getQuestionPaperId() {
-		return questionPaperId;
-	}
-
-
-
-
-	public void setQuestionPaperId(Integer questionPaperId) {
-		this.questionPaperId = questionPaperId;
-	}
-
-
-
-
-	public PageBean getPage() {
-		return page;
-	}
-
-
-
-
-	public void setPage(PageBean page) {
-		this.page = page;
-	}
-
-
-
-
-	@Override
-	public String toString() {
-		return "QuestionnaireQuestion [questionId=" + questionId
-				+ ", questionName=" + questionName + ", questionPic="
-				+ questionPic + ", questionDesc=" + questionDesc
-				+ ", questionType=" + questionType + ", questionUpdateDate="
-				+ questionUpdateDate + ", questionCreateDate="
-				+ questionCreateDate + ", questionStatu=" + questionStatu
-				+ ", questionIsChekcbox=" + questionIsChekcbox
-				+ ", questionCalculation=" + questionCalculation
-				+ ", questionPaperId=" + questionPaperId + ", page=" + page
-				+ "]";
-	}
-
-	
-	
-	
-	
-	
-}

wechat-common-core/src/main/java/com/iamberry/wechat/core/entity/questionnaire/QuestionnaireQuestionDto.java

@@ -1,99 +0,0 @@
-package com.iamberry.wechat.core.entity.questionnaire;
-
-import java.io.Serializable;
-import java.util.Date;
-
-import com.iamberry.wechat.core.entity.PageBean;
-
-/**
- * 题目表
- * @author Administrator
- *
- */
-public class QuestionnaireQuestionDto implements Serializable{
-	
-	private static final long serialVersionUID = 1667164673597708491L;
-	private Long questionId;			//题目id question_id
-	private String questionName;		//题目名称 question_name
-	private String questionPic ; 		//题目图片 question_pic
-	private String questionDesc;		//题目简介 question_desc
-	
-	private Date questionUpdateDate;	
-	private Date questionCreateDate;	
-	
-	private Integer questionStatu;	//1:正常使用 2:已经停止使用 question_statu
-
-	private PageBean page = new PageBean(); //分页信息
-	
-	public QuestionnaireQuestionDto() {
-		super();
-		// TODO Auto-generated constructor stub
-	}
-
-	public Long getQuestionId() {
-		return questionId;
-	}
-
-	public void setQuestionId(Long questionId) {
-		this.questionId = questionId;
-	}
-
-	public String getQuestionName() {
-		return questionName;
-	}
-
-	public void setQuestionName(String questionName) {
-		this.questionName = questionName;
-	}
-
-	public String getQuestionPic() {
-		return questionPic;
-	}
-
-	public void setQuestionPic(String questionPic) {
-		this.questionPic = questionPic;
-	}
-
-	public String getQuestionDesc() {
-		return questionDesc;
-	}
-
-	public void setQuestionDesc(String questionDesc) {
-		this.questionDesc = questionDesc;
-	}
-
-	public Date getQuestionUpdateDate() {
-		return questionUpdateDate;
-	}
-
-	public void setQuestionUpdateDate(Date questionUpdateDate) {
-		this.questionUpdateDate = questionUpdateDate;
-	}
-
-	public Date getQuestionCreateDate() {
-		return questionCreateDate;
-	}
-
-	public void setQuestionCreateDate(Date questionCreateDate) {
-		this.questionCreateDate = questionCreateDate;
-	}
-
-	public Integer getQuestionStatu() {
-		return questionStatu;
-	}
-
-	public void setQuestionStatu(Integer questionStatu) {
-		this.questionStatu = questionStatu;
-	}
-
-	public PageBean getPage() {
-		return page;
-	}
-
-	public void setPage(PageBean page) {
-		this.page = page;
-	}
-
-	
-	
-}

wechat-common-core/src/main/java/com/iamberry/wechat/core/entity/questionnaire/QuestionnaireTestPaper.java

@@ -1,119 +0,0 @@
-package com.iamberry.wechat.core.entity.questionnaire;
-
-import java.io.Serializable;
-import java.util.Date;
-
-/**
- * 试卷题目表
- * @author Administrator
- *
- */
-public class QuestionnaireTestPaper implements Serializable{
-	
-	
-	private static final long serialVersionUID = -420678737793767335L;
-	
-	private Integer testId;			//试卷题目ID test_id
-	private Integer testPaperId;		//试卷-外间 test_paper_id
-	private Integer testQuestionId;	//试卷题目-外间 test_question_id
-	private Integer testOptionId;	//试卷选项-外间 test_option_id
-	private Date testCreateDate;	//时间 test_create_date
-	private Date testUpdateDate;	//时间 test_update_date
-	private Integer testOrder;		//试卷题目排序 test_order
-	private Integer testNumber;	//回答次数 test_number
-	private Integer testScore;		//选项分数 test_score
-	private Integer testIsChekcbox; //题目是否多选 1，多选 2单选 注意保持一致 test_is_chekcbox
-	public QuestionnaireTestPaper() {
-		super();
-		// TODO Auto-generated constructor stub
-	}
-	public QuestionnaireTestPaper(Integer testId, Integer testPaperId,
-			Integer testQuestionId, Integer testOptionId, Date testCreateDate,
-			Date testUpdateDate, Integer testOrder, Integer testNumber,
-			Integer testScore, Integer testIsChekcbox) {
-		super();
-		this.testId = testId;
-		this.testPaperId = testPaperId;
-		this.testQuestionId = testQuestionId;
-		this.testOptionId = testOptionId;
-		this.testCreateDate = testCreateDate;
-		this.testUpdateDate = testUpdateDate;
-		this.testOrder = testOrder;
-		this.testNumber = testNumber;
-		this.testScore = testScore;
-		this.testIsChekcbox = testIsChekcbox;
-	}
-	public Integer getTestId() {
-		return testId;
-	}
-	public void setTestId(Integer testId) {
-		this.testId = testId;
-	}
-	public Integer getTestPaperId() {
-		return testPaperId;
-	}
-	public void setTestPaperId(Integer testPaperId) {
-		this.testPaperId = testPaperId;
-	}
-	public Integer getTestQuestionId() {
-		return testQuestionId;
-	}
-	public void setTestQuestionId(Integer testQuestionId) {
-		this.testQuestionId = testQuestionId;
-	}
-	public Integer getTestOptionId() {
-		return testOptionId;
-	}
-	public void setTestOptionId(Integer testOptionId) {
-		this.testOptionId = testOptionId;
-	}
-	public Date getTestCreateDate() {
-		return testCreateDate;
-	}
-	public void setTestCreateDate(Date testCreateDate) {
-		this.testCreateDate = testCreateDate;
-	}
-	public Date getTestUpdateDate() {
-		return testUpdateDate;
-	}
-	public void setTestUpdateDate(Date testUpdateDate) {
-		this.testUpdateDate = testUpdateDate;
-	}
-	public Integer getTestOrder() {
-		return testOrder;
-	}
-	public void setTestOrder(Integer testOrder) {
-		this.testOrder = testOrder;
-	}
-	public Integer getTestNumber() {
-		return testNumber;
-	}
-	public void setTestNumber(Integer testNumber) {
-		this.testNumber = testNumber;
-	}
-	public Integer getTestScore() {
-		return testScore;
-	}
-	public void setTestScore(Integer testScore) {
-		this.testScore = testScore;
-	}
-	public Integer getTestIsChekcbox() {
-		return testIsChekcbox;
-	}
-	public void setTestIsChekcbox(Integer testIsChekcbox) {
-		this.testIsChekcbox = testIsChekcbox;
-	}
-	@Override
-	public String toString() {
-		return "QuestionnaireTestPaper [testId=" + testId + ", testPaperId="
-				+ testPaperId + ", testQuestionId=" + testQuestionId
-				+ ", testOptionId=" + testOptionId + ", testCreateDate="
-				+ testCreateDate + ", testUpdateDate=" + testUpdateDate
-				+ ", testOrder=" + testOrder + ", testNumber=" + testNumber
-				+ ", testScore=" + testScore + ", testIsChekcbox="
-				+ testIsChekcbox + "]";
-	}
-	
-	
-	
-}

wechat-wechat-web/src/main/resources/iamberry-wechat-service-datasource.xml

@@ -58,7 +58,7 @@
 	<bean id="sqlSessionFactory" class="org.mybatis.spring.SqlSessionFactoryBean">
 		<!-- 配置数据源 -->
 		<property name="dataSource" ref="ratfwDataSource" />
-		<property name="configLocation" value="classpath:iamberry-wechat-service-mybatis.xml" />
+		<property name="configLocation" value="classpath:mybatis.xml" />
 	</bean>
 
 	<!-- 自动扫描SQL隐射文件 -->

wechat-wechat-web/src/main/resources/iamberry-wechat-service-mybatis.xml

@@ -1,448 +0,0 @@
-<?xml version="1.0" encoding="UTF-8"?>
-<!DOCTYPE configuration PUBLIC "-//mybatis.org//DTD Config 3.0//EN" "http://mybatis.org/dtd/mybatis-3-config.dtd">
-<configuration>
-	<!-- 设置  -->
-	<settings>
-        <!--关闭懒加载-->  
-        <setting name="lazyLoadingEnabled" value="false" />  
-		<!-- 日志使用log4j -->
-        <setting name="logImpl" value="LOG4J"/>  
-		<!-- 开启驼峰命名转换 map_entity to mapEntity -->
-		<setting name="mapUnderscoreToCamelCase" value="true" />  
-		<!-- 使用jdbc的getGeneratedKeys获取数据库自增主键 -->
-		<setting name="useGeneratedKeys" value="true" />  
-		<!-- 开启别列名转换 : select name as title form table -->
-		<setting name="useColumnLabel" value="true" />  
-    </settings>
-    <!-- 别名设置 -->
-	<typeAliases>
-		<typeAlias type="com.iamberry.wechat.core.entity.admin.AdminChildHavePermission" alias="AdminChildHavePermission"/>
-		<typeAlias type="com.iamberry.wechat.core.entity.admin.AdminChildInfo" alias="AdminChildInfo"/>
-		<typeAlias type="com.iamberry.wechat.core.entity.admin.AdminChildPermissionErmissions" alias="AdminChildPermissionErmissions"/>
-		<typeAlias type="com.iamberry.wechat.core.entity.admin.AdminChildPermissions" alias="AdminChildPermissions"/>
-		<typeAlias type="com.iamberry.wechat.core.entity.admin.AdminInfo" alias="AdminInfo"/>
-		<typeAlias type="com.iamberry.wechat.core.entity.admin.AdminLog" alias="AdminLog"/>
-		<typeAlias type="com.iamberry.wechat.core.entity.admin.AdminLoginDTO" alias="AdminLoginDTO"/>
-		<typeAlias type="com.iamberry.wechat.core.entity.admin.ShopSystemRule" alias="ShopSystemRule"/>
-		<typeAlias type="com.iamberry.wechat.core.entity.agent.AgentMemberDto" alias="AgentMemberDto"/>
-		<typeAlias type="com.iamberry.wechat.core.entity.agent.AgentOrderDto" alias="AgentOrderDto"/>
-		<typeAlias type="com.iamberry.wechat.core.entity.agent.OrderStatusDto" alias="OrderStatusDto"/>
-		<typeAlias type="com.iamberry.wechat.core.entity.banner.ActionBanner" alias="ActionBanner"/>
-		<typeAlias type="com.iamberry.wechat.core.entity.banner.ActionBannerImage" alias="ActionBannerImage"/>
-		<typeAlias type="com.iamberry.wechat.core.entity.banner.BannerDTO" alias="BannerDTO"/>
-		<typeAlias type="com.iamberry.wechat.core.entity.banner.JSONDTO" alias="JSONDTO"/>
-		<typeAlias type="com.iamberry.wechat.core.entity.banner.MessageDTO" alias="MessageDTO"/>
-		<typeAlias type="com.iamberry.wechat.core.entity.bindingApp.BindingMac" alias="BindingMac"/>
-		<typeAlias type="com.iamberry.wechat.core.entity.bindingApp.BindingMacInfo" alias="BindingMacInfo"/>
-		<typeAlias type="com.iamberry.wechat.core.entity.cart.CartDto" alias="CartDto"/>
-		<typeAlias type="com.iamberry.wechat.core.entity.cart.OrderPayDto" alias="OrderPayDto"/>
-		<typeAlias type="com.iamberry.wechat.core.entity.cart.SendPayDto" alias="SendPayDto"/>
-		<typeAlias type="com.iamberry.wechat.core.entity.cart.ShopOrderAndItemDto" alias="ShopOrderAndItemDto"/>
-		<typeAlias type="com.iamberry.wechat.core.entity.cart.ShopOrderItemDto" alias="ShopOrderItemDto"/>
-		<typeAlias type="com.iamberry.wechat.core.entity.cart.ShopSalesOrderDto" alias="ShopSalesOrderDto"/>
-		<typeAlias type="com.iamberry.wechat.core.entity.cart.TempOrderDto" alias="TempOrderDto"/>
-		<typeAlias type="com.iamberry.wechat.core.entity.coupon.CouponItem" alias="CouponItem"/>
-		<typeAlias type="com.iamberry.wechat.core.entity.coupon.CouponItemDto" alias="CouponItemDto"/>
-		<typeAlias type="com.iamberry.wechat.core.entity.coupon.AdminCouponItemDto" alias="AdminCouponItemDto"/>
-		<typeAlias type="com.iamberry.wechat.core.entity.coupon.CouponType" alias="CouponType"/>
-		<typeAlias type="com.iamberry.wechat.core.entity.drp.EarningLogs" alias="EarningLogs"/>
-		<typeAlias type="com.iamberry.wechat.core.entity.drp.EasyPage" alias="EasyPage"/>
-		<typeAlias type="com.iamberry.wechat.core.entity.drp.IncomeRecord" alias="IncomeRecord"/>
-		<typeAlias type="com.iamberry.wechat.core.entity.drp.ObjRecord" alias="ObjRecord"/>
-		<typeAlias type="com.iamberry.wechat.core.entity.drp.ObjRecord2" alias="ObjRecord2"/>
-		<typeAlias type="com.iamberry.wechat.core.entity.drp.PageBeanEarningLogs" alias="PageBeanEarningLogs"/>
-		<typeAlias type="com.iamberry.wechat.core.entity.drp.PageBeanPlaceInfo" alias="PageBeanPlaceInfo"/>
-		<typeAlias type="com.iamberry.wechat.core.entity.drp.PageBeanPlaceLogs" alias="PageBeanPlaceLogs"/>
-		<typeAlias type="com.iamberry.wechat.core.entity.drp.PageBeanWithdraw" alias="PageBeanWithdraw"/>
-		<typeAlias type="com.iamberry.wechat.core.entity.drp.PlaceInfo" alias="PlaceInfo"/>
-		<typeAlias type="com.iamberry.wechat.core.entity.drp.PlaceInfoBattleDto" alias="PlaceInfoBattleDto"/>
-		<typeAlias type="com.iamberry.wechat.core.entity.drp.PlaceLogs" alias="PlaceLogs"/>
-		<typeAlias type="com.iamberry.wechat.core.entity.drp.PlaceRoleInfo" alias="PlaceRoleInfo"/>
-		<typeAlias type="com.iamberry.wechat.core.entity.drp.PlaceWithDrawalsLogs" alias="PlaceWithDrawalsLogs"/>
-		<typeAlias type="com.iamberry.wechat.core.entity.drp.ApplyUserInfo" alias="ApplyUserInfo"/>
-		<typeAlias type="com.iamberry.wechat.core.entity.flow.TemplateFlowInfo" alias="TemplateFlowInfo"/>
-		<typeAlias type="com.iamberry.wechat.core.entity.flow.TemplateInfo" alias="TemplateInfo"/>
-		<typeAlias type="com.iamberry.wechat.core.entity.JsonBack" alias="JsonBack"/>
-		<typeAlias type="com.iamberry.wechat.core.entity.member.ApplyDto" alias="ApplyDto"/>
-		<typeAlias type="com.iamberry.wechat.core.entity.member.CashLog" alias="CashLog"/>
-		<typeAlias type="com.iamberry.wechat.core.entity.member.Integral" alias="Integral"/>
-		<typeAlias type="com.iamberry.wechat.core.entity.member.IntegralDto" alias="IntegralDto"/>
-		<typeAlias type="com.iamberry.wechat.core.entity.member.Member" alias="Member"/>
-		<typeAlias type="com.iamberry.wechat.core.entity.member.ShareInfo" alias="ShareInfo"/>
-		<typeAlias type="com.iamberry.wechat.core.entity.member.Withdraw" alias="Withdraw"/>
-		<typeAlias type="com.iamberry.wechat.core.entity.mq.MQMessage" alias="MQMessage"/>
-		<typeAlias type="com.iamberry.wechat.core.entity.news.News" alias="News"/>
-		<typeAlias type="com.iamberry.wechat.core.entity.order.Order" alias="Order"/>
-		<typeAlias type="com.iamberry.wechat.core.entity.order.OrderRebackMoney" alias="OrderRebackMoney"/>
-		<typeAlias type="com.iamberry.wechat.core.entity.order.OrderActionDto" alias="OrderActionDto"/>
-		<typeAlias type="com.iamberry.wechat.core.entity.order.OrderItem" alias="OrderItem"/>
-		<typeAlias type="com.iamberry.wechat.core.entity.order.OrderOperation" alias="OrderOperation"/>
-		<typeAlias type="com.iamberry.wechat.core.entity.Page" alias="Page"/>
-		<typeAlias type="com.iamberry.wechat.core.entity.PageBean" alias="PageBean"/>
-		<typeAlias type="com.iamberry.wechat.core.entity.PaperBean" alias="PaperBean"/>
-		<typeAlias type="com.iamberry.wechat.core.entity.pay.PayResult" alias="PayResult"/>
-		<typeAlias type="com.iamberry.wechat.core.entity.product.Product" alias="Product"/>
-		<typeAlias type="com.iamberry.wechat.core.entity.product.ProductImageText" alias="ProductImageText"/>
-		<typeAlias type="com.iamberry.wechat.core.entity.product.ProductPicture" alias="ProductPicture"/>
-		<typeAlias type="com.iamberry.wechat.core.entity.product.ProductColor" alias="ProductColor"/>
-		<typeAlias type="com.iamberry.wechat.core.entity.qrcode.Qrcode" alias="Qrcode"/>
-		<typeAlias type="com.iamberry.wechat.core.entity.qrcode.QrcodeResult" alias="QrcodeResult"/>
-		<typeAlias type="com.iamberry.wechat.core.entity.qrcode.TemporaryQrcode" alias="TemporaryQrcode"/>
-		<typeAlias type="com.iamberry.wechat.core.entity.reback.RebackInfo" alias="RebackInfo"/>
-		<typeAlias type="com.iamberry.wechat.core.entity.reback.RolesListDto" alias="RolesListDto"/>
-		<typeAlias type="com.iamberry.wechat.core.entity.reback.StoreStatiscInfo" alias="StoreStatiscInfo"/>
-		<typeAlias type="com.iamberry.wechat.core.entity.relationship.DealerRelation" alias="DealerRelation"/>
-		<typeAlias type="com.iamberry.wechat.core.entity.relationship.WdRelation" alias="WdRelation"/>
-		<typeAlias type="com.iamberry.wechat.core.entity.wx.AccessToken" alias="AccessToken"/>
-		<typeAlias type="com.iamberry.wechat.core.entity.wx.Article" alias="Article"/>
-		<typeAlias type="com.iamberry.wechat.core.entity.wx.BaseMessage" alias="BaseMessage"/>
-		<typeAlias type="com.iamberry.wechat.core.entity.wx.Button" alias="Button"/>
-		<typeAlias type="com.iamberry.wechat.core.entity.wx.CommonButton" alias="CommonButton"/>
-		<typeAlias type="com.iamberry.wechat.core.entity.wx.ComplexButton" alias="ComplexButton"/>
-		<typeAlias type="com.iamberry.wechat.core.entity.wx.Config" alias="Config"/>
-		<typeAlias type="com.iamberry.wechat.core.entity.wx.ConfigJSSDK" alias="ConfigJSSDK"/>
-		<typeAlias type="com.iamberry.wechat.core.entity.wx.FirstAccess" alias="FirstAccess"/>
-		<typeAlias type="com.iamberry.wechat.core.entity.wx.FirstJoinKey" alias="FirstJoinKey"/>
-		<typeAlias type="com.iamberry.wechat.core.entity.wx.ImageTextInfo" alias="ImageTextInfo"/>
-		<typeAlias type="com.iamberry.wechat.core.entity.wx.ImagetextMaterial" alias="ImagetextMaterial"/>
-		<typeAlias type="com.iamberry.wechat.core.entity.wx.ImageTextMore" alias="ImageTextMore"/>
-		<typeAlias type="com.iamberry.wechat.core.entity.wx.Income" alias="Income"/>
-		<typeAlias type="com.iamberry.wechat.core.entity.wx.ITTempLate" alias="ITTempLate"/>
-		<typeAlias type="com.iamberry.wechat.core.entity.wx.KeyWord" alias="KeyWord"/>
-		<typeAlias type="com.iamberry.wechat.core.entity.wx.Menu" alias="Menu"/>
-		<typeAlias type="com.iamberry.wechat.core.entity.wx.MenuData" alias="MenuData"/>
-		<typeAlias type="com.iamberry.wechat.core.entity.wx.MenuInfo" alias="MenuInfo"/>
-		<typeAlias type="com.iamberry.wechat.core.entity.wx.MenuKeySet" alias="MenuKeySet"/>
-		<typeAlias type="com.iamberry.wechat.core.entity.wx.Music" alias="Music"/>
-		<typeAlias type="com.iamberry.wechat.core.entity.wx.MusicMessage" alias="MusicMessage"/>
-		<typeAlias type="com.iamberry.wechat.core.entity.wx.NewsMessage" alias="NewsMessage"/>
-		<typeAlias type="com.iamberry.wechat.core.entity.wx.PagingDTO" alias="PagingDTO"/>
-		<typeAlias type="com.iamberry.wechat.core.entity.wx.QRCJson" alias="QRCJson"/>
-		<typeAlias type="com.iamberry.wechat.core.entity.wx.Rewards" alias="Rewards"/>
-		<typeAlias type="com.iamberry.wechat.core.entity.wx.Shipment" alias="Shipment"/>
-		<typeAlias type="com.iamberry.wechat.core.entity.wx.Status" alias="Status"/>
-		<typeAlias type="com.iamberry.wechat.core.entity.wx.TextMessage" alias="TextMessage"/>
-		<typeAlias type="com.iamberry.wechat.core.entity.wx.Ticket" alias="Ticket"/>
-		<typeAlias type="com.iamberry.wechat.core.entity.wx.Token" alias="Token"/>
-		<typeAlias type="com.iamberry.wechat.core.entity.wx.TransferCustomer" alias="TransferCustomer"/>
-		<typeAlias type="com.iamberry.wechat.core.entity.wx.TransInfo" alias="TransInfo"/>
-		<typeAlias type="com.iamberry.wechat.core.entity.wx.WxPayDto" alias="WxPayDto"/>
-		<typeAlias type="com.iamberry.wechat.core.entity.wx.WxPayResult" alias="WxPayResult"/>
-		<typeAlias type="com.iamberry.wechat.core.entity.wx.WxPrepayIdErrorResult" alias="WxPrepayIdErrorResult"/>
-		<typeAlias type="com.iamberry.wechat.core.entity.wx.ZTreeBean" alias="ZTreeBean"/>
-		<typeAlias type="com.iamberry.wechat.core.entity.drp.ApplyPlaceLogs" alias="ApplyPlaceLogs"/>
-		<typeAlias type="com.iamberry.wechat.core.entity.wx.WechatShare" alias="WechatShare"/>
-		<typeAlias type="com.iamberry.wechat.core.entity.order.NumberBacklogDto" alias="NumberBacklogDto"/>
-
-		<typeAlias type="com.iamberry.wechat.core.entity.report.Report" alias="Report"/>
-
-
-		<typeAlias type="com.iamberry.wechat.core.entity.receive.ChargerReceive" alias="ChargerReceive"/>
-
-		<!-- 【门店关注统计报表类】 -->
-		<typeAlias type="com.iamberry.wechat.core.entity.statictics.AttentionInfo" alias="AttentionInfo"/>
-		<typeAlias type="com.iamberry.wechat.core.entity.statictics.MarketInfo" alias="MarketInfo"/>
-		<!-- 【省代收益统计报表类】 -->
-		<typeAlias type="com.iamberry.wechat.core.entity.statictics.EarningsInfo" alias="EarningsInfo"/>
-		<!-- 【激活数量统计报表类】 -->
-		<typeAlias type="com.iamberry.wechat.core.entity.statictics.ActivateInfo" alias="ActivateInfo"/>
-		<!-- 【激活用户信息报表类】 -->
-		<typeAlias type="com.iamberry.wechat.core.entity.statictics.UerActivateInfo" alias="UerActivateInfo"/>
-		<!-- 【产品返利类型】 -->
-		<typeAlias type="com.iamberry.wechat.core.entity.product.ProductType" alias="ProductType"/>
-		<!-- 【统计总信息类】 -->
-		<typeAlias type="com.iamberry.wechat.core.entity.statictics.StatisticsInfo" alias="StatisticsInfo"/>
-		
-		<!-- 定期任务 -->
-		<typeAlias type="com.iamberry.wechat.core.entity.task.WechatTask" alias="WechatTask"/>
-		<typeAlias type="com.iamberry.wechat.core.entity.task.WechatTaskLogs" alias="WechatTaskLogs"/>
-		
-		<!-- 【会员分销奖励记录】 -->
-		<typeAlias type="com.iamberry.wechat.core.entity.rewards.RewardsLog" alias="RewardsLog"/>
-		<!-- 【会员等级】 -->
-		<typeAlias type="com.iamberry.wechat.core.entity.rewards.RewardsRank" alias="RewardsRank"/>
-		<!-- 【会员销售记录】 -->
-		<typeAlias type="com.iamberry.wechat.core.entity.rewards.SalesLog" alias="SalesLog"/>
-		
-		<!-- 游戏实体dto -->
-		<typeAlias type="com.iamberry.wechat.core.entity.game.GameSystemDto" alias="GameSystemDto"/>
-		<!-- 游戏日志dto -->
-		<typeAlias type="com.iamberry.wechat.core.entity.game.GameLogsDto" alias="GameLogsDto"/>
-		<!-- 游戏奖品dto -->
-		<typeAlias type="com.iamberry.wechat.core.entity.game.GamePrizeDto" alias="GamePrizeDto"/>
-		
-		
-		<!-- 营养自测 -->
-		<typeAlias type="com.iamberry.wechat.core.entity.questionnaire.QuestionnairePaper" alias="QuestionnairePaper"/>
-		<typeAlias type="com.iamberry.wechat.core.entity.questionnaire.QuestionnaireAnswer" alias="QuestionnaireAnswer"/>
-		<typeAlias type="com.iamberry.wechat.core.entity.questionnaire.QuestionnaireAnswerDetailed" alias="QuestionnaireAnswerDetailed"/>
-		<typeAlias type="com.iamberry.wechat.core.entity.questionnaire.QuestionnaireOption" alias="QuestionnaireOption"/>
-		<typeAlias type="com.iamberry.wechat.core.entity.questionnaire.QuestionnaireQuestion" alias="QuestionnaireQuestion"/>
-		<typeAlias type="com.iamberry.wechat.core.entity.questionnaire.QuestionnaireTestPaper" alias="QuestionnaireTestPaper"/>
-		<typeAlias type="com.iamberry.wechat.core.entity.questionnaire.QuestionnairePaperDto" alias="QuestionnairePaperDto"/>
-		
-		<!-- 试用订单 -->
-		<typeAlias type="com.iamberry.wechat.core.entity.probation.ProbationAwardRelu" alias="ProbationAwardRelu"/>	
-		<typeAlias type="com.iamberry.wechat.core.entity.probation.ProbationNewLogs" alias="ProbationNewLogs"/>		
-		<typeAlias type="com.iamberry.wechat.core.entity.probation.ProbationUserInfo" alias="ProbationUserInfo"/>		
-	  	<typeAlias type="com.iamberry.wechat.core.entity.order.ProbationOrder" alias="ProbationOrder"/>
-	  	<typeAlias type="com.iamberry.wechat.core.entity.order.ProbationOrderDto" alias="ProbationOrderDto"/>	
-	  	<typeAlias type="com.iamberry.wechat.core.entity.order.ProbationCode" alias="ProbationCode"/>	
-	  	<typeAlias type="com.iamberry.wechat.core.entity.probation.ProbationUserDto" alias="ProbationUserDto"/>
-	  	
-	  	<!-- 租赁订单 -->
-	  	<typeAlias type="com.iamberry.wechat.core.entity.lease.LeaseOrder" alias="LeaseOrder"/>
-	  	<typeAlias type="com.iamberry.wechat.core.entity.machine.Machine" alias="Machine"/>
-	  	<typeAlias type="com.iamberry.wechat.core.entity.machine.MachineShareRecord" alias="MachineShareRecord"/>
-	  	<typeAlias type="com.iamberry.wechat.core.entity.statictics.SalesmanDto" alias="SalesmanDto"/>
-	  	<typeAlias type="com.iamberry.wechat.core.entity.statictics.SalesmanInfo" alias="SalesmanInfo"/>
-	  	<typeAlias type="com.iamberry.wechat.core.entity.statictics.SalesmanRelation" alias="SalesmanRelation"/>
-	  	
-	  	
-	  	<typeAlias type="com.iamberry.wechat.core.entity.statictics.StoresStatisticsDto" alias="StoresStatisticsDto"/>
-	  	<typeAlias type="com.iamberry.wechat.core.entity.statictics.VipOfflineDto" alias="VipOfflineDto"/>
-	  	
-	  	<!-- 赠送礼品信息表 -->
-	  	<typeAlias type="com.iamberry.wechat.core.entity.cart.UserGiftDto" alias="UserGiftDto"/>	
-	  		  	
-	  	<!-- 返利奖励任务表 -->
-	  	<typeAlias type="com.iamberry.wechat.core.entity.flow.TemplateReward" alias="TemplateReward"/>
-	  	<!-- 销售订单统计 -->
-	  	<typeAlias type="com.iamberry.wechat.core.entity.statictics.StatisticsOrderDTO" alias="StatisticsOrderDTO"/>
-	  	<typeAlias type="com.iamberry.wechat.core.entity.statictics.StatisticManagerDto" alias="StatisticManagerDto"/>
-	  	<typeAlias type="com.iamberry.wechat.core.entity.statictics.StatisticOrderByMonthDto" alias="StatisticOrderByMonthDto"/>
-
-		<!-- 礼品卡相关 -->	  	
-	  	<typeAlias type="com.iamberry.wechat.core.entity.giftCard.AgentInfo" alias="AgentInfo"/>
-		<typeAlias type="com.iamberry.wechat.core.entity.giftCard.AgentPayLogs" alias="AgentPayLogs"/>
-		<typeAlias type="com.iamberry.wechat.core.entity.giftCard.AgentMachine" alias="AgentMachine"/>
-		<typeAlias type="com.iamberry.wechat.core.entity.giftCard.UserMachineInfo" alias="UserMachineInfo"/>
-		<typeAlias type="com.iamberry.wechat.core.entity.giftCard.GiftCardInfo" alias="GiftCardInfo"/>
-		<typeAlias type="com.iamberry.wechat.core.entity.giftCard.CardCashInfo" alias="CardCashInfo"/>
-		<typeAlias type="com.iamberry.wechat.core.entity.giftCard.GiftCardPayCode" alias="GiftCardPayCode"/>
-		<!-- 机器编号，获取二维码-->
-		<typeAlias type="com.iamberry.wechat.core.entity.machineNumber.MachineGift" alias="MachineGift"/>
-		<typeAlias type="com.iamberry.wechat.core.entity.machineNumber.MachineNumber" alias="MachineNumber"/>
-		<typeAlias type="com.iamberry.wechat.core.entity.machineNumber.MachineNumberLogs" alias="MachineNumberLogs"/>
-        <typeAlias type="com.iamberry.wechat.core.entity.product.QrcodeGift" alias="QrcodeGift"/>
-		<typeAlias type="com.iamberry.wechat.core.entity.machineNumber.WarrantyCard" alias="WarrantyCard"/>
-		<!-- 代理商信息 -->
-		<typeAlias type="com.iamberry.wechat.core.entity.agentInfo.AgentConfig" alias="AgentConfig"/>
-		<typeAlias type="com.iamberry.wechat.core.entity.agentInfo.AgentTooth" alias="AgentTooth"/>
-		<typeAlias type="com.iamberry.wechat.core.entity.agentInfo.AgentOrder" alias="AgentOrder"/>
-		<typeAlias type="com.iamberry.wechat.core.entity.agentInfo.AgentOrderItem" alias="AgentOrderItem"/>
-		<typeAlias type="com.iamberry.wechat.core.entity.agentInfo.OrderHint" alias="OrderHint"/>
-
-		<!-- 销售统计 -->
-		<typeAlias type="com.iamberry.wechat.core.entity.statictics.StatisticsSalesOrder" alias="StatisticsSalesOrder"/>
-		<!-- 水机租赁 -->
-		<typeAlias type="com.iamberry.wechat.core.entity.rent.RentTypeInfo" alias="RentTypeInfo"/>
-
-		<!-- 机器 -->
-		<typeAlias type="com.iamberry.wechat.core.entity.apparatus.Apparatus" alias="Apparatus"/>
-		<!--积分-->
-		<typeAlias type="com.iamberry.wechat.core.entity.integral.UseIntegral" alias="UseIntegral"/>
-		<typeAlias type="com.iamberry.wechat.core.entity.integral.IntegralConfig" alias="IntegralConfig"/>
-		<typeAlias type="com.iamberry.wechat.core.entity.integral.MemberIntegral" alias="MemberIntegral"/>
-		<typeAlias type="com.iamberry.wechat.core.entity.integral.RankRule" alias="RankRule"/>
-		<typeAlias type="com.iamberry.wechat.core.entity.integral.StayIntegral" alias="StayIntegral"/>
-
-		<!--积分商城-->
-		<typeAlias type="com.iamberry.wechat.core.entity.integral.IntegralItem" alias="IntegralItem"/>
-		<typeAlias type="com.iamberry.wechat.core.entity.integral.IntegralOrder" alias="IntegralOrder"/>
-		<typeAlias type="com.iamberry.wechat.core.entity.integral.IntegralOrderAddress" alias="IntegralOrderAddress"/>
-		<typeAlias type="com.iamberry.wechat.core.entity.integral.IntegralProduct" alias="IntegralProduct"/>
-		<typeAlias type="com.iamberry.wechat.core.entity.integral.IntegralProductConvert" alias="IntegralProductConvert"/>
-		<typeAlias type="com.iamberry.wechat.core.entity.integral.IntegralProductGrade" alias="IntegralProductGrade"/>
-		<typeAlias type="com.iamberry.wechat.core.entity.integral.IntegralProductPicture" alias="IntegralProductPicture"/>
-
-		<typeAlias type="com.iamberry.wechat.core.entity.product.ProductRelatedRstProduce" alias="ProductRelatedRstProduce"/>
-
-		<!--牙刷定制-->
-		<typeAlias type="com.iamberry.wechat.core.entity.customized.CustomizedColor" alias="CustomizedColor"/>
-		<typeAlias type="com.iamberry.wechat.core.entity.customized.CustomizedPattern" alias="CustomizedPattern"/>
-		<typeAlias type="com.iamberry.wechat.core.entity.customized.CustomizedPosition" alias="CustomizedPosition"/>
-		<typeAlias type="com.iamberry.wechat.core.entity.customized.OrderCustomized" alias="OrderCustomized"/>
-		<typeAlias type="com.iamberry.wechat.core.entity.customized.CustomizedTooth" alias="CustomizedTooth"/>
-		<typeAlias type="com.iamberry.wechat.core.entity.customized.CustomizedExternalUrl" alias="CustomizedExternalUrl"/>
-
-		<!--618活动好友助力-->
-		<typeAlias type="com.iamberry.wechat.core.entity.activity.Activity" alias="Activity"/>
-		<typeAlias type="com.iamberry.wechat.core.entity.activity.ActivityHelp" alias="ActivityHelp"/>
-
-		<!--上朵促销统计产品浏览人数-->
-		<typeAlias type="com.iamberry.wechat.core.entity.product.AccessFlow" alias="AccessFlow"/>
-
-		<!--上朵分销-->
-		<typeAlias type="com.iamberry.wechat.core.entity.channel.ChannelPrice" alias="ChannelPrice"/>
-		<typeAlias type="com.iamberry.wechat.core.entity.channel.ChannelRebate" alias="ChannelRebate"/>
-		<typeAlias type="com.iamberry.wechat.core.entity.channel.ChildChannel" alias="ChildChannel"/>
-		<typeAlias type="com.iamberry.wechat.core.entity.channel.MainChannel" alias="MainChannel"/>
-		<typeAlias type="com.iamberry.wechat.core.entity.channel.BalanceLog" alias="BalanceLog"/>
-		<typeAlias type="com.iamberry.wechat.core.entity.channel.ChannelAdmin" alias="ChannelAdmin"/>
-		<typeAlias type="com.iamberry.wechat.core.entity.channel.AttenStatistics" alias="AttenStatistics"/>
-
-		<!--活动表-->
-		<typeAlias type="com.iamberry.wechat.core.entity.coupon.SalesActivities" alias="SalesActivities"/>
-
-		<!-- 客服信息 -->
-		<typeAlias type="com.iamberry.wechat.core.entity.customer.CustomerInfo" alias="CustomerInfo"/>
-
-		<!-- 优惠券对应商品 -->
-		<typeAlias type="com.iamberry.wechat.core.entity.coupon.CouponColor" alias="CouponColor"/>
-
-		<!-- 赠品 -->
-		<typeAlias type="com.iamberry.wechat.core.entity.gift.SettlementGift" alias="SettlementGift"/>
-
-		<!-- 年货节 -->
-		<typeAlias type="com.iamberry.wechat.core.entity.activity.Festival" alias="Festival"/>
-		<typeAlias type="com.iamberry.wechat.core.entity.activity.FestivalHelp" alias="FestivalHelp"/>
-
-		<package name="com.iamberry.wechat.core.entity.rent"/>
-	</typeAliases>
-	<!-- PageHelper -->
-	<plugins>
-		<plugin interceptor="com.github.pagehelper.PageInterceptor">
-			<property name="reasonable" value="true"/>
-			<property name="pageSizeZero" value="true"/>
-		</plugin>
-	</plugins>
-	<mappers>
-		<mapper resource="com/iamberry/wechat/service/mapper/adminBannerMapper.xml"/>
-		<mapper resource="com/iamberry/wechat/service/mapper/adminChildPermissionsMapper.xml"/>
-		<mapper resource="com/iamberry/wechat/service/mapper/adminCouponItemMapper.xml"/>
-		<mapper resource="com/iamberry/wechat/service/mapper/adminInfoMapper.xml"/>
-		<mapper resource="com/iamberry/wechat/service/mapper/adminLogMapper.xml"/>
-		<mapper resource="com/iamberry/wechat/service/mapper/adminOrderMapper.xml"/>
-		<mapper resource="com/iamberry/wechat/service/mapper/adminStatisticsMapper.xml"/>
-		<mapper resource="com/iamberry/wechat/service/mapper/agentMemberMapper.xml"/>
-		<mapper resource="com/iamberry/wechat/service/mapper/agentOrderMapper.xml"/>
-		<mapper resource="com/iamberry/wechat/service/mapper/bindingMacMapper.xml"/>
-		<mapper resource="com/iamberry/wechat/service/mapper/cartMapper.xml"/>
-		<mapper resource="com/iamberry/wechat/service/mapper/cashLogMapper.xml"/>
-		<mapper resource="com/iamberry/wechat/service/mapper/configMapper.xml"/>
-		<mapper resource="com/iamberry/wechat/service/mapper/couponItemMapper.xml"/>
-		<mapper resource="com/iamberry/wechat/service/mapper/couponTypeMapper.xml"/>
-		<mapper resource="com/iamberry/wechat/service/mapper/dealerRelationMapper.xml"/>
-		<mapper resource="com/iamberry/wechat/service/mapper/drpRoleInfoMapper.xml"/>
-		<mapper resource="com/iamberry/wechat/service/mapper/firstAccessMapper.xml"/>
-		<mapper resource="com/iamberry/wechat/service/mapper/firstJoinKeyMapper.xml"/>
-		<mapper resource="com/iamberry/wechat/service/mapper/gameMapper.xml"/>
-		<mapper resource="com/iamberry/wechat/service/mapper/homeMemberMapper.xml"/>
-		<mapper resource="com/iamberry/wechat/service/mapper/imageTextInfoMapper.xml"/>
-		<mapper resource="com/iamberry/wechat/service/mapper/imageTextMoreMapper.xml"/>
-		<mapper resource="com/iamberry/wechat/service/mapper/keyWordMapper.xml"/>
-		<mapper resource="com/iamberry/wechat/service/mapper/memberMapper.xml"/>
-		<mapper resource="com/iamberry/wechat/service/mapper/menuInfoMapper.xml"/>
-		<mapper resource="com/iamberry/wechat/service/mapper/menuKeySetMapper.xml"/>
-		<mapper resource="com/iamberry/wechat/service/mapper/mqMapper.xml"/>
-		<mapper resource="com/iamberry/wechat/service/mapper/newsMapper.xml"/>
-		<mapper resource="com/iamberry/wechat/service/mapper/orderMapper.xml"/>
-		<mapper resource="com/iamberry/wechat/service/mapper/placeInfoMapper.xml"/>
-		<mapper resource="com/iamberry/wechat/service/mapper/placeLogsMapper.xml"/>
-		<mapper resource="com/iamberry/wechat/service/mapper/placeWithDrawalsLogsMapper.xml"/>
-		<mapper resource="com/iamberry/wechat/service/mapper/productImageTextMapper.xml"/>
-		<mapper resource="com/iamberry/wechat/service/mapper/productInfoMapper.xml"/>
-		<mapper resource="com/iamberry/wechat/service/mapper/productMapper.xml"/>
-		<mapper resource="com/iamberry/wechat/service/mapper/productPictureMapper.xml"/>
-		<mapper resource="com/iamberry/wechat/service/mapper/productColorMapper.xml"/>
-		<mapper resource="com/iamberry/wechat/service/mapper/qrcodeMapper.xml"/>
-		<mapper resource="com/iamberry/wechat/service/mapper/rebackInfoMapper.xml"/>
-		<mapper resource="com/iamberry/wechat/service/mapper/rewardsMapper.xml"/>
-		<mapper resource="com/iamberry/wechat/service/mapper/salesLogMapper.xml"/>
-		<mapper resource="com/iamberry/wechat/service/mapper/systemMapper.xml"/>
-		<mapper resource="com/iamberry/wechat/service/mapper/taskMapper.xml"/>
-		<mapper resource="com/iamberry/wechat/service/mapper/templateFlowInfoMapper.xml"/>
-		<mapper resource="com/iamberry/wechat/service/mapper/templateInfoMapper.xml"/>
-		<mapper resource="com/iamberry/wechat/service/mapper/temporaryQrcodeMapper.xml"/>
-		<mapper resource="com/iamberry/wechat/service/mapper/tokenMapper.xml"/>
-		<mapper resource="com/iamberry/wechat/service/mapper/wdRelationMapper.xml"/>
-		<mapper resource="com/iamberry/wechat/service/mapper/wechatShareMapper.xml"/>
-		<mapper resource="com/iamberry/wechat/service/mapper/withdrawMapper.xml"/>
-
-		<mapper resource="com/iamberry/wechat/service/mapper/chargerReceiveMapper.xml"/>
-
-		<!--统计-->
-		<mapper resource="com/iamberry/wechat/service/mapper/reportMapper.xml"/>
-
-		<!-- 试用订单流程mapper -->
-		<mapper resource="com/iamberry/wechat/service/mapper/probationShopOrderMapper.xml"/>
-		<mapper resource="com/iamberry/wechat/service/mapper/adminProbationOrderMapper.xml"/>
-		<mapper resource="com/iamberry/wechat/service/mapper/probationMapper.xml"/>
-		
-		<!-- 前端统计mapper -->
-		<mapper resource="com/iamberry/wechat/service/mapper/statisticsRelationMapper.xml"/>
-		
-		<!-- 租赁订单流程mapper -->
-		<mapper resource="com/iamberry/wechat/service/mapper/leaseOrderMapper.xml"/>
-		<mapper resource="com/iamberry/wechat/service/mapper/leaseMachineMapper.xml"/>
-		
-		<!-- 礼品卡 -->
-		<mapper resource="com/iamberry/wechat/service/mapper/userMachineInfoMapper.xml"/>
-		<mapper resource="com/iamberry/wechat/service/mapper/giftCardMapper.xml"/>
-		<mapper resource="com/iamberry/wechat/service/mapper/agentMachineMapper.xml"/>
-		<mapper resource="com/iamberry/wechat/service/mapper/agentMapper.xml"/>
-		<mapper resource="com/iamberry/wechat/service/mapper/giftCardPayCodeMapper.xml"/>
-		<!-- 代理商信息 -->
-		<mapper resource="com/iamberry/wechat/service/mapper/agentInfoMapper.xml"/>
-		<mapper resource="com/iamberry/wechat/service/mapper/agentPurchaseOrderMapper.xml"/>
-		<!-- 水机租赁 -->
-		<!--<mapper resource="com/iamberry/rent/service/order/mapper/rentOrderMapper.xml"/>
-		<mapper resource="com/iamberry/rent/service/machine/mapper/machineMapper.xml"/>	
-		<mapper resource="com/iamberry/rent/service/order/mapper/serviceCouponMapper.xml"/>	
-		<mapper resource="com/iamberry/rent/service/rebate/mapper/orderRebateMapper.xml"/>	
-		<mapper resource="com/iamberry/rent/service/order/mapper/rentExchangeMapper.xml"/>-->
-		<!-- 机器编号，获取二维码-->
-		<mapper resource="com/iamberry/wechat/service/mapper/machineNumberMapper.xml"/>
-		<!-- 机器 -->
-		<mapper resource="com/iamberry/wechat/service/mapper/apparatusMapper.xml"/>
-		<!--积分-->
-		<mapper resource="com/iamberry/wechat/service/mapper/useIntegralMapper.xml"/>
-
-		<!--积分商城-->
-		<mapper resource="com/iamberry/wechat/service/mapper/IntegralItemMapper.xml"/>
-		<mapper resource="com/iamberry/wechat/service/mapper/integralOrderAddressMapper.xml"/>
-		<mapper resource="com/iamberry/wechat/service/mapper/integralOrderMapper.xml"/>
-		<mapper resource="com/iamberry/wechat/service/mapper/integralProductConvertMapper.xml"/>
-		<mapper resource="com/iamberry/wechat/service/mapper/integralProductGradeMapper.xml"/>
-		<mapper resource="com/iamberry/wechat/service/mapper/integralProductMapper.xml"/>
-		<mapper resource="com/iamberry/wechat/service/mapper/integralProductPictureMapper.xml"/>
-
-		<!--牙刷定制-->
-		<mapper resource="com/iamberry/wechat/service/mapper/customizedColorMapper.xml"/>
-		<mapper resource="com/iamberry/wechat/service/mapper/customizedPatternMapper.xml"/>
-		<mapper resource="com/iamberry/wechat/service/mapper/customizedPositionMapper.xml"/>
-		<mapper resource="com/iamberry/wechat/service/mapper/orderCustomizedMapper.xml"/>
-		<mapper resource="com/iamberry/wechat/service/mapper/customizedToothMapper.xml"/>
-		<mapper resource="com/iamberry/wechat/service/mapper/customizedExternalUrlMapper.xml"/>
-
-		<!--618活动，好友助力-->
-		<mapper resource="com/iamberry/wechat/service/mapper/activityHelpMapper.xml"/>
-		<mapper resource="com/iamberry/wechat/service/mapper/activityMapper.xml"/>
-
-		<!-- 上朵促销统计产品浏览人数 -->
-		<mapper resource="com/iamberry/wechat/service/mapper/accessFlowMapper.xml"/>
-
-		<!--上朵分销-->
-		<mapper resource="com/iamberry/wechat/service/mapper/mainChannelMapper.xml"/>
-		<mapper resource="com/iamberry/wechat/service/mapper/childChannelMapper.xml"/>
-		<mapper resource="com/iamberry/wechat/service/mapper/channelRebateMapper.xml"/>
-		<mapper resource="com/iamberry/wechat/service/mapper/channelPriceMapper.xml"/>
-		<mapper resource="com/iamberry/wechat/service/mapper/balanceLogMapper.xml"/>
-		<mapper resource="com/iamberry/wechat/service/mapper/channelAdminMapper.xml"/>
-		<mapper resource="com/iamberry/wechat/service/mapper/attenStatisticsMapper.xml"/>
-
-		<!--活动-->
-		<mapper resource="com/iamberry/wechat/service/mapper/salesActivitiesMapper.xml"/>
-
-		<!--优惠券对应产品表-->
-		<mapper resource="com/iamberry/wechat/service/mapper/couponColorMapper.xml"/>
-
-		<!-- 赠品 -->
-		<mapper resource="com/iamberry/wechat/service/mapper/settlementGiftMapper.xml"/>
-
-		<!-- 年货节 -->
-		<mapper resource="com/iamberry/wechat/service/mapper/festivalHelpMapper.xml"/>
-		<mapper resource="com/iamberry/wechat/service/mapper/festivalMapper.xml"/>
-	</mappers>
-</configuration>

wechat-wechat-web/src/main/resources/iamberry-wechat-service-orderTesk.xml

@@ -1,92 +0,0 @@
-<?xml version="1.0" encoding="UTF-8"?>
-<!DOCTYPE beans PUBLIC "-//SPRING//DTD BEAN//EN" "http://www.springframework.org/dtd/spring-beans.dtd">
-<beans>
-	<!-- 执行任务的处理类 -->
-	<!-- 30天后返利的定时任务start -->
-	<bean id="statJob3"
-		class="com.iamberry.wechat.handles.order.orderListener.OrderListener" >
-	</bean>
-	<bean id="statJobTask3"
-		class="org.springframework.scheduling.quartz.MethodInvokingJobDetailFactoryBean">
-		<property name="targetObject" ref="statJob3" />
-		<property name="targetMethod" value="executeTimerTask" />
-		 <property name="concurrent" value="false" />
-	</bean>
-	
-	<bean id="doTime3"
-		class="org.springframework.scheduling.quartz.CronTriggerFactoryBean">
-		<property name="jobDetail" ref="statJobTask3" />
-		<!-- cron表达式  秒 分 时 日 月  星期 年-->
-		<property name="cronExpression" value="0 0/1 * * * ?" />
-	</bean>
-	<!-- 30天后返利的定时任务end -->
-	
-	<!-- 45分钟后订单关闭start -->
-	<!--<bean id="closeOrder"
-		class="com.iamberry.wechat.handles.order.orderListener.OrderCloseListener" ></bean>-->
-		
-	<!--<bean id="closeOrderTask"
-		class="org.springframework.scheduling.quartz.MethodInvokingJobDetailFactoryBean">
-		<property name="targetObject" ref="closeOrder" />
-		<property name="targetMethod" value="closeOrderByCreateTime" />
-		 <property name="concurrent" value="false" />
-	</bean>-->
-	<!--<bean id="closeOrderTime"
-		class="org.springframework.scheduling.quartz.CronTriggerFactoryBean">
-		<property name="jobDetail" ref="closeOrderTask" />-->
-		<!-- cron表达式  秒 分 时 日 月  星期 年-->
-		<!--<property name="cronExpression" value="0 0/3 * * * ?" />
-	</bean>-->
-	<!-- 45分钟后订单关闭end -->
-	
-	<!-- 30分钟后租赁订单关闭start -->
-	<!--<bean id="closeRentOrder"
-		class="com.iamberry.rent.handlers.listener.RentOrderListener" ></bean>
-		
-	<bean id="closeRentOrderTask"
-		class="org.springframework.scheduling.quartz.MethodInvokingJobDetailFactoryBean">
-		<property name="targetObject" ref="closeRentOrder" />
-		<property name="targetMethod" value="closeRentOrder" />
-		 <property name="concurrent" value="false" />
-	</bean>
-	
-	<bean id="closeRentOrderTime"
-		class="org.springframework.scheduling.quartz.CronTriggerFactoryBean">
-		<property name="jobDetail" ref="closeRentOrderTask" />
-		&lt;!&ndash; cron表达式  秒 分 时 日 月  星期 年&ndash;&gt;
-		<property name="cronExpression" value="0 0/2 * * * ?" />
-	</bean>-->
-	<!-- 30分钟后租赁订单关闭end -->
-	
-	<!-- 轮询订单同步百胜信息start -->
-	<bean id="efastOrder"
-		class="com.iamberry.wechat.handles.order.orderListener.OrderEfastListener" ></bean>
-		
-	<bean id="efastOrderTask"
-		class="org.springframework.scheduling.quartz.MethodInvokingJobDetailFactoryBean">
-		<property name="targetObject" ref="efastOrder" />
-		<property name="targetMethod" value="getEfastOrderInfo" />
-		 <property name="concurrent" value="false" />
-	</bean>
-	
-	<bean id="efastOrderTime"
-		class="org.springframework.scheduling.quartz.CronTriggerFactoryBean">
-		<property name="jobDetail" ref="efastOrderTask" />
-		<!-- cron表达式  秒 分 时 日 月  星期 年-->
-		<property name="cronExpression" value="0 0 4 * * ? " />
-	</bean>
-	<!-- 轮询订单同步百胜信息end -->
-	
-	<!-- 添加触发器 -->
-	<bean id="startQuertz3" lazy-init="false" autowire="no" 
-		class="org.springframework.scheduling.quartz.SchedulerFactoryBean">
-		<property name="triggers">
-			<list>
-				<ref local="doTime3" />
-				<!--<ref local="closeOrderTime"/>-->
-				<!--<ref local="closeRentOrderTime"/>-->
-				<ref local="efastOrderTime" />
-			</list>
-		</property>
-	</bean>
-</beans>

wechat-wechat-web/src/main/resources/iamberry-wechat-web-ioc.xml

@@ -56,7 +56,7 @@
     <!-- 将30天后奖励积分的定时任务的xml引入-->
 	<!--<import resource="classpath:iamberry-wechat-service-orderTesk.xml"></import>-->
 	
-	<import resource="classpath:iamberry-wechat-service-datasource.xml"/>
+	<import resource="classpath:datasource.xml"/>
 	
 	<!-- spring监控 -->
     <bean id="druid-stat-interceptor" class="com.alibaba.druid.support.spring.stat.DruidStatInterceptor">

wechat-wechat-web/src/main/resources/mybatis.xml

@@ -0,0 +1,224 @@
+<?xml version="1.0" encoding="UTF-8"?>
+<!DOCTYPE configuration PUBLIC "-//mybatis.org//DTD Config 3.0//EN" "http://mybatis.org/dtd/mybatis-3-config.dtd">
+<configuration>
+	<!-- 设置  -->
+	<settings>
+        <!--关闭懒加载-->  
+        <setting name="lazyLoadingEnabled" value="false" />  
+		<!-- 日志使用log4j -->
+        <setting name="logImpl" value="LOG4J"/>  
+		<!-- 开启驼峰命名转换 map_entity to mapEntity -->
+		<setting name="mapUnderscoreToCamelCase" value="true" />  
+		<!-- 使用jdbc的getGeneratedKeys获取数据库自增主键 -->
+		<setting name="useGeneratedKeys" value="true" />  
+		<!-- 开启别列名转换 : select name as title form table -->
+		<setting name="useColumnLabel" value="true" />  
+    </settings>
+    <!-- 别名设置 -->
+	<typeAliases>
+
+		<typeAlias type="com.iamberry.wechat.core.entity.JsonBack" alias="JsonBack"/>
+		<typeAlias type="com.iamberry.wechat.core.entity.member.ApplyDto" alias="ApplyDto"/>
+		<typeAlias type="com.iamberry.wechat.core.entity.member.Member" alias="Member"/>
+		<typeAlias type="com.iamberry.wechat.core.entity.member.ShareInfo" alias="ShareInfo"/>
+		<typeAlias type="com.iamberry.wechat.core.entity.member.Withdraw" alias="Withdraw"/>
+		<typeAlias type="com.iamberry.wechat.core.entity.mq.MQMessage" alias="MQMessage"/>
+		<typeAlias type="com.iamberry.wechat.core.entity.pay.PayResult" alias="PayResult"/>
+		<typeAlias type="com.iamberry.wechat.core.entity.product.ProductImageText" alias="ProductImageText"/>
+		<typeAlias type="com.iamberry.wechat.core.entity.product.ProductPicture" alias="ProductPicture"/>
+		<typeAlias type="com.iamberry.wechat.core.entity.product.ProductColor" alias="ProductColor"/>
+		<typeAlias type="com.iamberry.wechat.core.entity.qrcode.Qrcode" alias="Qrcode"/>
+		<typeAlias type="com.iamberry.wechat.core.entity.qrcode.QrcodeResult" alias="QrcodeResult"/>
+		<typeAlias type="com.iamberry.wechat.core.entity.qrcode.TemporaryQrcode" alias="TemporaryQrcode"/>
+		<typeAlias type="com.iamberry.wechat.core.entity.reback.RebackInfo" alias="RebackInfo"/>
+		<typeAlias type="com.iamberry.wechat.core.entity.reback.RolesListDto" alias="RolesListDto"/>
+		<typeAlias type="com.iamberry.wechat.core.entity.reback.StoreStatiscInfo" alias="StoreStatiscInfo"/>
+		<typeAlias type="com.iamberry.wechat.core.entity.relationship.DealerRelation" alias="DealerRelation"/>
+		<typeAlias type="com.iamberry.wechat.core.entity.relationship.WdRelation" alias="WdRelation"/>
+		<typeAlias type="com.iamberry.wechat.core.entity.wx.AccessToken" alias="AccessToken"/>
+		<typeAlias type="com.iamberry.wechat.core.entity.wx.Article" alias="Article"/>
+		<typeAlias type="com.iamberry.wechat.core.entity.wx.BaseMessage" alias="BaseMessage"/>
+		<typeAlias type="com.iamberry.wechat.core.entity.wx.Button" alias="Button"/>
+		<typeAlias type="com.iamberry.wechat.core.entity.wx.CommonButton" alias="CommonButton"/>
+		<typeAlias type="com.iamberry.wechat.core.entity.wx.ComplexButton" alias="ComplexButton"/>
+		<typeAlias type="com.iamberry.wechat.core.entity.wx.Config" alias="Config"/>
+		<typeAlias type="com.iamberry.wechat.core.entity.wx.ConfigJSSDK" alias="ConfigJSSDK"/>
+		<typeAlias type="com.iamberry.wechat.core.entity.wx.FirstAccess" alias="FirstAccess"/>
+		<typeAlias type="com.iamberry.wechat.core.entity.wx.FirstJoinKey" alias="FirstJoinKey"/>
+		<typeAlias type="com.iamberry.wechat.core.entity.wx.ImageTextInfo" alias="ImageTextInfo"/>
+		<typeAlias type="com.iamberry.wechat.core.entity.wx.ImagetextMaterial" alias="ImagetextMaterial"/>
+		<typeAlias type="com.iamberry.wechat.core.entity.wx.ImageTextMore" alias="ImageTextMore"/>
+		<typeAlias type="com.iamberry.wechat.core.entity.wx.Income" alias="Income"/>
+		<typeAlias type="com.iamberry.wechat.core.entity.wx.ITTempLate" alias="ITTempLate"/>
+		<typeAlias type="com.iamberry.wechat.core.entity.wx.KeyWord" alias="KeyWord"/>
+		<typeAlias type="com.iamberry.wechat.core.entity.wx.Menu" alias="Menu"/>
+		<typeAlias type="com.iamberry.wechat.core.entity.wx.MenuData" alias="MenuData"/>
+		<typeAlias type="com.iamberry.wechat.core.entity.wx.MenuInfo" alias="MenuInfo"/>
+		<typeAlias type="com.iamberry.wechat.core.entity.wx.MenuKeySet" alias="MenuKeySet"/>
+		<typeAlias type="com.iamberry.wechat.core.entity.wx.Music" alias="Music"/>
+		<typeAlias type="com.iamberry.wechat.core.entity.wx.MusicMessage" alias="MusicMessage"/>
+		<typeAlias type="com.iamberry.wechat.core.entity.wx.NewsMessage" alias="NewsMessage"/>
+		<typeAlias type="com.iamberry.wechat.core.entity.wx.PagingDTO" alias="PagingDTO"/>
+		<typeAlias type="com.iamberry.wechat.core.entity.wx.QRCJson" alias="QRCJson"/>
+		<typeAlias type="com.iamberry.wechat.core.entity.wx.Rewards" alias="Rewards"/>
+		<typeAlias type="com.iamberry.wechat.core.entity.wx.Shipment" alias="Shipment"/>
+		<typeAlias type="com.iamberry.wechat.core.entity.wx.Status" alias="Status"/>
+		<typeAlias type="com.iamberry.wechat.core.entity.wx.TextMessage" alias="TextMessage"/>
+		<typeAlias type="com.iamberry.wechat.core.entity.wx.Ticket" alias="Ticket"/>
+		<typeAlias type="com.iamberry.wechat.core.entity.wx.Token" alias="Token"/>
+		<typeAlias type="com.iamberry.wechat.core.entity.wx.TransferCustomer" alias="TransferCustomer"/>
+		<typeAlias type="com.iamberry.wechat.core.entity.wx.TransInfo" alias="TransInfo"/>
+		<typeAlias type="com.iamberry.wechat.core.entity.wx.WxPayDto" alias="WxPayDto"/>
+		<typeAlias type="com.iamberry.wechat.core.entity.wx.WxPayResult" alias="WxPayResult"/>
+		<typeAlias type="com.iamberry.wechat.core.entity.wx.WxPrepayIdErrorResult" alias="WxPrepayIdErrorResult"/>
+		<typeAlias type="com.iamberry.wechat.core.entity.wx.ZTreeBean" alias="ZTreeBean"/>
+		<typeAlias type="com.iamberry.wechat.core.entity.drp.ApplyPlaceLogs" alias="ApplyPlaceLogs"/>
+		<typeAlias type="com.iamberry.wechat.core.entity.wx.WechatShare" alias="WechatShare"/>
+		<typeAlias type="com.iamberry.wechat.core.entity.order.NumberBacklogDto" alias="NumberBacklogDto"/>
+
+		<typeAlias type="com.iamberry.wechat.core.entity.report.Report" alias="Report"/>
+
+		<typeAlias type="com.iamberry.wechat.core.entity.receive.ChargerReceive" alias="ChargerReceive"/>
+
+		<package name="com.iamberry.wechat.core.entity.rent"/>
+	</typeAliases>
+	<!-- PageHelper -->
+	<plugins>
+		<plugin interceptor="com.github.pagehelper.PageInterceptor">
+			<property name="reasonable" value="true"/>
+			<property name="pageSizeZero" value="true"/>
+		</plugin>
+	</plugins>
+	<mappers>
+		<mapper resource="com/iamberry/wechat/service/mapper/adminBannerMapper.xml"/>
+		<mapper resource="com/iamberry/wechat/service/mapper/adminChildPermissionsMapper.xml"/>
+		<mapper resource="com/iamberry/wechat/service/mapper/adminCouponItemMapper.xml"/>
+		<mapper resource="com/iamberry/wechat/service/mapper/adminInfoMapper.xml"/>
+		<mapper resource="com/iamberry/wechat/service/mapper/adminLogMapper.xml"/>
+		<mapper resource="com/iamberry/wechat/service/mapper/adminOrderMapper.xml"/>
+		<mapper resource="com/iamberry/wechat/service/mapper/adminStatisticsMapper.xml"/>
+		<mapper resource="com/iamberry/wechat/service/mapper/agentMemberMapper.xml"/>
+		<mapper resource="com/iamberry/wechat/service/mapper/agentOrderMapper.xml"/>
+		<mapper resource="com/iamberry/wechat/service/mapper/bindingMacMapper.xml"/>
+		<mapper resource="com/iamberry/wechat/service/mapper/cartMapper.xml"/>
+		<mapper resource="com/iamberry/wechat/service/mapper/cashLogMapper.xml"/>
+		<mapper resource="com/iamberry/wechat/service/mapper/configMapper.xml"/>
+		<mapper resource="com/iamberry/wechat/service/mapper/couponItemMapper.xml"/>
+		<mapper resource="com/iamberry/wechat/service/mapper/couponTypeMapper.xml"/>
+		<mapper resource="com/iamberry/wechat/service/mapper/dealerRelationMapper.xml"/>
+		<mapper resource="com/iamberry/wechat/service/mapper/drpRoleInfoMapper.xml"/>
+		<mapper resource="com/iamberry/wechat/service/mapper/firstAccessMapper.xml"/>
+		<mapper resource="com/iamberry/wechat/service/mapper/firstJoinKeyMapper.xml"/>
+		<mapper resource="com/iamberry/wechat/service/mapper/gameMapper.xml"/>
+		<mapper resource="com/iamberry/wechat/service/mapper/homeMemberMapper.xml"/>
+		<mapper resource="com/iamberry/wechat/service/mapper/imageTextInfoMapper.xml"/>
+		<mapper resource="com/iamberry/wechat/service/mapper/imageTextMoreMapper.xml"/>
+		<mapper resource="com/iamberry/wechat/service/mapper/keyWordMapper.xml"/>
+		<mapper resource="com/iamberry/wechat/service/mapper/memberMapper.xml"/>
+		<mapper resource="com/iamberry/wechat/service/mapper/menuInfoMapper.xml"/>
+		<mapper resource="com/iamberry/wechat/service/mapper/menuKeySetMapper.xml"/>
+		<mapper resource="com/iamberry/wechat/service/mapper/mqMapper.xml"/>
+		<mapper resource="com/iamberry/wechat/service/mapper/newsMapper.xml"/>
+		<mapper resource="com/iamberry/wechat/service/mapper/orderMapper.xml"/>
+		<mapper resource="com/iamberry/wechat/service/mapper/placeInfoMapper.xml"/>
+		<mapper resource="com/iamberry/wechat/service/mapper/placeLogsMapper.xml"/>
+		<mapper resource="com/iamberry/wechat/service/mapper/placeWithDrawalsLogsMapper.xml"/>
+		<mapper resource="com/iamberry/wechat/service/mapper/productImageTextMapper.xml"/>
+		<mapper resource="com/iamberry/wechat/service/mapper/productInfoMapper.xml"/>
+		<mapper resource="com/iamberry/wechat/service/mapper/productMapper.xml"/>
+		<mapper resource="com/iamberry/wechat/service/mapper/productPictureMapper.xml"/>
+		<mapper resource="com/iamberry/wechat/service/mapper/productColorMapper.xml"/>
+		<mapper resource="com/iamberry/wechat/service/mapper/qrcodeMapper.xml"/>
+		<mapper resource="com/iamberry/wechat/service/mapper/rebackInfoMapper.xml"/>
+		<mapper resource="com/iamberry/wechat/service/mapper/rewardsMapper.xml"/>
+		<mapper resource="com/iamberry/wechat/service/mapper/salesLogMapper.xml"/>
+		<mapper resource="com/iamberry/wechat/service/mapper/systemMapper.xml"/>
+		<mapper resource="com/iamberry/wechat/service/mapper/taskMapper.xml"/>
+		<mapper resource="com/iamberry/wechat/service/mapper/templateFlowInfoMapper.xml"/>
+		<mapper resource="com/iamberry/wechat/service/mapper/templateInfoMapper.xml"/>
+		<mapper resource="com/iamberry/wechat/service/mapper/temporaryQrcodeMapper.xml"/>
+		<mapper resource="com/iamberry/wechat/service/mapper/tokenMapper.xml"/>
+		<mapper resource="com/iamberry/wechat/service/mapper/wdRelationMapper.xml"/>
+		<mapper resource="com/iamberry/wechat/service/mapper/wechatShareMapper.xml"/>
+		<mapper resource="com/iamberry/wechat/service/mapper/withdrawMapper.xml"/>
+
+		<mapper resource="com/iamberry/wechat/service/mapper/chargerReceiveMapper.xml"/>
+
+		<!--统计-->
+		<mapper resource="com/iamberry/wechat/service/mapper/reportMapper.xml"/>
+
+		<!-- 试用订单流程mapper -->
+		<mapper resource="com/iamberry/wechat/service/mapper/probationShopOrderMapper.xml"/>
+		<mapper resource="com/iamberry/wechat/service/mapper/adminProbationOrderMapper.xml"/>
+		<mapper resource="com/iamberry/wechat/service/mapper/probationMapper.xml"/>
+		
+		<!-- 前端统计mapper -->
+		<mapper resource="com/iamberry/wechat/service/mapper/statisticsRelationMapper.xml"/>
+		
+		<!-- 租赁订单流程mapper -->
+		<mapper resource="com/iamberry/wechat/service/mapper/leaseOrderMapper.xml"/>
+		<mapper resource="com/iamberry/wechat/service/mapper/leaseMachineMapper.xml"/>
+		
+		<!-- 礼品卡 -->
+		<mapper resource="com/iamberry/wechat/service/mapper/userMachineInfoMapper.xml"/>
+		<mapper resource="com/iamberry/wechat/service/mapper/giftCardMapper.xml"/>
+		<mapper resource="com/iamberry/wechat/service/mapper/agentMachineMapper.xml"/>
+		<mapper resource="com/iamberry/wechat/service/mapper/agentMapper.xml"/>
+		<mapper resource="com/iamberry/wechat/service/mapper/giftCardPayCodeMapper.xml"/>
+		<!-- 代理商信息 -->
+		<mapper resource="com/iamberry/wechat/service/mapper/agentInfoMapper.xml"/>
+		<mapper resource="com/iamberry/wechat/service/mapper/agentPurchaseOrderMapper.xml"/>
+		<!-- 机器编号，获取二维码-->
+		<mapper resource="com/iamberry/wechat/service/mapper/machineNumberMapper.xml"/>
+		<!-- 机器 -->
+		<mapper resource="com/iamberry/wechat/service/mapper/apparatusMapper.xml"/>
+		<!--积分-->
+		<mapper resource="com/iamberry/wechat/service/mapper/useIntegralMapper.xml"/>
+
+		<!--积分商城-->
+		<mapper resource="com/iamberry/wechat/service/mapper/IntegralItemMapper.xml"/>
+		<mapper resource="com/iamberry/wechat/service/mapper/integralOrderAddressMapper.xml"/>
+		<mapper resource="com/iamberry/wechat/service/mapper/integralOrderMapper.xml"/>
+		<mapper resource="com/iamberry/wechat/service/mapper/integralProductConvertMapper.xml"/>
+		<mapper resource="com/iamberry/wechat/service/mapper/integralProductGradeMapper.xml"/>
+		<mapper resource="com/iamberry/wechat/service/mapper/integralProductMapper.xml"/>
+		<mapper resource="com/iamberry/wechat/service/mapper/integralProductPictureMapper.xml"/>
+
+		<!--牙刷定制-->
+		<mapper resource="com/iamberry/wechat/service/mapper/customizedColorMapper.xml"/>
+		<mapper resource="com/iamberry/wechat/service/mapper/customizedPatternMapper.xml"/>
+		<mapper resource="com/iamberry/wechat/service/mapper/customizedPositionMapper.xml"/>
+		<mapper resource="com/iamberry/wechat/service/mapper/orderCustomizedMapper.xml"/>
+		<mapper resource="com/iamberry/wechat/service/mapper/customizedToothMapper.xml"/>
+		<mapper resource="com/iamberry/wechat/service/mapper/customizedExternalUrlMapper.xml"/>
+
+		<!--618活动，好友助力-->
+		<mapper resource="com/iamberry/wechat/service/mapper/activityHelpMapper.xml"/>
+		<mapper resource="com/iamberry/wechat/service/mapper/activityMapper.xml"/>
+
+		<!-- 上朵促销统计产品浏览人数 -->
+		<mapper resource="com/iamberry/wechat/service/mapper/accessFlowMapper.xml"/>
+
+		<!--上朵分销-->
+		<mapper resource="com/iamberry/wechat/service/mapper/mainChannelMapper.xml"/>
+		<mapper resource="com/iamberry/wechat/service/mapper/childChannelMapper.xml"/>
+		<mapper resource="com/iamberry/wechat/service/mapper/channelRebateMapper.xml"/>
+		<mapper resource="com/iamberry/wechat/service/mapper/channelPriceMapper.xml"/>
+		<mapper resource="com/iamberry/wechat/service/mapper/balanceLogMapper.xml"/>
+		<mapper resource="com/iamberry/wechat/service/mapper/channelAdminMapper.xml"/>
+		<mapper resource="com/iamberry/wechat/service/mapper/attenStatisticsMapper.xml"/>
+
+		<!--活动-->
+		<mapper resource="com/iamberry/wechat/service/mapper/salesActivitiesMapper.xml"/>
+
+		<!--优惠券对应产品表-->
+		<mapper resource="com/iamberry/wechat/service/mapper/couponColorMapper.xml"/>
+
+		<!-- 赠品 -->
+		<mapper resource="com/iamberry/wechat/service/mapper/settlementGiftMapper.xml"/>
+
+		<!-- 年货节 -->
+		<mapper resource="com/iamberry/wechat/service/mapper/festivalHelpMapper.xml"/>
+		<mapper resource="com/iamberry/wechat/service/mapper/festivalMapper.xml"/>
+	</mappers>
+</configuration>

wechat-wechat-web/src/main/webapp/WEB-INF/web.xml

@@ -20,7 +20,7 @@
 
 	<context-param>
 		<param-name>contextConfigLocation</param-name>
-		<param-value>classpath:iamberry-wechat-web-ioc.xml</param-value>
+		<param-value>classpath:ioc.xml</param-value>
 	</context-param>
 
 	<listener>
@@ -38,7 +38,7 @@
 		<servlet-class>org.springframework.web.servlet.DispatcherServlet</servlet-class>
 		<init-param>
 			<param-name>contextConfigLocation</param-name>
-			<param-value>classpath:iamberry-wechat-web-springmvc.xml</param-value>
+			<param-value>classpath:springmvc.xml</param-value>
 		</init-param>
 		<load-on-startup>1</load-on-startup>
 	</servlet>