From 07612f2a98dcd9c5c54d2b053987690fec010faa Mon Sep 17 00:00:00 2001
From: zhangxu <3%usVi4iXbVkhI1c>
Date: 星期二, 11 十月 2022 14:48:25 +0800
Subject: [PATCH] Merge remote-tracking branch 'origin/master'
---
phis-feign/src/main/java/com/hz/his/feign/service/phisAdmin/SOrderService.java | 23 +++++++++++
phis-feign/src/main/java/com/hz/his/dto/user/coupon/OrderUseGoodsDto.java | 2
phis-feign/src/main/java/com/hz/his/dto/user/UserUnionDto.java | 2 +
phis-feign/src/main/java/com/hz/his/dto/coupon/CouponGoodsDto.java | 4 ++
phis-feign/src/main/java/com/hz/his/feign/service/platform/SPhipOrderService.java | 6 +++
phis-feign/src/main/java/com/hz/his/feign/service/platform/SPhipTreatService.java | 10 ++--
phis-feign/src/main/java/com/hz/his/feign/service/phis/SCouponService.java | 12 ++++++
phis-feign/src/main/java/com/hz/his/dto/PageDto.java | 11 +++++
8 files changed, 64 insertions(+), 6 deletions(-)
diff --git a/phis-feign/src/main/java/com/hz/his/dto/PageDto.java b/phis-feign/src/main/java/com/hz/his/dto/PageDto.java
index 85d1234..178bccd 100644
--- a/phis-feign/src/main/java/com/hz/his/dto/PageDto.java
+++ b/phis-feign/src/main/java/com/hz/his/dto/PageDto.java
@@ -16,6 +16,9 @@
/**鍒嗙被鏍囪瘑*/
private String typeId;
+ //appid
+ private String appId;
+
public Integer getPageNum() {
if(this.pageNum == null || this.pageNum < 0){
@@ -80,4 +83,12 @@
public void setTypeId(String typeId) {
this.typeId = typeId;
}
+
+ public String getAppId() {
+ return appId;
+ }
+
+ public void setAppId(String appId) {
+ this.appId = appId;
+ }
}
diff --git a/phis-feign/src/main/java/com/hz/his/dto/coupon/CouponGoodsDto.java b/phis-feign/src/main/java/com/hz/his/dto/coupon/CouponGoodsDto.java
index ac67919..fd1491a 100644
--- a/phis-feign/src/main/java/com/hz/his/dto/coupon/CouponGoodsDto.java
+++ b/phis-feign/src/main/java/com/hz/his/dto/coupon/CouponGoodsDto.java
@@ -26,6 +26,10 @@
private List<String> ids;
/**鍟嗗搧绫诲瀷*/
private String goodsType;
+ /*鎼滅储鍙傛暟*/
+ private String keyWord;
+ //浣跨敤绫诲瀷
+ private Integer useType;
/**鍟嗗搧绫诲瀷-椤圭洰*/
diff --git a/phis-feign/src/main/java/com/hz/his/dto/user/UserUnionDto.java b/phis-feign/src/main/java/com/hz/his/dto/user/UserUnionDto.java
index 19468ca..fb04d0d 100644
--- a/phis-feign/src/main/java/com/hz/his/dto/user/UserUnionDto.java
+++ b/phis-feign/src/main/java/com/hz/his/dto/user/UserUnionDto.java
@@ -45,4 +45,6 @@
*/
private String corpUserId;
+ private String id;
+
}
diff --git a/phis-feign/src/main/java/com/hz/his/dto/user/coupon/OrderUseGoodsDto.java b/phis-feign/src/main/java/com/hz/his/dto/user/coupon/OrderUseGoodsDto.java
index 6e66d22..863bdde 100644
--- a/phis-feign/src/main/java/com/hz/his/dto/user/coupon/OrderUseGoodsDto.java
+++ b/phis-feign/src/main/java/com/hz/his/dto/user/coupon/OrderUseGoodsDto.java
@@ -10,7 +10,7 @@
*/
@Data
public class OrderUseGoodsDto extends PageDto {
- /**CRM sku鏍囪瘑*/
+ /**鍟嗗搧sku鏍囪瘑*/
private String skuId;
/**鍟嗗搧绫诲瀷*/
private Integer goodsType;
diff --git a/phis-feign/src/main/java/com/hz/his/feign/service/phis/SCouponService.java b/phis-feign/src/main/java/com/hz/his/feign/service/phis/SCouponService.java
index ec180ee..3926995 100644
--- a/phis-feign/src/main/java/com/hz/his/feign/service/phis/SCouponService.java
+++ b/phis-feign/src/main/java/com/hz/his/feign/service/phis/SCouponService.java
@@ -68,4 +68,16 @@
Result checkGroupCoupon(@RequestBody CouponGoodsDto couponGoodsDto);
+ /**
+ * 鏍规嵁浼樻儬鍒竔d鏌ヨ鍏宠仈鍟嗗搧鍒嗙被
+ */
+ @PostMapping(value = "/get/coupon/type")
+ Result getCouponGoodsTyep(@RequestBody CouponGoodsDto couponGoodsDto);
+
+
+ /**
+ * 鏍规嵁浼樻儬鍒竔d缁熻鍏宠仈鍟嗗搧
+ */
+ @PostMapping(value = "/get/coupon/goods")
+ Result getCouponGoods(@RequestBody CouponGoodsDto couponGoodsDto);
}
diff --git a/phis-feign/src/main/java/com/hz/his/feign/service/phisAdmin/SOrderService.java b/phis-feign/src/main/java/com/hz/his/feign/service/phisAdmin/SOrderService.java
new file mode 100644
index 0000000..a2938d4
--- /dev/null
+++ b/phis-feign/src/main/java/com/hz/his/feign/service/phisAdmin/SOrderService.java
@@ -0,0 +1,23 @@
+package com.hz.his.feign.service.phisAdmin;
+
+import com.hx.resultTool.Result;
+import org.springframework.cloud.openfeign.FeignClient;
+import org.springframework.web.bind.annotation.RequestMapping;
+import org.springframework.web.bind.annotation.RequestParam;
+
+/**
+ * 棰勭害鍚庡彴璁㈠崟鎺ュ彛
+ *
+ * @Author: zhouxiang
+ * @Date: 2022/09/27/15:59
+ * @Description:
+ */
+@FeignClient(name="phis-service",contextId = "phis-order")
+public interface SOrderService {
+ /**
+ * 鏌ヨ璁㈠崟璇︽儏鎺ュ彛
+ * @return
+ */
+ @RequestMapping("/order/feign/get/one")
+ Result getAllGoods(@RequestParam("orderId") String orderId);
+}
diff --git a/phis-feign/src/main/java/com/hz/his/feign/service/platform/SPhipOrderService.java b/phis-feign/src/main/java/com/hz/his/feign/service/platform/SPhipOrderService.java
index c287361..6f12054 100644
--- a/phis-feign/src/main/java/com/hz/his/feign/service/platform/SPhipOrderService.java
+++ b/phis-feign/src/main/java/com/hz/his/feign/service/platform/SPhipOrderService.java
@@ -91,5 +91,11 @@
@PostMapping(value = "/order/refundNote/confirm")
Result noteConfirm(@RequestBody OrderRefundNoteListDto orderRefundNoteListDto);
+ /**
+ * 寮�鏀惧钩鍙�-鏌ヨ璁㈠崟鏀粯闆嗗悎
+ */
+ @PostMapping(value = "/order/get/ConsumePay")
+ Result getConsumePay(@RequestBody PayDto dto);
+
}
\ No newline at end of file
diff --git a/phis-feign/src/main/java/com/hz/his/feign/service/platform/SPhipTreatService.java b/phis-feign/src/main/java/com/hz/his/feign/service/platform/SPhipTreatService.java
index e59e3af..f333954 100644
--- a/phis-feign/src/main/java/com/hz/his/feign/service/platform/SPhipTreatService.java
+++ b/phis-feign/src/main/java/com/hz/his/feign/service/platform/SPhipTreatService.java
@@ -1,11 +1,9 @@
package com.hz.his.feign.service.platform;
import com.hx.resultTool.Result;
-import com.hz.his.dto.card.CardQueryDto;
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;
/**
* 杩欓噷杩欎釜name 闇�瑕佸～鍐� 璇锋眰鐨勬湇鍔℃彁渚涜�呯殑娉ㄥ唽鍒皀acos Server涓婇潰鐨勬湇鍔″悕锛宲ath 鏄姹傛帴鍙ｅ墠缂�
@@ -15,14 +13,16 @@
/**
* 寮�鏀惧钩鍙�-鑾峰彇閫氱煡鍗曡鎯�
+ * @param treatSingleId String绫诲瀷JsonObject
*/
- @PostMapping(value = "/treat/confirmTreatNotice")
- Result getTreatInfo(@RequestParam("treatSingleId") String treatSingleId);
+ @PostMapping(value = "/treat/info")
+ Result getTreatInfo(@RequestBody String treatSingleId);
/**
* 寮�鏀惧钩鍙�-鑾峰彇閫氱煡鍗曠‘璁�
+ * @param treatSingleId String绫诲瀷JsonObject
*/
@PostMapping(value = "/treat/confirmTreatNotice")
- Result confirmTreat(@RequestParam("treatSingleId") String treatSingleId);
+ Result confirmTreat(@RequestBody String treatSingleId);
}
\ No newline at end of file
--
Gitblit v1.8.0