java/qijisheng.git

			@@ -13,9 +13,11 @@
			import com.ruoyi.common.security.service.TokenService;
			import com.ruoyi.common.security.utils.SecurityUtils;
			import com.ruoyi.order.feignClient.RemoteOrderGoodsClient;
			import com.ruoyi.other.api.domain.Technician;
			import com.ruoyi.other.api.domain.TechnicianSubscribe;
			import com.ruoyi.other.enums.TechnicianStatus;
			import com.ruoyi.other.mapper.TechnicianSubscribeMapper;
			import com.ruoyi.other.service.TechnicianService;
			import com.ruoyi.other.service.TechnicianSubscribeService;
			import com.ruoyi.other.vo.TechnicianSubscribeVO;
			import org.springframework.data.redis.connection.RedisZSetCommands;
			@@ -53,6 +55,8 @@
			private TokenService tokenService;
			@Resource
			private AppUserShopClient appUserShopClient;
			@Resource
			private TechnicianService technicianService;



			@@ -64,13 +68,14 @@
			Long userid = tokenService.getLoginUserApplet().getUserid();
			List<AppUserShop> data = appUserShopClient.getAppUserShop(userid).getData();
			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, 1));
			technicianId = technician.getId();
			}


			List<TechnicianSubscribeVO> list = technicianSubscribeMapper.getTechnicianSubscribeByUserAndShop(pageInfo, shopId, status);
			List<TechnicianSubscribeVO> list = technicianSubscribeMapper.getTechnicianSubscribeByUserAndShop(pageInfo, shopId, status, technicianId);
			for (TechnicianSubscribeVO technicianSubscribeVO : list) {
			String id = technicianSubscribeVO.getId();
			TechnicianSubscribe technicianSubscribe = this.getById(id);