Merge remote-tracking branch 'origin/2.0' into 2.0

huliguo

1 天以前 a966dafb8877552267a94fe8c544c5ea72cf5650

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

@@ -13,6 +13,7 @@
import com.ruoyi.goods.api.domain.UserLotteryEventQuestions;
import com.ruoyi.goods.domain.vo.AppLotteryEventPageVo;
import com.ruoyi.goods.domain.vo.LotteryEventVo;
import com.ruoyi.goods.domain.vo.ShopLotteryDrawListVo;
import com.ruoyi.goods.domain.vo.UserLotteryEventVo;
import com.ruoyi.goods.mapper.lottery.LotteryEventMapper;
import com.ruoyi.goods.service.lottery.ILotteryEventPrizeService;
@@ -198,6 +199,7 @@
               case 2:
                  memberGiftRecord.setGiftType(2);
                  memberGiftRecord.setGoodsId(userLotteryEvent.getObjectId());
                  memberGiftRecord.setGiftName(userLotteryEvent.getObjectName());
                  memberGiftRecord.setGoodsNumber(userLotteryEvent.getNumber());
                  break;
               case 3:
@@ -236,4 +238,17 @@
   public List<AppLotteryEventPageVo> pageAppLotteryEvent(Page<AppLotteryEventPageVo> page, Long userId) {
      return this.baseMapper.pageAppLotteryEvent(page, userId);
   }
	
	
   /**
    * 获取门店抽奖列表
    *
    * @param page
    * @param shopId
    * @return
    */
   @Override
   public List<ShopLotteryDrawListVo> getShopLotteryDrawList(Page<ShopLotteryDrawListVo> page, Long shopId) {
      return this.baseMapper.getShopLotteryDrawList(page, shopId);
   }
}