Merge branch 'master' of http://1.15.4.62/r/~chenjiahe/phis-service-feign

zhouxiang

2022-09-08 50435810ba607fd87848126567861a2def3a1f95

Merge branch 'master' of http://1.15.4.62/r/~chenjiahe/phis-service-feign

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

@@ -38,8 +38,8 @@
    }

    public Integer getPageSize() {
        if(this.pageSize == null || this.pageSize < 0 || this.pageSize > 500){
            this.pageSize = 500;
        if(this.pageSize == null || this.pageSize < 0 || this.pageSize > 800){
            this.pageSize = 800;
        }
        return this.pageSize;
    }

 phis-feign/src/main/java/com/hz/his/dto/user/money/UserMoneyDto.java

@@ -107,6 +107,9 @@
    /* 操作类型 是否需要领取 默认 只有增值金 添加需要领取系统处理 0 用户领取 1*/
    private Integer opType;

    /*是否需要领取 0 否 1 是  默认需要领取*/
    private Integer isReceiveValueAddedFund;


    /*****************类型信息 注：以下常量以phis的UserMoneyLog常量为主*******************************/
    /**

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

@@ -42,4 +42,11 @@
     * */
    @PostMapping(value = "/user/money/info")
    Result userMoneyInfo(@RequestBody UserMoneyDto userMoneyDto);


    /**
     * 设置增值金是否需要用户领取状态
     * */
    @PostMapping(value = "/user/money/unclaimed/default/setting")
    Result userDefaultSetting(@RequestBody UserMoneyDto userMoneyDto);
}

 phis-feign/src/main/java/com/hz/phis/dt/project/ProjectDetailBo.java

@@ -1,6 +1,8 @@
package com.hz.phis.dt.project;

import com.hz.phis.dt.BaseDt;
import com.hz.phis.dt.spec.SkuGroupSpecDt;
import com.hz.phis.dt.spec.SkuSpecDt;
import lombok.Data;

import java.math.BigDecimal;
@@ -29,6 +31,8 @@
    private List<ProjectSpecsBo> projectSpecsBoList;
    /**sku信息*/
    private List<String> skuIdList;
    /**sku规格信息*/
    private List<SkuGroupSpecDt> skuSpecsBoList;
    /**规格*/
    private String specification;
    /**其他规格*/

 phis-feign/src/main/java/com/hz/phis/dt/spec/SkuGroupSpecDt.java

New file
@@ -0,0 +1,18 @@
package com.hz.phis.dt.spec;

import lombok.Data;

import java.util.List;

/**
 * 项目sku返回扩展
 * @author fwq
 * */
@Data
public class SkuGroupSpecDt {

    /**项目sku标识*/
    private String projectId;

    private List<SkuSpecDt> valueList;
}

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

@@ -69,4 +69,6 @@
    private String email;
    /**头像*/
    private String imgUrl;

    private String userBelongingType;
}