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

fwq

2023-06-21 55dc3707715ed7213163f4c8a0bf79c6a6f4dc63

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

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

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

import com.gitee.sunchenbin.mybatis.actable.annotation.Column;
import com.gitee.sunchenbin.mybatis.actable.constants.MySqlTypeConstant;
import com.hz.his.dto.PageDto;
import lombok.Data;

@@ -35,4 +37,6 @@
    private Integer isHaveShop;
    /**是否有顾问*/
    private Integer isHaveCorp;
    /*开单平台，来源应用appId*/
    private String appId;
}

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

@@ -285,8 +285,14 @@
    Result nextLevel(@RequestBody UserDto userDto);

    /**
     * 查询用户会员等级下一级
     * 查询累计返佣
     * */
    @PostMapping(value = "/user/query/rebate")
    Result queryRebate(@RequestBody UserDto userDto);

    /**
     * 查询用户首天消费累计
     * */
    @PostMapping(value = "/user/first/day/consumption")
    Result firstDayConsumption(@RequestBody UserDto userDto);
}