Merge branch 'master' into master-test

wangrenhuang

2023-07-16 3de90089345a2bb8c18114885a8d7dcd58a432ce

Merge branch 'master' into master-test

 phis-feign/src/main/java/com/hz/his/dto/report/EmployeeReportDto.java

@@ -29,4 +29,8 @@
    private String endTime;
    /**类型*/
    private Integer type;
    /**是否新会员*/
    private Integer isNewUser;
    /**是否首天*/
    private Integer isBothOne;
}

 phis-feign/src/main/java/com/hz/his/feign/service/phis/SUserService.java

@@ -19,6 +19,8 @@
import org.springframework.web.bind.annotation.RequestBody;
import org.springframework.web.bind.annotation.RequestParam;

import java.util.List;

/**
 * 这里这个name 需要填写 请求的服务提供者的注册到nacos Server上面的服务名，path 是请求接口前缀
 */
@@ -271,6 +273,12 @@
    Result userInfoBaseInfo(@RequestParam("userId") String userId);

    /**
     * 获取到用户
     */
    @PostMapping(value = "/user/sync/by/idList")
    Result userSyncList(@RequestParam("hisIdList") List<String> hisIdList);

    /**
     *  判断用户是否是会员
     * @param userDto userId
     * @return

 phis-feign/src/main/java/com/hz/his/feign/service/platform/bi/BiConsultantDayService.java

@@ -82,4 +82,11 @@
    @PostMapping("/admin/export/employee/user/member/distribution/proportion")
    Result memberDistributionProportion(@RequestBody UserReleaseDto userReleaseDto);

    /**
     * 咨询师-老带新业绩
     * 返回接口Result.success(data); data是个map,key为员工标识,value是金额
     */
    @PostMapping("/admin/export/employee/oldNew/report")
    Result oldNewReport(@RequestBody EmployeeReportDto employeeReportDto);

}