20190724

src/main/java/com/izouma/awesomeadmin/dao/UserInfoMapper.xml

@@ -39,6 +39,7 @@
         <result column="recommender" property="recommender" jdbcType="INTEGER"/>
         <result column="money_ticket" property="moneyTicket" jdbcType="INTEGER"/>
         <result column="session_key" property="sessionKey" jdbcType="VARCHAR"/>
+        <result column="mini_id" property="miniId" jdbcType="INTEGER"/>
 
         <association property="departId" javaType="string" column="id"
                      select="com.izouma.awesomeadmin.dao.DepartInfoMapper.getUserDepartId"/>
@@ -84,6 +85,7 @@
         <result column="recommender" property="recommender" jdbcType="INTEGER"/>
         <result column="money_ticket" property="moneyTicket" jdbcType="INTEGER"/>
         <result column="session_key" property="sessionKey" jdbcType="VARCHAR"/>
+        <result column="mini_id" property="miniId" jdbcType="INTEGER"/>
     </resultMap>
 
     <sql id="Base_Column_List">
@@ -91,7 +93,7 @@
         country, province, city, district, create_time, del_flag, money_coin, money_point,
         contacter, contact_phone, company_name, company_type, admin_flag, cash_pledge,
         approve_flag, store_flag, company_flag, approve_step, notice_flag, remind_flag,
-        create_flag, level_id, house_card, recommender, money_ticket,session_key
+        create_flag, level_id, house_card, recommender, money_ticket,session_key,mini_id
     </sql>
     <select id="selectByPrimaryKey" resultMap="BaseResultMap" parameterType="java.lang.Integer">
         select
@@ -222,6 +224,9 @@
             <if test="sessionKey != null">
                 session_key,
             </if>
+            <if test="miniId != null">
+                mini_id,
+            </if>
         </trim>
         <trim prefix="values (" suffix=")" suffixOverrides=",">
             <if test="id != null">
@@ -338,6 +343,9 @@
             <if test="sessionKey != null">
                 #{sessionKey},
             </if>
+            <if test="miniId != null">
+                #{miniId},
+            </if>
         </trim>
     </insert>
     <update id="updateByPrimaryKeySelective" parameterType="com.izouma.awesomeadmin.model.UserInfo">
@@ -454,6 +462,9 @@
             <if test="sessionKey != null">
                 session_key = #{sessionKey},
             </if>
+            <if test="miniId != null">
+                mini_id = #{miniId},
+            </if>
         </set>
         where id = #{id,jdbcType=INTEGER}
     </update>
@@ -564,6 +575,9 @@
             <if test="record.moneyTicket != null and !&quot;&quot;.equals(record.moneyTicket)">
                 and money_ticket = #{record.moneyTicket}
             </if>
+            <if test="record.miniId != null and !&quot;&quot;.equals(record.miniId)">
+                and mini_id = #{record.miniId}
+            </if>
 
 
             <if test="record.searchKey != null and !&quot;&quot;.equals(record.searchKey)">
@@ -688,6 +702,9 @@
                 and money_ticket = #{moneyTicket}
             </if>
 
+            <if test="miniId != null and !&quot;&quot;.equals(miniId)">
+                and mini_id = #{miniId}
+            </if>
             <if test="searchKey != null and !&quot;&quot;.equals(searchKey)">
                 <trim prefix="and (" suffix=")" prefixOverrides="OR">
                     OR nickname LIKE concat('%',#{searchKey},'%')
@@ -766,6 +783,9 @@
             <if test="moneyTicket != null and !&quot;&quot;.equals(moneyTicket)">
                 and money_ticket = #{moneyTicket}
             </if>
+            <if test="miniId != null and !&quot;&quot;.equals(miniId)">
+                and mini_id = #{miniId}
+            </if>
         </where>
         LIMIT 1
     </select>
@@ -847,6 +867,11 @@
                 and money_ticket = #{moneyTicket}
             </if>
 
+            <if test="miniId != null and !&quot;&quot;.equals(miniId)">
+                and mini_id = #{miniId}
+            </if>
+
+
         </where>
         LIMIT 1
     </select>

src/main/java/com/izouma/awesomeadmin/model/UserInfo.java

@@ -95,6 +95,8 @@ public class UserInfo {
 
     private String sessionKey;
 
+    private Integer miniId;
+
 
     public String getDepartId() {
         return departId;
@@ -424,5 +426,13 @@ public class UserInfo {
     public void setSessionKey(String sessionKey) {
         this.sessionKey = sessionKey;
     }
+
+    public Integer getMiniId() {
+        return miniId;
+    }
+
+    public void setMiniId(Integer miniId) {
+        this.miniId = miniId;
+    }
 }
 

src/main/java/com/izouma/awesomeadmin/service/impl/UserInfoServiceImpl.java

@@ -620,6 +620,7 @@ public class UserInfoServiceImpl implements UserInfoService {
 
             if (userInfo != null) {
                 userInfo.setSessionKey(sessionKey);
+                userInfo.setMiniId(miniId);
                 updateUserInfo(userInfo);
                 return userInfo;
             }
@@ -629,6 +630,7 @@ public class UserInfoServiceImpl implements UserInfoService {
             userInfo.setOpenId(openId);
             userInfo.setIcon("https://microball.oss-cn-hangzhou.aliyuncs.com/awesomeAdmin/user.png");
             userInfo.setSessionKey(sessionKey);
+            userInfo.setMiniId(miniId);
 
             userInfo.setMoneyCoin(Double.valueOf(9999));//小程序注册测试赠送一千
 
@@ -688,6 +690,7 @@ public class UserInfoServiceImpl implements UserInfoService {
             userInfo.setCountry(wxUserInfo.getCountry());
             userInfo.setProvince(wxUserInfo.getProvince());
             userInfo.setCity(wxUserInfo.getCity());
+            userInfo.setMiniId(miniId);
 
             createUserInfo(userInfo);
 
@@ -699,6 +702,7 @@ public class UserInfoServiceImpl implements UserInfoService {
             userInfo.setCountry(wxUserInfo.getCountry());
             userInfo.setProvince(wxUserInfo.getProvince());
             userInfo.setCity(wxUserInfo.getCity());
+            userInfo.setMiniId(miniId);
             updateUserInfo(userInfo);
         }