doudou二期需求-卡片列表接口

liquidnet-bus-api/liquidnet-service-sweet-api/src/main/java/com/liquidnet/service/sweet/service/ISweetDoudouService.java

@@ -5,10 +5,12 @@ import com.liquidnet.service.base.ResponseDto;
 import com.liquidnet.service.sweet.entity.SweetDoudou;
 import com.liquidnet.service.sweet.param.SweetDouDouCheckParam;
 import com.liquidnet.service.sweet.param.SweetDouDouParam;
+import com.liquidnet.service.sweet.vo.SweetDouDouActiveVo;
 import com.liquidnet.service.sweet.vo.SweetDouDouVo;
 import org.springframework.web.multipart.MultipartFile;
 
 import javax.validation.Valid;
+import java.util.List;
 
 /**
  * <p>
@@ -29,4 +31,6 @@ public interface ISweetDoudouService extends IService<SweetDoudou> {
     ResponseDto<SweetDouDouVo> detail(SweetDouDouCheckParam param);
 
     boolean winningUpload(MultipartFile file);
+
+    ResponseDto<List<SweetDouDouActiveVo>> getActiveList();
 }

liquidnet-bus-api/liquidnet-service-sweet-api/src/main/java/com/liquidnet/service/sweet/vo/SweetDouDouActiveVo.java

+package com.liquidnet.service.sweet.vo;
+
+import io.swagger.annotations.ApiModel;
+import io.swagger.annotations.ApiModelProperty;
+import lombok.Data;
+
+import java.io.Serializable;
+
+@Data
+@ApiModel("SweetDouDouActiveVo")
+public class SweetDouDouActiveVo implements Serializable, Cloneable {
+
+    @ApiModelProperty("活动ID")
+    private String activeId;
+
+    @ApiModelProperty("标题")
+    private String title;
+
+    @ApiModelProperty("背景图")
+    private String cardImages;
+
+    @ApiModelProperty("活动详情背景图")
+    private String detailImages;
+
+    @ApiModelProperty("活动详情URL")
+    private String target_url;
+
+    @ApiModelProperty("活动状态：2：进行中 3：已结束")
+    private Integer activeStatus;
+
+    @ApiModelProperty("状态 1已登记 2未中签 3已中签 4已核销")
+    private Integer status;
+}

liquidnet-bus-do/liquidnet-service-sweet-do/src/main/java/com/liquidnet/service/sweet/entity/SweetDoudouActive.java

+package com.liquidnet.service.sweet.entity;
+
+import com.baomidou.mybatisplus.annotation.IdType;
+import com.baomidou.mybatisplus.annotation.TableId;
+import lombok.Data;
+import lombok.EqualsAndHashCode;
+
+import java.time.LocalDateTime;
+
+@Data
+@EqualsAndHashCode(callSuper = false)
+public class SweetDoudouActive {
+
+    private static final long serialVersionUID = 1L;
+
+    @TableId(value = "mid", type = IdType.AUTO)
+    private Long mid;
+
+    /**
+     * active_id
+     */
+    private String active_id;
+
+    /**
+     * 标题
+     */
+    private String title;
+
+    /**
+     * 卡片背景图
+     */
+    private String cardImages;
+
+    /**
+     * 活动详情背景图
+     */
+    private String detailImages;
+
+    /**
+     * 活动详情URL
+     */
+    private String target_url;
+
+    /**
+     * 开始时间
+     */
+    private String begin_at;
+
+    /**
+     * 结束时间
+     */
+    private String end_at;
+
+    /**
+     * 排序，越大越靠前
+     */
+    private Integer sort;
+
+
+    /**
+     * 状态 1可用 0不可用
+     */
+    private Integer status;
+
+    /**
+     * 创建时间
+     */
+    private LocalDateTime createdAt;
+
+    /**
+     * 更新时间
+     */
+    private LocalDateTime updatedAt;
+
+}

liquidnet-bus-do/liquidnet-service-sweet-do/src/main/java/com/liquidnet/service/sweet/mapper/SweetDoudouActiveMapper.java

+package com.liquidnet.service.sweet.mapper;
+
+import com.baomidou.mybatisplus.core.mapper.BaseMapper;
+import com.liquidnet.service.sweet.entity.SweetDoudou;
+import com.liquidnet.service.sweet.entity.SweetDoudouActive;
+
+/**
+ * <p>
+ * doudou预约签名CD记录表 Mapper 接口
+ * </p>
+ *
+ * @author jiangxiulong
+ * @since 2025-06-04
+ */
+public interface SweetDoudouActiveMapper extends BaseMapper<SweetDoudouActive> {
+
+}

liquidnet-bus-do/liquidnet-service-sweet-do/src/main/resources/com.liquidnet.service.sweet.mapper/SweetDoudouActiveMapper.xml

+<?xml version="1.0" encoding="UTF-8"?>
+<!DOCTYPE mapper PUBLIC "-//mybatis.org//DTD Mapper 3.0//EN" "http://mybatis.org/dtd/mybatis-3-mapper.dtd">
+<mapper namespace="com.liquidnet.service.sweet.mapper.SweetDoudouActiveMapper">
+
+</mapper>

liquidnet-bus-service/liquidnet-service-sweet/docu/db_20250626_doudouV2.sql

+drop TABLE if exists `sweet_doudou_active`;
+CREATE TABLE `sweet_doudou_active` (
+   `mid` bigint(20) unsigned NOT NULL AUTO_INCREMENT,
+   `active_id` varchar(255) COLLATE utf8mb4_unicode_ci NOT NULL DEFAULT '' COMMENT 'active_id',
+   `title` varchar(255) COLLATE utf8mb4_unicode_ci NOT NULL COMMENT '标题',
+   `card_images` varchar(255) CHARACTER SET utf8mb4 COLLATE utf8mb4_unicode_ci NOT NULL COMMENT '卡片背景图',
+   `detail_images` varchar(255) COLLATE utf8mb4_unicode_ci NOT NULL COMMENT '活动详情背景图',
+   `target_url` varchar(255) COLLATE utf8mb4_unicode_ci NOT NULL COMMENT '活动详情URL',
+   `begin_at` varchar(100) COLLATE utf8mb4_unicode_ci NOT NULL COMMENT '开始时间',
+   `end_at` varchar(100) COLLATE utf8mb4_unicode_ci NOT NULL COMMENT '结束时间',
+   `sort` tinyint(4) NOT NULL DEFAULT '1' COMMENT '排序，越大越靠前',
+   `status` tinyint(4) NOT NULL DEFAULT '1' COMMENT '状态 1可用 0不可用',
+   `created_at` datetime DEFAULT CURRENT_TIMESTAMP COMMENT '创建时间',
+   `updated_at` datetime DEFAULT CURRENT_TIMESTAMP COMMENT '更新时间',
+   PRIMARY KEY (`mid`),
+   UNIQUE KEY `active_id_ind` (`active_id`) USING BTREE
+) ENGINE=InnoDB DEFAULT CHARSET=utf8mb4 COLLATE=utf8mb4_unicode_ci ROW_FORMAT=DYNAMIC COMMENT='doudou活动表';
\ No newline at end of file

liquidnet-bus-service/liquidnet-service-sweet/src/main/java/com/liquidnet/service/sweet/controller/SweetDoudouController.java

@@ -5,6 +5,7 @@ import com.liquidnet.service.base.ResponseDto;
 import com.liquidnet.service.sweet.param.SweetDouDouCheckParam;
 import com.liquidnet.service.sweet.param.SweetDouDouParam;
 import com.liquidnet.service.sweet.service.ISweetDoudouService;
+import com.liquidnet.service.sweet.vo.SweetDouDouActiveVo;
 import com.liquidnet.service.sweet.vo.SweetDouDouVo;
 import io.swagger.annotations.Api;
 import io.swagger.annotations.ApiOperation;
@@ -13,6 +14,7 @@ import org.springframework.web.bind.annotation.*;
 import org.springframework.web.multipart.MultipartFile;
 
 import javax.validation.Valid;
+import java.util.List;
 
 /**
  * <p>
@@ -29,9 +31,15 @@ public class SweetDoudouController {
     @Autowired
     private ISweetDoudouService iSweetDoudouService;
 
+    @GetMapping("/active/list")
+    @ApiOperation("获取活动列表")
+    public ResponseDto<List<SweetDouDouActiveVo>> getActiveList() {
+        return iSweetDoudouService.getActiveList();
+    }
+
     @GetMapping("")
     @ApiOperation("获取用户预约详情")
-    public ResponseDto<SweetDouDouVo> info() {
+    public ResponseDto<SweetDouDouVo> info(@RequestParam(value = "activeId") String activeId) {
         return iSweetDoudouService.info();
     }
 
@@ -41,6 +49,8 @@ public class SweetDoudouController {
         return iSweetDoudouService.create(param);
     }
 
+// ################################## 二维码核销 ###############################################
+
     @PostMapping("/detail")
     @ApiOperation("核验-码详情")
     public ResponseDto<SweetDouDouVo> detail(@Valid @RequestBody SweetDouDouCheckParam param) {

liquidnet-bus-service/liquidnet-service-sweet/src/main/java/com/liquidnet/service/sweet/service/impl/SweetDoudouServiceImpl.java

@@ -4,6 +4,7 @@ import com.baomidou.mybatisplus.extension.service.impl.ServiceImpl;
 import com.liquidnet.commons.lang.util.CollectionUtil;
 import com.liquidnet.commons.lang.util.CurrentUtil;
 import com.liquidnet.commons.lang.util.IDGenerator;
+import com.liquidnet.commons.lang.util.StringUtil;
 import com.liquidnet.service.base.ErrorMapping;
 import com.liquidnet.service.base.ResponseDto;
 import com.liquidnet.service.base.SqlMapping;
@@ -15,6 +16,7 @@ import com.liquidnet.service.sweet.param.SweetDouDouParam;
 import com.liquidnet.service.sweet.service.ISweetDoudouService;
 import com.liquidnet.service.sweet.utils.QueueUtils;
 import com.liquidnet.service.sweet.utils.RedisDataUtils;
+import com.liquidnet.service.sweet.vo.SweetDouDouActiveVo;
 import com.liquidnet.service.sweet.vo.SweetDouDouScopeVo;
 import com.liquidnet.service.sweet.vo.SweetDouDouVo;
 import lombok.extern.slf4j.Slf4j;
@@ -175,6 +177,17 @@ public class SweetDoudouServiceImpl extends ServiceImpl<SweetDoudouMapper, Sweet
         return true;
     }
 
+    @Override
+    public ResponseDto<List<SweetDouDouActiveVo>> getActiveList() {
+        final String uid = CurrentUtil.getCurrentUid();
+        if (StringUtil.isBlank(uid)){
+            log.error("用户未登录");
+            return ResponseDto.success();
+        }
+
+        return ResponseDto.success();
+    }
+
     private List<SweetDouDouVo> getSweetDouDouVoListByFile(MultipartFile file) {
         // 1. 验证文件类型
         if (!isExcelFile(file)) {