修改表结构

wisenergy-mapper/src/main/resources/mapper/UsersMapper.xml

@@ -11,8 +11,7 @@
         <result column="sex" property="sex"/>
         <result column="school" property="school"/>
         <result column="student_type" property="studentType"/>
-        <result column="query_limit" property="queryLimit"/>
-        <result column="money_amount" property="moneyAmount"/>
+        <result column="source" property="source"/>
         <result column="is_delete" property="isDelete"/>
         <result column="create_time" property="createTime"/>
         <result column="update_time" property="updateTime"/>
@@ -28,12 +27,11 @@
     </sql>
 
     <sql id="cols_exclude_id">
-        user_name,password, phone,head_image,sex,school, student_type,is_delete,query_limit,
-        money_amount,create_time,update_time
+        user_name,password, phone,head_image,sex,school, student_type,is_delete,source, create_time,update_time
     </sql>
 
     <sql id="vals">
-        #{userName},#{password},#{phone},#{headImage},#{sex},#{school},#{studentType}, #{queryLimit},#{moneyAmount},
+        #{userName},#{password},#{phone},#{headImage},#{sex},#{school},#{studentType}, #{source},
         #{isDelete},now(),now()
     </sql>
 
@@ -45,8 +43,7 @@
         <if test="sex != null">sex =#{sex},</if>
         <if test="school != null">school =#{school},</if>
         <if test="studentType != null">inspector_name = #{studentType},</if>
-        <if test="queryLimit != null">query_limit = #{queryLimit},</if>
-        <if test="moneyAmount != null">money_amount = #{moneyAmount},</if>
+        <if test="source != null">source = #{source},</if>
         <if test="isDelete != null">is_delete = #{isDelete},</if>
         update_time =now()
     </sql>
@@ -60,8 +57,7 @@
         <if test="sex != null">and sex =#{sex}</if>
         <if test="school != null">and school =#{school}</if>
         <if test="studentType != null">and inspector_name = #{studentType}</if>
-        <if test="queryLimit != null">and query_limit = #{queryLimit}</if>
-        <if test="moneyAmount != null">and money_amount = #{moneyAmount}</if>
+        <if test="source != null">and source = #{source}</if>
         <if test="isDelete != null">and is_delete = #{isDelete}</if>
         <if test="createTime != null">and create_time &gt;= #{createTime}</if>
         <if test="updateTime != null">and #{updateTime} &gt;= update_time</if>

wisenergy-model/src/main/java/cn/wisenergy/model/app/PayRecord.java

@@ -18,43 +18,43 @@ public class PayRecord implements Serializable {
     private static final long serialVersionUID = -7865361068703566832L;
 
     /**
-     *
+     * 充值记录
      */
     @ApiModelProperty(value = "",name = "")
     private Integer id;
 
     /**
-     *
+     * 充值类型 1：支付宝 2：微信 3：充值卡
      */
     @ApiModelProperty(value = "",name = "")
     private Integer type;
 
     /**
-     *
+     * 充值卡id
      */
-    @ApiModelProperty(value = "",name = "")
-    private String cardCode;
+    @ApiModelProperty(value = "充值卡id",name = "cardId")
+    private String cardId;
 
     /**
-     *
+     * 充值用户id
      */
-    @ApiModelProperty(value = "",name = "")
+    @ApiModelProperty(value = "充值用户id",name = "userId")
     private Integer userId;
 
     /**
-     *
+     * 充值所花金额
      */
-    @ApiModelProperty(value = "",name = "")
+    @ApiModelProperty(value = "充值所花金额",name = "money")
     private String money;
 
     /**
-     *
+     * 充值结果 0：成功 1：失败
      */
-    @ApiModelProperty(value = "",name = "")
+    @ApiModelProperty(value = "充值结果 0：成功 1：失败",name = "result")
     private Integer result;
 
     /**
-     *
+     * 充值获得次数
      */
     @ApiModelProperty(value = "",name = "")
     private Integer limit;

wisenergy-model/src/main/java/cn/wisenergy/model/app/UserInfo.java

@@ -36,6 +36,11 @@ public class UserInfo extends BaseEntity implements Serializable {
      */
     private String phone;
 
+    /**
+     * 用户来源  1：移动端 2：pc端
+     */
+    private Integer source;
+
     /**
      * 头像
      */
@@ -56,14 +61,4 @@ public class UserInfo extends BaseEntity implements Serializable {
      */
     private Integer studentType;
 
-    /**
-     * 用户剩余查询次数
-     */
-    private Integer queryLimit;
-
-    /**
-     * 用户充值总额
-     */
-    private String moneyAmount;
-
 }