Pu Zhibing
4 天以前 d6a0c57043e8cc20694a3c678bf8e3a8f28f6499
ruoyi-modules/ruoyi-member/src/main/java/com/ruoyi/member/service/impl/birthday/BirthdayCardServiceImpl.java
@@ -543,6 +543,7 @@
                        memberGiftRecord.setDelFlag(0);
                        memberGiftRecord.setVerifyStatus(1);
                        memberGiftRecord.setGiftFrom(1);
                        memberGiftRecord.setPrizeFrom(1);
                        memberGiftRecord.setGiftYear(currentYear);
                        memberGiftRecord.setCreateTime(new Date());
                        memberGiftRecord.setUserId(userId);
@@ -622,6 +623,7 @@
                                memberGiftRecord.setDelFlag(0);
                                memberGiftRecord.setVerifyStatus(1);
                                memberGiftRecord.setGiftFrom(2);
                                memberGiftRecord.setPrizeFrom(1);
                                memberGiftRecord.setShopId(shopId);
                                memberGiftRecord.setGiftYear(currentYear);
                                memberGiftRecord.setCreateTime(new Date());
@@ -682,23 +684,23 @@
        appBirthdayCardVo.setBirthdayGiftVoList(birthdayGiftVoList);
        return appBirthdayCardVo;
    }
    /**
     * @description
     * @author  jqs
     * @date    2023/7/11 18:02
     * @param page
     * @param userId
     * @return  List<AppMemberPrizePageVo>
     * @return List<AppMemberPrizePageVo>
     * @description
     * @author jqs
     * @date 2023/7/11 18:02
     */
    @Override
    public List<AppMemberPrizePageVo> pageAppMemberPrize(Page page, Long userId){
    public List<AppMemberPrizePageVo> pageAppMemberPrize(Page page, Long userId) {
        List<AppMemberPrizePageVo> memberPrizePageVoList = birthdayCardMapper.pageAppMemberPrize(page, userId);
        if(memberPrizePageVoList!=null&&!memberPrizePageVoList.isEmpty()){
        if (memberPrizePageVoList != null && !memberPrizePageVoList.isEmpty()) {
            HashSet<Long> shopIdSet = new HashSet<>();
            for(AppMemberPrizePageVo appMemberPrizePageVo : memberPrizePageVoList){
                appMemberPrizePageVo.setVerifyCode("3-"+appMemberPrizePageVo.getPrizeId());
                if(appMemberPrizePageVo.getShopId()!=null){
            for (AppMemberPrizePageVo appMemberPrizePageVo : memberPrizePageVoList) {
                appMemberPrizePageVo.setVerifyCode("3-" + appMemberPrizePageVo.getPrizeId());
                if (appMemberPrizePageVo.getShopId() != null) {
                    shopIdSet.add(appMemberPrizePageVo.getShopId());
                }
            }
@@ -708,8 +710,8 @@
            List<MgtSimpleShopVo> simpleShopVoList = remoteShopService.listShopSimpleVoByIds(mgtBaseBathDto).getData();
            Map<Long, MgtSimpleShopVo> shopMap = simpleShopVoList.stream()
                    .collect(Collectors.toMap(MgtSimpleShopVo::getShopId, Function.identity()));
            for(AppMemberPrizePageVo appMemberPrizePageVo : memberPrizePageVoList){
                if(appMemberPrizePageVo.getShopId()!=null){
            for (AppMemberPrizePageVo appMemberPrizePageVo : memberPrizePageVoList) {
                if (appMemberPrizePageVo.getShopId() != null) {
                    appMemberPrizePageVo.setVerifyShopName(shopMap.get(appMemberPrizePageVo.getShopId()).getShopName());
                }
            }