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

fwq

2024-04-11 2bbfc3169ec968b3d3ce87bbc9bdd4e04501e377

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

@@ -1,13 +1,11 @@
package com.hz.his.feign.service.platform;

import com.hx.resultTool.Result;
import com.hz.his.dto.user.UserListDto;
import com.hz.his.dto.user.UserMergeDto;
import com.hz.his.dto.user.UserParamDto;
import com.hz.his.dto.user.UserUnionDto;
import com.hz.his.dto.marketing.common.MarketingTotalDto;
import com.hz.his.dto.user.*;
import com.hz.his.dto.user.coupon.UserCouponDto;
import com.hz.his.dto.user.project.UserProjectDto;
import feign.Request;
import com.hz.his.dto.user.room.UserDoctorRoomDto;
import net.sf.json.JSONObject;
import org.springframework.cloud.openfeign.FeignClient;
import org.springframework.web.bind.annotation.PostMapping;
@@ -75,6 +73,77 @@
     * 用户升级进度
     */
    @PostMapping("user/level/progress")
    Result userLevelProgress(@RequestBody JSONObject parmData);
    Result userLevelProgress(@RequestBody JSONObject paramData);

    /**
     * 用户邀请人信息
     */
    @PostMapping("user/invitee/info")
    Result userInviteeInfo(@RequestBody UserInviteeInfoDto userInviteeInfoDto);

    /**
     * 用户关注产品记录
     */
    @PostMapping("/attention/product/record/edit")
    Result userAttentionProductRecordEdit(@RequestBody UserAttentionProductDto userAttentionProductDto);

    /**
     * 开放平台-获取用户科室关系信息
     */
    @PostMapping(value = "/user/families/room/info")
    Result getUserFamiliesRoomInfo(@RequestBody UserParamDto userParamDto);

    /**
     * 开放平台-修改用户科室关系信息
     */
    @PostMapping(value = "/user/families/room/info/update")
    Result updateUserFamiliesRoomInfo(@RequestBody UserParamDto userParamDto);

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

    /**
     * 开放平台-获取用户的公众号信息
     */
    @PostMapping(value = "/user/gzh/info")
    Result userGZHInfo(@RequestBody UserParamDto userParamDto);

    /**
     * 开放平台-获取crm小程序跳转链接
     */
    @PostMapping(value = "/user/crm/url/link")
    Result getCRMUrlLink(@RequestBody UserUnionDto userParamDto);

    /**
     * 开放平台-发送获客消息添加客户
     */
    @PostMapping(value = "/user/acquisition/sent")
    Result sentUserAcquisitionSMS(@RequestBody UserParamDto userParamDto);

    /**
     * 开放平台-获取用户获客数据记录
     */
    @PostMapping(value = "/user/acquisition/list")
    Result getUserAcquisitionList(@RequestBody UserParamDto userParamDto);

    /**
     * 开放平台-用户科室点诊新增
     */
    @PostMapping(value = "/user/room/doctor/diagnosis/create")
    Result userFamiliesRoomCreate(@RequestBody UserDoctorRoomDto userDoctorRoomDto);

    /**
     * 开放平台-转发创建营销助手审核
     */
    @PostMapping(value = "/user/common/approve/create")
    Result commonApproveCreate(@RequestBody MarketingTotalDto marketingTotalDto);

    /**
     * 到访更新用户信息
     */
    @PostMapping(value = "/user/arrive/edit")
    Result arriveEdit(@RequestBody com.alibaba.fastjson.JSONObject data);
}