bug

jiangqs

2023-07-20 882edc4b8ac7cb11ec9d536b5573df2c7ed512ef

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

@@ -1,15 +1,17 @@
package com.ruoyi.member.service.impl.birthday;

import com.baomidou.mybatisplus.core.conditions.query.LambdaQueryWrapper;
import com.baomidou.mybatisplus.extension.plugins.pagination.Page;
import com.baomidou.mybatisplus.extension.service.impl.ServiceImpl;
import com.ruoyi.common.core.utils.bean.BeanUtils;
import com.ruoyi.common.core.utils.uuid.IdUtils;
import com.ruoyi.member.domain.dto.MerBirthdayEditDto;
import com.ruoyi.member.domain.dto.MgtBirthdayEditDto;
import com.ruoyi.member.domain.dto.MgtBirthdayGetDto;
import com.ruoyi.member.domain.dto.MgtBirthdayGiftDto;
import com.ruoyi.member.domain.pojo.birthday.BirthdayCard;
import com.ruoyi.member.domain.pojo.birthday.BirthdayGift;
import com.ruoyi.member.domain.pojo.member.MemberGiftRecord;
import com.ruoyi.system.api.domain.poji.member.MemberGiftRecord;
import com.ruoyi.member.domain.vo.*;
import com.ruoyi.member.mapper.birthday.BirthdayCardMapper;
import com.ruoyi.member.service.birthday.BirthdayCardService;
@@ -90,7 +92,11 @@
        // 创建新的生日卡
        BirthdayCard birthdayCard = new BirthdayCard();
        birthdayCard.setDelFlag(0);
        birthdayCard.setShopId(0L);
        if(mgtBirthdayEditDto.getShopId()!=null){
            birthdayCard.setShopId(mgtBirthdayEditDto.getShopId());
        }else{
            birthdayCard.setShopId(0L);
        }
        birthdayCard.setCardStatus(mgtBirthdayEditDto.getCardStatus());
        // 根据卡状态设置开启或关闭时间
        if(mgtBirthdayEditDto.getCardStatus()==1){
@@ -100,8 +106,8 @@
        }
        // 设置创建时间
        birthdayCard.setCreateTime(new Date());
        // 如果店铺ID不为空，则进行相关设置
        if(mgtBirthdayEditDto.getShopId()!=null){
        // 如果店铺ID为空，则进行相关设置
        if(mgtBirthdayEditDto.getShopId()==null){
            birthdayCard.setAreaFlag(mgtBirthdayEditDto.getAreaFlag());
            if(mgtBirthdayEditDto.getAreaFlag()==2){
                birthdayCard.setDesignatedArea(mgtBirthdayEditDto.getDesignatedArea());
@@ -229,6 +235,7 @@
                giftDesc = giftSj.toString();
                birthdayGetVo.setGiftDesc(giftDesc);
            }
            birthdayGetVo.setCardStatus(birthdayCard.getCardStatus());
        }else{
            birthdayGetVo.setCardStatus(2);
        }
@@ -345,7 +352,7 @@
        // 创建新的生日卡
        BirthdayCard birthdayCard = new BirthdayCard();
        birthdayCard.setDelFlag(0);
        birthdayCard.setShopId(0L);
        birthdayCard.setShopId(merBirthdayEditDto.getShopId());
        birthdayCard.setCardStatus(merBirthdayEditDto.getCardStatus());
        // 根据卡状态设置开启或关闭时间
        if(merBirthdayEditDto.getCardStatus()==1){
@@ -482,6 +489,7 @@
        BigDecimal winningProbability;
        BigDecimal randomProbability;
        BirthdayGiftSendDto birthdayGiftSendDto;
        String prizeId;
        String currentYear = String.valueOf(LocalDate.now().getYear());
        // 获取平台生日卡信息
        BirthdayCard plBirthdayCard = birthdayCardMapper.getPlatformBirthdayCard(shopId);
@@ -499,6 +507,10 @@
                        memberGiftRecord = new MemberGiftRecord();
                        birthdayGiftSendDto = new BirthdayGiftSendDto();
                        BeanUtils.copyProperties(birthdayGift, memberGiftRecord);
                        prizeId = IdUtils.simpleUUID();
                        memberGiftRecord.setPrizeId(prizeId);
                        memberGiftRecord.setDelFlag(0);
                        memberGiftRecord.setVerifyStatus(1);
                        memberGiftRecord.setGiftFrom(1);
                        memberGiftRecord.setGiftYear(currentYear);
                        memberGiftRecord.setCreateTime(new Date());
@@ -564,6 +576,10 @@
                            memberGiftRecord = new MemberGiftRecord();
                            birthdayGiftSendDto = new BirthdayGiftSendDto();
                            BeanUtils.copyProperties(birthdayGift, memberGiftRecord);
                            prizeId = IdUtils.simpleUUID();
                            memberGiftRecord.setPrizeId(prizeId);
                            memberGiftRecord.setDelFlag(0);
                            memberGiftRecord.setVerifyStatus(1);
                            memberGiftRecord.setGiftFrom(2);
                            memberGiftRecord.setShopId(shopId);
                            memberGiftRecord.setGiftYear(currentYear);
@@ -610,12 +626,22 @@
                }
            }
        }
        //发放奖品
        remoteOrderService.sendGoodsGift(sendGoodsList);
        remoteCouponService.sendCouponGift(sendCouponList);
        //保存用户礼物记录
        memberGiftRecordService.saveBatch(memberGiftRecordList);
        appBirthdayCardVo.setBirthdayGiftVoList(birthdayGiftVoList);
        return appBirthdayCardVo;
    }

    /**
     * @description
     * @author  jqs
     * @date    2023/7/11 18:02
     * @param page
     * @param userId
     * @return  List<AppMemberPrizePageVo>
     */
    @Override
    public List<AppMemberPrizePageVo> pageAppMemberPrize(Page page, Long userId){
        return birthdayCardMapper.pageAppMemberPrize(page, userId);
    }
}