Merge remote-tracking branch 'origin/score_shop' into score_shop

jyy

2021-03-15 53939e0ceb528f45c4906c86ce499ecb864f7af8

 zq-erp/src/main/java/com/matrix/system/shopXcx/api/action/WxSalesmanAction.java

@@ -9,11 +9,11 @@
import com.matrix.component.tools.ImageUtil;
import com.matrix.component.tools.WxacodeUtil;
import com.matrix.core.pojo.AjaxResult;
import com.matrix.core.pojo.BasePageQueryDto;
import com.matrix.core.tools.LogUtil;
import com.matrix.core.tools.MD5Util;
import com.matrix.core.tools.PropertiesUtil;
import com.matrix.core.tools.StringUtils;
import com.matrix.system.app.dto.BasePageDto;
import com.matrix.system.common.bean.BusParameterSettings;
import com.matrix.system.common.constance.AppConstance;
import com.matrix.system.common.dao.BusParameterSettingsDao;
@@ -23,6 +23,8 @@
import com.matrix.system.fenxiao.entity.ShopSalesmanApply;
import com.matrix.system.fenxiao.service.ShopSalesmanApplyService;
import com.matrix.system.shopXcx.api.WeChatApiTools;
import com.matrix.system.shopXcx.vo.SalesmanCenterInfo;
import com.matrix.system.shopXcx.vo.SalesmanVo;
import io.swagger.annotations.Api;
import io.swagger.annotations.ApiOperation;
import io.swagger.annotations.ApiResponse;
@@ -52,6 +54,7 @@

    @Autowired
    ShopSalesmanApplyDao salesmanApplyDao;


    @Autowired
    ShopSalesmanApplyService shopSalesmanApplyService;
@@ -83,14 +86,14 @@
    public AjaxResult applyToBeAnSalesman(@RequestBody Map<String,String> param) {
        BizUser loginUser = redisUserLoginUtils.getLoginUser(BizUser.class);
        String invitationId = param.get("invitationId");
        ShopSalesmanApply shopSalesmanApply= shopSalesmanApplyService.applyToBeAnSalesman(loginUser.getOpenId(),invitationId);
        ShopSalesmanApply shopSalesmanApply= shopSalesmanApplyService.applyToBeAnSalesman(loginUser.getOpenId(),"",invitationId,ShopSalesmanApply.APPLY_WAY_SELF);
        loginUser=bizUserDao.selectById(loginUser.getUserId());
        redisUserLoginUtils.updateUserInfo(loginUser);
        return AjaxResult.buildSuccessInstance(shopSalesmanApply);
    }


    @ApiOperation(value = "      ", notes = "")
    @ApiOperation(value = "查询审核进度", notes = "")
    @ApiResponses({
            @ApiResponse(code = 200, message = "ok", response = ShopSalesmanApply.class)
    })
@@ -197,22 +200,31 @@
    }



    @ApiOperation(value = "获取下级列表", notes = "")
    @ApiOperation(value = "获取下级列表", notes = "keywords=1 表示下级，keywords=2表示顾客")
    @PostMapping(value = "/getInvitationuserList")
    @ApiResponses({
            @ApiResponse(code = 200, message = "ok", response = BasePageDto.class)
            @ApiResponse(code = 200, message = "ok", response = SalesmanVo.class)
    })
    AjaxResult getInvitationuserList(@RequestBody BasePageDto pageDto) {
    AjaxResult getInvitationuserList(@RequestBody BasePageQueryDto pageDto) {
        BizUser loginUser = redisUserLoginUtils.getLoginUser(BizUser.class);
        Page<ShopSalesmanApply> page=new Page<>(pageDto.getPageNum(),pageDto.getPageSize());
        IPage<ShopSalesmanApply> shopSalesmanApplyIPage = salesmanApplyDao.selectInvitationuserInPage(page, loginUser.getOpenId());
        Page<SalesmanVo> page=new Page<>(pageDto.getPageNum(),pageDto.getPageSize());
        IPage<SalesmanVo> shopSalesmanApplyIPage = salesmanApplyDao.selectInvitationuserInPage(page, loginUser.getOpenId(),pageDto.getKeywords());
        AjaxResult result=AjaxResult.buildSuccessInstance(shopSalesmanApplyIPage.getRecords());
        return result;

    }


    @ApiOperation(value = "查询分销员中心信息", notes = "")
    @PostMapping(value = "/getSalesmanCenterInfo")
    @ApiResponses({
            @ApiResponse(code = 200, message = "ok", response = SalesmanCenterInfo.class)
    })
    AjaxResult getSalesmanCenterInfo() {
        BizUser loginUser = redisUserLoginUtils.getLoginUser(BizUser.class);
        SalesmanCenterInfo salesmanCenterInfo= salesmanApplyDao.selectSalesmanCenterInfo(loginUser.getOpenId());
        return AjaxResult.buildSuccessInstance(salesmanCenterInfo);
    }



}