Merge remote-tracking branch 'origin/master'

puzhibing

2024-12-16 6e936cc4af80fa65210d7e00a54e89a9e706305d

 ruoyi-service/ruoyi-other/src/main/java/com/ruoyi/other/service/impl/GoodsShopServiceImpl.java

@@ -1,10 +1,18 @@
package com.ruoyi.other.service.impl;

import com.baomidou.mybatisplus.extension.service.impl.ServiceImpl;
import com.ruoyi.common.security.service.TokenService;
import com.ruoyi.other.mapper.GoodsShopMapper;
import com.ruoyi.other.api.domain.GoodsShop;
import com.ruoyi.other.service.GoodsShopService;
import com.ruoyi.other.vo.ShopGoodsList;
import com.ruoyi.other.vo.ShopGoodsListVo;
import com.ruoyi.system.api.domain.SysUser;
import com.ruoyi.system.api.feignClient.SysUserClient;
import org.springframework.stereotype.Service;

import javax.annotation.Resource;
import java.util.List;

/**
 * <p>
@@ -16,5 +24,25 @@
 */
@Service
public class GoodsShopServiceImpl extends ServiceImpl<GoodsShopMapper, GoodsShop> implements GoodsShopService {

	
   @Resource
   private TokenService tokenService;
	
   @Resource
   private SysUserClient sysUserClient;
	
	
	
   /**
    * 获取门店授权的服务商品
    * @param shopGoodsListVo
    * @return
    */
   @Override
   public List<ShopGoodsList> getShopGoodsList(ShopGoodsListVo shopGoodsListVo) {
      Long userid = tokenService.getLoginUser().getUserid();
      SysUser sysUser = sysUserClient.getSysUser(userid).getData();
      List<ShopGoodsList> shopGoodsList = this.baseMapper.getShopGoodsList(sysUser.getObjectId(), shopGoodsListVo.getId(), shopGoodsListVo.getName(), shopGoodsListVo.getGoodsCategoryId());
      return shopGoodsList;
   }
}