From 7ac97b83b191cad2581f503cb8ea96b3711586ae Mon Sep 17 00:00:00 2001
From: chenjiahe <763432473@qq.com>
Date: 星期五, 28 七月 2023 11:52:57 +0800
Subject: [PATCH] Merge remote-tracking branch 'origin/master-prod-new' into master-prod-new
---
phis-feign/src/main/java/com/hz/his/dto/order/OrderCountShouldTotalDto.java | 24 ++++++++++++
phis-feign/src/main/java/com/hz/his/feign/service/platform/SPhipCouponService.java | 6 +++
phis-feign/src/main/java/com/hz/his/dto/order/CancelOrderDto.java | 3 +
phis-feign/src/main/java/com/hz/his/feign/service/platform/SPhipOrderService.java | 8 ++++
phis-feign/src/main/java/com/hz/his/dto/order/OrderCountShouldTotalItemDto.java | 24 ++++++++++++
5 files changed, 65 insertions(+), 0 deletions(-)
diff --git a/phis-feign/src/main/java/com/hz/his/dto/order/CancelOrderDto.java b/phis-feign/src/main/java/com/hz/his/dto/order/CancelOrderDto.java
index a0488d8..18878c6 100644
--- a/phis-feign/src/main/java/com/hz/his/dto/order/CancelOrderDto.java
+++ b/phis-feign/src/main/java/com/hz/his/dto/order/CancelOrderDto.java
@@ -26,6 +26,9 @@
/** 骞冲彴鏉ユ簮 鍥犱负鏄痟is鍔╂墜鍙栨秷璁㈠崟鐨勮瘽灏辫鑷姩纭閫�娆惧崟 蹇呭～*/
private Integer platformSource;
+ /** 鍙栨秷璁㈠崟澶囨敞 */
+ private String remarks;
+
/**his鍔╂墜*/
public static final Integer HIS_ASSISTANT = 0;
/**his鍚庡彴*/
diff --git a/phis-feign/src/main/java/com/hz/his/dto/order/OrderCountShouldTotalDto.java b/phis-feign/src/main/java/com/hz/his/dto/order/OrderCountShouldTotalDto.java
new file mode 100644
index 0000000..ec8cf08
--- /dev/null
+++ b/phis-feign/src/main/java/com/hz/his/dto/order/OrderCountShouldTotalDto.java
@@ -0,0 +1,24 @@
+package com.hz.his.dto.order;
+
+import lombok.Data;
+
+import java.math.BigDecimal;
+import java.util.List;
+
+/**
+ * 璁㈠崟璁＄畻搴斾粯閲戦
+ * @USER: fhx
+ * @DATE: 2023/6/13
+ **/
+@Data
+public class OrderCountShouldTotalDto {
+
+ //闂ㄥ簵id
+ private String shopId;
+ //鐢ㄦ埛浼樻儬鍒�
+ private String couponNumberId;
+ //璁㈠崟搴斾粯閲戦
+ private BigDecimal shouldTotal;
+ //鍟嗗搧item淇℃伅
+ private List<OrderCountShouldTotalItemDto> itemDtoList;
+}
diff --git a/phis-feign/src/main/java/com/hz/his/dto/order/OrderCountShouldTotalItemDto.java b/phis-feign/src/main/java/com/hz/his/dto/order/OrderCountShouldTotalItemDto.java
new file mode 100644
index 0000000..e336b12
--- /dev/null
+++ b/phis-feign/src/main/java/com/hz/his/dto/order/OrderCountShouldTotalItemDto.java
@@ -0,0 +1,24 @@
+package com.hz.his.dto.order;
+
+import com.gitee.sunchenbin.mybatis.actable.annotation.Column;
+import com.gitee.sunchenbin.mybatis.actable.constants.MySqlTypeConstant;
+import lombok.Data;
+
+import java.math.BigDecimal;
+
+/**
+ * 璁㈠崟璁＄畻搴斾粯閲戦item淇℃伅
+ * @USER: fhx
+ * @DATE: 2023/6/13
+ **/
+@Data
+public class OrderCountShouldTotalItemDto {
+ //鍟嗗搧绫诲瀷
+ private String type;
+ //鍟嗗搧id
+ private String commonId;
+ //璐拱鏁伴噺
+ private Integer buyNum;
+ //璁㈠崟鎶樻墸
+ private BigDecimal discount = BigDecimal.ZERO;
+}
diff --git a/phis-feign/src/main/java/com/hz/his/feign/service/platform/SPhipCouponService.java b/phis-feign/src/main/java/com/hz/his/feign/service/platform/SPhipCouponService.java
index 2c16814..0c30dc8 100644
--- a/phis-feign/src/main/java/com/hz/his/feign/service/platform/SPhipCouponService.java
+++ b/phis-feign/src/main/java/com/hz/his/feign/service/platform/SPhipCouponService.java
@@ -56,4 +56,10 @@
*/
@PostMapping(value = "/coupon/order/send/coupon")
Result orderSendCoupon(@RequestBody OrderSendCouponDto couponDto);
+
+ /**
+ * 寮�鏀惧钩鍙�-妫�鏌ヤ紭鎯犲埜鏄惁鍙敤 - 寮�鍗曠粨璐﹀悓鏃舵墽琛屼娇鐢�
+ */
+ @PostMapping(value = "/coupon/check/coupon/to/orderAndPay")
+ Result checkCouponToOrderAndPay(@RequestBody CouponDto couponDto);
}
\ No newline at end of file
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 6e97dc9..970d425 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
@@ -179,4 +179,12 @@
@PostMapping(value = "/order/refund/cancel")
Result refundCancel(@RequestBody RefundCancelVo refundCancelVo);
+
+ /**
+ * 璁＄畻璁㈠崟搴斾粯閲戦
+ */
+ @PostMapping(value = "/order/countOrderShouldTotal")
+ Result countOrderShouldTotal(@RequestBody OrderCountShouldTotalDto dto);
+
+
}
\ No newline at end of file
--
Gitblit v1.8.0