Merge branch 'sit' into uat-20260202

alien-entity/src/main/java/shop/alien/entity/store/vo/LifeUserVo.java

@@ -1,5 +1,6 @@
 package shop.alien.entity.store.vo;
 
+import com.fasterxml.jackson.annotation.JsonAlias;
 import com.fasterxml.jackson.annotation.JsonInclude;
 import io.swagger.annotations.ApiModelProperty;
 import lombok.Data;
@@ -66,5 +67,6 @@ public class LifeUserVo extends LifeUser {
     private String accountName;
 
     @ApiModelProperty(value = "验证码")
+    @JsonAlias("code")
     private String verificationCode;
 }

alien-entity/src/main/resources/mapper/storePlatform/StoreOperationalActivitySignupMapper.xml

@@ -39,7 +39,7 @@
         FROM store_operational_activity_signup
         WHERE activity_id = #{activityId}
           AND delete_flag = 0
---           AND status IN (0, 2)
+          AND status IN (0, 2)
     </select>
 
     <select id="countApprovedByActivityId" resultType="java.lang.Integer">

alien-store-platform/src/main/java/shop/alien/storeplatform/service/impl/OperationalActivitySignupServiceImpl.java

@@ -9,6 +9,7 @@ import lombok.RequiredArgsConstructor;
 import lombok.extern.slf4j.Slf4j;
 import org.springframework.beans.BeanUtils;
 import org.springframework.stereotype.Service;
+import org.springframework.transaction.annotation.Transactional;
 import shop.alien.entity.store.LifeNotice;
 import shop.alien.entity.store.LifeUser;
 import shop.alien.entity.store.vo.WebSocketVo;
@@ -173,6 +174,7 @@ public class OperationalActivitySignupServiceImpl implements OperationalActivity
     }
 
     @Override
+    @Transactional(rollbackFor = Exception.class)
     public int approveSignup(Integer id) {
         log.info("OperationalActivitySignupServiceImpl.approveSignup: id={}", id);
 
@@ -180,26 +182,37 @@ public class OperationalActivitySignupServiceImpl implements OperationalActivity
             throw new IllegalArgumentException("报名ID不能为空");
         }
 
+        StoreOperationalActivitySignup signup = signupMapper.selectById(id);
+        if (signup == null) {
+            throw new IllegalArgumentException("报名记录不存在");
+        }
+        if (signup.getStatus() == null || signup.getStatus() != 0) {
+            throw new IllegalArgumentException("仅待审核的报名可通过");
+        }
+
         LambdaUpdateWrapper<StoreOperationalActivitySignup> wrapper = new LambdaUpdateWrapper<>();
         wrapper.eq(StoreOperationalActivitySignup::getId, id)
+                .eq(StoreOperationalActivitySignup::getStatus, 0)
                 .set(StoreOperationalActivitySignup::getStatus, 2) // 2-通过
                 .set(StoreOperationalActivitySignup::getAuditTime, new Date()); // 设置审核时间为当前时间
 
         int result = signupMapper.update(null, wrapper);
-        
-        // 审核成功后发送通知
+
+        // 审核成功后同步活动状态并发送通知
         if (result > 0) {
+            syncActivitySignupStatus(signup.getActivityId());
             try {
                 sendApprovalNotice(id, true);
             } catch (Exception e) {
                 log.error("发送审核通过通知失败，signupId={}, error={}", id, e.getMessage(), e);
             }
         }
-        
+
         return result;
     }
 
     @Override
+    @Transactional(rollbackFor = Exception.class)
     public int rejectSignup(Integer id, String rejectReason) {
         log.info("OperationalActivitySignupServiceImpl.rejectSignup: id={}, rejectReason={}", id, rejectReason);
 
@@ -207,11 +220,20 @@ public class OperationalActivitySignupServiceImpl implements OperationalActivity
             throw new IllegalArgumentException("报名ID不能为空");
         }
 
