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

fwq

2024-05-17 2a28984276e51d5f6635f3ae62b982b30c442bfd

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

# Conflicts:
#	phis-feign/src/main/java/com/hz/his/dto/order/OrderItemPHisDto.java

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

@@ -28,6 +28,8 @@
    private BigDecimal couponTotal;
    /** 优惠福利总金额（元）必填，不传则默认0 */
    private BigDecimal preferentialTotal;
    /**当前是否允许低分抵扣现金*/
    private Boolean isCanUseIntegralCash = false;
    /**抵扣现金金额*/
    private BigDecimal cash = BigDecimal.ZERO;
    /**抵扣现金金额需要支付的积分*/
@@ -39,6 +41,8 @@

    /**非必填 第三方item标识 */
    private String commonItemId;
    /**非必填 第三方item的spu标识 */
    private String commonItemGoodsId;
    /**非必填 身体部位标识 */
    private String bodyPartsId;
    /**非必填 身体部位名称 */

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

@@ -69,5 +69,7 @@
    private String giveIncreaseTitle;
    /**赠送标题（领取记录展示-详情）（不要使用，会删除）*/
    private String giveIncreaseInfo;
    /**非必填 可以参与积分抵扣结账的商品标识*/
    private List<String> canIntegralCashIdList;

}