From becc7f3f5f3e424a02deaa1a5849f830d6ed7da7 Mon Sep 17 00:00:00 2001 From: chenjiahe <763432473@qq.com> Date: 星期五, 23 二月 2024 18:25:58 +0800 Subject: [PATCH] Merge remote-tracking branch 'origin/master-prod-new' into master-prod-new --- phis-feign/src/main/java/com/hz/his/dto/project/GoodsUpItemDto.java | 40 ++++++++++++++++++++ phis-feign/src/main/java/com/hz/his/dto/project/GoodsUpDto.java | 28 ++++++++++++++ phis-feign/src/main/java/com/hz/his/feign/service/platform/SPhipGoodsService.java | 22 +++++++++++ 3 files changed, 90 insertions(+), 0 deletions(-) diff --git a/phis-feign/src/main/java/com/hz/his/dto/project/GoodsUpDto.java b/phis-feign/src/main/java/com/hz/his/dto/project/GoodsUpDto.java new file mode 100644 index 0000000..1cb9c35 --- /dev/null +++ b/phis-feign/src/main/java/com/hz/his/dto/project/GoodsUpDto.java @@ -0,0 +1,28 @@ +package com.hz.his.dto.project; + + +import lombok.Data; + +import java.util.List; + +/** + * 涓婃灦鍟嗗搧 + */ +@Data +public class GoodsUpDto { + + /** + * 鎿嶄綔浜� + */ + private String operatorId; + /** + * 鎿嶄綔浜哄悕 + */ + private String operatorName; + + /** + * 涓婃灦鍟嗗搧淇℃伅 + */ + private List<GoodsUpItemDto> goodsUpItemList; + +} diff --git a/phis-feign/src/main/java/com/hz/his/dto/project/GoodsUpItemDto.java b/phis-feign/src/main/java/com/hz/his/dto/project/GoodsUpItemDto.java new file mode 100644 index 0000000..4eb212c --- /dev/null +++ b/phis-feign/src/main/java/com/hz/his/dto/project/GoodsUpItemDto.java @@ -0,0 +1,40 @@ +package com.hz.his.dto.project; + + +import lombok.Data; + +import java.util.Date; + +/** + * 涓婃灦鍟嗗搧 + */ +@Data +public class GoodsUpItemDto { + + /** + * 绫诲瀷 + */ + private String type; + /** + * 鏍囪瘑 + */ + private String id; + /** + * 寮�濮嬫椂闂� + */ + private Date startTime; + /** + * 缁撴潫鏃堕棿 + */ + private Date endTime; + + + /** + * 绫诲瀷锛氫績閿� + */ + public static Integer PROMOTION = 0; + /** + * 绫诲瀷锛氬崱椤� + */ + public static Integer CARD = 1; +} diff --git a/phis-feign/src/main/java/com/hz/his/feign/service/platform/SPhipGoodsService.java b/phis-feign/src/main/java/com/hz/his/feign/service/platform/SPhipGoodsService.java new file mode 100644 index 0000000..131928a --- /dev/null +++ b/phis-feign/src/main/java/com/hz/his/feign/service/platform/SPhipGoodsService.java @@ -0,0 +1,22 @@ +package com.hz.his.feign.service.platform; + +import com.hx.resultTool.Result; +import com.hz.his.dto.project.GoodsUpDto; +import org.springframework.cloud.openfeign.FeignClient; +import org.springframework.web.bind.annotation.PostMapping; +import org.springframework.web.bind.annotation.RequestBody; + +/** + * 杩欓噷杩欎釜name 闇�瑕佸~鍐� 璇锋眰鐨勬湇鍔℃彁渚涜�呯殑娉ㄥ唽鍒皀acos Server涓婇潰鐨勬湇鍔″悕锛宲ath 鏄姹傛帴鍙e墠缂� + */ +@FeignClient(name="phi-platform-service",path = "/phip",contextId = "phip-goods-up") +public interface SPhipGoodsService { + + /** + * 寮�鏀惧钩鍙�-涓婃灦鍟嗗搧 + */ + @PostMapping(value = "/goods/up/update/list") + Result upGoodsList(@RequestBody GoodsUpDto goodsUpDto); + + +} \ No newline at end of file -- Gitblit v1.8.0