Merge branch 'prod-扫码登记' into master-test

rx

2023-06-28 5e5ea0e3b26dbe73b38ee346380623000da037ae

Merge branch 'prod-扫码登记' into master-test

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

 phis-feign/src/main/java/com/hz/his/dto/mp/MpQrCodeDto.java

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


/**
 * 小程序二维码dto
 */
public class MpQrCodeDto   {

    //ciq
    private String ciq;

    //门店编号
    private String shopCode;

    public String getCiq() {
        return ciq;
    }

    public void setCiq(String ciq) {
        this.ciq = ciq;
    }

    public String getShopCode() {
        return shopCode;
    }

    public void setShopCode(String shopCode) {
        this.shopCode = shopCode;
    }
}

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

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

import com.hx.resultTool.Result;
import com.hz.his.dto.mp.MpQrCodeDto;
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-qrcode")
public interface SPhipMpQrCodeService {

    /**
     * 开放平台- 用户扫码登记模块 注册绑定后创建his助手小程序码(MpQrCodeController-userTempVisitQrCode方法)
     */
    @PostMapping(value = "/mp/qrcode/user/temp/visit/qrcode")
    Result userTempVisitQrCode(@RequestBody MpQrCodeDto mpQrCodeDto);
}

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

@@ -96,12 +96,8 @@
     */
    @PostMapping(value = "/user/families/room/info/update")
    Result updateUserFamiliesRoomInfo(@RequestBody UserParamDto userParamDto);
    
    /**
     * 开放平台- 用户扫码登记模块 注册绑定后创建his助手小程序码(UserCreateMpQrcodeController-bindCreateHisQrcode方法)
     */
    @PostMapping(value = "/user/mp/qrcode/create/his")
    Result bindCreateHisQrcode(@RequestBody com.alibaba.fastjson.JSONObject jsonObject);



    /**
     * 开放平台-用户等级重新计算