Merge branch 'score_shop' into api_score_meger

935090232@qq.com

2021-07-21 75f1c8f7380994e032de7d32ca7890dff543aaa2

 zq-erp/src/main/java/com/matrix/system/hive/action/VipInfoController.java

@@ -237,9 +237,9 @@
    public @ResponseBody
    AjaxResult showList(PaginationVO pageVo, SysVipInfo vipInfo) {

//        if (!getMe().getShopRole().equals(Dictionary.FLAG_YES_Y)) {
        vipInfo.setShopId(getMe().getShopId());
//        }

        QueryUtil.setQueryLimit(vipInfo);

        return showList(vipInfoService, vipInfo, pageVo);
    }

@@ -293,7 +293,9 @@
        } else {
            vipInfo.setVipState(Dictionary.VIP_STATE_HY);
            SysUsers users = WebUtil.getSessionAttribute(MatrixConstance.LOGIN_KEY);
            vipInfo.setShopId(users.getShopId());
            if(vipInfo.getShopId()==null){
                vipInfo.setShopId(users.getShopId());
            }
            return add(vipInfoService, vipInfo, "会员信息");
        }
    }