From dde6983def69577df7b97e3aefbcc06f24a1abf4 Mon Sep 17 00:00:00 2001
From: chenjiahe <763432473@qq.com>
Date: 星期一, 08 一月 2024 16:03:10 +0800
Subject: [PATCH] Merge branch 'master-prod-new' into master-test
---
crm-platform-feign/src/main/java/com/hz/crm/dto/order/refund/RefundModelVo.java | 4 ++
crm-platform-feign/src/main/java/com/hz/crm/vo/order/OrderPayVo.java | 40 ++++++++++++++++++++
crm-platform-feign/src/main/java/com/hz/crm/vo/order/OrderPayItemVo.java | 20 ++++++++++
crm-platform-feign/src/main/java/com/hz/crm/feign/FOderService.java | 6 +-
4 files changed, 67 insertions(+), 3 deletions(-)
diff --git a/crm-platform-feign/src/main/java/com/hz/crm/dto/order/refund/RefundModelVo.java b/crm-platform-feign/src/main/java/com/hz/crm/dto/order/refund/RefundModelVo.java
index 92ad1d8..2543ad8 100644
--- a/crm-platform-feign/src/main/java/com/hz/crm/dto/order/refund/RefundModelVo.java
+++ b/crm-platform-feign/src/main/java/com/hz/crm/dto/order/refund/RefundModelVo.java
@@ -13,6 +13,8 @@
/**鏀粯鏂瑰紡缂栧彿*/
private Integer modelNo;
+ /**绗笁鏂圭殑鏀粯缂栧彿锛坔is鐨勬敮浠樼紪鍙�)锛宮odelNo鍜宼hirdPartyNo蹇呭～涓�涓�*/
+ private String thirdPartyNo;
/***宸查��娆炬�婚噾棰�***/
private BigDecimal refundTotal = BigDecimal.ZERO;
@@ -27,5 +29,7 @@
public static final int REFUND_TYPE_RECHARGEL = 5;
/**閫�娆剧被鍨嬬被鍨�--澧炲�奸噾*/
public static final int REFUND_TYPE_INCREMENT = 6;
+ /**閫�娆剧被鍨嬬被鍨�--his鐨勯��娆炬柟寮忥紙鎵�鏈夋柟寮忎唬琛級*/
+ public static final int REFUND_TYPE_HIS = 7;
}
diff --git a/crm-platform-feign/src/main/java/com/hz/crm/feign/FOderService.java b/crm-platform-feign/src/main/java/com/hz/crm/feign/FOderService.java
index a2ae3a2..565ee25 100644
--- a/crm-platform-feign/src/main/java/com/hz/crm/feign/FOderService.java
+++ b/crm-platform-feign/src/main/java/com/hz/crm/feign/FOderService.java
@@ -45,9 +45,9 @@
Result userBuyList(@RequestBody FOrderPageDto dto);
/**
- * 绉垎璁㈠崟纭
+ * 绉垎璁㈠崟纭鏁版嵁
*/
- @RequestMapping("/order/integral/confirm-order")
+ @RequestMapping("/order/integral-crm/confirm-order")
Result integralOrderConfirm(@RequestBody OrderConfirmVo orderConfirmVo);
/**
@@ -59,7 +59,7 @@
/**
* 绉垎璁㈠崟涓嬪崟
*/
- @RequestMapping("/order/integral/add")
+ @RequestMapping("/order/integral-crm/add")
Result integralOrderAdd(@RequestBody OrderAddVo orderAddVo);
}
diff --git a/crm-platform-feign/src/main/java/com/hz/crm/vo/order/OrderPayItemVo.java b/crm-platform-feign/src/main/java/com/hz/crm/vo/order/OrderPayItemVo.java
new file mode 100644
index 0000000..a861739
--- /dev/null
+++ b/crm-platform-feign/src/main/java/com/hz/crm/vo/order/OrderPayItemVo.java
@@ -0,0 +1,20 @@
+package com.hz.crm.vo.order;
+
+import lombok.Data;
+
+import java.math.BigDecimal;
+import java.util.List;
+
+/**
+ * 鏀粯鐨勬椂鍊欐帴鏀剁殑瀹炰綋
+ * @author CJH
+ */
+@Data
+public class OrderPayItemVo {
+
+ /**鏀粯缂栧彿*/
+ private String paymentNo;
+ /**鏀粯閲戦*/
+ private BigDecimal money;
+
+}
diff --git a/crm-platform-feign/src/main/java/com/hz/crm/vo/order/OrderPayVo.java b/crm-platform-feign/src/main/java/com/hz/crm/vo/order/OrderPayVo.java
new file mode 100644
index 0000000..4b0635e
--- /dev/null
+++ b/crm-platform-feign/src/main/java/com/hz/crm/vo/order/OrderPayVo.java
@@ -0,0 +1,40 @@
+package com.hz.crm.vo.order;
+
+import lombok.Data;
+
+import java.math.BigDecimal;
+import java.util.List;
+
+/**
+ * 鏀粯鐨勬椂鍊欐帴鏀剁殑瀹炰綋
+ * @author CJH
+ */
+@Data
+public class OrderPayVo {
+
+ /**璁㈠崟鏍囪瘑*/
+ private String orderId;
+
+ /**鍌ㄥ�奸噾-鍓嶇濉啓*/
+ private BigDecimal rechargeMoney;
+ /**澧炲�奸噾-鍓嶇濉啓**/
+ private BigDecimal incrementMoney;
+ /**绉垎-鏀粯绉垎锛堝墠绔～鍐欙級*/
+ private BigDecimal integralTotal;
+ /**鏀粯鏂瑰紡-榛樿鍏朵粬*/
+ public Integer payModel = PAY_MODEL_OTHER;
+ /**浣跨敤浼樻儬鍒竔d*/
+ private String couponIds;
+ private List<String> coupons;
+
+ /**鏀粯鏂瑰紡*/
+ List<OrderPayItemVo> orderPayItemList;
+
+
+ /**鏀粯鏂瑰紡-鍏朵粬*/
+ public static final int PAY_MODEL_OTHER = 0;
+ /**鏀粯鏂瑰紡-寰俊*/
+ public static final int PAY_MODEL_WX = 1;
+ /**鏀粯鏂瑰紡-鏀粯瀹�*/
+ public static final int PAY_MODEL_ZFB = 2;
+}
--
Gitblit v1.8.0