Helius
2022-03-10 6678c4c0f42d25e0a63416f4ac5dda3cd66627a7
Merge branch 'developer' into alpha
1 files modified
2 ■■■ changed files
zq-erp/src/main/java/com/matrix/system/shopXcx/api/action/WxUserAction.java 2 ●●● patch | view | raw | blame | history
zq-erp/src/main/java/com/matrix/system/shopXcx/api/action/WxUserAction.java
@@ -238,7 +238,7 @@
        if ((loginUser.getIsSales() == null || loginUser.getIsSales() == 2)
                && StringUtils.isNotBlank(sysVipInfo.getNickName())) {//目前还不是分销员
            BusParameterSettings fxSwith = busParameterSettingsDao.selectCompanyParamByCode(FenxiaoSettingConstant.FX_SWITCH, HostInterceptor.getCompanyId());
            if (fxSwith!=null && fxSwith.getParamValue().equals("1")) {//开启分销
            if (fxSwith!=null && "1".equals(fxSwith.getParamValue())) {//开启分销
                BusParameterSettings applyWay = busParameterSettingsDao.selectCompanyParamByCode(FenxiaoSettingConstant.FX_APPLY_WAY, loginUser.getCompanyId());
                if (applyWay.getParamValue().equals(FenxiaoSettingConstant.FX_APPLY_WAY_AUTO)) {//自动成为分销员
                    QueryWrapper<ShopSalesmanApply> queryWrapper = new QueryWrapper<>();