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/integral/UseIntegral.java

@@ -27,8 +27,19 @@ public class UseIntegral implements Serializable {
     private Date integralCreateTime;     //创建时间
 
     private String integralConfigName;      //来源名称
+    @DateTimeFormat(pattern="yyyy-MM-dd")
+    @JsonFormat(pattern="yyyy-MM-dd",timezone = "GMT+8")
+    private Date stayRecordedTime;          //待入账时间
     private PageBean page=new PageBean();   //分页
 
+    public Date getStayRecordedTime() {
+        return stayRecordedTime;
+    }
+
+    public void setStayRecordedTime(Date stayRecordedTime) {
+        this.stayRecordedTime = stayRecordedTime;
+    }
+
     public Integer getIntegralId() {
         return integralId;
     }

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

@@ -52,7 +52,7 @@
 	<update id="updateMyMember" parameterType="Member" >
 		UPDATE TB_IAMBERRY_USER_USERINFO
 		<set>
-			<if test="userName!=null||userName!=''">
+			<if test="userName!=null">
 				user_name=#{userName},
 			</if>
 			<if test="userTel!=null">

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

@@ -16,11 +16,18 @@
     <!--全部积分记录-->
     <select id="listIntegralInfo" resultType="UseIntegral" parameterType="UseIntegral">
         SELECT
-          <include refid="AllUseField"></include>,
-          c.integral_config_name integralConfigName
+          i.integral_type integralType,
+          i.integral_number integralNumber,
+          i.integral_remarks integralRemarks,
+          i.integral_create_time integralCreateTime,
+          i.integral_before_number integralBeforeNumber,
+          i.integral_end_number integralEndNumber,
+          c.integral_config_name integralConfigName,
+          s.stay_recorded_time stayRecordedTime
         FROM
           tb_iamberry_use_integral i
         LEFT JOIN tb_iamberry_integral_config c ON i.config_id = c.integral_config_id
+        LEFT JOIN tb_iamberry_stay_integral s ON i.stay_id=s.stay_id
         WHERE i.user_openid=#{userOpenId}
             <if test="integralType != null and integralType != ''">
                AND i.integral_type = #{integralType}
@@ -33,7 +40,6 @@
             limit ${page.pageSize}
         </if>
     </select>
-
     <!--获得的总积分数-->
     <select id="getGainIntegralCount" parameterType="String" resultType="Integer">
         SELECT SUM(integral_number)