fix

Hentua

2024-01-25 e6f626e4f60e682c7d537fc12000768ebd8c553c

fix

 src/main/java/cc/mrbird/febs/mall/service/impl/ApiMallMemberServiceImpl.java

@@ -14,6 +14,8 @@
import cc.mrbird.febs.mall.vo.*;
import cc.mrbird.febs.pay.model.BrandWCPayRequestData;
import cc.mrbird.febs.pay.service.IXcxPayService;
import cc.mrbird.febs.vip.entity.MallVipConfig;
import cc.mrbird.febs.vip.mapper.MallVipConfigMapper;
import cn.hutool.core.bean.BeanUtil;
import cn.hutool.core.collection.CollUtil;
import cn.hutool.core.date.DateUtil;
@@ -73,6 +75,8 @@
    private final MallGoodsCouponMapper mallGoodsCouponMapper;
    private final MallMemberCouponMapper mallMemberCouponMapper;
    private final MallGoodsMapper mallGoodsMapper;

    private final MallVipConfigMapper mallVipConfigMapper;


    @Value("${spring.profiles.active}")
@@ -282,6 +286,10 @@
        mallMemberVo.setChildCnt(CollUtil.isNotEmpty(mallMembers) ? mallMembers.size() : 0);

        MallMemberWallet wallet = mallMemberWalletMapper.selectWalletByMemberId(mallMemberVo.getId());

        MallVipConfig mallVipConfig = mallVipConfigMapper.selectVipConfigByCode(mallMember.getLevel());

        mallMemberVo.setVipInfo(mallVipConfig);
        mallMemberVo.setBalance(wallet.getBalance());
//        mallMemberVo.setScore(wallet.getScore());
        mallMemberVo.setPrizeScore(wallet.getPrizeScore());

 src/main/java/cc/mrbird/febs/mall/vo/MallMemberVo.java

@@ -1,5 +1,6 @@
package cc.mrbird.febs.mall.vo;

import cc.mrbird.febs.vip.entity.MallVipConfig;
import com.fasterxml.jackson.annotation.JsonFormat;
import io.swagger.annotations.ApiModel;
import io.swagger.annotations.ApiModelProperty;
@@ -43,8 +44,6 @@
    private String referrerName;

    private String level;

    private Integer levelCnt;

    @JsonFormat(pattern = "yyyy-MM-dd HH:mm:ss", timezone = "GMT+8")
    private Date createdTime;
@@ -97,4 +96,7 @@

    @ApiModelProperty(value = "是否是推销员")
    private Integer isSale;

    @ApiModelProperty(value = "会员信息")
    private MallVipConfig vipInfo;
}

 src/main/java/cc/mrbird/febs/vip/service/impl/MallVipConfigServiceImpl.java

@@ -46,7 +46,7 @@
    }

    @Override
    @Transactional
    @Transactional(rollbackFor = Exception.class)
    public void addVipConfig(MallVipConfig config) {
        this.baseMapper.insert(config);


 src/main/resources/mapper/modules/MallVipConfigMapper.xml

@@ -34,6 +34,7 @@
        from mall_vip_config config
            inner join mall_vip_config_benefits configBenefits on config.id=configBenefits.config_id
            inner join mall_vip_benefits benefits on configBenefits.benefits_id=benefits.id
        order by level
    </select>

    <select id="selectVipConfigByCode" resultMap="vipConfigMap">