Merge branch 'fhx-prod-订单升单' into master-test

fhx

2023-08-23 392cea950b79e5f7ca794296733b8f55bd23cd7b

Merge branch 'fhx-prod-订单升单' into master-test

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

@@ -28,4 +28,8 @@
    private List<String> payMethodList;
    /**优惠券平台*/
    private String platform;

    /** 订单标识 */
    private String orderId;

}

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

@@ -30,4 +30,7 @@
    /**卡扣不判断过期时间：0否1是*/
    private Integer cardPass = 0;

    /** 订单升单关联列表 */
    private List<OrderRiseDto> orderRiseList;

}

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

New file
@@ -0,0 +1,16 @@
package com.hz.his.dto.order;

import lombok.Data;

/**
 * 订单升单关联dto
 * @USER: fhx
 * @DATE: 2023/8/23
 **/
@Data
public class OrderRiseDto {

    /** 关联订单标识(OrdersTotal) */
    private String assocOrderId;

}

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

@@ -97,6 +97,8 @@
    /**非必填 活动规则标识集合*/
    private List<String> activityIds;

    /** 治疗单id */
    /** 治疗单id(目前没用) */
    private String treatSingleId;
    /** 创建方式（OrderTotalConstants） */
    private String addWay;
}