bug修改

huliguo

4 天以前 68b7f670f7fe6fbe79e2f0682ac27b6ea1a0c417

 ruoyi-modules/ruoyi-goods/src/main/java/com/ruoyi/goods/service/impl/lottery/LotteryEventServiceImpl.java

@@ -450,8 +450,10 @@
      voList.forEach(x->{
         if (null == x.getShopId()){
            x.setCreateObject("平台创建");

         }else {
            //线下抽奖，获取门店名称
            x.setActivityType(6);
            if(map.containsKey(Long.valueOf(x.getShopId()))){
               x.setCreateObject(map.get(Long.valueOf(x.getShopId())).getShopName());
            }else {
@@ -476,13 +478,7 @@
      }
      MgtLotteryEventDetailVO vo = new MgtLotteryEventDetailVO();
      BeanUtils.copyProperties(lotteryEvent, vo);
      if (lotteryEvent.getActivityType()==6) {
         //线下抽奖 取商户名称
         Shop data = remoteShopService.getShop(Long.valueOf(lotteryEvent.getShopId())).getData();
         if (null != data) {
            vo.setShopName(data.getShopName());
         }
      }

      if(lotteryEvent.getActivityType()==5){
         //题干数据
         List<TLotteryEventQuestions> questionsList = lotteryEventQuestionsService.getBaseMapper().selectList(new LambdaQueryWrapper<TLotteryEventQuestions>().eq(TLotteryEventQuestions::getLotteryEventId, lotteryEvent.getId()));
@@ -514,7 +510,14 @@
            .eq(TLotteryEventPrize::getLotteryEventId, lotteryEvent.getId()));*/
      List<TLotteryEventPrize> prizeList = lotteryEventPrizeService.getPrizeListByLotteryEventId(lotteryEvent.getId());
      vo.setLotteryEventPrizeList(prizeList);
		
      if(null!=lotteryEvent.getShopId()){
         vo.setActivityType(6);
         //线下抽奖 取商户名称
         Shop data = remoteShopService.getShop(Long.valueOf(lotteryEvent.getShopId())).getData();
         if (null != data) {
            vo.setShopName(data.getShopName());
         }
      }
      return R.ok(vo);
   }