会员管理

fs-company/src/main/java/com/fs/user/FsUserAdminController.java

@@ -48,6 +48,7 @@ public class FsUserAdminController extends BaseController {
         LoginUser loginUser = tokenService.getLoginUser(ServletUtils.getRequest());
         param.setCompanyId(loginUser.getCompany().getCompanyId());
         param.setCompanyUserId(String.valueOf(loginUser.getUser().getUserId()));
+        param.setIsAdmin(loginUser.getUser().isAdmin());
 
         if(param.getCompanyUserId() == null) {
             throw new IllegalArgumentException("当前销售不存在！");

fs-service-system/src/main/java/com/fs/course/service/impl/FsUserCourseServiceImpl.java

@@ -12,6 +12,7 @@ import com.fs.company.domain.CompanyTag;
 import com.fs.company.domain.CompanyUser;
 import com.fs.company.mapper.CompanyTagMapper;
 import com.fs.company.mapper.CompanyUserMapper;
+import com.fs.config.cloud.CloudHostProper;
 import com.fs.course.config.CourseConfig;
 import com.fs.course.domain.*;
 import com.fs.course.mapper.*;
@@ -78,6 +79,8 @@ public class FsUserCourseServiceImpl implements IFsUserCourseService
     private FsCourseWatchLogMapper fsCourseWatchLogMapper;
     @Autowired
     private FsCourseAnswerLogsMapper fsCourseAnswerLogsMapper;
+    @Autowired
+    CloudHostProper cloudHostProper;
 
     private static final String realLink = "/courseH5/pages/course/learning?course=";
     private static final String shortLink = "/courseH5/pages/course/learning?s=";
@@ -491,7 +494,7 @@ public class FsUserCourseServiceImpl implements IFsUserCourseService
         graphics.fillRect(0, scaledHeight, scaledWidth, bottomHeight);
 
         // 绘制推荐区域（图片和文字）
-        drawRecommendationArea(graphics, file, scaledHeight, "云联融智", "为您推荐");
+        drawRecommendationArea(graphics, file, scaledHeight, cloudHostProper.getCompanyName(), "为您推荐");
 
         // 绘制二维码
         drawQRCode(graphics, url, scaledWidth, totalHeight);

fs-service-system/src/main/java/com/fs/store/mapper/FsStoreOrderMapper.java

@@ -161,9 +161,9 @@ public interface FsStoreOrderMapper
             " AND date_format(o.delivery_send_time,'%y%m%d') >= date_format(#{maps.deliverySendTimeList[0]},'%y%m%d') " +
             " AND date_format(o.delivery_send_time,'%y%m%d') <= date_format(#{maps.deliverySendTimeList[1]},'%y%m%d') " +
             "</if>" +
-            "<if test = 'maps.paid != null    '> " +
-            "and o.paid =#{maps.paid} " +
-            "</if>" +
+//            "<if test = 'maps.paid != null    '> " +
+//            "and o.paid =#{maps.paid} " +
+//            "</if>" +
             "<if test = 'maps.payTimeList != null    '> " +
             " AND date_format(o.pay_time,'%y%m%d') &gt;= date_format(#{maps.payTimeList[0]},'%y%m%d') " +
             " AND date_format(o.pay_time,'%y%m%d') &lt;= date_format(#{maps.payTimeList[1]},'%y%m%d') " +

fs-service-system/src/main/java/com/fs/store/param/h5/FsUserPageListParam.java

@@ -72,6 +72,8 @@ public class FsUserPageListParam implements Serializable {
      */
     private Long pcLoginUserId;
 
+    private Boolean isAdmin;
+
 
 
 

fs-service-system/src/main/java/com/fs/store/service/impl/FsUserServiceImpl.java

@@ -524,6 +524,12 @@ public class FsUserServiceImpl implements IFsUserService
         if(companyUserId != null) {
             Long companyUser = Long.parseLong(companyUserId);
             Set<Long> userIds = companyUserCacheService.selectUserAllCompanyUserId(companyUser);
+            if (userIds != null || userIds.size() <= 1) {
+                if (param.getIsAdmin()) {
+                    List<CompanyUser> companyUsers = companyUserMapper.selectCompanyUserByCompanyId(param.getCompanyId());
+                    userIds = companyUsers.stream().map(CompanyUser::getUserId).collect(Collectors.toSet());
+                }
+            }
             param.setCompanyUserIds(userIds);
         }
 

fs-service-system/src/main/resources/application-druid-zkzh.yml

@@ -137,3 +137,6 @@ rocketmq:
         group: test-group
         access-key: ak1243b25nj17d4b2dc1a03 # 替换为实际的 accessKey
         secret-key: sk08a7ea1f9f4b0237 # 替换为实际的 secretKey
+cloud_host:
+    company_name: 中康智慧
+

fs-service-system/src/main/resources/mapper/company/CompanyUserMapper.xml

@@ -473,7 +473,17 @@ PUBLIC "-//mybatis.org//DTD Mapper 3.0//EN"
         </where>
     </select>
     <select id="selectUserAllCompanyUserId" resultType="java.lang.Long">
-        select distinct user_id from company_user where parent_id=${companyUserId}
+--         select distinct user_id from company_user where parent_id=${companyUserId}
+            WITH RECURSIVE RecursiveUsers AS (
+                SELECT user_id, parent_id
+                FROM company_user
+                WHERE parent_id = ${companyUserId}
+                UNION ALL
+                SELECT cu.user_id, cu.parent_id
+                FROM company_user cu
+                         JOIN RecursiveUsers ru ON cu.parent_id = ru.user_id
+            )
+            SELECT DISTINCT user_id FROM RecursiveUsers;
     </select>
     <select id="selectCompanyUserNameUserById" resultType="java.lang.String">
         select concat(nick_name,'_',user_name) from company_user where user_id=${userId} limit 1