Merge branch 'master-prod-new' into master-test

fwq

2023-11-24 3bf1f7995a25bf6985eca4ed01155d26ede64a9e

Merge branch 'master-prod-new' into master-test

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

New file
@@ -0,0 +1,20 @@
package com.hz.his.dto.report;

import lombok.Data;

import java.util.List;

/**
 * 群业绩查询
 * @author fwq
 * */
@Data
public class GroupReportDto {
    /**标识*/
    private String id;
    /**用户标识*/
    private List<String> userIdList;
    /**用户RFM等级(表:rfm_new,字段:rfmGrade)*/
    private List<String> rfmLevelList;

}

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

New file
@@ -0,0 +1,24 @@
package com.hz.his.feign.service.platform.bi;

import com.hx.resultTool.Result;
import com.hz.his.dto.report.UserReportListDto;
import org.springframework.cloud.openfeign.FeignClient;
import org.springframework.web.bind.annotation.PostMapping;
import org.springframework.web.bind.annotation.RequestBody;


/**
 * 群业绩
 * 这里这个name 需要填写 请求的服务提供者的注册到nacos Server上面的服务名，path 是请求接口前缀
 */
@FeignClient(name = "phiskin-bi-view-user", path = "/bi-view", contextId = "bi-group-data")
public interface BiGroupService {

    /**
     * 用户现金执行数据
     */
    @PostMapping("/admin/user/report/money/data/list")
    Result cashTotalList(@RequestBody UserReportListDto userReportListDto);


}