修改bug

Pu Zhibing

昨天 0571bf579557ec97682a8940e29ed19699f6d95e

修改bug

 ruoyi-modules/ruoyi-goods/src/main/java/com/ruoyi/goods/controller/business/MerLotteryEventController.java

@@ -95,7 +95,7 @@
    @ApiOperation(value = "获取门店抽奖详情【2.0】")
    public R<TLotteryEvent> getShopLotteryDrawInfo(@RequestBody DelShopLotteryDrawDto dto) {
        TLotteryEvent lotteryEvent = lotteryEventService.getById(dto.getId());
        if (null == lotteryEvent) {
        if (null == lotteryEvent || 1 == lotteryEvent.getDelFlag()) {
            return R.fail("抽奖活动不存在");
        }
        if (!lotteryEvent.getShopId().equals(dto.getShopId().intValue())) {

 ruoyi-modules/ruoyi-goods/src/main/resources/mapper/lottery/LotteryEventMapper.xml

@@ -36,7 +36,7 @@
               DATE_FORMAT(start_time, '%Y-%m-%d %H:%i') as startTime,
               DATE_FORMAT(end_time, '%Y-%m-%d %H:%i')   as endTime
        from t_lottery_event
        where shop_id = #{shopId}
        where del_flag == 0 and shop_id = #{shopId}
        order by create_time desc
    </select>
    <select id="pageMgtLotteryEvent" resultType="com.ruoyi.goods.domain.vo.MgtLotteryEventPageVo">

 ruoyi-modules/ruoyi-member/src/main/java/com/ruoyi/member/domain/vo/AppMemberPrizePageVo.java

@@ -15,26 +15,29 @@
 */
@Data
public class AppMemberPrizePageVo {

    
    @ApiModelProperty(value = "奖品id")
    private String prizeId;

    
    @ApiModelProperty(value = "奖品名称")
    private String prizeName;

    
    @ApiModelProperty(value = "奖品来源")
    private String prizeFrom;

    
    @ApiModelProperty(value = "礼物类型1优惠券2商品3现金4实物5积分")
    private Integer giftType;
    
    @ApiModelProperty(value = "核销状态1未核销2已核销")
    private Integer verifyStatus;

    
    @ApiModelProperty(value = "获奖时间")
    @JsonFormat(pattern = "yyyy-MM-dd HH:mm:ss")
    private Date createTime;

    
    @ApiModelProperty(value = "核销码")
    private String verifyCode;

    
    @ApiModelProperty(value = "核销时间")
    @JsonFormat(pattern = "yyyy-MM-dd HH:mm:ss")
    private String verifyTime;

 ruoyi-modules/ruoyi-member/src/main/java/com/ruoyi/member/service/impl/birthday/BirthdayCardServiceImpl.java

@@ -699,7 +699,11 @@
        if (memberPrizePageVoList != null && !memberPrizePageVoList.isEmpty()) {
            HashSet<Long> shopIdSet = new HashSet<>();
            for (AppMemberPrizePageVo appMemberPrizePageVo : memberPrizePageVoList) {
                appMemberPrizePageVo.setVerifyCode("3-" + appMemberPrizePageVo.getPrizeId());
                Integer giftType = appMemberPrizePageVo.getGiftType();
                String prizeFrom = appMemberPrizePageVo.getPrizeFrom();
                if ("抽奖".equals(prizeFrom) && (giftType == 2 || giftType == 4)) {
                    appMemberPrizePageVo.setVerifyCode("3-" + appMemberPrizePageVo.getPrizeId());
                }
                if (appMemberPrizePageVo.getShopId() != null) {
                    shopIdSet.add(appMemberPrizePageVo.getShopId());
                }

 ruoyi-modules/ruoyi-member/src/main/resources/mapper/birthday/BirthdayCardMapper.xml

@@ -32,7 +32,8 @@
               verify_status verifyStatus,
               create_time   createTime,
               verify_time   verifyTime,
               shop_id       shopId
               shop_id       shopId,
               gift_type     gifttype
        FROM t_member_gift_record
        WHERE del_flag = 0
          AND user_id = #{userId}