拆分订单和商品服务

jiangqs

2023-05-23 687dbd8e6ababc010a3da5503b95cd62cecf9f02

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

@@ -19,14 +19,15 @@
import com.ruoyi.member.service.member.MemberNurseService;
import com.ruoyi.member.service.member.MemberService;
import com.ruoyi.member.util.HttpUtils;
import com.ruoyi.system.api.RemoteConfigService;
import com.ruoyi.system.api.RemoteOrderService;
import com.ruoyi.system.api.RemoteShopService;
import com.ruoyi.system.api.RemoteUserService;
import com.ruoyi.system.api.service.RemoteConfigService;
import com.ruoyi.system.api.service.RemoteOrderService;
import com.ruoyi.system.api.service.RemoteShopService;
import com.ruoyi.system.api.service.RemoteUserService;
import com.ruoyi.system.api.constant.AppErrorConstant;
import com.ruoyi.system.api.constant.SecurityConstant;
import com.ruoyi.system.api.domain.dto.AppEditUserDto;
import com.ruoyi.system.api.domain.dto.AppMemberBindingDto;
import com.ruoyi.system.api.domain.dto.AppMemberGoodsTypeDto;
import com.ruoyi.system.api.domain.poji.config.SysTag;
import com.ruoyi.system.api.domain.poji.member.Member;
import com.ruoyi.system.api.domain.poji.shop.Shop;
@@ -282,14 +283,15 @@
        AppUserInfoVo appUserInfoVo = new AppUserInfoVo();
        Member member = this.getByUserId(userId);
        appUserInfoVo.setUserId(userId);
        appUserInfoVo.setRelationShopId(member.getRelationShopId());
        appUserInfoVo.setMemberNo(member.getMemberNo());
        appUserInfoVo.setNickName(member.getNickName());
        appUserInfoVo.setRealName(member.getRealName());
        appUserInfoVo.setPhonenumber(member.getMobile());
        if(member.getRelationShopId()!=null){
        if(member.getRelationShopId()!=null&&member.getBindingFlag()==1){
            appUserInfoVo.setRelationShopId(member.getRelationShopId());
            Shop shop = shopService.getShop(member.getRelationShopId()).getData();
            appUserInfoVo.setShopName(shop.getShopName());
            appUserInfoVo.setShopAddress(shop.getShopAreaName()+shop.getShopAddress());
        }
        appUserInfoVo.setBirthday(member.getBirthday());
        appUserInfoVo.setGender(member.getGender());
@@ -364,6 +366,7 @@
        merMemberInfoVo.setPhonenumber(member.getMobile());
        merMemberInfoVo.setAvatar(member.getAvatar());
        merMemberInfoVo.setBirthday(member.getBirthday());
        merMemberInfoVo.setUserTags(member.getUserTags());
        //未完成

        return merMemberInfoVo;
@@ -453,7 +456,14 @@
    @Override
    public void editMerMemberTags(MerMemberTagEditDto merMemberTagEditDto){
        Member member = this.getByUserId(merMemberTagEditDto.getMemberUserId());
        member.setUserTags(merMemberTagEditDto.getUserTags());
        List<String> userTags = merMemberTagEditDto.getUserTags();
        StringJoiner sj = new StringJoiner(",");
        if(userTags!=null&&!userTags.isEmpty()){
            for(String str : userTags){
                sj.add(str);
            }
        }
        member.setUserTags(sj.toString());
        this.saveOrUpdate(member);
    }

@@ -546,4 +556,33 @@
        Member member = this.getOne(queryWrapper);
        return member;
    }

    /**
     * 更新用户商品类型
     * @param appMemberGoodsTypeDto
     */
    @Override
    public void updateMemberGoodsType(AppMemberGoodsTypeDto appMemberGoodsTypeDto){
        Member member = this.getByUserId(appMemberGoodsTypeDto.getUserId());
        HashSet<String> goodsTypeSet = appMemberGoodsTypeDto.getGoodsTypeSet();
        if(member!=null){
            String goodsType = member.getGoodsType();
            Boolean change = false;
            for(String str : goodsTypeSet){
                if(goodsType != null){
                    if(!goodsType.contains(str)){
                        goodsType = goodsType + "," + str;
                        change = true;
                    }
                }else{
                    goodsType = str;
                    change = true;
                }
            }
            if(change){
                member.setGoodsType(goodsType);
                this.saveOrUpdate(member);
            }
        }
    }
}