+        StoreOperationalActivitySignup signup = signupMapper.selectById(id);
+        if (signup == null) {
+            throw new IllegalArgumentException("报名记录不存在");
+        }
+        if (signup.getStatus() == null || signup.getStatus() != 0) {
+            throw new IllegalArgumentException("仅待审核的报名可拒绝");
+        }
+
         LambdaUpdateWrapper<StoreOperationalActivitySignup> wrapper = new LambdaUpdateWrapper<>();
         wrapper.eq(StoreOperationalActivitySignup::getId, id)
+                .eq(StoreOperationalActivitySignup::getStatus, 0)
                 .set(StoreOperationalActivitySignup::getStatus, 1) // 1-拒绝
                 .set(StoreOperationalActivitySignup::getAuditTime, new Date()); // 设置审核时间为当前时间
-        
+
         // 如果提供了拒绝原因，则保存；否则使用默认值
         if (rejectReason != null && !rejectReason.trim().isEmpty()) {
             wrapper.set(StoreOperationalActivitySignup::getRejectReason, rejectReason.trim());
@@ -220,20 +242,83 @@ public class OperationalActivitySignupServiceImpl implements OperationalActivity
         }
 
         int result = signupMapper.update(null, wrapper);
-        
-        // 审核拒绝后发送通知
+
+        // 审核拒绝后同步活动人数与状态，并发送通知
         if (result > 0) {
+            syncActivitySignupStatus(signup.getActivityId());
             try {
                 sendApprovalNotice(id, false);
             } catch (Exception e) {
                 log.error("发送审核拒绝通知失败，signupId={}, error={}", id, e.getMessage(), e);
             }
         }
