Merge branch 'master-prod-new' into master-test

fwq

2023-08-16 036b2143b802784ceff0bd0a4ea00a63c9cd8ee8

Merge branch 'master-prod-new' into master-test

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

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

import lombok.Data;

import java.util.List;

/**
 * 优惠券发送参数
 * @author fwq
 */
@Data
public class CouponSendDto{

    /**操作人类型*/
    private String operatorType;
    /**操作人标识-必填*/
    private String operatorId;
    /**操作人名称-必填*/
    private String operatorName;

    /**操作备注*/
    private Integer operatorRemark;

    /**来源标识-必填*/
    private String commonId;
    /**来源类型 CouponReleaseRecordItem*/
    private String commonType;

    /**发送的优惠券详情-必填*/
    private List<CouponSendUserDto> sendList;

}

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

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

import lombok.Data;

/**
 * 优惠券发送参数
 * @author fwq
 */
@Data
public class CouponSendItemDto {
    /**发放批次-必填*/
    private String recordName;
    /**优惠券标识-必填*/
    private String couponId;
    /**发放数量-必填*/
    private Integer num;

    /**生日券传:开始时间,不填默认一个月*/
    private String startTime;
    /**生日券传:结束时间,不填默认一个月*/
    private String endTime;
}

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

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

import lombok.Data;

import java.math.BigDecimal;
import java.util.List;

/**
 * 优惠券发送参数
 * @author fwq
 */
@Data
public class CouponSendUserDto {
    /**phis用户标识-必填*/
    private String userId;

    /**消耗储值金*/
    private BigDecimal storedValueFund;
    /**消耗增值金*/
    private BigDecimal valueAddedFund;
    /**消耗积分*/
    private BigDecimal integral;

    /**发送券详情-必填*/
    private List<CouponSendItemDto> couponSendItemDtoList;

}

 phis-feign/src/main/java/com/hz/his/dto/deduction/DeductionDto.java

@@ -96,6 +96,9 @@
    // 对比照片记录
    private String comparePhotoRecordJson;

    // 划扣照片json
    private String deductionPictureJson;

    // 批量添加项目id列表
    private String userProjectIds;


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

@@ -2,6 +2,7 @@

import com.hx.resultTool.Result;
import com.hz.his.dto.coupon.CouponDto;
import com.hz.his.dto.coupon.CouponSendDto;
import com.hz.his.dto.coupon.OrderSendCouponDto;
import org.springframework.cloud.openfeign.FeignClient;
import org.springframework.web.bind.annotation.PostMapping;
@@ -26,6 +27,12 @@
    Result sendUserCoupon(@RequestBody CouponDto couponDto);

    /**
     * 开放平台-派发优惠券给用户-金额版本
     */
    @PostMapping(value = "/coupon/send/coupon/by/money")
    Result sendUserCouponByMoney(@RequestBody CouponSendDto couponSendDto);

    /**
     * 开放平台-作废优惠券
     */
    @PostMapping(value = "/coupon/cancel/coupon")

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

@@ -20,18 +20,25 @@
    @PostMapping("/admin/doctor/sale/report/deduction/total/list")
    Result deductionList(@RequestBody EmployeeReportDto employeeReportDto);


    /**
     * 医生-执行业绩数据-分门店
     */
    @PostMapping("/admin/doctor/sale/report/deduction/shop/list")
    Result deductionDetailList(@RequestBody EmployeeReportDto employeeReportDto);


    /**
     * 医生-核心项目
     * 医生-核心项目占比数据
     */
    @PostMapping("/admin/doctor/sale/report/core/project/list")
    Result coreProjectList(@RequestBody EmployeeReportDto employeeReportDto);

    /**
     * 医生-核心项目业绩追踪
     */
    @PostMapping("/admin/doctor/sale/report/core/project/list/shop")
    Result coreProjectShopList(@RequestBody EmployeeReportDto employeeReportDto);


    /**
     * 执行项目-分类
@@ -39,6 +46,13 @@
    @PostMapping("/admin/doctor/sale/report/project/type/list")
    Result projectList(@RequestBody EmployeeReportDto employeeReportDto);


    /**
     * 执行项目-SPU占比
     */
    @PostMapping("/admin/doctor/sale/report/project/spu/list")
    Result projectGeneralList(@RequestBody EmployeeReportDto employeeReportDto);

    /**
     * 执行部位
     */
@@ -46,6 +60,18 @@
    Result bodyList(@RequestBody EmployeeReportDto employeeReportDto);

    /**
     * 流失数据
     */
    @PostMapping("/admin/doctor/sale/report/loss/user/list")
    Result lossUserList(@RequestBody EmployeeReportDto employeeReportDto);

    /**
     * 医生治疗会员情况
     */
    @PostMapping("/admin/doctor/sale/report/treat/user/list")
    Result treatUserList(@RequestBody EmployeeReportDto employeeReportDto);

    /**
     * 坐诊,接诊,预约数据
     */
    @PostMapping("/admin/doctor/sale/report/all/list")