Merge remote-tracking branch 'origin/master-prod-new' into master-test

fwq

2023-05-06 c0c3ba60f8620d2700c76afb62732ef940c38c70

Merge remote-tracking branch 'origin/master-prod-new' into master-test

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

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


import lombok.Data;

import java.util.Date;

/**
 * 划扣
 **/
@Data
public class CashierSettlementDto extends BaseQueryVo{

    /**开单开始时间*/
    private Date startTime;
    /**开单结束时间*/
    private Date endTime;
    /**用户等级*/
    private String userMemberName;
    /**订单号*/
    private String orderNo;
    /**是否是初诊单*/
    private Integer isBothTheOne;
    /**推荐名称*/
    private String userInviteeName;
    /**所属咨询师*/
    private String userCorpUserName;
    /**所属门店*/
    private String userShopName;
    /**商品名称*/
    private String goodsName;


    /*******保存参数********/
    /**操作人标识*/
    private String operatorId;
    /**操作人*/
    private String operatorName;
}

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

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

import com.hx.resultTool.Result;
import com.hz.his.dto.report.CashierSettlementDto;
import com.hz.his.dto.report.DeductionSurfaceDto;
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-cashier-settlement")
public interface BiCashierSettlementService {

    /**
     * 出纳结算列表
     */
    @PostMapping("/cashier/settlement/common/list")
    Result cashierSettlementList(@RequestBody CashierSettlementDto cashierSettlementDto);


}