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

chenjiahe

2023-08-21 188870750c8f1a8f0023c410cdd1ed9d8a2e09e7

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

 phis-feign/src/main/java/com/hz/his/dto/coupon/CouponSendDto.java

@@ -29,6 +29,8 @@
    private String commonId;
    /**来源类型 CouponReleaseRecordItem*/
    private String commonType;
    /**来源子标识*/
    private String commonItemId;

    /**发送的用户信息*/
    private List<CouponSendUserDto> sendUserList;

 phis-feign/src/main/java/com/hz/his/dto/coupon/CouponTypeDto.java

New file
@@ -0,0 +1,14 @@
package com.hz.his.dto.coupon;

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

/**
 * 优惠券发送参数
 * @author fwq
 */
@Data
public class CouponTypeDto extends PageDto {
    /**是否营销助手可申请*/
    private Integer isMarketAssistantApply;
}

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

@@ -14,6 +14,7 @@
    private String employeeId;
    /**门店标识*/
    private String shopId;
    /**门店标识集合*/
    private String shopIds;
    /**登录员工唯一字符串*/
    private String roleStr;
@@ -33,4 +34,9 @@
    private Integer isNewUser;
    /**是否首天*/
    private Integer isBothOne;
    /**工作日*/
    private Integer workDayNum;
    /**操作人*/
    private String operatorId;
    private String operatorName;
}

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

@@ -132,9 +132,14 @@
    Result findUserGoodsCoupon(@RequestBody(required = false) GoodsUsedCouponDto dto);

    /**
     * 查询优惠券分类
     * 查询基础分类
     */
    @PostMapping(value = "/coupon/type/list")
    Result getCouponTypeList(@RequestBody(required = false) CouponDto dto);

    /**
     * 查询优惠券分类
     */
    @PostMapping(value = "/couponType/list")
    Result couponTypeList(@RequestBody(required = false) CouponTypeDto couponTypeDto);
}

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

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

import com.hx.resultTool.Result;
import com.hz.his.dto.report.EmployeeReportDto;
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-arrive-report")
public interface BiArriveReportService {

    /**
     * 预约到访分析-门店数据
     */
    @PostMapping("/report/arrive/shop/list")
    Result shopDataList(@RequestBody EmployeeReportDto employeeReportDto);

    /**
     * 预约到访分析-咨询师
     */
    @PostMapping("/report/arrive/employee/list")
    Result empDataList(@RequestBody EmployeeReportDto employeeReportDto);

    /**
     * 预约到访分析-门店数据-导出
     */
    @PostMapping("/report/arrive/shop/list/export")
    Result shopDataListExport(@RequestBody EmployeeReportDto employeeReportDto);

    /**
     * 预约到访分析-咨询师-导出
     */
    @PostMapping("/report/arrive/employee/list/export")
    Result empDataListExport(@RequestBody EmployeeReportDto employeeReportDto);


}