Merge branch 'dev-caomeihuizhang' into container-test

docu/zhengzai-caomeihuizhang.sql

@@ -78,4 +78,6 @@ ALTER TABLE `adam_caomei_badge` ADD COLUMN `sort` int(11) NOT NULL DEFAULT 0 COM
 ALTER TABLE `adam_caomei_badge` ADD COLUMN `share_text` varchar(255) NOT NULL DEFAULT '' COMMENT '徽章分享文案' AFTER `sort`;
 
 -- 2026-04-23 新增徽章副标题字段
-ALTER TABLE `adam_caomei_badge` ADD COLUMN `sub_title` varchar(32) NOT NULL DEFAULT '' COMMENT '徽章副标题（最多20字）' AFTER `name`;
+ALTER TABLE `adam_caomei_badge` ADD COLUMN `sub_title` varchar(32) NOT NULL DEFAULT '' COMMENT '徽章副标题（最多20字）' AFTER `name`;
\ No newline at end of file
+
+-- TODO 上线前需要运行：adam_caomei_passport_inserts_BATCH-CAOMEI-B1.sql
\ No newline at end of file

liquidnet-bus-api/liquidnet-service-adam-api/src/main/java/com/liquidnet/service/adam/dto/param/AdamCaomeiBadgeClaimParam.java

@@ -5,12 +5,14 @@ import io.swagger.annotations.ApiModelProperty;
 import lombok.Data;
 
 import javax.validation.constraints.NotBlank;
+import javax.validation.constraints.NotEmpty;
+import java.util.List;
 
 @Data
 @ApiModel("草莓徽章-认领参数")
 public class AdamCaomeiBadgeClaimParam {
 
-    @NotBlank(message = "徽章ID不能为空")
-    @ApiModelProperty(value = "徽章ID", required = true)
-    private String badgeId;
+    @NotEmpty(message = "徽章ID列表不能为空")
+    @ApiModelProperty(value = "徽章ID列表", required = true)
+    private List<@NotBlank(message = "徽章ID不能为空") String> badgeIds;
 }

liquidnet-bus-api/liquidnet-service-adam-api/src/main/java/com/liquidnet/service/adam/service/IAdamCaomeiBadgeUserService.java

@@ -14,7 +14,7 @@ public interface IAdamCaomeiBadgeUserService {
     /**
      * 认领徽章
      */
-    ResponseDto<String> claimBadge(String badgeId, String uid);
+    ResponseDto<List<String>> claimBadges(List<String> badgeIds, String uid);
 
     /**
      * 补签申请记录列表（用户端）

liquidnet-bus-do/liquidnet-service-adam-do/src/main/java/com/liquidnet/service/adam/mapper/AdamCaomeiBadgeMapper.java

@@ -87,6 +87,18 @@ public interface AdamCaomeiBadgeMapper extends BaseMapper<AdamCaomeiBadge> {
     @Select("select count(1) from adam_caomei_user_badge where user_id = #{userId} and badge_id = #{badgeId}")
     int checkUserBadgeExists(@Param("userId") String userId, @Param("badgeId") String badgeId);
 
+    @Select({
+            "<script>",
+            "select badge_id from adam_caomei_user_badge",
+            "where user_id = #{userId} and badge_id in",
+            "<foreach collection='badgeIds' item='badgeId' open='(' separator=',' close=')'>",
+            "#{badgeId}",
+            "</foreach>",
+            "</script>"
+    })
+    List<String> selectClaimedBadgeIdsByUserAndBadgeIds(@Param("userId") String userId,
+                                                        @Param("badgeIds") List<String> badgeIds);
+
     @Insert({
             "insert into adam_caomei_user_badge (user_id, badge_id, source, created_at) ",
             "values (#{userId}, #{badgeId}, #{source}, now())"

liquidnet-bus-service/liquidnet-service-adam/liquidnet-service-adam-impl/src/main/java/com/liquidnet/service/adam/controller/AdamCaomeiBadgeUserController.java

@@ -36,9 +36,9 @@ public class AdamCaomeiBadgeUserController {
     @ApiOperationSupport(order = 1)
     @ApiOperation("认领徽章")
     @PostMapping("claim")
-    public ResponseDto<String> claim(@Valid @RequestBody AdamCaomeiBadgeClaimParam param) {
+    public ResponseDto<List<String>> claim(@Valid @RequestBody AdamCaomeiBadgeClaimParam param) {
         String uid = CurrentUtil.getCurrentUid();
-        return adamCaomeiBadgeUserService.claimBadge(param.getBadgeId(), uid);
+        return adamCaomeiBadgeUserService.claimBadges(param.getBadgeIds(), uid);
     }
 
     @ApiOperationSupport(order = 2)