Merge branch 'master' into master-test

wangrenhuang

2023-07-04 4bdc33f61729aa5387df5ef41e04f66dca1a35b0

Merge branch 'master' into master-test

 phis-feign/src/main/java/com/hz/his/dto/doctorTime/DoctorTimeDto.java

New file
@@ -0,0 +1,19 @@
package com.hz.his.dto.doctorTime;

import com.hz.his.dto.PageDto;
import lombok.Data;

/**
 * @ClassName DoctorTimeDto
 * @Description 医生排班dto
 * @Author wrh
 * @Date 2023/7/4 14:40
 * @Version 1.0
 */
@Data
public class DoctorTimeDto extends PageDto {

    String monthStr;
    String shopId;
    String doctorId;
}

 phis-feign/src/main/java/com/hz/his/dto/order/OrderPHisDto.java

@@ -26,4 +26,8 @@
    private List<OrderItemPHisDto> orderItem;
    /**开发人集合 非必填*/
    private List<OrderDeveloperDto> orderDeveloper;

    /**卡扣不判断过期时间：0否1是*/
    private Integer cardPass = 0;

}

 phis-feign/src/main/java/com/hz/his/dto/order/PayDto.java

@@ -51,5 +51,5 @@
    /**第三方兑换码*/
    private String redemptionCode;
    /**结账之后是否直接划扣：0否1是*/
    private Integer directDeduction;
    private Integer directDeduction = 0;
}

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

New file
@@ -0,0 +1,30 @@
package com.hz.his.feign.service.phis;

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

import java.math.BigDecimal;

/**
 * @ClassName SActivityController
 * @Description 活动规则
 * @Author Wrh
 * @Date 2022/8/8 17:36
 * @Version 1.0
 */
@FeignClient(name="phis-provider",path = "/p-his-data",contextId = "doctorTime")
public interface SDoctorTimeService {

    /**
     * 获取医生排班列表
     * @return Result
     */
    @PostMapping(value = "/doctor/time/list")
    Result list(@RequestBody DoctorTimeDto dto);


}