From 7f2749f8bb57290104636f50de4824ad1f13cdd5 Mon Sep 17 00:00:00 2001
From: k94314517 <8417338+k94314517@user.noreply.gitee.com>
Date: 星期三, 08 十一月 2023 10:40:12 +0800
Subject: [PATCH] 111
---
server/services/src/main/java/com/doumee/core/wx/WxMiniUtilService.java | 19 ++++++++++++++++---
server/web/src/main/java/com/doumee/api/web/BusinessApi.java | 3 +++
server/web/src/main/java/com/doumee/api/web/HomeApi.java | 1 +
server/services/src/main/java/com/doumee/core/constants/Constants.java | 14 +++++++-------
server/web/pom.xml | 4 ++++
server/services/src/main/java/com/doumee/core/annotation/pr/PreventRepeat.java | 2 +-
server/services/src/main/java/com/doumee/service/business/impl/GoodsorderServiceImpl.java | 1 -
server/services/src/main/java/com/doumee/core/annotation/pr/PreventRepeatDefaultHandler.java | 6 ++++++
8 files changed, 38 insertions(+), 12 deletions(-)
diff --git a/server/services/src/main/java/com/doumee/core/annotation/pr/PreventRepeat.java b/server/services/src/main/java/com/doumee/core/annotation/pr/PreventRepeat.java
index bbc4f98..016e94f 100644
--- a/server/services/src/main/java/com/doumee/core/annotation/pr/PreventRepeat.java
+++ b/server/services/src/main/java/com/doumee/core/annotation/pr/PreventRepeat.java
@@ -20,7 +20,7 @@
/**
* 闂撮殧鏃堕棿(ms)锛屽皬浜庢鏃堕棿瑙嗕负閲嶅鎻愪氦
*/
- int interval() default 800;
+ int interval() default 2000;
/**
* 閿欒娑堟伅
diff --git a/server/services/src/main/java/com/doumee/core/annotation/pr/PreventRepeatDefaultHandler.java b/server/services/src/main/java/com/doumee/core/annotation/pr/PreventRepeatDefaultHandler.java
index dc0d0fb..df35095 100644
--- a/server/services/src/main/java/com/doumee/core/annotation/pr/PreventRepeatDefaultHandler.java
+++ b/server/services/src/main/java/com/doumee/core/annotation/pr/PreventRepeatDefaultHandler.java
@@ -3,6 +3,7 @@
import com.doumee.core.model.LoginUserInfo;
import com.doumee.core.utils.Utils;
import lombok.extern.slf4j.Slf4j;
+import org.apache.commons.lang3.StringUtils;
import org.apache.shiro.SecurityUtils;
import org.springframework.stereotype.Component;
import org.springframework.util.DigestUtils;
@@ -33,6 +34,10 @@
if(user !=null){
signString.append("loginuserId").append("=").append(user.getId()).append(";");
}
+ String apiToken = String.valueOf(request.getHeader("token"));
+ if(StringUtils.isNotBlank(apiToken)){
+ signString.append("apiToken").append("=").append(apiToken).append(";");
+ }
// 鍙傛暟绛惧悕
return DigestUtils.md5DigestAsHex(signString.toString().getBytes());
}
@@ -46,6 +51,7 @@
HashMap<String, Object> paramMap = new HashMap<>();
paramMap.put("REQUEST_URI", request.getRequestURI());
paramMap.put("USER_TOKEN", String.valueOf(request.getHeader("eva-auth-token")));
+ paramMap.put("API_TOKEN", String.valueOf(request.getHeader("token")));
paramMap.put("IP", Utils.User_Client.getIP(request));
return paramMap;
}
diff --git a/server/services/src/main/java/com/doumee/core/constants/Constants.java b/server/services/src/main/java/com/doumee/core/constants/Constants.java
index 4aace47..62e26cf 100644
--- a/server/services/src/main/java/com/doumee/core/constants/Constants.java
+++ b/server/services/src/main/java/com/doumee/core/constants/Constants.java
@@ -88,11 +88,11 @@
//浜ゆ槗绫诲瀷 0绉熻溅鎶奸噾 1缁撶畻瀹為檯娑堣垂 2缁撶畻閫�娆� 3骞冲彴閫�娆�"
DEPOSIT(0,"绉熻溅鎶奸噾", "绉熻溅鎶奸噾"),
- CONSUMPTION(1,"缁撶畻瀹為檯娑堣垂", "缁撶畻瀹為檯娑堣垂"),
+ CONSUMPTION(1,"璁㈠崟娑堣垂缁撶畻", "璁㈠崟娑堣垂缁撶畻"),
- REFUND(2,"缁撶畻閫�娆�", "缁撶畻閫�娆�"),
+ REFUND(2,"缁撶畻閫�鎶奸噾", "缁撶畻閫�鎶奸噾"),
- PLATFORMREFUND(3,"骞冲彴閫�娆�", "骞冲彴閫�娆�")
+ PLATFORMREFUND(3,"骞冲彴閫�鎶奸噾", "骞冲彴閫�鎶奸噾")
;
String name;
@@ -335,13 +335,13 @@
public enum REFUND_TYPE{
// '閫�娆剧被鍨� 0鐢ㄦ埛缁撶畻閫�娆� 1骞冲彴鑷姩缁撶畻閫�娆� 2寮哄埗缁撶畻閫�娆� 3缁撶畻鍚庨��娆�'
- NORMAL( 0,"鐢ㄦ埛缁撶畻閫�娆�",""),
+ NORMAL( 0,"鐢ㄦ埛缁撶畻閫�娆�","缁撶畻閫�鎶奸噾"),
- PLAT_AUTO( 1,"骞冲彴鑷姩缁撶畻閫�娆�",""),
+ PLAT_AUTO( 1,"骞冲彴鑷姩缁撶畻閫�娆�","骞冲彴閫�鎶奸噾"),
- PLAT_FORCE( 2,"寮哄埗缁撶畻閫�娆�",""),
+ PLAT_FORCE( 2,"寮哄埗缁撶畻閫�娆�","骞冲彴閫�鎶奸噾"),
- BACK( 3,"缁撶畻鍚庨��娆�",""),
+ BACK( 3,"缁撶畻鍚庨��娆�","骞冲彴閫�娆�"),
;
String name;
diff --git a/server/services/src/main/java/com/doumee/core/wx/WxMiniUtilService.java b/server/services/src/main/java/com/doumee/core/wx/WxMiniUtilService.java
index 72ee3f6..aec7924 100644
--- a/server/services/src/main/java/com/doumee/core/wx/WxMiniUtilService.java
+++ b/server/services/src/main/java/com/doumee/core/wx/WxMiniUtilService.java
@@ -78,12 +78,25 @@
transactions.setIsdeleted(Constants.ZERO);
transactions.setOrderId(refundDTO.getOrderId());
transactions.setMoney(refundDTO.getRefundAmount());
- transactions.setType(refundDTO.getType()==Constants.TRANSACTIONS_TYPE.REFUND.getKey()?Constants.TRANSACTIONS_TYPE.PLATFORMREFUND.getKey():Constants.REFUND_TYPE.BACK.getKey());
transactions.setPreOrderid(refundDTO.getOrderId());
transactions.setOnlineOrderid(refNum);
transactions.setDoneDate(new Date());
- transactions.setTitle(Constants.TRANSACTIONS_TYPE.get(transactions.getType()).getName());
- transactions.setContent(Constants.TRANSACTIONS_TYPE.get(transactions.getType()).getInfo());
+ if(refund.getType().equals(Constants.REFUND_TYPE.PLAT_AUTO.getKey())||refund.getType().equals(Constants.REFUND_TYPE.PLAT_FORCE.getKey())){
+ //骞冲彴鑷姩閫�娆� 鎴� 寮哄埗閫�娆�
+ transactions.setType(Constants.TRANSACTIONS_TYPE.REFUND.getKey());
+ transactions.setTitle(Constants.REFUND_TYPE.PLAT_AUTO.getInfo());
+ transactions.setContent(Constants.REFUND_TYPE.PLAT_AUTO.getInfo());
+ }else if(refund.getType().equals(Constants.REFUND_TYPE.NORMAL.getKey())){
+ //鐢ㄦ埛涓诲姩閫�娆�
+ transactions.setType(Constants.TRANSACTIONS_TYPE.REFUND.getKey());
+ transactions.setTitle(Constants.REFUND_TYPE.NORMAL.getInfo());
+ transactions.setContent(Constants.REFUND_TYPE.NORMAL.getInfo());
+ }else if(refund.getType().equals(Constants.REFUND_TYPE.BACK.getKey())){
+ //缁撶畻鍚庨��娆�
+ transactions.setType(Constants.TRANSACTIONS_TYPE.REFUND.getKey());
+ transactions.setTitle(Constants.REFUND_TYPE.BACK.getInfo());
+ transactions.setContent(Constants.REFUND_TYPE.BACK.getInfo());
+ }
transactions.setBalance(BigDecimal.ZERO);
transactions.setObjId(refund.getId());
transactions.setObjType(Constants.ONE);
diff --git a/server/services/src/main/java/com/doumee/service/business/impl/GoodsorderServiceImpl.java b/server/services/src/main/java/com/doumee/service/business/impl/GoodsorderServiceImpl.java
index 3c2fab6..ae43981 100644
--- a/server/services/src/main/java/com/doumee/service/business/impl/GoodsorderServiceImpl.java
+++ b/server/services/src/main/java/com/doumee/service/business/impl/GoodsorderServiceImpl.java
@@ -477,7 +477,6 @@
@Override
public void closeGoodsorder( Goodsorder goodsorder ,int type ) {
-//
List<MemberRides> memberRides = getMemberRidesForClose(goodsorder.getId());
//榛樿缁撶畻涓烘娂閲戦噾棰�
BigDecimal closeMoney = new BigDecimal(0.00);
diff --git a/server/web/pom.xml b/server/web/pom.xml
index 83b8027..3943280 100644
--- a/server/web/pom.xml
+++ b/server/web/pom.xml
@@ -20,6 +20,10 @@
<artifactId>services</artifactId>
<version>1.0.0-SNAPSHOT</version>
</dependency>
+ <dependency>
+ <groupId>org.springframework.boot</groupId>
+ <artifactId>spring-boot-starter-aop</artifactId>
+ </dependency>
</dependencies>
<build>
diff --git a/server/web/src/main/java/com/doumee/api/web/BusinessApi.java b/server/web/src/main/java/com/doumee/api/web/BusinessApi.java
index 30b5a99..550897a 100644
--- a/server/web/src/main/java/com/doumee/api/web/BusinessApi.java
+++ b/server/web/src/main/java/com/doumee/api/web/BusinessApi.java
@@ -1,5 +1,6 @@
package com.doumee.api.web;
+import com.doumee.api.Repeat.RepeatSubmit;
import com.doumee.biz.system.SystemDictDataBiz;
import com.doumee.core.annotation.LoginRequired;
import com.doumee.core.annotation.pr.PreventRepeat;
@@ -59,6 +60,7 @@
@Autowired
private SystemDictDataBiz systemDictDataBiz;
+ @PreventRepeat
@LoginRequired
@ApiOperation(value = "鎶奸噾鏀粯", notes = "灏忕▼搴忕")
@GetMapping("/createGoodsOrderPay")
@@ -145,6 +147,7 @@
}
+ @PreventRepeat
@LoginRequired
@ApiOperation(value = "鎵爜瑙ｉ攣", notes = "灏忕▼搴忕")
@GetMapping("/openLock")
diff --git a/server/web/src/main/java/com/doumee/api/web/HomeApi.java b/server/web/src/main/java/com/doumee/api/web/HomeApi.java
index 4754edc..5428d6a 100644
--- a/server/web/src/main/java/com/doumee/api/web/HomeApi.java
+++ b/server/web/src/main/java/com/doumee/api/web/HomeApi.java
@@ -1,6 +1,7 @@
package com.doumee.api.web;
import com.doumee.core.annotation.LoginRequired;
+import com.doumee.core.annotation.pr.PreventRepeat;
import com.doumee.core.annotation.trace.Trace;
import com.doumee.core.model.ApiResponse;
import com.doumee.dao.business.web.response.HomeResponse;
--
Gitblit v1.9.3