Merge branch 'master' of http://git.iamberry.com/liuzhiwei/iamberry-common-tooth

# Conflicts:
#	tooth-common-core/src/main/java/com/iamberry/wechat/core/entity/coupon/CouponItemDto.java
#	tooth-common-core/src/main/java/com/iamberry/wechat/core/entity/integral/StayIntegral.java

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

@@ -39,6 +39,10 @@ public class CouponItemDto implements java.io.Serializable{
 
 	private Integer couponIsNewPeople;			//是否为新人优惠券
 
+	private Integer couponIsUse;			//判断是否可用
+	private String couponNoUseReason;			//不可用说明
+
+
 	public Integer getCouponIsNewPeople() {
 		return couponIsNewPeople;
 	}
@@ -145,7 +149,20 @@ public class CouponItemDto implements java.io.Serializable{
 	public void setCouponType(Integer couponType) {
 		this.couponType = couponType;
 	}
-	
-	
-	
+
+	public Integer getCouponIsUse() {
+		return couponIsUse;
+	}
+
+	public void setCouponIsUse(Integer couponIsUse) {
+		this.couponIsUse = couponIsUse;
+	}
+
+	public String getCouponNoUseReason() {
+		return couponNoUseReason;
+	}
+
+	public void setCouponNoUseReason(String couponNoUseReason) {
+		this.couponNoUseReason = couponNoUseReason;
+	}
 }

tooth-common-core/src/main/java/com/iamberry/wechat/core/entity/integral/StayIntegral.java

@@ -1,7 +1,7 @@
 package com.iamberry.wechat.core.entity.integral;
 
-import javax.xml.crypto.Data;
 import java.io.Serializable;
+import java.util.Date;
 
 public class StayIntegral implements Serializable{
     private static final long serialVersionUID = 8227292419418899771L;
@@ -11,11 +11,89 @@ public class StayIntegral implements Serializable{
     private Integer configId;           //来源
     private Integer orderId;//订单id
     private Integer stayNumber;         //积分数量
-    private Data stayRecordedTime;      //积分入账时间
+    private Date stayRecordedTime;      //积分入账时间
     private Integer stayStatus;         //状态
     private String stayRemark;          //取消的备注
-    private Data stayCreateTime;        //创建时间
-    private Data stayUpdateTime;        //更新时间
+    private Date stayCreateTime;        //创建时间
+    private Date stayUpdateTime;        //更新时间
 
+    public Integer getStayId() {
+        return stayId;
+    }
 
+    public void setStayId(Integer stayId) {
+        this.stayId = stayId;
+    }
+
+    public String getUserOpenId() {
+        return userOpenId;
+    }
+
+    public void setUserOpenId(String userOpenId) {
+        this.userOpenId = userOpenId;
+    }
+
+    public Integer getConfigId() {
+        return configId;
+    }
+
+    public void setConfigId(Integer configId) {
+        this.configId = configId;
+    }
+
+    public Integer getOrderId() {
+        return orderId;
+    }
+
+    public void setOrderId(Integer orderId) {
+        this.orderId = orderId;
+    }
+
+    public Integer getStayNumber() {
+        return stayNumber;
+    }
+
+    public void setStayNumber(Integer stayNumber) {
+        this.stayNumber = stayNumber;
+    }
+
+    public Date getStayRecordedTime() {
+        return stayRecordedTime;
+    }
+
+    public void setStayRecordedTime(Date stayRecordedTime) {
+        this.stayRecordedTime = stayRecordedTime;
+    }
+
+    public Integer getStayStatus() {
+        return stayStatus;
+    }
+
+    public void setStayStatus(Integer stayStatus) {
+        this.stayStatus = stayStatus;
+    }
+
+    public String getStayRemark() {
+        return stayRemark;
+    }
+
+    public void setStayRemark(String stayRemark) {
+        this.stayRemark = stayRemark;
+    }
+
+    public Date getStayCreateTime() {
+        return stayCreateTime;
+    }
+
+    public void setStayCreateTime(Date stayCreateTime) {
+        this.stayCreateTime = stayCreateTime;
+    }
+
+    public Date getStayUpdateTime() {
+        return stayUpdateTime;
+    }
+
+    public void setStayUpdateTime(Date stayUpdateTime) {
+        this.stayUpdateTime = stayUpdateTime;
+    }
 }

tooth-common-core/src/main/java/com/iamberry/wechat/core/entity/integral/UseIntegral.java

@@ -4,8 +4,8 @@ import com.fasterxml.jackson.annotation.JsonFormat;
 import com.iamberry.wechat.core.entity.PageBean;
 import org.springframework.format.annotation.DateTimeFormat;
 
-import javax.xml.crypto.Data;
 import java.io.Serializable;
+import java.util.Date;
 
 /**
  * 积分使用实体类
@@ -13,129 +13,106 @@ import java.io.Serializable;
 public class UseIntegral implements Serializable {
 
     private static final long serialVersionUID = 8060941187906868547L;
-    private Integer useIntegralId;          //ID
+    private Integer integralId;          //ID
     private String userOpenId;              //用户openid
-    private Integer useType;                //积分类型
-    private Integer useIntegralType;        //使用积分类型
-    private Integer useIntegralNumber;      //使用积分数量
-    private Integer useConfigId;            //积分来源类型
-    private String useIntegralRemarks;      //备注
-    private Integer integralBeforeNumber;   //变动前可用积分总额
-    private Integer integralEndNumber;      //变动后可用积分总额
+    private Integer integralType;                //积分类型
+    private Integer integralNumber;      //使用积分数量
+    private Integer configId;            //积分来源类型
+    private Integer integralBeforeNumber;//变动前可用积分总额
+    private Integer integralEndNumber;//变动后可用积分总额
+    private String integralRemark;      //备注
     @DateTimeFormat(pattern="yyyy-MM-dd")
     @JsonFormat(pattern="yyyy-MM-dd",timezone = "GMT+8")
-    private Data useIntegralCreateTime;     //创建时间
+    private Date integralCreateTime;     //创建时间
 
     private String integralConfigName;      //来源名称
     private PageBean page=new PageBean();   //分页
 
-    public Integer getIntegralBeforeNumber() {
-        return integralBeforeNumber;
-    }
-
-    public void setIntegralBeforeNumber(Integer integralBeforeNumber) {
-        this.integralBeforeNumber = integralBeforeNumber;
+    public Integer getIntegralId() {
+        return integralId;
     }
 
-    public Integer getIntegralEndNumber() {
-        return integralEndNumber;
-    }
-
-    public void setIntegralEndNumber(Integer integralEndNumber) {
-        this.integralEndNumber = integralEndNumber;
+    public void setIntegralId(Integer integralId) {
+        this.integralId = integralId;
     }
 
-    public PageBean getPage() {
-        return page;
-    }
-
-    public void setPage(PageBean page) {
-        this.page = page;
+    public String getUserOpenId() {
+        return userOpenId;
     }
 
-    public String getIntegralConfigName() {
-        return integralConfigName;
+    public void setUserOpenId(String userOpenId) {
+        this.userOpenId = userOpenId;
     }
 
-    public void setIntegralConfigName(String integralConfigName) {
-        this.integralConfigName = integralConfigName;
+    public Integer getIntegralType() {
+        return integralType;
     }
 
-    public Integer getUseIntegralId() {
-        return useIntegralId;
+    public void setIntegralType(Integer integralType) {
+        this.integralType = integralType;
     }
 
-    public void setUseIntegralId(Integer useIntegralId) {
-        this.useIntegralId = useIntegralId;
+    public Integer getIntegralNumber() {
+        return integralNumber;
     }
 
-    public String getUserOpenId() {
-        return userOpenId;
+    public void setIntegralNumber(Integer integralNumber) {
+        this.integralNumber = integralNumber;
     }
 
-    public void setUserOpenId(String userOpenId) {
-        this.userOpenId = userOpenId;
+    public Integer getConfigId() {
+        return configId;
     }
 
-    public Integer getUseType() {
-        return useType;
+    public void setConfigId(Integer configId) {
+        this.configId = configId;
     }
 
-    public void setUseType(Integer useType) {
-        this.useType = useType;
+    public Integer getIntegralBeforeNumber() {
+        return integralBeforeNumber;
     }
 
-    public Integer getUseIntegralType() {
-        return useIntegralType;
+    public void setIntegralBeforeNumber(Integer integralBeforeNumber) {
+        this.integralBeforeNumber = integralBeforeNumber;
     }
 
-    public void setUseIntegralType(Integer useIntegralType) {
-        this.useIntegralType = useIntegralType;
+    public Integer getIntegralEndNumber() {
+        return integralEndNumber;
     }
 
-    public Integer getUseIntegralNumber() {
-        return useIntegralNumber;
+    public void setIntegralEndNumber(Integer integralEndNumber) {
+        this.integralEndNumber = integralEndNumber;
     }
 
-    public void setUseIntegralNumber(Integer useIntegralNumber) {
-        this.useIntegralNumber = useIntegralNumber;
+    public String getIntegralRemark() {
+        return integralRemark;
     }
 
-    public Integer getUseConfigId() {
-        return useConfigId;
+    public void setIntegralRemark(String integralRemark) {
+        this.integralRemark = integralRemark;
     }
 
-    public void setUseConfigId(Integer useConfigId) {
-        this.useConfigId = useConfigId;
+    public Date getIntegralCreateTime() {
+        return integralCreateTime;
     }
 
-    public String getUseIntegralRemarks() {
-        return useIntegralRemarks;
+    public void setIntegralCreateTime(Date integralCreateTime) {
+        this.integralCreateTime = integralCreateTime;
     }
 
-    public void setUseIntegralRemarks(String useIntegralRemarks) {
-        this.useIntegralRemarks = useIntegralRemarks;
+    public String getIntegralConfigName() {
+        return integralConfigName;
     }
 
-    public Data getUseIntegralCreateTime() {
-        return useIntegralCreateTime;
+    public void setIntegralConfigName(String integralConfigName) {
+        this.integralConfigName = integralConfigName;
     }
 
-    public void setUseIntegralCreateTime(Data useIntegralCreateTime) {
-        this.useIntegralCreateTime = useIntegralCreateTime;
+    public PageBean getPage() {
+        return page;
     }
 
-    @Override
-    public String toString() {
-        return "UseIntegral{" +
-                "useIntegralId=" + useIntegralId +
-                ", userOpenId='" + userOpenId + '\'' +
-                ", useType=" + useType +
-                ", useIntegralType=" + useIntegralType +
-                ", useIntegralNumber=" + useIntegralNumber +
-                ", useConfigid=" + useConfigId +
-                ", useIntegralRemarks='" + useIntegralRemarks + '\'' +
-                ", useIntegralCreateTime=" + useIntegralCreateTime +
-                '}';
+    public void setPage(PageBean page) {
+        this.page = page;
     }
 }

tooth-wechat-service/src/main/java/com/iamberry/wechat/service/apparatus/ApparatusServiceImpl.java

@@ -166,7 +166,7 @@ public class ApparatusServiceImpl implements ApparatusService {
             return false;
         }
 
-        stayIntegral.setUserOpenid(openId);
+        stayIntegral.setUserOpenId(openId);
         stayIntegral.setConfigId(integralConfig.getIntegralConfigId());
         stayIntegral.setStayNumber(stayNumber);
 

tooth-wechat-service/src/main/java/com/iamberry/wechat/service/mapper/useIntegralMapper.xml

@@ -3,14 +3,14 @@
 
 <mapper namespace="com.iamberry.wechat.service.mapper.UseIntegralMapper">
     <sql id="AllUseField">
-        use_integral_id useIntegralId,
+        integral_id integralId,
         user_openid userOpenId,
-        use_integral_type useIntegralType,
-        use_integral_number useIntegralNumber,
-        use_type useType,
-        use_config_id useConfigId,
-        use_integral_remarks useIntegralRemarks,
-        use_integral_create_time useIntegralCreateTime,
+        integral_type integralType,
+        integral_number integralNumber,
+        integral_type useType,
+        config_id configId,
+        integral_remarks integralRemarks,
+        integral_create_time integralCreateTime,
         integral_before_number integralBeforeNumber,
         integral_end_number integralEndNumber
     </sql>
@@ -21,12 +21,12 @@
           c.integral_config_name integralConfigName
         FROM
           tb_iamberry_use_integral i
-        LEFT JOIN tb_iamberry_integral_config c ON i.use_config_id = c.integral_config_id
+        LEFT JOIN tb_iamberry_integral_config c ON i.config_id = c.integral_config_id
         WHERE i.user_openid=#{userOpenId}
             <if test="useType != null||useType != ''">
-               AND i.use_type = #{useType}
+               AND i.integral_type = #{useType}
             </if>
-        ORDER BY i.use_integral_id DESC
+        ORDER BY i.integral_id DESC
         <if test="page!=null and page.recordBegin>0 and page.pageSize>0 ">
             limit ${page.recordBegin},${page.pageSize}
         </if>
@@ -37,15 +37,15 @@
 
     <!--获得的总积分数-->
     <select id="getGainIntegralCount" parameterType="String" resultType="int">
-        SELECT avg(use_integral_number)
+        SELECT avg(integral_number)
         FROM tb_iamberry_use_integral
-        WHERE user_openid=#{userOpenid} AND use_type=1
+        WHERE user_openid=#{userOpenid} AND integral_type=1
     </select>
     <!--使用的总积分数-->
     <select id="getUseIntegralCount" parameterType="String" resultType="int">
-        SELECT avg(use_integral_number)
+        SELECT avg(integral_number)
         FROM tb_iamberry_use_integral
-        WHERE user_openid=#{userOpenid} AND use_type=2
+        WHERE user_openid=#{userOpenid} AND integral_type=2
     </select>
     <!--待入账的总积分数-->
     <select id="getStayIntegralCount" parameterType="String" resultType="int">
@@ -72,7 +72,7 @@
     </select>
 
     <!-- 添加积分日志 -->
-    <insert id="addUseIntegral" parameterType="UseIntegral" keyProperty="useIntegralId" useGeneratedKeys="true">
+    <insert id="addUseIntegral" parameterType="UseIntegral" keyProperty="integralId" useGeneratedKeys="true">
         INSERT INTO tb_iamberry_use_integral
         (
           user_openid,

tooth-wechat-web/src/main/java/com/iamberry/wechat/handles/integral/UseIntegralHandler.java

@@ -66,7 +66,7 @@ public class UseIntegralHandler {
         }
         UseIntegral useIntegral=new UseIntegral();
         useIntegral.setUserOpenId(m.getUserOpenid());
-        useIntegral.setUseType(useType);
+        useIntegral.setIntegralType(useType);
         useIntegral.getPage().setPageSize(pageSize);
         useIntegral.getPage().setPageNumber(pageNO);
         useIntegral.getPage().initRecordBegin();
@@ -112,7 +112,7 @@ public class UseIntegralHandler {
         }
         UseIntegral useIntegral=new UseIntegral();
         useIntegral.setUserOpenId(m.getUserOpenid());
-        useIntegral.setUseType(useType);
+        useIntegral.setIntegralType(useType);
         useIntegral.getPage().setPageSize(pageSize);
         useIntegral.getPage().setPageNumber(pageNO);
         useIntegral.getPage().initRecordBegin();
@@ -160,7 +160,7 @@ public class UseIntegralHandler {
         }
         UseIntegral useIntegral=new UseIntegral();
         //useIntegral.setUserOpenId(m.getUserOpenid());
-        useIntegral.setUseType(useType);
+        useIntegral.setIntegralType(useType);
         useIntegral.getPage().setPageSize(pageSize);
         useIntegral.getPage().setPageNumber(pageNO);
         useIntegral.getPage().initRecordBegin();