blame | history | patch | commit | commitdiff | ignore whitespace
wzy
2021-03-25 1b51c3e64ba8117900d594fcd5b677336e4759bc 
 zq-erp/src/main/java/com/matrix/system/shopXcx/api/action/WxUserAction.java


@@ -23,10 +23,7 @@


import org.springframework.beans.factory.annotation.Autowired;


import org.springframework.beans.factory.annotation.Value;


import org.springframework.stereotype.Controller;


import org.springframework.web.bind.annotation.PathVariable;


import org.springframework.web.bind.annotation.RequestBody;


import org.springframework.web.bind.annotation.RequestMapping;


import org.springframework.web.bind.annotation.ResponseBody;


import org.springframework.web.bind.annotation.*;




import java.util.Collections;


import java.util.Date;


@@ -144,6 +141,20 @@


        return res;


    }




    /**


     * 根据OpenID查询用户信息


     */


    @GetMapping(value = "/findUserInfo/{openId}")


    public @ResponseBody


    AjaxResult findUserInfo(@PathVariable String openId) {


        BizUser bizUser = bizUserService.findByOpenId(openId);


        BizUser bizUserQuery=new BizUser();


        bizUserQuery.setNickName(bizUser.getNickName());


        bizUserQuery.setAvatarUrl(bizUser.getAvatarUrl());


        bizUserQuery.setOpenId(openId);


        return AjaxResult.buildSuccessInstance(bizUserQuery);


    }






    /**


     * 接收用户信息


@@ -160,11 +171,11 @@




        //查询是否需要自动成为分销员


        if ((loginUser.getIsSales() == null || loginUser.getIsSales() == 2)


                && StringUtils.isNotBlank(loginUser.getNickName())) {//目前还不是分销员


                && StringUtils.isNotBlank(bizUser.getNickName())) {//目前还不是分销员


            BusParameterSettings fxSwith = busParameterSettingsDao.selectCompanyParamByCode(FenxiaoSettingConstant.FX_SWITCH, HostInterceptor.getCompanyId());


            if (fxSwith.getParamValue().equals("1")) {//开启分销


                BusParameterSettings applyCondition = busParameterSettingsDao.selectCompanyParamByCode(FenxiaoSettingConstant.FX_APPLY_CONDITION, loginUser.getCompanyId());


                if (applyCondition.getParamValue().equals(FenxiaoSettingConstant.FX_APPLY_CONDITION_WTJ)) {//无条件可称为分销员


                BusParameterSettings applyWay = busParameterSettingsDao.selectCompanyParamByCode(FenxiaoSettingConstant.FX_APPLY_WAY, loginUser.getCompanyId());


                if (applyWay.getParamValue().equals(FenxiaoSettingConstant.FX_APPLY_WAY_AUTO)) {//自动成为分销员


                    QueryWrapper<ShopSalesmanApply> queryWrapper = new QueryWrapper<>();


                    queryWrapper.eq("user_id", loginUser.getOpenId());


                    queryWrapper.eq("apply_status", ShopSalesmanApply.APPLY_STATUS_DSH);