Merge branch 'milestone-20250723-wwl' into wuweili/feature-20250715095139-抽奖众筹

lottery-system/.idea/ApifoxUploaderProjectSetting.xml

@@ -0,0 +1,13 @@
+<?xml version="1.0" encoding="UTF-8"?>
+<project version="4">
+  <component name="ApifoxUploaderProjectSetting">
+    <option name="apiAccessToken" value="APS-xj8kOQmafbg1T5dq6bs6LJfHku7PRk9n" />
+    <option name="apiProjectIds">
+      <array>
+        <option value="&lt;byte-array&gt;rO0ABXNyADZjb20uaXRhbmdjZW50LmlkZWEucGx1Z2luLmFwaS5hY2NvdW50LlByb2plY3RBbmRNb2R1bGUAAAAAAAAAAQIAFVoABmVuYWJsZUwACG1vZHVsZUlkdAASTGphdmEvbGFuZy9TdHJpbmc7TAAGb3RoZXIxcQB+AAFMAAdvdGhlcjEwcQB+AAFMAAdvdGhlcjExcQB+AAFMAAdvdGhlcjEycQB+AAFMAAZvdGhlcjJxAH4AAUwABm90aGVyM3EAfgABTAAGb3RoZXI0cQB+AAFMAAZvdGhlcjVxAH4AAUwABm90aGVyNnEAfgABTAAGb3RoZXI3cQB+AAFMAAZvdGhlcjhxAH4AAUwABm90aGVyOXEAfgABTAAKcGF0aEJlZm9yZXEAfgABTAANcHJvamVjdEZvbGRlcnEAfgABTAAPcHJvamVjdEZvbGRlcklkcQB+AAFMAAlwcm9qZWN0SWRxAH4AAUwAC3Byb2plY3ROYW1lcQB+AAFMAAxzY2hlbWFGb2xkZXJxAH4AAUwACHNjaGVtYUlkcQB+AAF4cAF0AA9sb3R0ZXJ5LXNlcnZpY2V0AABwcHBxAH4ABHQAC2JyYW5jaC1tYWludAAM6buY6K6k5qih5Z2XcHBwcHBxAH4ABHQACeagueebruW9lXQAATB0AAc2ODIyNTU4dAAM5Liq5Lq66aG555uucQB+AAdxAH4ACA==&lt;/byte-array&gt;" />
+      </array>
+    </option>
+    <option name="treeNodes" value="&lt;byte-array&gt;rO0ABXNyABdqYXZhLnV0aWwuTGlua2VkSGFzaE1hcDTATlwQbMD7AgABWgALYWNjZXNzT3JkZXJ4cgARamF2YS51dGlsLkhhc2hNYXAFB9rBwxZg0QMAAkYACmxvYWRGYWN0b3JJAAl0aHJlc2hvbGR4cD9AAAAAAAAMdwgAAAAQAAAAAXQABzM2OTM2NjhzcgAuY29tLml0YW5nY2VudC5pZGVhLnBsdWdpbi5hcGkuYWNjb3VudC5UcmVlTm9kZQAAAAAAAAABAgAQTAAHYWxsUGF0aHQAEkxqYXZhL2xhbmcvU3RyaW5nO1sAFGJyYW5jaEFuZFZlcnNpb25JdGVtdABLW0xjb20vaXRhbmdjZW50L2lkZWEvcGx1Z2luL2RpYWxvZy9jb21wb25lbnQvYWNjb3VudC9BY2NvdW50UmlnaHRQYW5lbEl0ZW07TAAUYnJhbmNoSWRBbmRWZXJzaW9uSWRxAH4ABUwACGNoaWxkcmVudAAPTGphdmEvdXRpbC9NYXA7TAAKZm9sZGVyVHlwZXEAfgAFTAAIZnVsbFBhdGhxAH4ABUwAA2tleXEAfgAFWwAJbW9kZWxJdGVtcQB+AAZMAAhtb2R1bGVJZHEAfgAFTAAEbmFtZXEAfgAFTAAIcGFyZW50SWRxAH4ABUwACXByb2plY3RJZHEAfgAFTAALcHJvamVjdE5hbWVxAH4ABUwABnRlYW1JZHEAfgAFTAAIdGVhbU5hbWVxAH4ABUwABHR5cGV0ADBMY29tL2l0YW5nY2VudC9pZGVhL3BsdWdpbi9hcGkvYWNjb3VudC9Ob2RlVHlwZTt4cHQADOS4quS6uuWboumYn3Bwc3EAfgAAP0AAAAAAAAx3CAAAABAAAAABdAAHNjgyMjU1OHNxAH4ABHQAGeS4quS6uuWboumYny/kuKrkurrpobnnm65wcHNxAH4AAD9AAAAAAAAAdwgAAAAQAAAAAHgAcHBxAH4ADHBwdAAW5Liq5Lq66aG555uuICg2ODIyNTU4KXQABzM2OTM2NjhxAH4ADHQADOS4quS6uumhueebrnEAfgARcH5yAC5jb20uaXRhbmdjZW50LmlkZWEucGx1Z2luLmFwaS5hY2NvdW50Lk5vZGVUeXBlAAAAAAAAAAASAAB4cgAOamF2YS5sYW5nLkVudW0AAAAAAAAAABIAAHhwdAAHUFJPSkVDVHgAcHBxAH4AA3BwcQB+AApwcHBxAH4AA3EAfgAKfnEAfgATdAAEVEVBTXgA&lt;/byte-array&gt;" />
+    <option name="treeNodesJTree" value="&lt;byte-array&gt;rO0ABXNyACFqYXZheC5zd2luZy50cmVlLkRlZmF1bHRUcmVlTW9kZWynvpEmGsXl2QMAA1oAEmFza3NBbGxvd3NDaGlsZHJlbkwADGxpc3RlbmVyTGlzdHQAJUxqYXZheC9zd2luZy9ldmVudC9FdmVudExpc3RlbmVyTGlzdDtMAARyb290dAAbTGphdmF4L3N3aW5nL3RyZWUvVHJlZU5vZGU7eHAAc3IAI2phdmF4LnN3aW5nLmV2ZW50LkV2ZW50TGlzdGVuZXJMaXN0kUjMLXPfDt4DAAB4cHB4c3IAJ2phdmF4LnN3aW5nLnRyZWUuRGVmYXVsdE11dGFibGVUcmVlTm9kZcRYv/zyqHHgAwADWgAOYWxsb3dzQ2hpbGRyZW5MAAhjaGlsZHJlbnQAEkxqYXZhL3V0aWwvVmVjdG9yO0wABnBhcmVudHQAIkxqYXZheC9zd2luZy90cmVlL011dGFibGVUcmVlTm9kZTt4cAFzcgAQamF2YS51dGlsLlZlY3RvctmXfVuAO68BAwADSQARY2FwYWNpdHlJbmNyZW1lbnRJAAxlbGVtZW50Q291bnRbAAtlbGVtZW50RGF0YXQAE1tMamF2YS9sYW5nL09iamVjdDt4cAAAAAAAAAABdXIAE1tMamF2YS5sYW5nLk9iamVjdDuQzlifEHMpbAIAAHhwAAAACnNxAH4ABgFzcQB+AAoAAAAAAAAAAXVxAH4ADQAAAApzcQB+AAYBcHEAfgAPdXEAfgANAAAAAnQACnVzZXJPYmplY3RzcgAuY29tLml0YW5nY2VudC5pZGVhLnBsdWdpbi5hcGkuYWNjb3VudC5UcmVlTm9kZQAAAAAAAAABAgAQTAAHYWxsUGF0aHQAEkxqYXZhL2xhbmcvU3RyaW5nO1sAFGJyYW5jaEFuZFZlcnNpb25JdGVtdABLW0xjb20vaXRhbmdjZW50L2lkZWEvcGx1Z2luL2RpYWxvZy9jb21wb25lbnQvYWNjb3VudC9BY2NvdW50UmlnaHRQYW5lbEl0ZW07TAAUYnJhbmNoSWRBbmRWZXJzaW9uSWRxAH4AFkwACGNoaWxkcmVudAAPTGphdmEvdXRpbC9NYXA7TAAKZm9sZGVyVHlwZXEAfgAWTAAIZnVsbFBhdGhxAH4AFkwAA2tleXEAfgAWWwAJbW9kZWxJdGVtcQB+ABdMAAhtb2R1bGVJZHEAfgAWTAAEbmFtZXEAfgAWTAAIcGFyZW50SWRxAH4AFkwACXByb2plY3RJZHEAfgAWTAALcHJvamVjdE5hbWVxAH4AFkwABnRlYW1JZHEAfgAWTAAIdGVhbU5hbWVxAH4AFkwABHR5cGV0ADBMY29tL2l0YW5nY2VudC9pZGVhL3BsdWdpbi9hcGkvYWNjb3VudC9Ob2RlVHlwZTt4cHQAGeS4quS6uuWboumYny/kuKrkurrpobnnm651cgBLW0xjb20uaXRhbmdjZW50LmlkZWEucGx1Z2luLmRpYWxvZy5jb21wb25lbnQuYWNjb3VudC5BY2NvdW50UmlnaHRQYW5lbEl0ZW07KbxSniq4DKkCAAB4cAAAAAFzcgBIY29tLml0YW5nY2VudC5pZGVhLnBsdWdpbi5kaWFsb2cuY29tcG9uZW50LmFjY291bnQuQWNjb3VudFJpZ2h0UGFuZWxJdGVtAAAAAAAAAAECAARaAA9pc01haW5PckRlZmF1bHRMAAhpY29uVHlwZXEAfgAWTAACaWRxAH4AFkwABG5hbWVxAH4AFnhwAXQABmJyYW5jaHQAAHQABG1haW5wc3IAF2phdmEudXRpbC5MaW5rZWRIYXNoTWFwNMBOXBBswPsCAAFaAAthY2Nlc3NPcmRlcnhyABFqYXZhLnV0aWwuSGFzaE1hcAUH2sHDFmDRAwACRgAKbG9hZEZhY3RvckkACXRocmVzaG9sZHhwP0AAAAAAAAB3CAAAABAAAAAAeABwcHQABzY4MjI1NTh1cQB+ABwAAAABc3EAfgAeAXQABW1vZGVscQB+ACF0AAzpu5jorqTmqKHlnZdwdAAW5Liq5Lq66aG555uuICg2ODIyNTU4KXQABzM2OTM2Njh0AAc2ODIyNTU4dAAM5Liq5Lq66aG555uudAAHMzY5MzY2OHB+cgAuY29tLml0YW5nY2VudC5pZGVhLnBsdWdpbi5hcGkuYWNjb3VudC5Ob2RlVHlwZQAAAAAAAAAAEgAAeHIADmphdmEubGFuZy5FbnVtAAAAAAAAAAASAAB4cHQAB1BST0pFQ1R4cHBwcHBwcHBweHEAfgAJdXEAfgANAAAAAnEAfgAUc3EAfgAVdAAM5Liq5Lq65Zui6ZifcHBzcQB+ACM/QAAAAAAAAHcIAAAAEAAAAAB4AHBwdAAHMzY5MzY2OHBwdAAM5Liq5Lq65Zui6ZifcHBwdAAHMzY5MzY2OHQADOS4quS6uuWboumYn35xAH4AMHQABFRFQU14cHBwcHBwcHBweHB1cQB+AA0AAAACcQB+ABRzcQB+ABV0AARSb290cHBwcHB0AAEwcHBxAH4AQHBwcHBwcQB+ADx4c3EAfgAKAAAAAAAAAAJ1cQB+AA0AAAAKdAAEcm9vdHEAfgAJcHBwcHBwcHB4eA==&lt;/byte-array&gt;" />
+  </component>
+</project>

