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

wangrenhuang

2023-02-28 4607163342d0f3598748662eb3e41cacb708adc6

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

 phis-feign/src/main/java/com/hz/his/dto/card/CardBagDto.java

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

import com.hz.his.dto.PageDto;
import lombok.Data;

/**
 * 卡包扩展
 *
 * @author fwq
 */
@Data
public class CardBagDto extends PageDto {
    /**用户标识*/
    private String userId;
    /**卡包标识*/
    private String cardBagId;
    /**操作员工标识*/
    private String opEmployeeId;
    /**操作门店标识*/
    private String opShopId;
    /**开始时间*/
    private String startTime;
    /**结束时间*/
    private String endTime;
    /**备注*/
    private String remarks;
}

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

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

import com.hx.resultTool.Result;
import com.hz.his.dto.activity.ActivityDto;
import com.hz.his.dto.card.CardBagDto;
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-card")
public interface SPhipUserCardService {

    /**
     * 开放平台-卡包列表
     */
    @PostMapping(value = "/user/card/cardBag/list")
    Result cardBagList(@RequestBody CardBagDto cardBagDto);

    /**
     * 开放平台-卡包延期
     */
    @PostMapping(value = "/user/card/delay/cardBag")
    Result delayCardBag(@RequestBody CardBagDto cardBagDto);



}

 phis-feign/src/main/java/com/hz/phis/dt/user/UserDt.java

@@ -69,7 +69,7 @@
    private String email;
    /**头像*/
    private String imgUrl;

    private String hisId;
    private String userBelongingType;

    private String hisId;