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

fhx

2024-03-14 1690df135fe42b1a22d4866c5d55470b3dcaeb7e

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

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

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

import lombok.Data;

import java.util.List;

/**
 * 用户报表扩展
 * @author fwq
 * */
@Data
public class UserDetailReportDto {
    /**映射模块*/
    private Integer moduleType;
    /**过滤测试账号*/
    private Integer isFilterTestAccount;

    /**开始时间*/
    private String startTime;
    /**结束时间*/
    private String endTime;

    /**门店标识*/
    private List<String> shopIdList;
    /**门店编号*/
    private List<String> shopNoList;
    /**顾问标识*/
    private List<String> adviserIdList;
    /**顾问编号*/
    private List<String> adviserNoList;

}

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

@@ -71,4 +71,10 @@
     */
    @PostMapping(value = "/deduction/postoperative/card/info")
    Result postoperativeCardInfo(@RequestBody DeductionDto dto);

    /**
     * 更新划扣图片
     */
    @PostMapping(value = "/deduction/update/deduction/picture")
    Result updateDeductionPicture(@RequestBody DeductionDto dto);
}

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

@@ -1,6 +1,7 @@
package com.hz.his.feign.service.platform.bi;

import com.hx.resultTool.Result;
import com.hz.his.dto.report.UserDetailReportDto;
import com.hz.his.dto.report.UserReportDto;
import com.hz.his.dto.report.UserReportListDto;
import com.hz.his.dto.user.UserDto;
@@ -77,4 +78,38 @@
    @PostMapping("/admin/user/info/card/detail")
    Result userInfoCardDetail(@RequestBody UserDto userDto);

    /**
     *  rfm客户概览-会员数量
     */
    @PostMapping("/admin/rfmUser/report/total/list")
    Result totalList(@RequestBody UserDetailReportDto userDetailReportDto);
    /**
     *  rfm客户概览-RFM分值人数
     */
    @PostMapping("/admin/rfmUser/report/score/list")
    Result scoreList(@RequestBody UserDetailReportDto userDetailReportDto);
    /**
     *  rfm客户概览-客群数据
     */
    @PostMapping("/admin/rfmUser/report/group/list")
    Result groupList(@RequestBody UserDetailReportDto userDetailReportDto);
    /**
     *  rfm客户概览-执行项目数据
     */
    @PostMapping("/admin/rfmUser/report/deduction/list")
    Result deductionList(@RequestBody UserDetailReportDto userDetailReportDto);

    /**
     *  rfm客户概览-颜值规划标签信息
     */
    @PostMapping("/admin/rfmUser/report/label/list")
    Result labelList(@RequestBody UserDetailReportDto userDetailReportDto);

    /**
     *  rfm客户概览-搜索用户列表
     */
    @PostMapping("/admin/rfmUser/report/user/search/list")
    Result userSearchList(@RequestBody UserDetailReportDto userDetailReportDto);


}