新增申请成为分销员接口10

jyy

2021-03-12 e84e71bda390661a98d2f548d11f3721d2ec110c

 zq-erp/src/main/java/com/matrix/system/fenxiao/service/ShopSalesmanApplyService.java

@@ -1,6 +1,5 @@
package com.matrix.system.fenxiao.service;

import cn.hutool.core.util.ObjectUtil;
import com.baomidou.mybatisplus.core.conditions.Wrapper;
import com.baomidou.mybatisplus.core.conditions.query.QueryWrapper;
import com.baomidou.mybatisplus.core.metadata.IPage;
@@ -13,7 +12,6 @@
import com.matrix.core.tools.StringUtils;
import com.matrix.system.common.bean.BusParameterSettings;
import com.matrix.system.common.dao.BusParameterSettingsDao;
import com.matrix.system.common.interceptor.HostInterceptor;
import com.matrix.system.fenxiao.constant.FenxiaoSettingConstant;
import com.matrix.system.fenxiao.dao.ShopSalesmanApplyDao;
import com.matrix.system.fenxiao.dao.ShopSalesmanGradeDao;
@@ -60,7 +58,7 @@
     * @param invitationId
     * @return
     */
    public ShopSalesmanApply applyToBeAnSalesman(String openId,long gradeId,String invitationId) {
    public ShopSalesmanApply applyToBeAnSalesman(String openId,String gradeId,String invitationId) {

        BizUser loginUser=bizUserDao.findByOpenId(openId);
        //校验审核状态，和是否重复发起
@@ -88,8 +86,8 @@
                //如果曾经是被邀请进来的则自动绑定为之前邀请人的下级
                shopSalesmanApply.setParentUserId(loginUser.getParentOpenId());
            }
            if(ObjectUtil.isNotEmpty(gradeId)){
               shopSalesmanApply.setGradeId(gradeId);
            if(StringUtils.isNotBlank(gradeId)){
               shopSalesmanApply.setGradeId(Long.parseLong(gradeId));
            }else{
                //获取初始等级ID（公司id，是否为初始等级）
                Wrapper<ShopSalesmanGrade> queryWrapperOrepool = new QueryWrapper<>();
@@ -99,7 +97,7 @@
               shopSalesmanApply.setGradeId(shopSalesmanGrade.getId());
            }

            BusParameterSettings busParameterSettings = busParameterSettingsDao.selectCompanyParamByCode(FenxiaoSettingConstant.FX_AUDIT_METHOD, HostInterceptor.getCompanyId());
            BusParameterSettings busParameterSettings = busParameterSettingsDao.selectCompanyParamByCode(FenxiaoSettingConstant.FX_AUDIT_METHOD, loginUser.getCompanyId());
            if(busParameterSettings!=null
                    &&busParameterSettings.getParamValue().equals("1")){
                //自动审核
@@ -134,7 +132,7 @@
      return shopSalesmanGradeDao.getShopSalesmanGradeVo(companyId);
   }

   public void addSaleManApply(String userId,long gradeId) {
   public void addSaleManApply(String userId,String gradeId) {
      BizUser user = bizUserDao.selectById(userId);
      
      applyToBeAnSalesman(user.getOpenId(),gradeId, "");