Merge branch 'master-prod-new' into master-fwq-颜值规划4.0

fwq

2024-04-11 17457a80779db37013ef004d2aa232c859838b8d

Merge branch 'master-prod-new' into master-fwq-颜值规划4.0

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

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

import com.hz.his.dto.report.UserDetailReportDto;
import lombok.Data;

import java.util.List;

/**
 * 用户报表查询客户信息
 * @author fwq
 * */
@Data
public class UserDetailSelectDto extends UserDetailReportDto {
    /**查询活跃老VIP情况 勾选人数：查老活跃，勾选流失：流失 勾选活跃/沉睡 查状态*/

    /**查询客户等级*/
    private List<String> userLevelList;
    /**三大项目未执行  集合 （每个都是单选）*/

    /**颜值规划(一级，二级，三级的集合)*/

    /**RFM 集合 R1..R2..等都是单选*/

    /**客群:等级单选，触达单选*/

}

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

@@ -46,6 +46,10 @@
    @PostMapping(value = "/micro/record/crm/see")
    Result crmSee(@RequestBody MicroRecordDto dto);

    /** crm查看记录详情 - 颜值规划4.0版本*/
    @PostMapping(value = "/micro/record/crm/see/V2")
    Result crmSeeV2(@RequestBody MicroRecordDto dto);

    /** 根据用户id查询是否有未查看过的微整记录 */
    @PostMapping(value = "/micro/record/check/view")
    Result checkView(@RequestBody MicroRecordDto dto);