益寿缘app-优化App奖品发红包逻辑-增加appOpenId

fs-service/src/main/java/com/fs/his/domain/FsUser.java

@@ -81,6 +81,9 @@ public class FsUser extends BaseEntity
 //    @Excel(name = "微信公众号OPENID")
     private String mpOpenId;
 
+    /** 益寿缘APP OPENID */
+    private String appOpenId;
+
     /** 关联ID */
     @Excel(name = "关联ID")
     private String unionId;

fs-service/src/main/resources/mapper/his/FsUserMapper.xml

@@ -16,6 +16,7 @@ PUBLIC "-//mybatis.org//DTD Mapper 3.0//EN"
         <result property="tuiUserCount"    column="tui_user_count"    />
         <result property="maOpenId"    column="ma_open_id"    />
         <result property="mpOpenId"    column="mp_open_id"    />
+        <result property="appOpenId"    column="app_open_id"    />
         <result property="unionId"    column="union_id"    />
         <result property="isDel"    column="is_del"    />
         <result property="userCode"    column="user_code"    />
@@ -54,7 +55,7 @@ PUBLIC "-//mybatis.org//DTD Mapper 3.0//EN"
     </resultMap>
 
     <sql id="selectFsUserVo">
-        select user_id,qw_ext_id,sex,is_buy,course_ma_open_id,is_push,is_add_qw,source,login_device,is_individuation_push,store_open_id,password,jpush_id, is_vip,vip_start_date,vip_end_date,vip_level,vip_status,nick_name,integral_status, avatar, phone, integral,sign_num, status, tui_user_id, tui_time, tui_user_count, ma_open_id, mp_open_id, union_id, is_del, user_code, remark, create_time, update_time, last_ip, balance,is_weixin_auth,parent_id,qw_user_id,company_id,company_user_id,first_login_time,app_roles,app_rewards_viewed_days from fs_user
+        select user_id,qw_ext_id,sex,is_buy,course_ma_open_id,is_push,is_add_qw,source,login_device,is_individuation_push,store_open_id,password,jpush_id, is_vip,vip_start_date,vip_end_date,vip_level,vip_status,nick_name,integral_status, avatar, phone, integral,sign_num, status, tui_user_id, tui_time, tui_user_count, ma_open_id, mp_open_id,app_open_id, union_id, is_del, user_code, remark, create_time, update_time, last_ip, balance,is_weixin_auth,parent_id,qw_user_id,company_id,company_user_id,first_login_time,app_roles,app_rewards_viewed_days from fs_user
     </sql>
 
     <select id="selectFsUserList" parameterType="FsUser" resultMap="FsUserResult">
@@ -72,6 +73,7 @@ PUBLIC "-//mybatis.org//DTD Mapper 3.0//EN"
             <if test="tuiUserCount != null "> and tui_user_count = #{tuiUserCount}</if>
             <if test="maOpenId != null  and maOpenId != ''"> and ma_open_id = #{maOpenId}</if>
             <if test="mpOpenId != null  and mpOpenId != ''"> and mp_open_id = #{mpOpenId}</if>
+            <if test="appOpenId != null  and appOpenId != ''"> and app_open_id = #{appOpenId}</if>
             <if test="unionId != null  and unionId != ''"> and union_id = #{unionId}</if>
             <if test="isDel != null "> and is_del = #{isDel}</if>
             <if test="userCode != null  and userCode != ''"> and user_code = #{userCode}</if>
@@ -580,6 +582,7 @@ PUBLIC "-//mybatis.org//DTD Mapper 3.0//EN"
             <if test="tuiUserCount != null">tui_user_count,</if>
             <if test="maOpenId != null">ma_open_id,</if>
             <if test="mpOpenId != null">mp_open_id,</if>
+            <if test="appOpenId != null">app_open_id,</if>
             <if test="unionId != null">union_id,</if>
             <if test="isDel != null">is_del,</if>
             <if test="userCode != null">user_code,</if>
@@ -626,6 +629,7 @@ PUBLIC "-//mybatis.org//DTD Mapper 3.0//EN"
             <if test="tuiUserCount != null">#{tuiUserCount},</if>
             <if test="maOpenId != null">#{maOpenId},</if>
             <if test="mpOpenId != null">#{mpOpenId},</if>
+            <if test="appOpenId != null">#{appOpenId},</if>
             <if test="unionId != null">#{unionId},</if>
             <if test="isDel != null">#{isDel},</if>
             <if test="userCode != null">#{userCode},</if>
@@ -677,6 +681,7 @@ PUBLIC "-//mybatis.org//DTD Mapper 3.0//EN"
             <if test="tuiUserCount != null">tui_user_count = #{tuiUserCount},</if>
             <if test="maOpenId != null">ma_open_id = #{maOpenId},</if>
             <if test="mpOpenId != null">mp_open_id = #{mpOpenId},</if>
+            <if test="appOpenId != null">app_open_id = #{appOpenId},</if>
             <if test="unionId != null">union_id = #{unionId},</if>
             <if test="isDel != null">is_del = #{isDel},</if>
             <if test="userCode != null">user_code = #{userCode},</if>

fs-user-app/src/main/java/com/fs/app/controller/AppLoginController.java

@@ -605,4 +605,34 @@ public class AppLoginController extends AppBaseController{
 
         return R.ok("验证码已发送");
     }
+
+    /**
+     * 添加appId到用户的appId列表中（如果不存在）
+     * @param currentAppIds 当前用户已有的appId列表（逗号分隔）
+     * @param newAppId 新的appId
+     * @return 更新后的appId列表
+     */
+    private String addAppIdIfNotExists(String currentAppIds, String newAppId) {
+        // 如果新appId为空，返回原值
+        if (StringUtils.isEmpty(newAppId)) {
+            return currentAppIds == null ? "" : currentAppIds;
+        }
+
+        // 如果当前appId为空，直接返回新appId
+        if (StringUtils.isEmpty(currentAppIds)) {
+            return newAppId;
+        }
+
+        // 检查是否已存在
+        String[] appIdArray = currentAppIds.split(",");
+        for (String appId : appIdArray) {
+            if (appId.trim().equals(newAppId.trim())) {
+                // 已存在，不需要添加
+                return currentAppIds;
+            }
+        }
+
+        // 不存在，追加到末尾
+        return currentAppIds + "," + newAppId;
+    }
 }