Merge remote-tracking branch 'origin/master-prod-new-合并账号' into master-test

fwq

2023-03-23 599ef2e379d11b4be517f0c38cd504c9395f0297

Merge remote-tracking branch 'origin/master-prod-new-合并账号' into master-test

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

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

import com.hx.resultTool.Result;
import com.hz.his.dto.user.UserMergeDto;
import feign.Request;
import org.springframework.cloud.openfeign.FeignClient;
import org.springframework.web.bind.annotation.PostMapping;
import org.springframework.web.bind.annotation.RequestBody;

/**
 * 这里这个name 需要填写 请求的服务提供者的注册到nacos Server上面的服务名，path 是请求接口前缀
 */
@FeignClient(name="phi-platform-service",path = "/phip",contextId = "phip-user-merge")
public interface SPhipUserMergeService {

    /**
     * 用户合并日志
     */
    @PostMapping("/user/merge/log/add")
    Result userMergeAdd(Request.Options options, @RequestBody UserMergeDto userMergeDto);
}

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

@@ -7,6 +7,7 @@
import com.hz.his.dto.user.UserUnionDto;
import com.hz.his.dto.user.coupon.UserCouponDto;
import com.hz.his.dto.user.project.UserProjectDto;
import feign.Request;
import net.sf.json.JSONObject;
import org.springframework.cloud.openfeign.FeignClient;
import org.springframework.web.bind.annotation.PostMapping;
@@ -76,9 +77,4 @@
    @PostMapping("user/level/progress")
    Result userLevelProgress(@RequestBody JSONObject parmData);

    /**
     * 用户升级进度
     */
    @PostMapping("/user/merge/log/add")
    Result userMergeAdd(@RequestBody UserMergeDto userMergeDto);
}