基础配置 管理台联调bug

jiangqs

2023-06-12 924242a73d62d247f7055ffd0dd86a2700757f5b

 ruoyi-modules/ruoyi-shop/src/main/java/com/ruoyi/shop/service/impl/shop/ShopStaffServiceImpl.java

@@ -5,11 +5,8 @@
import com.baomidou.mybatisplus.core.toolkit.Wrappers;
import com.baomidou.mybatisplus.extension.service.impl.ServiceImpl;
import com.ruoyi.common.core.utils.bean.BeanUtils;
import com.ruoyi.shop.domain.pojo.shop.ShopRelUser;
import com.ruoyi.shop.domain.pojo.shop.ShopStaff;
import com.ruoyi.shop.mapper.shop.ShopStaffMapper;
import com.ruoyi.shop.service.shop.ShopRelUserService;
import com.ruoyi.shop.service.shop.ShopService;
import com.ruoyi.shop.service.shop.ShopStaffService;
import com.ruoyi.system.api.domain.dto.MerEditUserDto;
import com.ruoyi.system.api.domain.poji.shop.Shop;
@@ -29,11 +26,6 @@
@Service
public class ShopStaffServiceImpl extends ServiceImpl<ShopStaffMapper, ShopStaff> implements ShopStaffService {

    @Resource
    private ShopService shopService;

    @Resource
    private ShopRelUserService shopRelUserService;

    @Resource
    private ShopStaffMapper shopStaffMapper;
@@ -69,19 +61,16 @@
     * @return
     */
    @Override
    public MerStaffInfoVo getShopStaffInfo(Long userId){
    public MerStaffInfoVo getShopStaffInfo(Long userId,Shop shop){
        MerStaffInfoVo merStaffInfoVo = new MerStaffInfoVo();
        ShopStaff shopStaff = this.getByUserId(userId);
        BeanUtils.copyProperties(shopStaff,merStaffInfoVo);
        ShopRelUser shopRelUser = shopRelUserService.getByUserId(userId);
        Shop shop = shopService.getByShopId(shopRelUser.getShopId());
        merStaffInfoVo.setShopName(shop.getShopName());
        merStaffInfoVo.setShopAddress(shop.getShopAddress());
        merStaffInfoVo.setShopServicePhone(shop.getShopServicePhone());
        merStaffInfoVo.setBusinessTime(shop.getBusinessStartTime()+"-"+shop.getBusinessEndTime());
        merStaffInfoVo.setShopType(shop.getShopType());
        merStaffInfoVo.setShopNumber(shop.getShopNumber());

        return merStaffInfoVo;
    }