java/qijisheng.git

			@@ -1,5 +1,6 @@
			package com.ruoyi.other.service.impl;

			import com.alibaba.fastjson2.JSON;
			import com.baomidou.mybatisplus.core.conditions.query.LambdaQueryWrapper;
			import com.baomidou.mybatisplus.core.metadata.IPage;
			import com.baomidou.mybatisplus.extension.plugins.pagination.Page;
			@@ -8,6 +9,7 @@
			import com.ruoyi.account.api.feignClient.AppUserShopClient;
			import com.ruoyi.account.api.model.AppUser;
			import com.ruoyi.account.api.model.AppUserShop;
			import com.ruoyi.account.api.model.UserAddress;
			import com.ruoyi.common.core.utils.StringUtils;
			import com.ruoyi.common.core.web.page.PageInfo;
			import com.ruoyi.common.security.service.TokenService;
			@@ -70,11 +72,15 @@
			Optional<AppUserShop> first = data.stream().filter(s -> s.getShopId() == shopId.intValue() && s.getRoleType() == 3).findFirst();
			Integer technicianId = null;
			if(first.isPresent()){
			AppUserShop appUserShop = first.get();
			Technician technician = technicianService.getOne(new LambdaQueryWrapper<Technician>().eq(Technician::getAppUserId, appUserShop.getAppUserId())
			.eq(Technician::getShopId, appUserShop.getShopId()).eq(Technician::getDelFlag, 0).eq(Technician::getStatus, 2));
			if(null != technician){
			technicianId = technician.getId();
			//既是店员又是技师，需要取员工身份获取列表数据
			Optional<AppUserShop> first1 = data.stream().filter(s -> s.getShopId() == shopId.intValue() && s.getRoleType() != 3).findFirst();
			if(!first1.isPresent()){
			AppUserShop appUserShop = first.get();
			Technician technician = technicianService.getOne(new LambdaQueryWrapper<Technician>().eq(Technician::getAppUserId, appUserShop.getAppUserId())
			.eq(Technician::getShopId, appUserShop.getShopId()).eq(Technician::getDelFlag, 0).eq(Technician::getStatus, 2));
			if(null != technician){
			technicianId = technician.getId();
			}
			}
			}
			List<TechnicianSubscribeVO> list = technicianSubscribeMapper.getTechnicianSubscribeByUserAndShop(pageInfo, shopId, status, technicianId);
			@@ -84,6 +90,11 @@
			AppUser appUser = appUserClient.getAppUserById(technicianSubscribe.getAppUserId());
			technicianSubscribeVO.setUserName(appUser.getName());
			technicianSubscribeVO.setPhone(appUser.getPhone());
			Integer serviceMode = technicianSubscribeVO.getServiceMode();
			if(1 == serviceMode){
			UserAddress userAddress = JSON.parseObject(technicianSubscribeVO.getUserAddress(), UserAddress.class);
			technicianSubscribeVO.setUserAddress(userAddress.getProvince() + userAddress.getCity() + userAddress.getDistrict() + userAddress.getRecieveAddress());
			}
			}
			return pageInfo.setRecords(list);
			}