Merge branch 'fhx-prod-复购活动' into master-test

fhx

2024-05-13 7a774c4d798fc6c40a02045a9ea69849bb8a4695

Merge branch 'fhx-prod-复购活动' into master-test

 phis-feign/src/main/java/com/hz/his/constant/ActivityPreferentialConstants.java

@@ -1,5 +1,7 @@
package com.hz.his.constant;

import com.hx.util.StringUtils;

/**
 * 活动优惠类型
 * @USER: fhx
@@ -30,4 +32,18 @@
            default: return "未知";
        }
    }

    /** 检查判断是否赠送类型 */
    public static boolean checkGiftType(String type){
        if(StringUtils.isEmpty(type)){
            return false;
        }

        if(TYPE_GIFT_COUPON.equals(type)
                || TYPE_GIFT_INTEGRAL.equals(type)
                || TYPE_GIFT_PROJECT.equals(type)){
            return true;
        }
        return false;
    }
}

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

@@ -24,6 +24,10 @@
    private BigDecimal totalPoints;
    /**非必填 折扣(单位:百分比) 必填，默认100,不传后台默认100*/
    private BigDecimal discount;
    /** 优惠券金额（元）必填，不传则默认0 */
    private BigDecimal couponTotal;
    /** 优惠福利总金额（元）必填，不传则默认0 */
    private BigDecimal preferentialTotal;
    /**抵扣现金金额*/
    private BigDecimal cash = BigDecimal.ZERO;
    /**抵扣现金金额需要支付的积分*/