抽奖人员重复校验调整

jeeplus-module/jeeplus-test/src/main/java/com/jeeplus/test/luckyDraw/controller/LuckyDrawInfoController.java

@@ -76,7 +76,7 @@ public class LuckyDrawInfoController {
                 sh.setLuckyDrawFlag("1");
                 addList.add(sh);
             }else{
-                re.setLuckyDrawFlag("1");
+                re.setLuckyDrawFlag("0");
                 re.setShowFlag("2");
             }
 

jeeplus-module/jeeplus-test/src/main/java/com/jeeplus/test/luckyDraw/controller/LuckyDrawMembersController.java

@@ -3,6 +3,7 @@ package com.jeeplus.test.luckyDraw.controller;
 import com.baomidou.mybatisplus.core.metadata.IPage;
 import com.baomidou.mybatisplus.extension.plugins.pagination.Page;
 import com.jeeplus.common.utils.ResponseUtil;
+import com.jeeplus.sys.utils.StringUtils;
 import com.jeeplus.test.luckyDraw.service.LuckyDrawMembersService;
 import com.jeeplus.test.luckyDraw.service.dto.LuckyDrawMembersDto;
 import io.swagger.annotations.Api;
@@ -44,11 +45,15 @@ public class LuckyDrawMembersController {
     @ApiOperation(value = "新增、修改")
     @PostMapping("/save")
     public ResponseEntity<String> save(@RequestBody LuckyDrawMembersDto dto) throws Exception{
-        String s = membersService.save(dto);
-        if (s == "1") {
-            return ResponseEntity.badRequest().body ("名字重复，请重新修改");
-        }else if (s == "2"){
-            return ResponseEntity.badRequest().body ("新增失败");
+        if(StringUtils.isBlank(dto.getEventId())){
+            return ResponseEntity.badRequest().body ("请选择参与的活动");
+        }
+        String result = membersService.save(dto);
+        switch (result){
+            case "1":
+                return ResponseEntity.badRequest().body ("名字重复，请重新修改");
+            case "2":
+                return ResponseEntity.badRequest().body ("新增失败");
         }
         return ResponseEntity.ok ("操作成功");
     }

jeeplus-module/jeeplus-test/src/main/java/com/jeeplus/test/luckyDraw/mapper/xml/LuckyDrawMembersMapper.xml

@@ -21,6 +21,7 @@
 		select count(1) from lucky_draw_members
 		<where>
 			name = #{name}
+			and event_id = #{eventId}
 			<if test="id != null and id != ''">
 				and id != #{id}
 			</if>