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

fwq

2024-02-22 05e9aa8a610932d706d48257a36e95cec9de39fa

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

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

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

import com.gitee.sunchenbin.mybatis.actable.annotation.Column;
import com.gitee.sunchenbin.mybatis.actable.constants.MySqlTypeConstant;
import lombok.Data;

import java.math.BigDecimal;
@@ -112,5 +110,6 @@
    private Integer activityPageType = 0;
    /**活动区分编号-用于一次性活动，存储活动编号，便于查找*/
    private String activityPageCode;

    /**活动区分标题*/
    private String activityPageName;
}

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

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

import lombok.Data;

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

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

    /**赠送到账用户*/
    private String giveIncreaseUserId;
    /**赠送增值金（注意：传了就送）*/
    private BigDecimal giveIncrease;
    /**赠送增值金到账规则（MoneyRule）（传了就使用，否则就默认）*/
    private String giveIncreaseId;
    /**赠送标题（领取记录展示）*/
    private String giveIncreaseTitle;


}

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

New file
@@ -0,0 +1,23 @@
package com.hz.his.feign.service.phis;

import com.hx.resultTool.Result;
import org.springframework.cloud.openfeign.FeignClient;
import org.springframework.web.bind.annotation.PostMapping;
import org.springframework.web.bind.annotation.RequestParam;

import java.math.BigDecimal;

/**
 * 资金到账规则
 */
@FeignClient(name="phis-provider",path = "/p-his-data",contextId = "money-rule")
public interface SMoneyRuleService {

    /**
     * @param functionCode 功能编号
     * @return
     */
    @PostMapping(value = "/money-rule/list")
    Result getList(@RequestParam("functionCode") String functionCode);

}