add: 供应商子账号5

cloudroam

2024-12-12 db6da36b94e1e43096a818052ee65dbfcd5e6d98

 src/main/java/com/mzl/flower/service/system/UserService.java

@@ -3,12 +3,14 @@
import com.baomidou.mybatisplus.core.conditions.query.LambdaQueryWrapper;
import com.baomidou.mybatisplus.core.conditions.query.QueryWrapper;
import com.baomidou.mybatisplus.extension.plugins.pagination.Page;
import com.mzl.flower.config.GlobalSupplierVariables;
import com.mzl.flower.config.exception.ValidationException;
import com.mzl.flower.config.security.SecurityUtils;
import com.mzl.flower.constant.Constants;
import com.mzl.flower.dto.request.BindWechatDTO;
import com.mzl.flower.dto.request.system.*;
import com.mzl.flower.dto.response.current.CurrentUserDTO;
import com.mzl.flower.dto.response.supplier.SupplierDTO;
import com.mzl.flower.dto.response.system.EmployeeDTO;
import com.mzl.flower.dto.response.system.MenuTreeDTO;
import com.mzl.flower.dto.response.system.UserDetailsDTO;
@@ -18,6 +20,7 @@
import com.mzl.flower.entity.system.*;
import com.mzl.flower.enums.TrueOrFalseEnum;
import com.mzl.flower.mapper.point.CustomerPointMapper;
import com.mzl.flower.mapper.supplier.SupplierMapper;
import com.mzl.flower.mapper.supplier.SupplierSubMapper;
import com.mzl.flower.mapper.system.*;
import com.mzl.flower.service.customer.CustomerService;
@@ -89,6 +92,12 @@
    @Autowired
    private SupplierSubMapper supplierSubMapper;

    @Autowired
    private SupplierMapper supplierMapper;

    @Autowired
    private  GlobalSupplierVariables globalSupplierVariables;


    public User findUserByOpenId(String openId, String sessionKey, String unionId
            , String imgUrl, String nickname,String userType){
@@ -148,6 +157,7 @@
    }

    public CurrentUserDTO getCurrentUser() {

        String userId = SecurityUtils.getUserId();

        CurrentUserDTO result = new CurrentUserDTO();
@@ -215,17 +225,34 @@
            }
        }else if(Constants.USER_TYPE.supplier.name().equals(user.getType())){
            result.setSupplierDTO(supplierService.getCurrentSupplier());
            //子账号信息
            SupplierSub sub = supplierSubMapper.getCurrentSupplier(SecurityUtils.getUserId());
            //主账号信息
            SupplierDTO dto = supplierMapper.getCurrentSupplier(SecurityUtils.getUserId());
//            if (!ObjectUtils.isEmpty(dto)) {
//                globalSupplierVariables.removeSupplier(String.valueOf(dto.getId()));
//            }
            String tempUserId = "";
            if (!ObjectUtils.isEmpty(sub)) {
                tempUserId = globalSupplierVariables.getSupplier(String.valueOf(sub.getId()));
            } else {
                tempUserId = globalSupplierVariables.getSupplier(String.valueOf(dto.getId()));
            }
            if (!ObjectUtils.isEmpty(sub)) {
                result.setIsSubSupplier(true);
                result.setSupplierSub(sub);
                //可切换
                result.setSwitchFlag(true);
            } else {
                result.setIsSubSupplier(false);
                result.setSupplierSub(null);
                //不可切换
                result.setSwitchFlag(false);
            } else {
                if (!StringUtils.isBlank(tempUserId)) {
                    SupplierSub temSub = supplierSubMapper.getCurrentSupplier(tempUserId);
                    result.setIsSubSupplier(true);
                    result.setSupplierSub(temSub);
                    result.setSwitchFlag(true);
                } else {
                    result.setIsSubSupplier(false);
                    result.setSupplierSub(null);
                    result.setSwitchFlag(true);
                }
            }
        }else if(Constants.USER_TYPE.partner.name().equals(user.getType())){
            result.setPartnerDTO(partnerService.getCurrentPartner());