Browse Source

fix(store): 修复用户信息获取逻辑并修正订单查询表名

- 修改了 selectOrderByUserIdLimit1 方法中的 SQL 查询表名,从 fs_store_order_scrm 更正为 fs_store_payment_scrm
- 在 getUserInfo 接口增加 appId 参数支持,用于控制 isShow 字段的返回值
- 优化用户是否展示逻辑判断,优先根据 appId 匹配结果设置 isShow 状态
- 保留原有通过订单记录判断用户显示状态的兜底逻辑
xw 1 week ago
parent
commit
d320dadfbe

+ 1 - 1
fs-service/src/main/java/com/fs/hisStore/mapper/FsStoreOrderScrmMapper.java

@@ -1025,7 +1025,7 @@ public interface FsStoreOrderScrmMapper
 
 
     List<JSONObject> selectTuiMoneyCounts(Map<String, Object> map);
     List<JSONObject> selectTuiMoneyCounts(Map<String, Object> map);
 
 
-    @Select("select * from fs_store_order_scrm where user_id = #{userId} limit 1")
+    @Select("select * from fs_store_payment_scrm where user_id = #{userId} limit 1")
     FsStoreOrderScrm selectOrderByUserIdLimit1(Long userId);
     FsStoreOrderScrm selectOrderByUserIdLimit1(Long userId);
 
 
     List<FsStoreOrderScrm> selectFsStoreOrderStatisticsByUserId(@Param("ids") List<Long> ids);
     List<FsStoreOrderScrm> selectFsStoreOrderStatisticsByUserId(@Param("ids") List<Long> ids);

+ 10 - 2
fs-user-app/src/main/java/com/fs/app/controller/store/UserScrmController.java

@@ -97,15 +97,23 @@ public class UserScrmController extends AppBaseController {
     @Login
     @Login
     @ApiOperation("获取用户信息")
     @ApiOperation("获取用户信息")
     @GetMapping("/getUserInfo")
     @GetMapping("/getUserInfo")
-    public R getUserInfo(HttpServletRequest request){
+    public R getUserInfo(HttpServletRequest request, @RequestParam(value = "appId", required = false) String appId){
         try {
         try {
             FsUserScrm user=userService.selectFsUserById(Long.parseLong(getUserId()));
             FsUserScrm user=userService.selectFsUserById(Long.parseLong(getUserId()));
-            if (user.getIsShow() !=null && user.getIsShow() == 0){
+
+            if (StringUtils.isNotEmpty(appId) && StringUtils.isNotEmpty(user.getAppId())) {
+                if (user.getAppId().contains(appId)) {
+                    user.setIsShow(1);
+                } else {
+                    user.setIsShow(0);
+                }
+            } else if (user.getIsShow() !=null && user.getIsShow() == 0){
                 FsStoreOrderScrm order = orderService.selectOrderByUserIdLimit1(user.getUserId());
                 FsStoreOrderScrm order = orderService.selectOrderByUserIdLimit1(user.getUserId());
                 if (order!=null){
                 if (order!=null){
                     user.setIsShow(1);
                     user.setIsShow(1);
                 }
                 }
             }
             }
+            
             return R.ok().put("user",user);
             return R.ok().put("user",user);
         } catch (Exception e){
         } catch (Exception e){
             log.error("【获取用户信息】:{}",e);
             log.error("【获取用户信息】:{}",e);