Merge remote-tracking branch 'origin/2.0' into 2.0

Pu Zhibing

昨天 2cf783a1480050c0f13907c5fde625edee8fce62

Merge remote-tracking branch 'origin/2.0' into 2.0

 ruoyi-common/ruoyi-common-security/src/main/java/com/ruoyi/common/security/utils/SecurityUtils.java

@@ -52,7 +52,11 @@

    public static SysUser getSysUser()
    {
        return getLoginUser().getSysUser();
//        return getLoginUser().getSysUser();
        SysUser sysUser = new SysUser();

        sysUser.setUserId(Long.valueOf(SecurityContextHolder.get("user_id")));
        return sysUser;
    }

    /**

 ruoyi-modules/ruoyi-goods/src/main/java/com/ruoyi/goods/service/impl/activity/ActivityServiceImpl.java

@@ -844,6 +844,7 @@
        activity.setActivityEndTime(now);
        activity.setUpdateTime(now);
        activity.setUpdateUserId(mgtBaseGetDto.getUserId());
        activity.setActivityStatus(2);
        this.updateById(activity);
        return R.ok();
    }

 ruoyi-modules/ruoyi-goods/src/main/java/com/ruoyi/goods/service/impl/goods/GoodsServiceImpl.java

@@ -40,6 +40,7 @@
import com.ruoyi.system.api.service.RemoteConfigService;
import com.ruoyi.system.api.service.RemoteOrderService;
import com.ruoyi.system.api.service.RemoteShopService;
import com.ruoyi.system.api.service.RemoteUserService;
import org.springframework.stereotype.Service;

import javax.annotation.Resource;
@@ -86,7 +87,8 @@
    @Resource
    private RemoteShopService remoteShopService;


    @Resource
    private RemoteUserService sysUserService;
    /**
     * @param page shopId
     * @return List<AppSimpleGoodsVo>
@@ -796,10 +798,12 @@
        //查询商品销量 销售额
        return remoteOrderService.getGoodsSellStatic(goodsId).getData();
    }

    @Override
    public R<Void> updateGoodsPrice(UpdateGoodsPriceDTO updateGoodsPriceDTO) {
        //判断当前登录人员类型
        SysUser sysUser = SecurityUtils.getSysUser();
        SysUser sysUserId = SecurityUtils.getSysUser();
        SysUser sysUser = sysUserService.getSysUser(sysUserId.getUserId()).getData();
        if ("01".equals(sysUser.getUserType())){
            //B端
            Shop shop = remoteShopService.getShop(updateGoodsPriceDTO.getShopId()).getData();

 ruoyi-modules/ruoyi-member/src/main/java/com/ruoyi/member/service/impl/member/MemberServiceImpl.java

@@ -960,7 +960,8 @@
            merMemberPageDto.setStartBirthday(startBirthday.format(formatter));
        }
        // 获取当前登陆人的可视权限
        SysUser sysUser = SecurityUtils.getSysUser();
        SysUser sysUserId = SecurityUtils.getSysUser();
        SysUser sysUser = sysUserService.getSysUser(sysUserId.getUserId()).getData();
        // 店铺ids
        List<Long> scope = new ArrayList<>();
        if (sysUser!=null){

 ruoyi-modules/ruoyi-shop/src/main/java/com/ruoyi/shop/controller/management/MgtShopController.java

@@ -74,7 +74,8 @@
    @ApiOperation(value = "获取简易商户列表")
    public R<List<MgtShopListSimpleVo>> listMgtShopSimpleVo(@RequestBody MgtShopListDto mgtShopListDto) {
        // 获取当前登陆人的可视权限
        SysUser sysUser = SecurityUtils.getSysUser();
        SysUser sysUserId = SecurityUtils.getSysUser();
        SysUser sysUser = sysUserService.getSysUser(sysUserId.getUserId()).getData();
        // 店铺ids
        List<Long> scope = new ArrayList<>();
        if (sysUser!=null){
@@ -125,7 +126,8 @@
    @ApiOperation(value = "分页获取商户列表")
    public R<Page<MgtShopPageVo>> pageMgtShop(@RequestBody MgtShopPageDto mgtShopPageDto) {
        // 获取当前登陆人的可视权限
        SysUser sysUser = SecurityUtils.getSysUser();
        SysUser sysUserId = SecurityUtils.getSysUser();
        SysUser sysUser = sysUserService.getSysUser(sysUserId.getUserId()).getData();
        // 店铺ids
        List<Long> scope = new ArrayList<>();
        if (sysUser!=null){
@@ -194,7 +196,8 @@
            page.setCurrent(mgtShopPageDto.getPageNum());
        }
        // 获取当前登陆人的可视权限
        SysUser sysUser = SecurityUtils.getSysUser();
        SysUser sysUserId = SecurityUtils.getSysUser();
        SysUser sysUser = sysUserService.getSysUser(sysUserId.getUserId()).getData();
        // 店铺ids
        List<Long> scope = new ArrayList<>();
        if (sysUser!=null){
@@ -424,7 +427,8 @@
        page.setSize(mgtShopAuthPageDto.getPageSize());
        page.setCurrent(mgtShopAuthPageDto.getPageNum());
        // 获取当前登陆人的可视权限
        SysUser sysUser = SecurityUtils.getSysUser();
        SysUser sysUserId = SecurityUtils.getSysUser();
        SysUser sysUser = sysUserService.getSysUser(sysUserId.getUserId()).getData();
        // 店铺ids
        List<Long> scope = new ArrayList<>();
        if (sysUser!=null){
@@ -511,7 +515,8 @@
    @ApiOperation(value = "分页获取商户进件列表（汇付天下）")
    public R<Page<MgtShopHFTXAuthPageVo>> pageMgtShopHFTXAuth(@RequestBody MgtShopHFTXAuthPageDto mgtShopAuthPageDto) {
        // 获取当前登陆人的可视权限
        SysUser sysUser = SecurityUtils.getSysUser();
        SysUser sysUserId = SecurityUtils.getSysUser();
        SysUser sysUser = sysUserService.getSysUser(sysUserId.getUserId()).getData();
        // 店铺ids
        List<Long> scope = new ArrayList<>();
        if (sysUser!=null){

 ruoyi-modules/ruoyi-system/src/main/java/com/ruoyi/system/controller/management/MgtStaffController.java

@@ -55,7 +55,8 @@
    @ApiOperation(value = "获取部门员工列表")
    public R<List<MgtDeptStaffListVo>> listMgtDeptStaff(@RequestBody ListMgtDeptStaffDto listMgtDeptStaffDto) {
        // 获取当前登陆人的可视权限
        SysUser sysUser = SecurityUtils.getSysUser();
        SysUser sysUserId = SecurityUtils.getSysUser();
        SysUser sysUser = sysUserService.getSysUser(sysUserId.getUserId()).getData();
        // 如果当前登陆人权限是查看部门数据
        Long deptId = null;
        // 如果当前登陆人是查看个人数据