-        
+
         return result;
     }
 
     /**
+     * 根据有效报名人数同步活动状态：
+     * 满员时将未开始/进行中活动置为已售罄(4)；
+     * 拒绝后名额释放时将已售罄(4)恢复为未开始(2)/进行中(5)。
+     */
+    private void syncActivitySignupStatus(Integer activityId) {
+        if (activityId == null) {
+            return;
+        }
+        StoreOperationalActivity activity = activityMapper.selectById(activityId);
+        if (activity == null) {
+            return;
+        }
+
+        Integer limitPeople = activity.getActivityLimitPeople();
+        if (limitPeople == null || limitPeople <= 0) {
+            return;
+        }
+
+        Integer signupCount = signupMapper.countSignupByActivityId(activityId);
+        int currentCount = signupCount != null ? signupCount : 0;
+        Integer currentStatus = activity.getStatus();
+        Integer targetStatus = null;
+
+        if (currentCount >= limitPeople) {
+            if (currentStatus != null && (currentStatus == 2 || currentStatus == 5)) {
+                targetStatus = 4;
+            }
+        } else if (currentStatus != null && currentStatus == 4) {
+            targetStatus = resolveTimelineStatus(activity);
+            if (targetStatus != 2 && targetStatus != 5) {
+                targetStatus = null;
+            }
+        }
+
+        if (targetStatus != null && !targetStatus.equals(currentStatus)) {
+            LambdaUpdateWrapper<StoreOperationalActivity> activityWrapper = new LambdaUpdateWrapper<>();
+            activityWrapper.eq(StoreOperationalActivity::getId, activityId)
+                    .set(StoreOperationalActivity::getStatus, targetStatus);
+            activityMapper.update(null, activityWrapper);
+            log.info("同步活动报名状态，activityId={}, signupCount={}, limitPeople={}, status: {} -> {}",
+                    activityId, currentCount, limitPeople, currentStatus, targetStatus);
+        }
+    }
+
+    /**
+     * 按活动时间轴计算未开始/进行中/已结束状态。
+     */
+    private int resolveTimelineStatus(StoreOperationalActivity activity) {
+        Date now = new Date();
+        if (activity.getStartTime() == null || activity.getEndTime() == null) {
+            return 2;
+        }
+        if (now.before(activity.getStartTime())) {
+            return 2;
+        }
+        if (!now.after(activity.getEndTime())) {
+            return 5;
+        }
+        return 7;
+    }
+
+    /**
      * 获取状态文字
      *
      * @param status 状态值

alien-store/src/main/java/shop/alien/store/controller/LifeUserController.java

@@ -14,8 +14,8 @@ import shop.alien.entity.store.LifeUser;
 import shop.alien.entity.store.dto.LifeFansFollowOutcome;
 import shop.alien.entity.store.vo.LifeUserVo;
 import shop.alien.mapper.LifeUserMapper;
-import shop.alien.store.config.BaseRedisService;
 import shop.alien.store.service.LifeUserService;
+import shop.alien.store.util.ali.AliSms;
 import shop.alien.util.common.FileUpload;
 import shop.alien.util.common.RandomCreateUtil;
 
@@ -41,7 +41,7 @@ public class LifeUserController {
 
     private final LifeUserMapper lifeUserMapper;
 
-    private final BaseRedisService baseRedisService;
+    private final AliSms aliSms;
 
     @ApiOperation("查询用户信息")
     @ApiOperationSupport(order = 2)
@@ -168,16 +168,37 @@ public class LifeUserController {
     @ApiOperation("用户端注销用户")
     @PostMapping("/liftCancelAccount")
     public R<Boolean> liftCancelAccount(@RequestBody LifeUserVo user) {
-        log.info("StoreUserController.liftCancelAccount?LifeUserVo={}", user.toString());
-        // 2025-11-04 验证码-用户端注销账号
-        String cacheCode = baseRedisService.getString("verification_user_cancel_account_" + user.getUserPhone());
-        if (null == cacheCode) {
-            return R.fail("验证码过期或未发送");
+        log.info("LifeUserController.liftCancelAccount?LifeUserVo={}", user);
+        if (user.getId() == null) {
+            return R.fail("用户id不能为空");
         }
-        if (!cacheCode.trim().equals(user.getVerificationCode().trim())) {
-            return R.fail("验证码错误");
+        LifeUser lifeUser = lifeUserMapper.selectById(user.getId());
+        if (lifeUser == null) {
+            return R.fail("用户不存在");
+        }
+        if (lifeUser.getLogoutFlag() != null && lifeUser.getLogoutFlag() == 1) {
+            return R.fail("账号已在注销中");
+        }
+        if (!StringUtils.hasText(lifeUser.getUserPhone())) {
+            return R.fail("用户手机号不存在");
+        }
+        if (!StringUtils.hasText(user.getVerificationCode())) {
+            return R.fail("验证码不能为空");
+        }
+        int code;
+        try {
+            code = Integer.parseInt(user.getVerificationCode().trim());
+        } catch (NumberFormatException e) {
+            return R.fail("验证码格式错误");
+        }
+        if (!aliSms.checkSmsCode(lifeUser.getUserPhone(), 0, 5, code)) {
+            return R.fail("验证码错误或已过期");
+        }
+        try {
+            service.liftCancelAccount(user);
+        } catch (IllegalArgumentException e) {
+            return R.fail(e.getMessage());
         }
-        service.liftCancelAccount(user);
         return R.success("注销成功");
     }
 

alien-store/src/main/java/shop/alien/store/service/LifeUserService.java

@@ -475,15 +475,18 @@ public class LifeUserService extends ServiceImpl<LifeUserMapper, LifeUser> {
     }
 
     public void liftCancelAccount(LifeUser user) {
-        // 通过id获取当前用户账号信息
-        LambdaQueryWrapper<LifeUser> lambdaQueryWrapper = new LambdaQueryWrapper<>();
-        lambdaQueryWrapper.eq(LifeUser::getId, user.getId());
-        LifeUser lifeUser = lifeUserMapper.selectOne(lambdaQueryWrapper);
-        // 修改注销标记为1
+        if (user == null || user.getId() == null) {
+            throw new IllegalArgumentException("用户id不能为空");
+        }
+        LifeUser lifeUser = lifeUserMapper.selectById(user.getId());
+        if (lifeUser == null) {
+            throw new IllegalArgumentException("用户不存在");
+        }
+        if (lifeUser.getLogoutFlag() != null && lifeUser.getLogoutFlag() == 1) {
+            throw new IllegalArgumentException("账号已在注销中");
+        }
         lifeUser.setLogoutFlag(1);
-        // 添加注销原因
         lifeUser.setLogoutReason(user.getLogoutReason());
-        // 添加注销申请时间
         lifeUser.setLogoutTime(new Date());
         lifeUserMapper.updateById(lifeUser);
     }