代码提交

k94314517

2024-07-17 c0e7eb96665fb334151965ec86ce9f0aad889682

代码提交

 server/service/src/main/java/com/doumee/biz/zbom/impl/ZbomZhongTaiServiceImpl.java

@@ -410,7 +410,6 @@
        return  null;
    }


    public   <T>   ZTBaseResponse<T> sendHttpRequest(String url,String name,String token,String userType,String param,TypeReference<ZTBaseResponse<T>> typeReference){
        log.info("【"+name+"】================开始===="+ JSONObject.toJSONString(param));
        String res = null;

 server/service/src/main/java/com/doumee/biz/zbom/model/crm/CrmCustomerListRequest.java

@@ -19,4 +19,6 @@
    private int page;
    @ApiModelProperty(value = "客户名称,客户手机号码 ,地址")
    private String keyWords;
    @ApiModelProperty(value = "导购主键",hidden = true)
    private Long userId;
}

 server/service/src/main/java/com/doumee/service/business/impl/GetCrmDataServiceImpl.java

@@ -12,6 +12,7 @@
import com.doumee.core.exception.BusinessException;
import com.doumee.dao.business.MemberMapper;
import com.doumee.dao.business.UsersMapper;
import com.doumee.dao.business.model.Users;
import com.doumee.dao.web.response.ZTBaseInfoResponse;
import com.doumee.service.business.GetCrmDataService;
import com.doumee.service.business.GetZhongTaiDataService;
@@ -45,16 +46,18 @@
    @Autowired
    private SystemDictDataBiz systemDictDataBiz;


    @Override
    public CRMBaseResponse<List<CRMCustomerListResponse>> getCrmCustomerList(CrmCustomerListRequest crmCustomerListRequest){
        if(Objects.isNull(crmCustomerListRequest)
         || Objects.isNull(crmCustomerListRequest.getPage())
         || Objects.isNull(crmCustomerListRequest.getPageSize())
         || StringUtils.isBlank(crmCustomerListRequest.getFlag())
        || Objects.isNull(crmCustomerListRequest.getUserId())
        ){
            throw new BusinessException(ResponseStatus.BAD_REQUEST);
        }
        Users users = usersMapper.selectById(crmCustomerListRequest.getUserId());
        crmCustomerListRequest.setUserName(users.getName());
        CRMBaseResponse<List<CRMCustomerListResponse>> crmBaseResponse = zbomCRMService.getCustomerList(crmCustomerListRequest);
        if(Objects.isNull(crmBaseResponse)){
            throw new BusinessException(ResponseStatus.NOT_ALLOWED.getCode(),"CRM接口请求失败!");

 server/web/src/main/java/com/doumee/api/web/PersonnelApi.java

@@ -1,12 +1,16 @@
package com.doumee.api.web;

import com.doumee.biz.zbom.ZbomCRMService;
import com.doumee.biz.zbom.model.crm.CrmCustomerListRequest;
import com.doumee.biz.zbom.model.crm.response.CRMBaseResponse;
import com.doumee.biz.zbom.model.crm.response.CRMCustomerListResponse;
import com.doumee.config.annotation.LoginRequired;
import com.doumee.config.annotation.UserLoginRequired;
import com.doumee.core.annotation.trace.Trace;
import com.doumee.core.model.ApiResponse;
import com.doumee.core.model.PageData;
import com.doumee.core.model.PageWrap;
import com.doumee.core.utils.Constants;
import com.doumee.dao.business.model.Shop;
import com.doumee.dao.business.model.SmsEmail;
import com.doumee.dao.web.reqeust.EditMemberRequest;
@@ -14,10 +18,7 @@
import com.doumee.dao.web.reqeust.EditUsersRequest;
import com.doumee.dao.web.reqeust.ContentShareImgDto;
import com.doumee.dao.web.response.AccountResponse;
import com.doumee.service.business.MemberService;
import com.doumee.service.business.ShopService;
import com.doumee.service.business.SmsEmailService;
import com.doumee.service.business.UsersService;
import com.doumee.service.business.*;
import io.swagger.annotations.Api;
import io.swagger.annotations.ApiImplicitParam;
import io.swagger.annotations.ApiImplicitParams;
@@ -27,6 +28,8 @@
import org.checkerframework.checker.units.qual.A;
import org.springframework.beans.factory.annotation.Autowired;
import org.springframework.web.bind.annotation.*;

import java.util.List;

/**
 * Created by IntelliJ IDEA.
@@ -49,6 +52,9 @@

    @Autowired
    public ShopService shopService;

    @Autowired
    public GetCrmDataService getCrmDataService;

    @ApiOperation(value = "小程序登陆", notes = "员工端小程序")
    @GetMapping("/loginByWx")
@@ -155,10 +161,24 @@
    public ApiResponse<String> getUserCard() {
        return  ApiResponse.success(usersService.getUserCard(this.getLoginUserInfo()));
    }

    @ApiOperation(value = "获取内容分享海报", notes = "获取内容分享海报，加小程序码")
    @PostMapping("/getContentShareImg")
    public ApiResponse<String> getContentShareImg(@RequestBody ContentShareImgDto param) {
        return  ApiResponse.success(usersService.getContentShareImg(this.getLoginUserInfo(),param));
    }


    @UserLoginRequired
    @ApiOperation(value = "获取客户/潜客列表", notes = "员工端小程序")
    @PostMapping("/getCustomerList")
    @ApiImplicitParams({
            @ApiImplicitParam(paramType = "header", dataType = "String", name = "token", value = "用户token值", required = true)
    })
    public ApiResponse<CRMBaseResponse<List<CRMCustomerListResponse>>> getCustomerList(@RequestBody CrmCustomerListRequest crmCustomerListRequest) {
        crmCustomerListRequest.setUserId(getMemberId());
        return  ApiResponse.success(getCrmDataService.getCrmCustomerList(crmCustomerListRequest));
    }


}