modify

Helius

2020-12-28 ad4c12307f622abffd86a7fe3f713b82c668d0e0

modify

 zq-erp/src/main/java/com/matrix/system/app/action/ApiCommonAction.java

@@ -11,6 +11,7 @@
import com.matrix.system.common.authority.strategy.LoginStrategy;
import com.matrix.system.common.bean.SysUsers;
import com.matrix.system.common.service.SysUsersService;
import com.matrix.system.hive.bean.SysShopInfo;
import com.matrix.system.hive.service.SysShopInfoService;
import io.swagger.annotations.Api;
import io.swagger.annotations.ApiOperation;
@@ -57,8 +58,11 @@
        LoginStrategy apLogin = new AccountPasswordLogin(user, sysUsersService);
        user = authorityManager.login(apLogin);

        UserInfoVo userInfoVo = new UserInfoVo();
        if(user.getShopId()!=null){
            user.setShopName(sysShopInfoService.findById(user.getShopId()).getShopName());
            SysShopInfo shopInfo = sysShopInfoService.findById(user.getShopId());
            user.setShopName(shopInfo.getShopName());
            userInfoVo.setShopName(shopInfo.getShopShortName());
        }
        user.setSuPassword(null);

@@ -66,7 +70,6 @@
        redisClient.saveValueForever(token, JSONObject.toJSONString(user));
        redisClient.saveValueForever(user.getSuId().toString(), token);

        UserInfoVo userInfoVo = new UserInfoVo();
        userInfoVo.setId(user.getSuId());
        userInfoVo.setName(user.getSuName());
        userInfoVo.setRoleName(user.getRoleName());

 zq-erp/src/main/java/com/matrix/system/app/action/ApiVipInfoAction.java

@@ -144,4 +144,9 @@

        return AjaxResult.buildSuccessInstance(sysVipInfoService.findAll(sysVipInfo));
    }

    @GetMapping(value = "/findVipCardInfo/{vipId}")
    public AjaxResult findVipCardInfo(@PathVariable("vipId") Long vipId) {
        return null;
    }
}

 zq-erp/src/main/java/com/matrix/system/app/vo/UserInfoVo.java

@@ -22,6 +22,9 @@
    @ApiModelProperty(value = "头像", example = "--")
    private String photo;

    @ApiModelProperty(value = "门店名称")
    private String shopName;

    public Long getId() {
        return id;
    }
@@ -53,4 +56,12 @@
    public void setPhoto(String photo) {
        this.photo = photo;
    }

    public String getShopName() {
        return shopName;
    }

    public void setShopName(String shopName) {
        this.shopName = shopName;
    }
}