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

fwq

2023-06-30 13f8c7c5a4fedf6b7222f6775d414f6e8bf95ebc

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

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

New file
@@ -0,0 +1,13 @@
package com.hz.his.dto.file;

import lombok.Data;

/**生成签名访问URL
 * @author CJH*/
@Data
public class FileSignReturnVo {

    /**文件路径*/
    private String fileUrl;

}

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

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

import lombok.Data;

/**生成签名访问URL
 * @author CJH*/
@Data
public class FileSignVo {

    /**文件路径*/
    private String fileUrl;
    /**桶名称-可不传*/
    private String bucketName;

}

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

@@ -95,4 +95,6 @@
    public static final String OPERATION_REASON_CHANGE = "changeGoods";
    /**操作方式-生日赠送*/
    public static final String OPERATION_REASON_BIRTHDAY_GIFT = "birthdayGift";

    public static final String OPERATION_REASON_GIFT_0701 = "bringNewUserGift_0701";
}

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

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

import com.hx.resultTool.Result;
import com.hz.his.dto.file.FileDownDto;
import com.hz.his.dto.file.FileSignVo;
import feign.Response;
import org.springframework.cloud.openfeign.FeignClient;
import org.springframework.http.MediaType;
@@ -46,4 +47,12 @@
    @PostMapping(value = "/cos/download-file")
    Response downloadFile(@RequestBody FileDownDto cosDownDto);

    /**
     *生成签名访问URL
     * @param fileSignVo 对象
     * @return 使用FileSignReturnVo转化
     */
    @PostMapping(value = "/cos/signUrl")
    Response downloadFile(@RequestBody FileSignVo fileSignVo);

}

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

@@ -96,4 +96,10 @@
     */
    @PostMapping(value = "/user/families/room/info/update")
    Result updateUserFamiliesRoomInfo(@RequestBody UserParamDto userParamDto);

    /**
     * 开放平台-用户等级重新计算
     */
    @PostMapping(value = "/user/level/calc")
    Result userLevelCalc(@RequestBody UserParamDto userParamDto);
}