lottery-system/lottery-service/src/main/java/com/lottery/admin/controller/AdminGradeController.java

@@ -12,6 +12,7 @@ import com.lottery.utils.ConvertBeanUtil;
 import com.lottery.vo.GradeSimpleVo;
 import com.lottery.vo.GradeVo;
 import com.lottery.vo.PageInfo;
+import lombok.extern.slf4j.Slf4j;
 import org.slf4j.Logger;
 import org.slf4j.LoggerFactory;
 import org.springframework.beans.factory.annotation.Autowired;
@@ -33,6 +34,7 @@ import java.util.List;
  **/
 
 //TODo 删除等级时 把奖品表关联删除。。删除用户表时，把内定用户表关联删除，，，，增加内定多一个逻辑：如果增加的内定用户已存在表中，增加失败（其实就是一个用户只能内定一个等级）
+
 @RestController
 @RequestMapping("/admin/grade")
 public class AdminGradeController {
@@ -45,7 +47,6 @@ public class AdminGradeController {
 
     private final static Logger LOGGER = LoggerFactory.getLogger(AdminGradeController.class);
 
-
     @PostMapping("/list")
     public Result<PageInfo<GradeVo>> selectGrade(@RequestBody PageSimpleDto pageSimpleDto){
         if (pageSimpleDto.getPageNum() == null) {

lottery-system/lottery-service/src/main/java/com/lottery/admin/controller/AdminUserController.java

@@ -70,6 +70,7 @@ public class AdminUserController {
         if (userQueryDto.getPageSize() == null) {
             userQueryDto.setPageSize(10);
         }
+
         return Result.success(adminUserService.listUser(userQueryDto.getPageNum(), userQueryDto.getPageSize(), userQueryDto));
     }
 

lottery-system/lottery-service/src/main/java/com/lottery/admin/service/Impl/AdminGradeServiceImpl.java

@@ -78,6 +78,7 @@ public class AdminGradeServiceImpl extends ServiceImpl<AdminGradeMapper, Grade>
                                 .orderByAsc(Grade::getId);   //sort一样按照id排序
         Page<Grade> gradePage = this.page(page, gradeLambdaQueryWrapper);
 
+
         List<GradeVo> gradeVos = ConvertBeanUtil.convertList(gradePage.getRecords(), GradeVo.class);
         return PageInfo.of(gradePage, gradeVos);
     }
@@ -91,8 +92,8 @@ public class AdminGradeServiceImpl extends ServiceImpl<AdminGradeMapper, Grade>
 
     @Override
     public boolean saveGrade(GradeDto gradeDto) {
-        Grade grade = ConvertBeanUtil.convert(gradeDto, Grade.class);
 
+        Grade grade = ConvertBeanUtil.convert(gradeDto, Grade.class);
         grade.setRemainNum(gradeDto.getAmount());
         grade.setCreateTime(new Date());
         grade.setUpdateTime(new Date());

lottery-system/lottery-service/src/main/java/com/lottery/admin/service/Impl/FundingServiceImpl.java

@@ -299,8 +299,13 @@ public class FundingServiceImpl implements IFundingService {
         if(marketCount ==null || marketCount == 0){
             return Result.failure("所要设置市场不存在");
         }
-        fundingMapper.setVirtual(activityId, stock, addTotal);
+        //查询当前总的助力数
+        Integer total = fundingMapper.searchMarketTotal(activityId,stock);
+        if(total + addTotal >= 1500){
+            return Result.failure("所在市场助力值最大1500");
+        }
 
+        fundingMapper.setVirtual(activityId, stock, addTotal);
         return Result.success("设置虚拟次数成功");
     }
 

lottery-system/lottery-service/src/main/java/com/lottery/api/service/Impl/ApiFundingServiceImpl.java

@@ -49,7 +49,7 @@ public class ApiFundingServiceImpl implements ApiIFundingService {
             if (count == null || count == 0 || count > 1) {
                 // 根据业务逻辑，这里可以分别处理count为null、小于0和大于1的情况
                 // 但为了简化示例，我们统一返回一个失败结果
-                return Result.failure("活动数量不符合要求，请检查打开或关闭多余的活动");
+                return Result.failure(200,"操作成功");
             }
 
         Integer activityId = fundingMapper.selectStatus();

lottery-system/lottery-service/src/main/java/com/lottery/interceptor/AuthInterceptor.java

@@ -40,7 +40,10 @@ public class AuthInterceptor implements HandlerInterceptor {
         if("/api/user/list".equals(request.getRequestURI())) {
             return true;
         }
-        if("/admin/win/list".equals(request.getRequestURI())) {
+//        if("/admin/win/list".equals(request.getRequestURI())) {
+//            return true;
+//        }
+        if("/api/winUser/list".equals(request.getRequestURI())) {
             return true;
         }
         if("/api/lottery/start".equals(request.getRequestURI())) {