bug
jiangqs
2023-07-31 122bb1142631e31ce50716495dba420102f58f56
ruoyi-modules/ruoyi-member/src/main/java/com/ruoyi/member/service/impl/birthday/BirthdayCardServiceImpl.java
@@ -448,8 +448,8 @@
                                break;
                            case 4:
                                // 礼物类型为4,即礼品
                                appBirthdayGiftVo.setGiftName(memberGiftRecord.getCouponName());
                                appBirthdayGiftVo.setGiftNumber(memberGiftRecord.getCouponNumber());
                                appBirthdayGiftVo.setGiftName(memberGiftRecord.getGiftName());
                                appBirthdayGiftVo.setGiftNumber(memberGiftRecord.getGiftNumber());
                                break;
                            default:
                                break;
@@ -672,7 +672,9 @@
            Map<Long, MgtSimpleShopVo> shopMap = simpleShopVoList.stream()
                    .collect(Collectors.toMap(MgtSimpleShopVo::getShopId, Function.identity()));
            for(AppMemberPrizePageVo appMemberPrizePageVo : memberPrizePageVoList){
                appMemberPrizePageVo.setVerifyShopName(shopMap.get(appMemberPrizePageVo.getShopId()).getShopName());
                if(appMemberPrizePageVo.getShopId()!=null){
                    appMemberPrizePageVo.setVerifyShopName(shopMap.get(appMemberPrizePageVo.getShopId()).getShopName());
                }
            }
        }
        return memberPrizePageVoList;