Merge branch 'master-prod-new' into chenjiahe-新版回访

chenjiahe

2024-06-07 87e5906636e9c3dc56e716833c3b315c24def707

Merge branch 'master-prod-new' into chenjiahe-新版回访

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

@@ -65,4 +65,10 @@

    /** 优惠券ID*/
    private List<String> couponIdList;

    /**平台限制*/
    private Integer platLimit;
    /**平台可用过滤,appId*/
    private List<String> limitPlatformList;

}

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

@@ -162,6 +162,10 @@
    @PostMapping(value = "/coupon/birthday/list/user")
    Result userBirthDayCouponList(@RequestBody(required = false) CouponDto dto);


    /**
     * 获取优惠券领取规则列表
     */
    @PostMapping(value = "/coupon/receive/rule/list")
    Result getReceiveRuleList();

}

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

@@ -111,4 +111,9 @@
    /**查询项目积分抵扣现金的比例*/
    @PostMapping(value = "/project/integral/cash/rate")
    Result getIntegralCashRate(@RequestBody ProjectDto projectDto);

    /**查询映射项目模块树型三级*/
    @PostMapping(value = "/project/item/relation/list")
    Result projectItemList(@RequestBody ProjectDto projectDto);

}

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

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

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

/**
 * RFM等级数据区间service
 * @USER: fhx
 * @DATE: 2024/5/28
 **/
@FeignClient(name="bi-rfm",path = "/rfm",contextId = "phip-rfm-paragraph-grade")
public interface SRfmParagraphGradeService {

    /**
     * RFM综合等级等级区间获取
     */
    @RequestMapping("/grade-paragraph/comprehensive/data")
    Result comprehensiveGradeData();


}

 phis-feign/src/main/java/com/hz/his/vo/coupon/CouponReceiveVo.java

New file
@@ -0,0 +1,15 @@
package com.hz.his.vo.coupon;

import lombok.Data;

/**
 *  优惠券领取规则
 * */
@Data
public class CouponReceiveVo {
    /**规则标识*/
    private String id;
    /**规则名称*/
    private String name;

}

 phis-feign/src/main/java/com/hz/phis/dt/user/UserDt.java

@@ -1,7 +1,5 @@
package com.hz.phis.dt.user;

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

import java.math.BigDecimal;
@@ -91,4 +89,8 @@
    //是否含有热玛吉项目
    private Boolean isHaveRmj = false;

    /** 所属顾问名称 */
    private String adviserName;
    /** RFM综合等级 */
    private String rfmGrade;
}

 phis-feign/src/main/java/com/hz/phis/vo/money/MoneyRuleVo.java

@@ -9,4 +9,6 @@
public class MoneyRuleVo {
    /**功能编号*/
    private String functionCode;
    /**金额类型:0增值金,1积分*/
    private Integer moneyType;
}