From 21cc776dfb780d6e2b0335c1542e6d3e898ce8cb Mon Sep 17 00:00:00 2001
From: guang <guang@guang.com>
Date: 星期五, 14 六月 2024 16:43:48 +0800
Subject: [PATCH] Merge branch 'master-stander' of http://1.15.4.62/r/~chenjiahe/crm-platform-feign into master-stander
---
crm-platform-feign/src/main/java/com/hz/crm/feign/FOderRefundService.java | 2 +-
.gitignore | 2 +-
crm-platform-feign/src/main/java/com/hz/crm/feign/FGoodsSkuService.java | 2 +-
crm-platform-feign/src/main/java/com/hz/crm/feign/goods/FGoodsTypeService.java | 2 +-
crm-platform-feign/src/main/java/com/hz/crm/feign/FUserService.java | 2 +-
crm-platform-feign/src/main/java/com/hz/crm/dto/order/refund/RefundModelVo.java | 4 ++++
crm-platform-feign/src/main/java/com/hz/crm/dto/order/refund/RefundDto.java | 2 ++
crm-platform-feign/src/main/java/com/hz/crm/feign/goods/FIntegralGoodsService.java | 2 +-
crm-platform-feign/src/main/java/com/hz/crm/feign/FDoctorTimeService.java | 2 +-
crm-platform-feign/src/main/java/com/hz/crm/feign/FGoodsService.java | 2 +-
crm-platform-feign/src/main/java/com/hz/crm/feign/FCouponService.java | 2 +-
crm-platform-feign/src/main/java/com/hz/crm/feign/FOldBrinNewService.java | 2 +-
crm-platform-feign/src/main/java/com/hz/crm/feign/FGroupActivityService.java | 2 +-
crm-platform-feign/src/main/java/com/hz/crm/feign/FOderService.java | 2 +-
crm-platform-feign/src/main/java/com/hz/crm/feign/FSyncPhisAppealTypeRelateService.java | 2 +-
15 files changed, 19 insertions(+), 13 deletions(-)
diff --git a/.gitignore b/.gitignore
index f50d082..39878bf 100644
--- a/.gitignore
+++ b/.gitignore
@@ -8,4 +8,4 @@
/httpRequests/
/.idea
-*/target
\ No newline at end of file
+*/target
diff --git a/crm-platform-feign/src/main/java/com/hz/crm/dto/order/refund/RefundDto.java b/crm-platform-feign/src/main/java/com/hz/crm/dto/order/refund/RefundDto.java
index 32fa863..561dc8f 100644
--- a/crm-platform-feign/src/main/java/com/hz/crm/dto/order/refund/RefundDto.java
+++ b/crm-platform-feign/src/main/java/com/hz/crm/dto/order/refund/RefundDto.java
@@ -41,6 +41,8 @@
private BigDecimal refundIncrement;
/**蹇呭～ 閫�娆炬�荤Н鍒� */
private BigDecimal refundIntegral;
+ /**蹇呭～ 閫�娆炬�绘姷鎵ｇН鍒� */
+ private BigDecimal refundIntegralDeduction;
////鎿嶄綔浜轰俊鎭�
/**蹇呭～ 鎿嶄綔浜虹被鍨� */
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 2543ad8..9910c22 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
@@ -17,6 +17,8 @@
private String thirdPartyNo;
/***宸查��娆炬�婚噾棰�***/
private BigDecimal refundTotal = BigDecimal.ZERO;
+ /***宸查��娆炬�绘姷鎵ｉ噾棰�***/
+ private BigDecimal refundDeductionTotal = BigDecimal.ZERO;
/**********閫�娆剧被鍨�************/
/**閫�娆剧被鍨嬬被鍨�-寰俊*/
@@ -31,5 +33,7 @@
public static final int REFUND_TYPE_INCREMENT = 6;
/**閫�娆剧被鍨嬬被鍨�--his鐨勯��娆炬柟寮忥紙鎵�鏈夋柟寮忎唬琛級*/
public static final int REFUND_TYPE_HIS = 7;
+ /**閫�娆剧被鍨嬬被鍨�--鎶垫墸绉垎*/
+ public static final int REFUND_TYPE_INTEGRAL_CASH = 8;
}
diff --git a/crm-platform-feign/src/main/java/com/hz/crm/feign/FCouponService.java b/crm-platform-feign/src/main/java/com/hz/crm/feign/FCouponService.java
index 318319a..28d8d36 100644
--- a/crm-platform-feign/src/main/java/com/hz/crm/feign/FCouponService.java
+++ b/crm-platform-feign/src/main/java/com/hz/crm/feign/FCouponService.java
@@ -10,7 +10,7 @@
/**
* 杩欓噷杩欎釜name 闇�瑕佸～鍐� 璇锋眰鐨勬湇鍔℃彁渚涜�呯殑娉ㄥ唽鍒皀acos Server涓婇潰鐨勬湇鍔″悕锛宲ath 鏄姹傛帴鍙ｅ墠缂�
*/
-@FeignClient(name="crm-platform-service",path = "/crm-platform",contextId = "crm-coupon")
+@FeignClient(name="crm-user",path = "/crm-platform",contextId = "crm-coupon")
public interface FCouponService {
@PostMapping(value = "/coupon/getGoodsSku")
diff --git a/crm-platform-feign/src/main/java/com/hz/crm/feign/FDoctorTimeService.java b/crm-platform-feign/src/main/java/com/hz/crm/feign/FDoctorTimeService.java
index 8769cfe..9007010 100644
--- a/crm-platform-feign/src/main/java/com/hz/crm/feign/FDoctorTimeService.java
+++ b/crm-platform-feign/src/main/java/com/hz/crm/feign/FDoctorTimeService.java
@@ -11,7 +11,7 @@
/**
* 杩欓噷杩欎釜name 闇�瑕佸～鍐� 璇锋眰鐨勬湇鍔℃彁渚涜�呯殑娉ㄥ唽鍒皀acos Server涓婇潰鐨勬湇鍔″悕锛宲ath 鏄姹傛帴鍙ｅ墠缂�
*/
-@FeignClient(name="crm-platform-service",path = "/crm-platform",contextId = "crm-doctorTime")
+@FeignClient(name="crm-user",path = "/crm-platform",contextId = "crm-doctorTime")
public interface FDoctorTimeService {
@PostMapping(value = "/doctor/time/sync")
diff --git a/crm-platform-feign/src/main/java/com/hz/crm/feign/FGoodsService.java b/crm-platform-feign/src/main/java/com/hz/crm/feign/FGoodsService.java
index 43d8aff..160ba83 100644
--- a/crm-platform-feign/src/main/java/com/hz/crm/feign/FGoodsService.java
+++ b/crm-platform-feign/src/main/java/com/hz/crm/feign/FGoodsService.java
@@ -9,7 +9,7 @@
/**
* 杩欓噷杩欎釜name 闇�瑕佸～鍐� 璇锋眰鐨勬湇鍔℃彁渚涜�呯殑娉ㄥ唽鍒皀acos Server涓婇潰鐨勬湇鍔″悕锛宲ath 鏄姹傛帴鍙ｅ墠缂�
*/
-@FeignClient(name="crm-platform-service",path = "/crm-platform",contextId = "crm-goods")
+@FeignClient(name="crm-user",path = "/crm-platform",contextId = "crm-goods")
public interface FGoodsService {
@PostMapping(value = "/goods/spec/check")
diff --git a/crm-platform-feign/src/main/java/com/hz/crm/feign/FGoodsSkuService.java b/crm-platform-feign/src/main/java/com/hz/crm/feign/FGoodsSkuService.java
index d70d3c7..db508de 100644
--- a/crm-platform-feign/src/main/java/com/hz/crm/feign/FGoodsSkuService.java
+++ b/crm-platform-feign/src/main/java/com/hz/crm/feign/FGoodsSkuService.java
@@ -15,7 +15,7 @@
/**
* 杩欓噷杩欎釜name 闇�瑕佸～鍐� 璇锋眰鐨勬湇鍔℃彁渚涜�呯殑娉ㄥ唽鍒皀acos Server涓婇潰鐨勬湇鍔″悕锛宲ath 鏄姹傛帴鍙ｅ墠缂�
*/
-@FeignClient(name="crm-platform-service",path = "/crm-platform",contextId = "crm-goods-sku")
+@FeignClient(name="crm-user",path = "/crm-platform",contextId = "crm-goods-sku")
public interface FGoodsSkuService {
/**sku鍒楄〃*/
diff --git a/crm-platform-feign/src/main/java/com/hz/crm/feign/FGroupActivityService.java b/crm-platform-feign/src/main/java/com/hz/crm/feign/FGroupActivityService.java
index 16a98e0..d883b79 100644
--- a/crm-platform-feign/src/main/java/com/hz/crm/feign/FGroupActivityService.java
+++ b/crm-platform-feign/src/main/java/com/hz/crm/feign/FGroupActivityService.java
@@ -10,7 +10,7 @@
/**
* 杩欓噷杩欎釜name 闇�瑕佸～鍐� 璇锋眰鐨勬湇鍔℃彁渚涜�呯殑娉ㄥ唽鍒皀acos Server涓婇潰鐨勬湇鍔″悕锛宲ath 鏄姹傛帴鍙ｅ墠缂�
*/
-@FeignClient(name = "crm-platform-service", path = "/crm-platform", contextId = "crm-group-activity")
+@FeignClient(name = "crm-user", path = "/crm-platform", contextId = "crm-group-activity")
public interface FGroupActivityService {
/**涓撳尯鍒楄〃*/
diff --git a/crm-platform-feign/src/main/java/com/hz/crm/feign/FOderRefundService.java b/crm-platform-feign/src/main/java/com/hz/crm/feign/FOderRefundService.java
index f600b9d..211374e 100644
--- a/crm-platform-feign/src/main/java/com/hz/crm/feign/FOderRefundService.java
+++ b/crm-platform-feign/src/main/java/com/hz/crm/feign/FOderRefundService.java
@@ -9,7 +9,7 @@
/**
* 杩欓噷杩欎釜name 闇�瑕佸～鍐� 璇锋眰鐨勬湇鍔℃彁渚涜�呯殑娉ㄥ唽鍒皀acos Server涓婇潰鐨勬湇鍔″悕锛宲ath 鏄姹傛帴鍙ｅ墠缂�
*/
-@FeignClient(name="crm-platform-service",path = "/crm-platform",contextId = "crm-order-refund")
+@FeignClient(name="crm-user",path = "/crm-platform",contextId = "crm-order-refund")
public interface FOderRefundService {
@PostMapping(value = "/order/refund/refundAmount")
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 9c16821..5b343dc 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
@@ -15,7 +15,7 @@
/**
* 杩欓噷杩欎釜name 闇�瑕佸～鍐� 璇锋眰鐨勬湇鍔℃彁渚涜�呯殑娉ㄥ唽鍒皀acos Server涓婇潰鐨勬湇鍔″悕锛宲ath 鏄姹傛帴鍙ｅ墠缂�
*/
-@FeignClient(name="crm-platform-service",path = "/crm-platform",contextId = "crm-order")
+@FeignClient(name="crm-user",path = "/crm-platform",contextId = "crm-order")
public interface FOderService {
/**鍙栨秷璁㈠崟*/
diff --git a/crm-platform-feign/src/main/java/com/hz/crm/feign/FOldBrinNewService.java b/crm-platform-feign/src/main/java/com/hz/crm/feign/FOldBrinNewService.java
index 825f63d..6cde347 100644
--- a/crm-platform-feign/src/main/java/com/hz/crm/feign/FOldBrinNewService.java
+++ b/crm-platform-feign/src/main/java/com/hz/crm/feign/FOldBrinNewService.java
@@ -10,7 +10,7 @@
/**
* 杩欓噷杩欎釜name 闇�瑕佸～鍐� 璇锋眰鐨勬湇鍔℃彁渚涜�呯殑娉ㄥ唽鍒皀acos Server涓婇潰鐨勬湇鍔″悕锛宲ath 鏄姹傛帴鍙ｅ墠缂�
*/
-@FeignClient(name="crm-platform-service",path = "/crm-platform",contextId = "crm-oldBrinNew")
+@FeignClient(name="crm-user",path = "/crm-platform",contextId = "crm-oldBrinNew")
public interface FOldBrinNewService {
@PostMapping(value = "/oldBrinNew/give/integral")
diff --git a/crm-platform-feign/src/main/java/com/hz/crm/feign/FSyncPhisAppealTypeRelateService.java b/crm-platform-feign/src/main/java/com/hz/crm/feign/FSyncPhisAppealTypeRelateService.java
index a670a0b..f2f2783 100644
--- a/crm-platform-feign/src/main/java/com/hz/crm/feign/FSyncPhisAppealTypeRelateService.java
+++ b/crm-platform-feign/src/main/java/com/hz/crm/feign/FSyncPhisAppealTypeRelateService.java
@@ -11,7 +11,7 @@
* @USER: fhx
* @DATE: 2023/8/14
**/
-@FeignClient(name="crm-platform-service",path = "/crm-platform",contextId = "sync-phis-appeal-type-relate")
+@FeignClient(name="crm-user",path = "/crm-platform",contextId = "sync-phis-appeal-type-relate")
public interface FSyncPhisAppealTypeRelateService {
/** 鍒濆鏁版嵁 */
diff --git a/crm-platform-feign/src/main/java/com/hz/crm/feign/FUserService.java b/crm-platform-feign/src/main/java/com/hz/crm/feign/FUserService.java
index 3f74a8a..81a5290 100644
--- a/crm-platform-feign/src/main/java/com/hz/crm/feign/FUserService.java
+++ b/crm-platform-feign/src/main/java/com/hz/crm/feign/FUserService.java
@@ -9,7 +9,7 @@
/**
* 杩欓噷杩欎釜name 闇�瑕佸～鍐� 璇锋眰鐨勬湇鍔℃彁渚涜�呯殑娉ㄥ唽鍒皀acos Server涓婇潰鐨勬湇鍔″悕锛宲ath 鏄姹傛帴鍙ｅ墠缂�
*/
-@FeignClient(name="crm-platform-service",path = "/crm-platform",contextId = "crm-user")
+@FeignClient(name="crm-user",path = "/crm-platform",contextId = "crm-user")
public interface FUserService {
@PostMapping(value = "/user/info")
diff --git a/crm-platform-feign/src/main/java/com/hz/crm/feign/goods/FGoodsTypeService.java b/crm-platform-feign/src/main/java/com/hz/crm/feign/goods/FGoodsTypeService.java
index 18fb8f1..8ad88cb 100644
--- a/crm-platform-feign/src/main/java/com/hz/crm/feign/goods/FGoodsTypeService.java
+++ b/crm-platform-feign/src/main/java/com/hz/crm/feign/goods/FGoodsTypeService.java
@@ -11,7 +11,7 @@
* 杩欓噷杩欎釜name 闇�瑕佸～鍐� 璇锋眰鐨勬湇鍔℃彁渚涜�呯殑娉ㄥ唽鍒皀acos Server涓婇潰鐨勬湇鍔″悕锛宲ath 鏄姹傛帴鍙ｅ墠缂�
* @author CJH
*/
-@FeignClient(name="crm-platform-service",path = "/crm-platform",contextId = "crm-goods-type")
+@FeignClient(name="crm-user",path = "/crm-platform",contextId = "crm-goods-type")
public interface FGoodsTypeService {
/**
diff --git a/crm-platform-feign/src/main/java/com/hz/crm/feign/goods/FIntegralGoodsService.java b/crm-platform-feign/src/main/java/com/hz/crm/feign/goods/FIntegralGoodsService.java
index aa314cd..5fb77ff 100644
--- a/crm-platform-feign/src/main/java/com/hz/crm/feign/goods/FIntegralGoodsService.java
+++ b/crm-platform-feign/src/main/java/com/hz/crm/feign/goods/FIntegralGoodsService.java
@@ -12,7 +12,7 @@
* 杩欓噷杩欎釜name 闇�瑕佸～鍐� 璇锋眰鐨勬湇鍔℃彁渚涜�呯殑娉ㄥ唽鍒皀acos Server涓婇潰鐨勬湇鍔″悕锛宲ath 鏄姹傛帴鍙ｅ墠缂�
* @author CJH
*/
-@FeignClient(name="crm-platform-service",path = "/crm-platform",contextId = "crm-integral-goods")
+@FeignClient(name="crm-user",path = "/crm-platform",contextId = "crm-integral-goods")
public interface FIntegralGoodsService {
/**
--
Gitblit v1.8.0