bug

jiangqs

2023-08-12 f19155dcda0413563963d545eed3045364814c0d

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

@@ -11,16 +11,18 @@
import com.ruoyi.member.domain.dto.MgtBirthdayEditDto;
import com.ruoyi.member.domain.dto.MgtBirthdayGetDto;
import com.ruoyi.member.domain.dto.MgtBirthdayGiftDto;
import com.ruoyi.system.api.domain.poji.member.BirthdayCard;
import com.ruoyi.member.domain.pojo.birthday.BirthdayGift;
import com.ruoyi.member.domain.vo.*;
import com.ruoyi.member.mapper.birthday.BirthdayCardMapper;
import com.ruoyi.member.service.birthday.BirthdayCardService;
import com.ruoyi.member.service.birthday.BirthdayGiftService;
import com.ruoyi.member.service.member.MemberGiftRecordService;
import com.ruoyi.member.service.member.MemberService;
import com.ruoyi.system.api.constant.AppErrorConstant;
import com.ruoyi.system.api.domain.dto.BirthdayGiftSendDto;
import com.ruoyi.system.api.domain.dto.MgtBaseBathDto;
import com.ruoyi.system.api.domain.poji.member.BirthdayCard;
import com.ruoyi.system.api.domain.poji.member.Member;
import com.ruoyi.system.api.domain.poji.member.MemberGiftRecord;
import com.ruoyi.system.api.domain.poji.shop.Shop;
import com.ruoyi.system.api.domain.vo.MgtSimpleShopVo;
@@ -56,6 +58,10 @@

    @Resource
    private MemberGiftRecordService memberGiftRecordService;

    @Resource
    private MemberService memberService;



    /**
@@ -501,8 +507,23 @@
        BirthdayGiftSendDto birthdayGiftSendDto;
        String prizeId;
        String currentYear = String.valueOf(LocalDate.now().getYear());
        Member member = memberService.getByUserId(userId);
        // 获取平台生日卡信息
        BirthdayCard plBirthdayCard = birthdayCardMapper.getPlatformBirthdayCard(shopId);
        BirthdayCard plBirthdayCard = this.getBirthdayCard();
        //绑定的时候需要判断范围
        if(member.getBindingFlag()==1){
            //判断指定区域全部店铺
            if(plBirthdayCard.getShopFlag()==1&&plBirthdayCard.getAreaFlag()==2){
                Shop shop = remoteShopService.getShop(member.getRelationShopId()).getData();
                if(!StringUtils.checkString(plBirthdayCard.getDesignatedArea(),shop.getShopCityCode())){
                    plBirthdayCard = null;
                }
            }
            //判断指定店铺
            if(plBirthdayCard.getShopFlag()==2&&!StringUtils.checkString(plBirthdayCard.getApplicableShop(),shopId.toString())){
                plBirthdayCard = null;
            }
        }
        // 如果生日卡存在
        if (plBirthdayCard != null && plBirthdayCard.getCardStatus()==1) {
            // 获取生日卡对应的生日礼物列表
@@ -574,6 +595,7 @@
            }
        }
        //获取商户营销开关状态
        if(member.getBindingFlag()==1){
        Integer marketingStatus = remoteShopService.getShopMarketingStatus(shopId).getData();
        if(marketingStatus>1){
            //获取商户生日卡
@@ -654,6 +676,7 @@
                }
            }
        }
        }
        //保存用户礼物记录
        memberGiftRecordService.saveBatch(memberGiftRecordList);
        appBirthdayCardVo.setBirthdayGiftVoList(birthdayGiftVoList);
@@ -710,16 +733,22 @@
        if (plBirthdayCard == null || plBirthdayCard.getCardStatus()!=1) {
            platformBirthdayCardOpen = false;
        }else{
            if(plBirthdayCard.getShopFlag()==2&&plBirthdayCard.getAreaFlag()==1){
            //绑死店铺判断区域和店铺
            if(bindingFlag==1){
                //判断指定区域全部店铺
                if(plBirthdayCard.getShopFlag()==1&&plBirthdayCard.getAreaFlag()==2){
                Shop shop = remoteShopService.getShop(shopId).getData();
                if(!StringUtils.checkString(plBirthdayCard.getDesignatedArea(),shop.getShopCityCode())){
                    platformBirthdayCardOpen = false;
                }
            }
            if(plBirthdayCard.getAreaFlag()==2&&!StringUtils.checkString(plBirthdayCard.getApplicableShop(),shopId.toString())){
                //判断指定店铺
                if(plBirthdayCard.getShopFlag()==2&&!StringUtils.checkString(plBirthdayCard.getApplicableShop(),shopId.toString())){
                platformBirthdayCardOpen = false;
            }
        }
        }
        //判断店铺生日卡
        BirthdayCard shopBirthdayCard = birthdayCardMapper.getMerShopBirthdayCard(shopId);
        // 如果生日卡存在
        Boolean shopBirthdayCardOpen  = true;