修改bug

puzhibing

2023-10-31 32cafa15d3d4aa99a67102914a1b31e8f080c03f

修改bug

 ruoyi-modules/ruoyi-member/src/main/java/com/ruoyi/member/domain/vo/MgtMemberPageVo.java

@@ -79,6 +79,10 @@
    @Excel(name = "客户类型", width = 30, sort = 13)
    private String goodsType;

    @ApiModelProperty(value = "关联商户id")
    @Excel(name = "关联商户名称", width = 30, sort = 14)
    private Long relationShopId;

    @ApiModelProperty(value = "关联商户名称")
    @Excel(name = "关联商户名称", width = 30, sort = 14)
    private String relationShopName;

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

@@ -8,6 +8,7 @@
import com.baomidou.mybatisplus.core.toolkit.Wrappers;
import com.baomidou.mybatisplus.extension.plugins.pagination.Page;
import com.baomidou.mybatisplus.extension.service.impl.ServiceImpl;
import com.ruoyi.common.core.domain.R;
import com.ruoyi.common.core.exception.ServiceException;
import com.ruoyi.common.core.utils.DateUtils;
import com.ruoyi.common.core.utils.StringUtils;
@@ -942,6 +943,15 @@
                //活跃度赋值
                Date lastPayTime;
                for (MgtMemberPageVo mgtMemberPageVo : memberPageVoList) {
                    if(null != mgtMemberPageVo.getRelationShopId()){
                        R<Shop> shop_r = remoteShopService.getShop(mgtMemberPageVo.getRelationShopId());
                        if(shop_r.getCode() == 200){
                            Shop data = shop_r.getData();
                            if(null != data){
                                mgtMemberPageVo.setRelationShopName(data.getShopName());
                            }
                        }
                    }
                    lastPayTime = mgtMemberPageVo.getLastPayTime();
                    StringJoiner sj = new StringJoiner(",");
                    if (lastPayTime != null) {
@@ -1137,7 +1147,14 @@
        mgtMemberGetVo.setLastPayTime(memberTotal.getLastPayTime());
        mgtMemberGetVo.setGoodsType(member.getGoodsType());
        if(member.getBindingFlag()==1){
            mgtMemberGetVo.setRelationShopName(member.getRelationShopName());
            R<Shop> shop = remoteShopService.getShop(member.getRelationShopId());
            if(shop.getCode() == 200){
                Shop data = shop.getData();
                if(null != data){
                    mgtMemberGetVo.setRelationShopName(data.getShopName());
                }
            }

        }
        mgtMemberGetVo.setIntegral(memberTotal.getTotalIntegral());
        mgtMemberGetVo.setMemberFrom(member.getCustomerSource());

 ruoyi-modules/ruoyi-member/src/main/resources/mapper/member/MemberMapper.xml

@@ -243,6 +243,7 @@
        tm.create_time createTime,
        tmt.last_pay_time lastPayTime,
        tm.goods_type goodsType,
        tm.relation_shop_id as relationShopId,
        CASE binding_flag WHEN 1 THEN tm.relation_shop_name ELSE "" END relationShopName,
        tmt.total_integral integral,
        tm.referrer referrer,