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

ANDRU-PC\Andru

2023-10-20 1cc890a6f7432147c633e2cf7c3d4043460e85e9

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

 phis-download-feign/src/main/java/com/hz/his/dto/DConsumablesDto.java

@@ -9,6 +9,5 @@
 **/
@Data
public class DConsumablesDto extends DCommonDto {


    private Integer type;
}

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

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

import com.hx.resultTool.Result;
import com.hz.his.dto.user.*;
import com.hz.his.dto.user.card.UserCardDto;
import com.hz.his.dto.user.card.UserCardUsedDto;
import com.hz.his.dto.user.coupon.GoodsUsedCouponDto;
import com.hz.his.dto.user.coupon.OrderCanUseCouponDto;
import com.hz.his.dto.user.coupon.UserCanUseCouponDto;
import com.hz.his.dto.user.coupon.UserCouponDto;
import com.hz.his.dto.user.label.UserLabelDto;
import com.hz.his.dto.user.money.*;
import com.hz.his.dto.user.packages.UserPhisPackageDto;
import com.hz.his.dto.user.project.UserProjectDto;
import com.hz.his.dto.user.project.UserProjectUsedDto;
import com.hz.his.dto.user.promotion.UserPromotionUsedDto;
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;

import java.util.List;

/**
 * 这里这个name 需要填写 请求的服务提供者的注册到nacos Server上面的服务名，path 是请求接口前缀
 */
@FeignClient(name="phis-provider",path = "/p-his-data",contextId = "user-visit")
public interface SUserVisitService {

    /**
     * 查询用户是否有到访
     * */
    @PostMapping(value = "/user/check")
    Result check(@RequestBody UserDto userDto);



    @PostMapping(value = "/user/query/visitCount")
    Result queryVisitCount(UserDto userDto);

    @PostMapping(value = "/user/query/lastVisit")
    Result queryLastVisit(UserDto userDto);



}