Sfoglia il codice sorgente

实现使绿 S-cfc-316 admin.activity.config:券/活动配置校验三原则

能力键 admin.activity.config(TDD 红转绿):
- AdminCouponController.create:时间冲突(validFrom>validUntil)400 / 名额超卖(usedCount>totalCount)400 / 重名幂等(selectCount>0)400
- AdminCouponController.update:时间冲突 / 名额超卖 400
- ActivityService.create:时间冲突(startTime>endTime)400
- ActivityService.update:时间冲突 + 名额超卖(approvedCount>maxParticipants)400,合并 existing 与请求值判定

契约溯源:SC-A-07/SC-A-17、TC-A-13-E/TC-A-18-E(tests/user-scenarios + test-cases/admin.md)
验证:AdminActivityConfigContractTest 5/5 通过;ActivityServicePublishTest 6/6、
ActivityAdminServiceTest 10/10、AdminCommissionConfig* 7/7 无回归
Agnes Agent 2 giorni fa
parent
commit
cf806f00

+ 26 - 0
cfc-backend/src/main/java/com/etotem/cfc/controller/admin/AdminCouponController.java

@@ -74,6 +74,23 @@ public class AdminCouponController {
     @PostMapping("/create")
     @PreAuthorize("hasRole('admin')")
     public Result<String> create(@RequestBody Coupon coupon) {
+        // 配置校验三原则(S-cfc-316 admin.activity.config):时间冲突 / 名额超卖 / 重名幂等
+        if (coupon.getValidFrom() != null && coupon.getValidUntil() != null
+                && coupon.getValidFrom().after(coupon.getValidUntil())) {
+            return Result.badRequest("券生效时间冲突:生效开始时间不能晚于结束时间");
+        }
+        if (coupon.getUsedCount() != null && coupon.getTotalCount() != null
+                && coupon.getUsedCount() > coupon.getTotalCount()) {
+            return Result.badRequest("券名额超卖保护:已用数量不能大于总数量");
+        }
+        if (coupon.getName() != null && !coupon.getName().trim().isEmpty()) {
+            LambdaQueryWrapper<Coupon> nameQuery = new LambdaQueryWrapper<>();
+            nameQuery.eq(Coupon::getName, coupon.getName());
+            Long existed = couponMapper.selectCount(nameQuery);
+            if (existed != null && existed > 0) {
+                return Result.badRequest("同名称券模板已存在,请勿重复创建");
+            }
+        }
         if (coupon.getType() == null) coupon.setType("FIXED");
         if (coupon.getMinSpend() == null) coupon.setMinSpend(0);
         if (coupon.getApplicableTo() == null) coupon.setApplicableTo("ALL");
@@ -86,6 +103,15 @@ public class AdminCouponController {
     @PostMapping("/update")
     @PreAuthorize("hasRole('admin')")
     public Result<String> update(@RequestBody Coupon coupon) {
+        // 配置校验(S-cfc-316 admin.activity.config):时间冲突 / 名额超卖
+        if (coupon.getValidFrom() != null && coupon.getValidUntil() != null
+                && coupon.getValidFrom().after(coupon.getValidUntil())) {
+            return Result.badRequest("券生效时间冲突:生效开始时间不能晚于结束时间");
+        }
+        if (coupon.getUsedCount() != null && coupon.getTotalCount() != null
+                && coupon.getUsedCount() > coupon.getTotalCount()) {
+            return Result.badRequest("券名额超卖保护:已用数量不能大于总数量");
+        }
         couponMapper.updateById(coupon);
         return Result.success("更新成功");
     }

+ 18 - 0
cfc-backend/src/main/java/com/etotem/cfc/service/ActivityService.java

@@ -183,6 +183,11 @@ public class ActivityService extends ServiceImpl<ActivityMapper, Activity> {
     }
 
     public Result<ActivityDTO> create(Activity activity, Long creatorId) {
+        // 配置校验(S-cfc-316 admin.activity.config):时间冲突(SC-A-07 / TC-A-13-E)
+        if (activity.getStartTime() != null && activity.getEndTime() != null
+                && activity.getStartTime().after(activity.getEndTime())) {
+            return Result.badRequest("活动时间冲突:开始时间不能晚于结束时间");
+        }
         activity.setStatus("draft");
         activity.setCurrentParticipants(0);
         activity.setApprovedCount(0);
@@ -199,6 +204,19 @@ public class ActivityService extends ServiceImpl<ActivityMapper, Activity> {
         if (existing == null) {
             return Result.error("活动不存在");
         }
+        // 配置校验(S-cfc-316 admin.activity.config):时间冲突 / 名额超卖(SC-A-17 / TC-A-18-E)
+        Date startTime = activity.getStartTime() != null ? activity.getStartTime() : existing.getStartTime();
+        Date endTime = activity.getEndTime() != null ? activity.getEndTime() : existing.getEndTime();
+        if (startTime != null && endTime != null && startTime.after(endTime)) {
+            return Result.badRequest("活动时间冲突:开始时间不能晚于结束时间");
+        }
+        Integer approvedCount = activity.getApprovedCount() != null
+                ? activity.getApprovedCount() : existing.getApprovedCount();
+        Integer maxParticipants = activity.getMaxParticipants() != null
+                ? activity.getMaxParticipants() : existing.getMaxParticipants();
+        if (approvedCount != null && maxParticipants != null && approvedCount > maxParticipants) {
+            return Result.badRequest("活动名额超卖保护:已审核人数不能大于最大参与人数");
+        }
         activity.setUpdatedAt(new Date());
         this.updateById(activity);
         return Result.success(ActivityDTO.from(this.getById(activity.getId())));