合并分支 'dxy' 到 'qa'

src/main/java/com/wangxiaolu/promotion/domain/lottery/dao/impl/LotteryCoreDaoImpl.java

@@ -15,10 +15,8 @@ import com.wangxiaolu.promotion.utils.TencentMapUtil;
 import org.springframework.beans.factory.annotation.Autowired;
 import org.springframework.stereotype.Service;
 
-import java.util.ArrayList;
-import java.util.Map;
-import java.util.Objects;
-import java.util.Random;
+import java.text.SimpleDateFormat;
+import java.util.*;
 
 /**
  * @Author: DouXinYu
@@ -37,6 +35,8 @@ public class LotteryCoreDaoImpl implements LotteryCoreDao {
     @Autowired
     private LotteryUserInfoMapper lotteryUserInfoMapper;
 
+    private final static SimpleDateFormat FORMAT = new SimpleDateFormat("yyyy-MM-dd");
+
     /**
      * 初始化抽奖记录
      */
@@ -56,6 +56,7 @@ public class LotteryCoreDaoImpl implements LotteryCoreDao {
         record.setAddress(location.get("address"));
         record.setReceiptImageUrl(receiptImage);
         record.setStatus("pending");
+        record.setCreateDate(FORMAT.format(new Date()));
         record.setWxOpenId(wxOpenId);
         lotteryMapper.insert(record);
         LotteryRecordDto result = BeanUtils.transitionDto(record, LotteryRecordDto.class);
@@ -85,9 +86,16 @@ public class LotteryCoreDaoImpl implements LotteryCoreDao {
         }
 
         if (record.getWxOpenId() != null && record.getPrizeLevel() != null) {
-            throw new ParamException(RCode.LOTTERY_RECORD_ERROR);
+
         }
 
+        LambdaQueryWrapper<LotteryRecord> qw = new LambdaQueryWrapper<>();
+        qw.eq(LotteryRecord::getWxOpenId,record.getWxOpenId());
+        qw.eq(LotteryRecord::getCreateDate,FORMAT.format(new Date()));
+        LotteryRecord lotteryRecord = lotteryMapper.selectOne(qw);
+        if (Objects.nonNull(lotteryRecord)){
+            throw new ParamException(RCode.LOTTERY_RECORD_ERROR);
+        }
 
         LotteryUserInfo user = lotteryUserInfoMapper.selectOne(new LambdaQueryWrapper<LotteryUserInfo>().eq(LotteryUserInfo::getOpenId, record.getWxOpenId()));
         if (Objects.isNull(user)) {

src/main/java/com/wangxiaolu/promotion/domain/lottery/entity/LotteryRecord.java

@@ -53,6 +53,11 @@ public class LotteryRecord {
     private String status;
     private String wxOpenId;
 
+    /**
+     * 创建日期
+     */
+    private String createDate;
+
     /**
      * 创建时间
      */

src/main/java/com/wangxiaolu/promotion/domain/lottery/entity/LotteryUserInfo.java

 package com.wangxiaolu.promotion.domain.lottery.entity;
 
 
+import com.baomidou.mybatisplus.annotation.IdType;
+import com.baomidou.mybatisplus.annotation.TableId;
 import com.baomidou.mybatisplus.annotation.TableName;
 import lombok.Data;
+import lombok.Value;
 
 import java.util.Date;
 
 @Data
 @TableName("lottery_user_info")
 public class  LotteryUserInfo {
+    @TableId(type = IdType.AUTO)
     private Long id;
     private String openId;
     private String nickName;

src/main/java/com/wangxiaolu/promotion/pojo/lottery/dto/LotteryRecordDto.java

@@ -59,6 +59,11 @@ public class LotteryRecordDto {
      */
     private String wxOpenId;
 
+    /**
+     * 创建时间
+     */
+    private String createDate;
+
     /**
      * 用户信息
      */

src/main/java/com/wangxiaolu/promotion/pojo/lottery/vo/LotteryRecordVo.java

@@ -58,4 +58,9 @@ public class LotteryRecordVo {
      */
     private LotteryUserInfoDto userInfo;
 
+    /**
+     * 创建日期
+     */
+    private String createDate;
+
 }
\ No newline at end of file

src/main/resources/application-master.yml

@@ -24,7 +24,7 @@ spring:
     port: 6379
     host: r-2zehfktt1r34vn4qws.redis.rds.aliyuncs.com
     database: 0
-    password: Wxl2025!@#$
+    password: 7YVyyVT8B7R9zY
 
 
   cloud: