Merge branch 'fhx-prod-CRM预约' into master-test

fhx

2024-04-07 860c4e691821197e05e12cc6288a36f89c410181

Merge branch 'fhx-prod-CRM预约' into master-test

 phis-feign/src/main/java/com/hz/his/dto/appointment/AppointmentAutoMateDto.java

@@ -56,5 +56,7 @@
    /** 实际面诊时长(分) */
    private Integer realMzTime;

    /** 是否当天分隔上下午匹配(默认false) */
    private boolean isDaySpace = false;

}

 phis-feign/src/main/java/com/hz/his/dto/appointment/AppointmentCrmSelfDto.java

New file
@@ -0,0 +1,24 @@
package com.hz.his.dto.appointment;

import lombok.Data;

/**
 * CRM自助预约dto
 * @USER: fhx
 * @DATE: 2024/4/7
 **/
@Data
public class AppointmentCrmSelfDto {

    /** 用户标识 */
    private String userId;
    /** 门店标识 */
    private String shopId;
    /** 医生标识 */
    private String doctorId;
    /** 预约时间(yyyy-MM-dd) */
    private String dateTime;
    /** 预约项目json */
    private String projectJson;

}

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

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

import com.hx.resultTool.Result;
import com.hz.his.dto.appointment.AppointmentAutoMateDto;
import com.hz.his.dto.user.UserDto;
import org.springframework.cloud.openfeign.FeignClient;
import org.springframework.web.bind.annotation.PostMapping;
import org.springframework.web.bind.annotation.RequestBody;

/**
 * 预约自动匹配service
 * @USER: fhx
 * @DATE: 2023/7/6
 **/
@FeignClient(name="phi-platform-service",path = "/phip",contextId = "phip-appointment-crm-self")
public interface SPhipCrmSelfService {

    /** 预约页面数据 */
    @PostMapping("/appointment/crm/self/page/data")
    Result pageData(@RequestBody UserDto dto);

    /** 用户自助预约列表 */
    @PostMapping("/appointment/crm/self/self/list")
    Result selfList(@RequestBody UserDto dto);

    /** 用户自助预约项目 */
    @PostMapping("/appointment/crm/self/project/list")
    Result projectList(@RequestBody UserDto dto);


}

 phis-feign/src/main/java/com/hz/his/vo/user/card/UserCardItemVo.java

@@ -13,6 +13,10 @@
    private String itemId;
    /**用户卡项条目-名称*/
    private String itemName;
    /**用户卡项条目-类型*/
    private String itemType;
    /**用户卡项条目-编号*/
    private String itemCode;
    /**用户卡项条目-分摊总金额*/
    private BigDecimal total;
    /**用户卡项条目-单次抵扣金额*/