Merge remote-tracking branch 'origin/master'

fs-admin/src/main/java/com/fs/course/task/CompanyBalanceTask.java

@@ -49,7 +49,6 @@ public class CompanyBalanceTask {
      * @Author xgb
      * @Date 2025/10/22 11:52
      */
-    @EventListener(ApplicationReadyEvent.class)
     public void initCompanyBalance() {
         balanceRollbackErrorService.initCompanyBalance();
 

fs-service/src/main/java/com/fs/course/service/impl/BalanceRollbackErrorServiceImpl.java

@@ -15,6 +15,8 @@ import org.redisson.api.RedissonClient;
 import org.slf4j.Logger;
 import org.slf4j.LoggerFactory;
 import org.springframework.beans.factory.annotation.Autowired;
+import org.springframework.boot.context.event.ApplicationReadyEvent;
+import org.springframework.context.event.EventListener;
 import org.springframework.stereotype.Service;
 
 import java.math.BigDecimal;
@@ -87,6 +89,7 @@ public class BalanceRollbackErrorServiceImpl extends ServiceImpl<BalanceRollback
     }
 
     @Override
+    @EventListener(ApplicationReadyEvent.class)
     public void initCompanyBalance() {
 
         // 查询公司表 Company

fs-service/src/main/java/com/fs/store/vo/h5/FsUserPageListVO.java

@@ -5,6 +5,7 @@ import io.swagger.annotations.ApiModel;
 import io.swagger.annotations.ApiModelProperty;
 import lombok.Data;
 
+import java.math.BigDecimal;
 import java.util.Date;
 
 /**
@@ -99,4 +100,10 @@ public class FsUserPageListVO {
     @ApiModelProperty(value = "用户-项目-销售ID")
     private Long userCompanyUserId;
 
+    @ApiModelProperty(value = "用户积分")
+    private BigDecimal integral;
+
+    @ApiModelProperty(value = "是否购买 1：是 0 否")
+    private BigDecimal isBuy;
+
 }

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

@@ -342,7 +342,9 @@ PUBLIC "-//mybatis.org//DTD Mapper 3.0//EN"
         fs_user.remark,
         ucu.company_user_id,
         ucu.company_id,
-        ucu.project_id
+        ucu.project_id,
+        fs_user.integral,
+        if(fs_user.pay_count>0,1,0) as isBuy
         FROM
         fs_user
         left join fs_user_company_user ucu on ucu.user_id = fs_user.user_id