huliguo
18 小时以前 4ff383b3c9e251c73b3825005fbaa045403d8cc9
抽奖bug修改
7个文件已修改
25 ■■■■ 已修改文件
ruoyi-modules/ruoyi-goods/src/main/java/com/ruoyi/goods/domain/vo/MgtLotteryEventPageVo.java 2 ●●● 补丁 | 查看 | 原始文档 | blame | 历史
ruoyi-modules/ruoyi-goods/src/main/java/com/ruoyi/goods/mapper/lottery/LotteryEventPrizeMapper.java 2 ●●●●● 补丁 | 查看 | 原始文档 | blame | 历史
ruoyi-modules/ruoyi-goods/src/main/java/com/ruoyi/goods/service/impl/lottery/LotteryEventPrizeServiceImpl.java 7 ●●●●● 补丁 | 查看 | 原始文档 | blame | 历史
ruoyi-modules/ruoyi-goods/src/main/java/com/ruoyi/goods/service/impl/lottery/LotteryEventServiceImpl.java 6 ●●●●● 补丁 | 查看 | 原始文档 | blame | 历史
ruoyi-modules/ruoyi-goods/src/main/java/com/ruoyi/goods/service/lottery/ILotteryEventPrizeService.java 2 ●●●●● 补丁 | 查看 | 原始文档 | blame | 历史
ruoyi-modules/ruoyi-goods/src/main/resources/mapper/lottery/LotteryEventMapper.xml 3 ●●●●● 补丁 | 查看 | 原始文档 | blame | 历史
ruoyi-modules/ruoyi-goods/src/main/resources/mapper/lottery/LotteryEventPrizeMapper.xml 3 ●●●●● 补丁 | 查看 | 原始文档 | blame | 历史
ruoyi-modules/ruoyi-goods/src/main/java/com/ruoyi/goods/domain/vo/MgtLotteryEventPageVo.java
@@ -13,7 +13,7 @@
    @ApiModelProperty("活动id")
    private String id;
    @ApiModelProperty(value = "门店id",hidden = true)
    @ApiModelProperty(value = "门店id")
    private Integer shopId;
    @ApiModelProperty("抽奖名称")
ruoyi-modules/ruoyi-goods/src/main/java/com/ruoyi/goods/mapper/lottery/LotteryEventPrizeMapper.java
@@ -14,4 +14,6 @@
    void deleteByLotteryEventId(@Param("lotteryEventId") String lotteryEventId);
    void savePrizeList(@Param("list") List<LotteryEventPrize> prizeList);
    List<LotteryEventPrize> getPrizeListByLotteryEventId(@Param("lotteryEventId") String lotteryEventId);
}
ruoyi-modules/ruoyi-goods/src/main/java/com/ruoyi/goods/service/impl/lottery/LotteryEventPrizeServiceImpl.java
@@ -6,6 +6,7 @@
import com.ruoyi.goods.service.lottery.ILotteryEventPrizeService;
import org.springframework.stereotype.Service;
import java.util.Collections;
import java.util.List;
/**
@@ -23,4 +24,10 @@
    public void savePrizeList(List<LotteryEventPrize> prizeList) {
        this.baseMapper.savePrizeList(prizeList);
    }
    @Override
    public List<LotteryEventPrize> getPrizeListByLotteryEventId(String lotteryEventId) {
        return this.baseMapper.getPrizeListByLotteryEventId(lotteryEventId);
    }
}
ruoyi-modules/ruoyi-goods/src/main/java/com/ruoyi/goods/service/impl/lottery/LotteryEventServiceImpl.java
@@ -307,6 +307,7 @@
        }
        //新增
        BeanUtils.copyProperties(dto, lotteryEvent);
        lotteryEvent.setDelFlag(0);
        if (dto.getId() == null) {
            lotteryEvent.setId(IdUtils.simpleUUID());
            lotteryEvent.setCreateTime(LocalDateTime.now());
@@ -438,8 +439,9 @@
            vo.setMgtLotteryQuestionVOList(questionsVOList);
        }
        //奖项信息
        List<LotteryEventPrize> prizeList = lotteryEventPrizeService.getBaseMapper().selectList(new LambdaQueryWrapper<LotteryEventPrize>()
                .eq(LotteryEventPrize::getLotteryEventId, lotteryEvent.getId()));
        /*List<LotteryEventPrize> prizeList = lotteryEventPrizeService.getBaseMapper().selectList(new LambdaQueryWrapper<LotteryEventPrize>()
                .eq(LotteryEventPrize::getLotteryEventId, lotteryEvent.getId()));*/
        List<LotteryEventPrize> prizeList = lotteryEventPrizeService.getPrizeListByLotteryEventId(lotteryEvent.getId());
        vo.setLotteryEventPrizeList(prizeList);
        return R.ok(vo);
ruoyi-modules/ruoyi-goods/src/main/java/com/ruoyi/goods/service/lottery/ILotteryEventPrizeService.java
@@ -13,4 +13,6 @@
    void deleteByLotteryEventId(String lotteryEventId);
    void savePrizeList(List<LotteryEventPrize> prizeList);
    List<LotteryEventPrize> getPrizeListByLotteryEventId(String lotteryEventId);
}
ruoyi-modules/ruoyi-goods/src/main/resources/mapper/lottery/LotteryEventMapper.xml
@@ -86,7 +86,6 @@
            <when test="dto.shopIds != null and dto.shopIds.size() > 0">
                <choose>
                    <when test="dto.flag != null and dto.flag == 1">
                        -- flag=1: 需要查询shop_id为null的记录 即平台创建的
                        AND (shop_id IN
                        <foreach collection="dto.shopIds" item="shopId" open="(" separator="," close=")">
                            #{shopId}
@@ -94,7 +93,6 @@
                        OR shop_id IS NULL)
                    </when>
                    <otherwise>
                        -- flag不为1: 只查询shopIds的值
                        AND shop_id IN
                        <foreach collection="dto.shopIds" item="shopId" open="(" separator="," close=")">
                            #{shopId}
@@ -103,7 +101,6 @@
                </choose>
            </when>
            <when test="dto.flag != null and dto.flag == 1">
                -- shopIds为空但flag=1: 即查询平台创建,其他店铺没有类似的名称
                AND shop_id IS NULL
            </when>
        </choose>
ruoyi-modules/ruoyi-goods/src/main/resources/mapper/lottery/LotteryEventPrizeMapper.xml
@@ -28,4 +28,7 @@
        DELETE FROM t_lottery_event_prize
        WHERE lottery_event_id = #{lotteryEventId}
    </delete>
    <select id="getPrizeListByLotteryEventId" resultType="com.ruoyi.goods.api.domain.LotteryEventPrize">
        select * from t_lottery_event_prize where lottery_event_id = #{lotteryEventId}
    </select>
</mapper>