Merge remote-tracking branch 'origin/master' into master-test

fwq

2022-12-30 174051f74a5842466c68c0601832fbb5a952608e

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

@@ -4,10 +4,11 @@
 * @Author
 */

import org.springframework.cloud.openfeign.FeignClient;
import com.hx.resultTool.Result;
import org.springframework.http.MediaType;
import net.sf.json.JSONObject;
import org.springframework.cloud.openfeign.FeignClient;
import org.springframework.web.bind.annotation.PostMapping;
import org.springframework.web.bind.annotation.RequestBody;
import org.springframework.web.bind.annotation.RequestParam;

/**
@@ -21,13 +22,18 @@
     * @param userId
     * @return
     */
    @PostMapping(value = "/user/consumption/data/list",consumes = MediaType.APPLICATION_FORM_URLENCODED_VALUE)
    @PostMapping(value = "/user/consumption/data/list")
    Result userList(@RequestParam("userId") String userId);
    /**
     * 根据用户id同步用户基本信息
     * @param userId
     * @return
     */
    @PostMapping(value = "/sync/user/syncUserById",consumes = MediaType.APPLICATION_FORM_URLENCODED_VALUE)
    @PostMapping(value = "/sync/user/syncUserById")
    Result syncUserById(@RequestParam("userId") String userId);

    /** 主动同步创建顾客到his - 修改用户ciq和会员等级*/
    @PostMapping("/sync/user/updateMembership")
    Result updateMembership(@RequestBody JSONObject jsonObject);

}