Merge remote-tracking branch 'origin/Payment-Configuration' into Payment-Configuration

fs-admin/src/main/java/com/fs/app/task/ActivityTask.java

@@ -0,0 +1,16 @@
+package com.fs.app.task;
+
+import lombok.extern.slf4j.Slf4j;
+import org.springframework.stereotype.Component;
+
+/**
+ * @description: TODO
+ * @author: Xgb
+ * @createDate: 2026/3/10
+ * @version: 1.0
+ */
+@Component("activityTask")
+@Slf4j
+public class ActivityTask {
+    // 定时
+}

fs-service/src/main/java/com/fs/activity/domain/AccActivity.java

@@ -4,6 +4,8 @@ import com.baomidou.mybatisplus.annotation.IdType;
 import com.baomidou.mybatisplus.annotation.TableId;
 import com.baomidou.mybatisplus.annotation.TableName;
 import java.util.Date;
+
+import com.fs.common.core.domain.BaseEntity;
 import lombok.Data;
 
 /**
@@ -12,7 +14,7 @@ import lombok.Data;
  */
 @TableName(value ="acc_activity")
 @Data
-public class AccActivity {
+public class AccActivity extends BaseEntity {
     /**
      * 主键ID
      */

fs-service/src/main/java/com/fs/activity/domain/AccWork.java

@@ -1,9 +1,13 @@
 package com.fs.activity.domain;
 
 import com.baomidou.mybatisplus.annotation.IdType;
+import com.baomidou.mybatisplus.annotation.TableField;
 import com.baomidou.mybatisplus.annotation.TableId;
 import com.baomidou.mybatisplus.annotation.TableName;
 import java.util.Date;
+import java.util.Map;
+
+import com.fs.common.core.domain.BaseEntity;
 import lombok.Data;
 
 /**
@@ -12,7 +16,7 @@ import lombok.Data;
  */
 @TableName(value ="acc_work")
 @Data
-public class AccWork {
+public class AccWork  {
     /**
      * 主键ID
      */
@@ -89,79 +93,11 @@ public class AccWork {
      */
     private Date updatedAt;
 
-    @Override
-    public boolean equals(Object that) {
-        if (this == that) {
-            return true;
-        }
-        if (that == null) {
-            return false;
-        }
-        if (getClass() != that.getClass()) {
-            return false;
-        }
-        AccWork other = (AccWork) that;
-        return (this.getId() == null ? other.getId() == null : this.getId().equals(other.getId()))
-            && (this.getTeamId() == null ? other.getTeamId() == null : this.getTeamId().equals(other.getTeamId()))
-            && (this.getActivityId() == null ? other.getActivityId() == null : this.getActivityId().equals(other.getActivityId()))
-            && (this.getWorkName() == null ? other.getWorkName() == null : this.getWorkName().equals(other.getWorkName()))
-            && (this.getCoverUrl() == null ? other.getCoverUrl() == null : this.getCoverUrl().equals(other.getCoverUrl()))
-            && (this.getVideoUrl() == null ? other.getVideoUrl() == null : this.getVideoUrl().equals(other.getVideoUrl()))
-            && (this.getDescription() == null ? other.getDescription() == null : this.getDescription().equals(other.getDescription()))
-            && (this.getDuration() == null ? other.getDuration() == null : this.getDuration().equals(other.getDuration()))
-            && (this.getVoteCount() == null ? other.getVoteCount() == null : this.getVoteCount().equals(other.getVoteCount()))
-            && (this.getViewCount() == null ? other.getViewCount() == null : this.getViewCount().equals(other.getViewCount()))
-            && (this.getStatus() == null ? other.getStatus() == null : this.getStatus().equals(other.getStatus()))
-            && (this.getAuditRemark() == null ? other.getAuditRemark() == null : this.getAuditRemark().equals(other.getAuditRemark()))
-            && (this.getAuditTime() == null ? other.getAuditTime() == null : this.getAuditTime().equals(other.getAuditTime()))
-            && (this.getCreatedAt() == null ? other.getCreatedAt() == null : this.getCreatedAt().equals(other.getCreatedAt()))
-            && (this.getUpdatedAt() == null ? other.getUpdatedAt() == null : this.getUpdatedAt().equals(other.getUpdatedAt()));
-    }
-
-    @Override
-    public int hashCode() {
-        final int prime = 31;
-        int result = 1;
-        result = prime * result + ((getId() == null) ? 0 : getId().hashCode());
-        result = prime * result + ((getTeamId() == null) ? 0 : getTeamId().hashCode());
-        result = prime * result + ((getActivityId() == null) ? 0 : getActivityId().hashCode());
-        result = prime * result + ((getWorkName() == null) ? 0 : getWorkName().hashCode());
-        result = prime * result + ((getCoverUrl() == null) ? 0 : getCoverUrl().hashCode());
-        result = prime * result + ((getVideoUrl() == null) ? 0 : getVideoUrl().hashCode());
-        result = prime * result + ((getDescription() == null) ? 0 : getDescription().hashCode());
-        result = prime * result + ((getDuration() == null) ? 0 : getDuration().hashCode());
-        result = prime * result + ((getVoteCount() == null) ? 0 : getVoteCount().hashCode());
-        result = prime * result + ((getViewCount() == null) ? 0 : getViewCount().hashCode());
-        result = prime * result + ((getStatus() == null) ? 0 : getStatus().hashCode());
-        result = prime * result + ((getAuditRemark() == null) ? 0 : getAuditRemark().hashCode());
-        result = prime * result + ((getAuditTime() == null) ? 0 : getAuditTime().hashCode());
-        result = prime * result + ((getCreatedAt() == null) ? 0 : getCreatedAt().hashCode());
-        result = prime * result + ((getUpdatedAt() == null) ? 0 : getUpdatedAt().hashCode());
-        return result;
-    }
-
-    @Override
-    public String toString() {
-        StringBuilder sb = new StringBuilder();
-        sb.append(getClass().getSimpleName());
-        sb.append(" [");
-        sb.append("Hash = ").append(hashCode());
-        sb.append(", id=").append(id);
-        sb.append(", teamId=").append(teamId);
-        sb.append(", activityId=").append(activityId);
-        sb.append(", workName=").append(workName);
-        sb.append(", coverUrl=").append(coverUrl);
-        sb.append(", videoUrl=").append(videoUrl);
-        sb.append(", description=").append(description);
-        sb.append(", duration=").append(duration);
-        sb.append(", voteCount=").append(voteCount);
-        sb.append(", viewCount=").append(viewCount);
-        sb.append(", status=").append(status);
-        sb.append(", auditRemark=").append(auditRemark);
-        sb.append(", auditTime=").append(auditTime);
-        sb.append(", createdAt=").append(createdAt);
-        sb.append(", updatedAt=").append(updatedAt);
-        sb.append("]");
-        return sb.toString();
-    }
+    @TableField(exist = false)
+    private Map<String, Object> params;
+
+    // 当前作品是否已投票
+    @TableField(exist = false)
+    private Boolean isVoted;
+
 }

fs-service/src/main/java/com/fs/activity/mapper/AccTeamMapper.java

@@ -12,9 +12,9 @@ import org.apache.ibatis.annotations.Param;
 */
 public interface AccTeamMapper extends BaseMapper<AccTeam> {
 
-    AccTeam isSignUp(@Param("userId") long userId,@Param("activityId") Long activityId);
+    AccTeam isSignUp(@Param("userId") Long userId,@Param("activityId") Long activityId);
 
-    AccTeam selectTeamByUserIdAndActivityId(Long userId, Long activityId);
+    AccTeam selectTeamByUserIdAndActivityId(@Param("userId") Long userId,@Param("activityId") Long activityId);
 }
 
 

fs-service/src/main/java/com/fs/activity/mapper/AccWorkMapper.java

@@ -2,6 +2,8 @@ package com.fs.activity.mapper;
 
 import com.fs.activity.domain.AccWork;
 import com.baomidou.mybatisplus.core.mapper.BaseMapper;
+import com.fs.activity.param.AccWorkRequest;
+import org.apache.ibatis.annotations.Param;
 
 import java.util.List;
 
@@ -60,6 +62,10 @@ public interface AccWorkMapper extends BaseMapper<AccWork> {
      * @return 结果
      */
     int deleteAccWorkByIds(Long[] ids);
+
+    AccWork selectOneByTeamIdAndActivityId(@Param("activityId") Long activityId,@Param("teamId") Long teamId);
+
+    List<AccWork> selectListForApp(AccWorkRequest request);
 }
 
 

fs-service/src/main/java/com/fs/activity/param/AccWorkRequest.java

@@ -0,0 +1,33 @@
+package com.fs.activity.param;
+
+import com.baomidou.mybatisplus.annotation.IdType;
+import com.baomidou.mybatisplus.annotation.TableField;
+import com.baomidou.mybatisplus.annotation.TableId;
+import com.baomidou.mybatisplus.annotation.TableName;
+import lombok.Data;
+
+import javax.validation.constraints.NotNull;
+import java.util.Date;
+import java.util.Map;
+
+/**
+ * 作品表
+ * @TableName acc_work
+ */
+@Data
+public class AccWorkRequest {
+
+    private Integer pageNum = 1;
+
+    private Integer pageSize = 10;
+
+    private String workName;  // 作品名称关键词
+
+    @NotNull(message = "活动ID不能为空")
+    private Long activityId;  // 活动ID
+
+    private String sortBy = "hot";  // 排序方式：hot-热门 new-最新
+
+    private Long userId;
+
+}

fs-service/src/main/java/com/fs/activity/service/AccWorkService.java

@@ -4,6 +4,7 @@ import com.fs.activity.domain.AccVoteRecord;
 import com.fs.activity.domain.AccWork;
 import com.baomidou.mybatisplus.extension.service.IService;
 import com.fs.activity.param.AccVoteRecordRequest;
+import com.fs.activity.param.AccWorkRequest;
 import com.fs.common.core.domain.R;
 
 import java.util.List;
@@ -71,4 +72,6 @@ public interface AccWorkService extends IService<AccWork> {
     R uploadVideo(AccWork accWork);
 
     R castVote(AccVoteRecordRequest accWorkRecord);
+
+    R getWorkList(AccWorkRequest request);
 }

fs-service/src/main/java/com/fs/activity/service/impl/AccTeamServiceImpl.java

@@ -63,12 +63,13 @@ public class AccTeamServiceImpl extends ServiceImpl<AccTeamMapper, AccTeam>
     @Transactional
     public R signUpLeader(AccTeam accTeam) {
 
-        accTeam.setTeamCode(CodeGenerator.generateTeamCode(accTeam.getActivityId()));
+
         R r=accActivityService.checkActivitySignUpStatus(accTeam.getActivityId());
         if(!r.get("code").equals(200)){
             return r;
         }
 
+        accTeam.setTeamCode(CodeGenerator.generateTeamCode(accTeam.getActivityId()));
         accTeam.setMemberCount(1);
         if(baseMapper.insert(accTeam)<=0){
             return R.error("创建领队失败");
@@ -82,7 +83,7 @@ public class AccTeamServiceImpl extends ServiceImpl<AccTeamMapper, AccTeam>
         if(accTeamMemberMapper.insert(accTeamMember)<=0){
             throw new RuntimeException("创建队员失败");
         }
-        return R.ok();
+        return R.ok().put("data",accTeam);
     }
 
     /**

fs-service/src/main/java/com/fs/activity/service/impl/AccWorkServiceImpl.java

@@ -2,12 +2,14 @@ package com.fs.activity.service.impl;
 
 import com.baomidou.mybatisplus.core.conditions.query.LambdaQueryWrapper;
 import com.baomidou.mybatisplus.core.conditions.query.QueryWrapper;
+import com.baomidou.mybatisplus.core.conditions.update.UpdateWrapper;
 import com.baomidou.mybatisplus.extension.service.impl.ServiceImpl;
 import com.fs.activity.domain.AccVoteRecord;
 import com.fs.activity.domain.AccWork;
 import com.fs.activity.mapper.AccVoteRecordMapper;
 import com.fs.activity.param.AccVoteRecordRequest;
 import com.fs.activity.param.AccVoteRecordResponse;
+import com.fs.activity.param.AccWorkRequest;
 import com.fs.activity.service.AccActivityService;
 import com.fs.activity.service.AccWorkService;
 import com.fs.activity.mapper.AccWorkMapper;
@@ -16,6 +18,8 @@ import com.fs.common.core.domain.R;
 import com.fs.common.core.redis.RedisCache;
 import com.fs.common.exception.ServiceException;
 import com.fs.common.exception.base.BusinessException;
+import com.github.pagehelper.PageHelper;
+import com.github.pagehelper.PageInfo;
 import lombok.extern.slf4j.Slf4j;
 import org.redisson.api.RLock;
 import org.redisson.api.RedissonClient;
@@ -39,13 +43,17 @@ import java.util.concurrent.TimeUnit;
 public class AccWorkServiceImpl extends ServiceImpl<AccWorkMapper, AccWork>
     implements AccWorkService{
 
+    // 今日投票数
     private static final String DAILY_VOTE_LIMIT = "vote:daily:limit";
 
+    // 锁
     private static final String VOTE_LOCK_KEY = "vote:lock:";
 
+    // 作品数量
     private static final String VOTE_COUNT_KEY = "vote:count:";
 
-    private static final String VOTE_RANKING_KEY = "vote:ranking";
+    // 今日是否已经投给该作品
+    private static final String VOTE_WORK_KEY = "vote:work:";
 
 
 
@@ -153,9 +161,7 @@ public class AccWorkServiceImpl extends ServiceImpl<AccWorkMapper, AccWork>
         }
 
         // 查询是否上传了视频，已上传更新
-        AccWork work = baseMapper.selectOne(new LambdaQueryWrapper<AccWork>()
-                .eq(AccWork::getActivityId, accWork.getActivityId())
-                .eq(AccWork::getTeamId, accWork.getTeamId()));
+        AccWork work=baseMapper.selectOneByTeamIdAndActivityId(accWork.getActivityId(),accWork.getTeamId());
         if(work!=null){
             accWork.setId(work.getId());
             if (baseMapper.updateById(accWork)<1){
@@ -200,11 +206,6 @@ public class AccWorkServiceImpl extends ServiceImpl<AccWorkMapper, AccWork>
 
         // 4. 使用Redis分布式锁防止重复提交
         String lockKey = VOTE_LOCK_KEY + userId + ":" + workId + ":" + todayStr;
-        Boolean locked = redisTemplate.opsForValue().setIfAbsent(lockKey, "1", 10, TimeUnit.SECONDS);
-        if (Boolean.FALSE.equals(locked)) {
-            throw new ServiceException("请勿重复提交");
-        }
-
         // 引入 Redisson
         RLock lock = redissonClient.getLock(lockKey);
         boolean lockAcquired = false;
@@ -212,15 +213,14 @@ public class AccWorkServiceImpl extends ServiceImpl<AccWorkMapper, AccWork>
             lockAcquired = lock.tryLock(3, 10, TimeUnit.SECONDS);
             if (lockAcquired) {
 
-                // 5. 检查今日是否已给该作品投票
-                if (accVoteRecordMapper.selectCount(new LambdaQueryWrapper<AccVoteRecord>()
-                        .eq(AccVoteRecord::getUserId, userId)
-                        .eq(AccVoteRecord::getWorkId, workId)
-                        .eq(AccVoteRecord::getVoteDate, today)) > 0) {
+                // 5. 检查今日是否已给该作品投票 (从 Redis 检查)
+                String userVoteKey = VOTE_WORK_KEY + userId + ":" + workId + ":" + todayStr;
+                Boolean hasVoted = redisTemplate.hasKey(userVoteKey);
+                if (hasVoted != null && hasVoted) {
                     throw new ServiceException("今日已给该作品投票");
                 }
 
-                // 6. 创建投票记录
+                // 6. 创建投票记录 不加事务,影响速度 数据不对后期家定时任务修复
                 AccVoteRecord record = new AccVoteRecord();
                 record.setWorkId(workId);
                 record.setUserId(userId);
@@ -230,34 +230,36 @@ public class AccWorkServiceImpl extends ServiceImpl<AccWorkMapper, AccWork>
                     throw new ServiceException("投票失败");
                 }
 
-                AccWork work = new AccWork();
-                work.setId(workId);
-                // 7. 更新作品票数
-                work.setVoteCount(work.getVoteCount() + 1);
-                baseMapper.updateById(work);
+                // 7. 标记用户今日已投票到 Redis
+                redisTemplate.opsForValue().set(userVoteKey, true, 2, TimeUnit.DAYS);
 
                 // 8. 更新Redis缓存
                 // 8.1 更新作品票数缓存
                 String countKey = VOTE_COUNT_KEY + workId;
-                redisTemplate.opsForValue().increment(countKey);
+                Long currentVotes=redisTemplate.opsForValue().increment(countKey);
+
+
+                UpdateWrapper<AccWork> updateWrapper = new UpdateWrapper<>();
+                updateWrapper.eq("id", workId).setSql("vote_count = vote_count + 1");
+                if(baseMapper.update(null, updateWrapper)<1){
+                    throw new ServiceException("更新失败");
+                }
+
 
                 // 8.2 更新排行榜（使用ZSet）
-                redisTemplate.opsForZSet().incrementScore(VOTE_RANKING_KEY, String.valueOf(workId), 1);
+//                redisTemplate.opsForZSet().incrementScore(VOTE_RANKING_KEY, String.valueOf(workId), 1);
 
 
                 // 8.4 更新用户今日投票计数
                 String dailyLimitKey = DAILY_VOTE_LIMIT + activityId +":"+ userId + ":" + todayStr;
-                Long currentVotes = redisTemplate.opsForValue().increment(dailyLimitKey);
-                redisTemplate.expire(dailyLimitKey, 2, TimeUnit.DAYS);
+                redisTemplate.opsForValue().increment(dailyLimitKey);
+                redisTemplate.expire(dailyLimitKey, 1, TimeUnit.DAYS);
 
-                log.info("用户{}给作品{}投票成功，今日第{}票，当前作品总票数：{}",
-                        userId, workId, currentVotes, work.getVoteCount());
 
                 // 9. 返回结果
                 AccVoteRecordResponse response = new AccVoteRecordResponse();
                 response.setWorkId(workId);
-                response.setWorkName(work.getWorkName());
-                response.setCurrentVotes(work.getVoteCount());
+                response.setCurrentVotes(currentVotes);
                 return R.ok().put("data", response);
             }else {
                 throw new ServiceException("服务繁忙,请稍后再试");
@@ -293,6 +295,32 @@ public class AccWorkServiceImpl extends ServiceImpl<AccWorkMapper, AccWork>
         return accVoteRecordMapper.selectCount(new LambdaQueryWrapper<AccVoteRecord>()
                 .eq(AccVoteRecord::getUserId, userId).eq(AccVoteRecord::getVoteDate, todayStr));
     }
+
+
+    /**
+     * @Description: 作品查询
+     * @Param:
+     * @Return:
+     * @Author xgb
+     * @Date 2026/3/10 16:03
+     */
+    @Override
+    public R getWorkList(AccWorkRequest request) {
+
+        LocalDate today = LocalDate.now();
+        String todayStr = today.format(DateTimeFormatter.ISO_DATE);
+
+        PageHelper.startPage(request.getPageNum(), request.getPageSize());
+        List<AccWork> accWorks=baseMapper.selectListForApp(request);
+        for (AccWork work : accWorks) {
+            String userVoteKey = VOTE_WORK_KEY + request.getUserId() + ":" + work.getId() + ":" + todayStr;
+            Boolean hasVoted = redisTemplate.hasKey(userVoteKey);
+            // 假设 AccWork 有 isVoted 字段
+            work.setIsVoted(hasVoted != null && hasVoted);
+        }
+
+        return R.ok().put("data",new PageInfo<>(accWorks));
+    }
 }
 
 

fs-service/src/main/resources/mapper/activity/AccWorkMapper.xml

@@ -49,6 +49,24 @@
         where id = #{id}
     </select>
 
+    <select id="selectOneByTeamIdAndActivityId" resultType="com.fs.activity.domain.AccWork">
+        <include refid="selectAccWorkVo"/> where team_id = #{teamId} and activity_id = #{activityId}
+    </select>
+    <select id="selectListForApp" resultType="com.fs.activity.domain.AccWork">
+        <include refid="selectAccWorkVo"/> where status = 1 and activity_id = #{activityId}
+        <if test="workName != null and workName !=''">
+            and work_name like concat('%', #{workName}, '%')
+        </if>
+        <if test="sortBy != null">
+            <if test="sortBy == 'hot'">
+                order by vote_count desc
+            </if>
+            <if test="sortBy == 'new'">
+                order by created_at desc
+            </if>
+        </if>
+    </select>
+
     <insert id="insertAccWork" parameterType="AccWork" useGeneratedKeys="true" keyProperty="id">
         insert into acc_work
         <trim prefix="(" suffix=")" suffixOverrides=",">

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

@@ -1,21 +1,17 @@
 package com.fs.app.controller.app;
 
 import com.fs.activity.domain.AccTeam;
-import com.fs.activity.domain.AccVoteRecord;
 import com.fs.activity.domain.AccWork;
 import com.fs.activity.param.AccTeamMemberRequest;
 import com.fs.activity.param.AccVoteRecordRequest;
+import com.fs.activity.param.AccWorkRequest;
 import com.fs.activity.service.AccActivityService;
 import com.fs.activity.service.AccTeamMemberService;
 import com.fs.activity.service.AccTeamService;
 import com.fs.activity.service.AccWorkService;
-import com.fs.activity.service.impl.AccTeamMemberServiceImpl;
 import com.fs.app.annotation.Login;
 import com.fs.app.controller.AppBaseController;
 import com.fs.common.core.domain.R;
-import com.fs.course.domain.FsUserTalent;
-import com.fs.course.param.FsUserVideoAddParam;
-import io.swagger.annotations.ApiOperation;
 import org.springframework.beans.factory.annotation.Autowired;
 import org.springframework.web.bind.annotation.*;
 
@@ -52,8 +48,8 @@ public class AccActivityController extends AppBaseController
      */
     @Login
     @GetMapping("/isSignUp")
-    public Boolean isSignUp(Long activityId){
-        return accTeamService.isSignUp(Long.parseLong(getUserId()),activityId);
+    public R isSignUp(Long activityId){
+        return  R.ok().put("isSignUp",accTeamService.isSignUp(Long.parseLong(getUserId()),activityId));
     }
 
     /**
@@ -79,6 +75,7 @@ public class AccActivityController extends AppBaseController
     @Login
     @PostMapping("/signUpLeader")
     public R signUpLeader(@RequestBody AccTeam accTeam){
+        accTeam.setLeaderId(Long.parseLong(getUserId()));
         return accTeamService.signUpLeader(accTeam);
     }
 
@@ -149,7 +146,7 @@ public class AccActivityController extends AppBaseController
      */
     @Login
     @PostMapping("/uploadVideo")
-    public R talentVideo(@RequestBody AccWork accWork){
+    public R uploadVideo(@RequestBody AccWork accWork){
         return accWorkService.uploadVideo(accWork);
     }
 
@@ -167,6 +164,21 @@ public class AccActivityController extends AppBaseController
         return accWorkService.castVote(request);
     }
 
+    /**
+     * @Description: 作品查询
+     * @Param:
+     * @Return:
+     * @Author xgb
+     * @Date 2026/3/10 16:00
+     */
+    @GetMapping("/getWorkList")
+    @Login
+    public R getWorkList(AccWorkRequest request){
+        request.setUserId(Long.parseLong(getUserId()));
+        return accWorkService.getWorkList(request);
+    }
+
+