合并分支 'dxy' 到 'qa'

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

@@ -14,6 +14,7 @@ import com.wangxiaolu.promotion.result.basedata.RCode;
 import com.wangxiaolu.promotion.utils.TencentMapUtil;
 import org.springframework.beans.factory.annotation.Autowired;
 import org.springframework.stereotype.Service;
+import org.springframework.util.CollectionUtils;
 
 import java.text.SimpleDateFormat;
 import java.util.*;
@@ -93,8 +94,13 @@ public class LotteryCoreDaoImpl implements LotteryCoreDao {
         qw.eq(LotteryRecord::getWxOpenId,record.getWxOpenId());
         qw.eq(LotteryRecord::getCreateDate,FORMAT.format(new Date()));
         List<LotteryRecord> lotteryRecordList = lotteryMapper.selectList(qw);
+        if (CollectionUtils.isEmpty(lotteryRecordList)){
+            throw new ParamException(RCode.LOTTERY_RECORD_NOT_EXIST);
+        }
         if (lotteryRecordList.size() > 1){
             throw new ParamException(RCode.LOTTERY_RECORD_ERROR);
+        }else if (lotteryRecordList.get(0).getPrizeLevel() != null){
+            throw new ParamException(RCode.LOTTERY_RECORD_ERROR);
         }
 
         LotteryUserInfo user = lotteryUserInfoMapper.selectOne(new LambdaQueryWrapper<LotteryUserInfo>().eq(LotteryUserInfo::getOpenId, record.getWxOpenId()));