doudou活动 2 期

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

@@ -21,15 +21,16 @@ public class SweetDouDouParam implements Serializable {
     @NotBlank(message = "phone不能为空")
     private String phone;
 
-    @ApiModelProperty(position = 12, required = true, value = "购买平台", example = "大麦")
-    @NotBlank(message = "platform不能为空")
-    private String platform;
+    @ApiModelProperty(position = 12, required = true, value = "3442", example = "活动 ID")
+    @NotBlank(message = "activeId不能为空")
+    private String activeId;
 
-    @ApiModelProperty(position = 13, required = true, value = "购买订单号", example = "23424353477473")
-    @NotBlank(message = "orderCodee不能为空")
-    private String orderCode;
+    @ApiModelProperty(position = 13, required = true, value = "img", example = "图片地址")
+    @NotBlank(message = "imgUrl不能为空")
+    private String imgUrl;
 
     @ApiModelProperty(position = 14, required = true, value = "想给doudou说的话", example = "我爱你啦啦啦")
     private String mark;
 
+
 }

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

@@ -22,7 +22,7 @@ import java.util.List;
  */
 public interface ISweetDoudouService extends IService<SweetDoudou> {
 
-    ResponseDto<SweetDouDouVo> info();
+    ResponseDto<SweetDouDouVo> info(String activeId);
 
     ResponseDto<SweetDouDouVo> create(@Valid SweetDouDouParam param);
 

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

@@ -21,11 +21,11 @@ public class SweetDouDouVo implements Serializable, Cloneable {
     @ApiModelProperty("观演人手机号")
     private String phone;
 
-    @ApiModelProperty("购买平台")
-    private String platform;
+    @ApiModelProperty("图片地址")
+    private String imgUrl;
 
-    @ApiModelProperty("购买订单号")
-    private String orderCode;
+    @ApiModelProperty("活动 ID")
+    private String activeId;
 
     @ApiModelProperty("想给doudou说的话")
     private String mark;

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

@@ -20,6 +20,14 @@ CREATE TABLE `sweet_doudou`
   COLLATE utf8mb4_unicode_ci
   ROW_FORMAT = DYNAMIC COMMENT 'doudou预约签名CD记录表';
 
+alter table sweet_doudou
+    add active_id varchar(100) default '' not null comment '活动id' after order_code;
+
+alter table sweet_doudou
+    add img_url varchar(255) default '' not null comment '订单截图 url' after active_id;
+
+
+
 -- 20250604 doudou预约签名核验权限表
 drop TABLE if exists `sweet_doudou_scope`;
 CREATE TABLE `sweet_doudou_scope`

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

@@ -46,7 +46,7 @@ public class SweetDoudouController {
     @GetMapping("")
     @ApiOperation("获取用户预约详情")
     public ResponseDto<SweetDouDouVo> info(@RequestParam(value = "activeId") String activeId) {
-        return iSweetDoudouService.info();
+        return iSweetDoudouService.info(activeId);
     }
 
     @PostMapping("")

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

@@ -48,32 +48,32 @@ public class SweetDoudouServiceImpl extends ServiceImpl<SweetDoudouMapper, Sweet
     QueueUtils queueUtils;
 
     @Override
-    public ResponseDto<SweetDouDouVo> info() {
+    public ResponseDto<SweetDouDouVo> info(String activeId) {
         String uid = CurrentUtil.getCurrentUid();
-        SweetDouDouVo vo = redisDataUtils.getSweetDouDou(uid);
+        SweetDouDouVo vo = redisDataUtils.getSweetDouDou(uid, activeId);
         return ResponseDto.success(vo);
     }
 
     @Override
     public ResponseDto<SweetDouDouVo> create(SweetDouDouParam param) {
         String uid = CurrentUtil.getCurrentUid();
-        SweetDouDouVo vo = redisDataUtils.getSweetDouDou(uid);
+        SweetDouDouVo vo = redisDataUtils.getSweetDouDou(uid, param.getActiveId());
         if (null != vo) {
             return ResponseDto.failure("您已经预约过啦~");
         }
         String nextSnowId = IDGenerator.nextSnowId();
         String username = param.getUsername();
         String phone = param.getPhone();
-        String platform = param.getPlatform();
-        String orderCode = param.getOrderCode();
+        String activeId = param.getActiveId();
+        String imgUrl = param.getImgUrl();
         String mark = param.getMark();
 
         SweetDouDouVo entityVo = SweetDouDouVo.getNew();
         entityVo.setDoudouId(nextSnowId);
         entityVo.setUsername(username);
         entityVo.setPhone(phone);
-        entityVo.setPlatform(platform);
-        entityVo.setOrderCode(orderCode);
+        entityVo.setActiveId(activeId);
+        entityVo.setImgUrl(imgUrl);
         entityVo.setMark(mark);
         entityVo.setUserId(uid);
         entityVo.setStatus(1);
@@ -83,7 +83,7 @@ public class SweetDoudouServiceImpl extends ServiceImpl<SweetDoudouMapper, Sweet
         LinkedList<Object[]> sqlsDataA = CollectionUtil.linkedListObjectArr();
         sqls.add(SqlMapping.get("sweet_doudou.insert"));
         sqlsDataA.add(new Object[]{
-                nextSnowId, uid, username, phone, platform, orderCode, mark
+                nextSnowId, uid, username, phone, activeId, imgUrl, mark
         });
         queueUtils.sendMsgByRedis(MQConst.SweetQueue.SWEET_ANSWER_INSERT.getKey(),
                 SqlMapping.gets(sqls, sqlsDataA));
@@ -100,8 +100,7 @@ public class SweetDoudouServiceImpl extends ServiceImpl<SweetDoudouMapper, Sweet
             return ResponseDto.failure(ErrorMapping.get("20003"));
         }
 
-        // TODO
-        SweetDouDouVo vo = redisDataUtils.getSweetDouDou(param.getUserId());
+        SweetDouDouVo vo = redisDataUtils.getSweetDouDou(param.getUserId(), param.getActiveId());
         if (null == vo) {
             return ResponseDto.failure(ErrorMapping.get("90091"));
         }
@@ -140,8 +139,7 @@ public class SweetDoudouServiceImpl extends ServiceImpl<SweetDoudouMapper, Sweet
             log.info("无权核验, authMoible: {}", param.getAuthMobile());
             return ResponseDto.failure(ErrorMapping.get("20003"));
         }
-        //TODO
-        SweetDouDouVo vo = redisDataUtils.getSweetDouDou(param.getUserId());
+        SweetDouDouVo vo = redisDataUtils.getSweetDouDou(param.getDoudouId(), param.getActiveId());
         if (vo == null) {
             return ResponseDto.failure(ErrorMapping.get("90091"));
         }
@@ -160,7 +158,7 @@ public class SweetDoudouServiceImpl extends ServiceImpl<SweetDoudouMapper, Sweet
         }
 
         for (SweetDouDouVo fileDouDouVo : fileSweetDouDouVos) {
-            SweetDouDouVo vo = redisDataUtils.getSweetDouDou(fileDouDouVo.getUserId());
+            SweetDouDouVo vo = redisDataUtils.getSweetDouDou(fileDouDouVo.getUserId(), fileDouDouVo.getActiveId());
             if (vo != null) {
                 vo.setStatus(fileDouDouVo.getStatus());
                 redisDataUtils.setSweetDouDou(vo);
@@ -220,8 +218,7 @@ public class SweetDoudouServiceImpl extends ServiceImpl<SweetDoudouMapper, Sweet
         if (StringUtil.isBlank(uid)){
             douDouActiveVo.setStatus(0);
         } else {
-            //TODO 添加活动ID
-            SweetDouDouVo sweetDouDou = redisDataUtils.getSweetDouDou(uid);
+            SweetDouDouVo sweetDouDou = redisDataUtils.getSweetDouDou(uid, doudouActive.getActiveId());
             if (sweetDouDou == null) {
                 douDouActiveVo.setStatus(0);
             }else {
@@ -293,8 +290,8 @@ public class SweetDoudouServiceImpl extends ServiceImpl<SweetDoudouMapper, Sweet
                 vo.setUserId(getStringValue(row.getCell(1)));
                 vo.setUsername(getStringValue(row.getCell(2)));
                 vo.setPhone(getStringValue(row.getCell(3)));
-                vo.setPlatform(getStringValue(row.getCell(4)));
-                vo.setOrderCode(getStringValue(row.getCell(5)));
+                vo.setActiveId(getStringValue(row.getCell(4)));
+                vo.setImgUrl(getStringValue(row.getCell(5)));
                 vo.setMark(getStringValue(row.getCell(6)));
                 String cell7 = getStringValue(row.getCell(7));
                 vo.setStatus(cell7.equals("1") ? 3 : 2);

liquidnet-bus-service/liquidnet-service-sweet/src/main/java/com/liquidnet/service/sweet/utils/RedisDataUtils.java

@@ -465,12 +465,12 @@ public class RedisDataUtils {
 
     // doudou
     public void setSweetDouDou(SweetDouDouVo vo) {
-        String redisKey = SweetConstant.REDIS_KEY_SWEET_DOUDOU_USER.concat(vo.getUserId());
+        String redisKey = SweetConstant.REDIS_KEY_SWEET_DOUDOU_USER.concat(vo.getUserId()).concat(":activeId:" + vo.getActiveId());
         redisUtil.set(redisKey, vo);
     }
 
-    public SweetDouDouVo getSweetDouDou(String uid) {
-        String redisKey = SweetConstant.REDIS_KEY_SWEET_DOUDOU_USER.concat(uid);
+    public SweetDouDouVo getSweetDouDou(String uid, String activeId) {
+        String redisKey = SweetConstant.REDIS_KEY_SWEET_DOUDOU_USER.concat(uid).concat(":activeId:" + activeId);
         return (SweetDouDouVo) redisUtil.get(redisKey);
     }