合并分支 'dxy' 到 'qa'

src/main/java/com/wangxiaolu/promotion/controller/lottery/LotteryController.java

@@ -36,4 +36,9 @@ public class LotteryController {
         lotteryService.uploadReceipt(lotteryRecordVo.getId(), lotteryRecordVo.getReceiptImageUrl());
         return R.success(lotteryRecordVo.getReceiptImageUrl());
     }
+
+    @PostMapping("/getuserinfo")
+    public R getLotteryUserInfo(@RequestBody LotteryRecordVo lotteryRecordVo) {
+        return R.success(lotteryService.getLotteryUserInfo(lotteryRecordVo.getWxOpenId()));
+    }
 }
\ No newline at end of file

src/main/java/com/wangxiaolu/promotion/domain/lottery/dao/LotteryCoreDao.java

@@ -13,4 +13,6 @@ public interface LotteryCoreDao {
     LotteryRecordDto doDraw(Long recordId, LotteryUserInfoDto userInfo);
 
     LotteryRecordDto initLottery(Double longitude, Double latitude, String receiptImage, String wxOpenId);
+
+    LotteryUserInfoDto getLotteryUserInfo(String wxOpenId);
 }

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

@@ -90,10 +90,13 @@ public class LotteryCoreDaoImpl implements LotteryCoreDao {
             throw new ParamException(RCode.LOTTERY_RECORD_ERROR);
         }
 
-        LotteryUserInfo lotteryUserInfo = new LotteryUserInfo();
-        lotteryUserInfo = BeanUtils.transitionDto(userInfo, LotteryUserInfo.class);
-        lotteryUserInfo.setOpenId(record.getWxOpenId());
-        lotteryUserInfoMapper.insert(lotteryUserInfo);
+        
+        if (Objects.nonNull(userInfo)) {
+            LotteryUserInfo lotteryUserInfo = new LotteryUserInfo();
+            lotteryUserInfo = BeanUtils.transitionDto(userInfo, LotteryUserInfo.class);
+            lotteryUserInfo.setOpenId(record.getWxOpenId());
+            lotteryUserInfoMapper.insert(lotteryUserInfo);
+        }
         // 动态概率
         int prizeLevel = simpleDynamicPrize();
         record.setPrizeLevel(prizeLevel);
@@ -104,6 +107,12 @@ public class LotteryCoreDaoImpl implements LotteryCoreDao {
         return result ;
     }
 
+    @Override
+    public LotteryUserInfoDto getLotteryUserInfo(String wxOpenId) {
+        LotteryUserInfo lotteryUserInfo = lotteryUserInfoMapper.selectOne(new LambdaQueryWrapper<LotteryUserInfo>().eq(LotteryUserInfo::getOpenId, wxOpenId));
+        return BeanUtils.transitionDto(lotteryUserInfo, LotteryUserInfoDto.class);
+    }
+
     /**
      * 简单动态概率
      */

src/main/java/com/wangxiaolu/promotion/service/lottery/impl/LotteryCoreServiceImpl.java

@@ -54,4 +54,8 @@ public class LotteryCoreServiceImpl implements LotteryCoreService {
     public LotteryRecordDto doDraw(Long recordId, LotteryUserInfoDto userInfo) {
         return lotteryCoreDao.doDraw(recordId,userInfo);
     }
+
+    public LotteryUserInfoDto getLotteryUserInfo(String wxOpenId) {
+        return lotteryCoreDao.getLotteryUserInfo(wxOpenId);
+    }
 }
\ No newline at end of file