From 07e338f6266c8beb7850d7dcf82ac34b5d807389 Mon Sep 17 00:00:00 2001
From: fwq <582742538@qq.com>
Date: 星期一, 26 二月 2024 11:45:14 +0800
Subject: [PATCH] Merge branch 'master-prod-new' into master-test

---
 phis-feign/src/main/java/com/hz/his/dto/project/GoodsUpItemDto.java               |   40 ++++++++++++++++++++
 phis-feign/src/main/java/com/hz/his/feign/service/platform/SPhipMoneyService.java |    7 +++
 phis-feign/src/main/java/com/hz/his/dto/order/PayDto.java                         |    5 +-
 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 +++++++++++
 5 files changed, 100 insertions(+), 2 deletions(-)

diff --git a/phis-feign/src/main/java/com/hz/his/dto/order/PayDto.java b/phis-feign/src/main/java/com/hz/his/dto/order/PayDto.java
index 99d66e4..5863f34 100644
--- a/phis-feign/src/main/java/com/hz/his/dto/order/PayDto.java
+++ b/phis-feign/src/main/java/com/hz/his/dto/order/PayDto.java
@@ -65,8 +65,9 @@
     private BigDecimal giveIncrease;
     /**璧犻�佸鍊奸噾鍒拌处瑙勫垯锛圡oneyRule锛夛紙浼犱簡灏变娇鐢紝鍚﹀垯灏遍粯璁わ級*/
     private String giveIncreaseId;
-    /**璧犻�佹爣棰橈紙棰嗗彇璁板綍灞曠ず锛�*/
+    /**璧犻�佹爣棰橈紙棰嗗彇璁板綍灞曠ず-鏍囬锛�*/
     private String giveIncreaseTitle;
-
+    /**璧犻�佹爣棰橈紙棰嗗彇璁板綍灞曠ず-璇︽儏锛�*/
+    private String giveIncreaseInfo;
 
 }
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..ac2bb47
--- /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 Integer 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
diff --git a/phis-feign/src/main/java/com/hz/his/feign/service/platform/SPhipMoneyService.java b/phis-feign/src/main/java/com/hz/his/feign/service/platform/SPhipMoneyService.java
index 5a7f352..9e0b355 100644
--- a/phis-feign/src/main/java/com/hz/his/feign/service/platform/SPhipMoneyService.java
+++ b/phis-feign/src/main/java/com/hz/his/feign/service/platform/SPhipMoneyService.java
@@ -1,6 +1,7 @@
 package com.hz.his.feign.service.platform;
 
 import com.hx.resultTool.Result;
+import com.hz.his.dto.PageDto;
 import com.hz.his.dto.user.money.UserMoneyDto;
 import org.springframework.cloud.openfeign.FeignClient;
 import org.springframework.web.bind.annotation.PostMapping;
@@ -55,4 +56,10 @@
      * */
     @PostMapping(value = "/user/money/use/log/list")
     Result useLogListData(@RequestBody UserMoneyDto userMoneyDto);
+
+    /**
+     * 閲戦閰嶇疆-棰嗗彇鏉′欢鏋氫妇鍒楄〃
+     * */
+    @PostMapping(value = "/common/list/money/rule/list/receive")
+    Result moneyRuleReceiveRuleList(@RequestBody PageDto pageDto);
 }
\ No newline at end of file

--
Gitblit v1.8.0