From 5636a3b962bc19c4e46e67646c74018037ee8792 Mon Sep 17 00:00:00 2001
From: Pu Zhibing <393733352@qq.com>
Date: 星期二, 24 九月 2024 13:26:40 +0800
Subject: [PATCH] 修改bug
---
UserZYTravel/guns-admin/src/main/java/com/stylefeng/guns/modular/specialTrain/server/impl/OrderPrivateCarServiceImpl.java | 63 ++++++++++++--------
UserZYTravel/guns-admin/src/main/resources/application.yml | 3 -
UserZYTravel/guns-admin/src/main/java/com/stylefeng/guns/modular/taxi/service/impl/PaymentRecordServiceImpl.java | 12 ++-
UserZYTravel/guns-admin/src/test/java/com/stylefeng/guns/GunsApplicationTest.java | 48 ++++++++++++++++
UserZYTravel/guns-core/src/main/resources/default-config.properties | 2
UserZYTravel/guns-admin/src/main/java/com/stylefeng/guns/modular/system/util/PayMoneyUtil.java | 15 ++--
6 files changed, 102 insertions(+), 41 deletions(-)
diff --git a/UserZYTravel/guns-admin/src/main/java/com/stylefeng/guns/modular/specialTrain/server/impl/OrderPrivateCarServiceImpl.java b/UserZYTravel/guns-admin/src/main/java/com/stylefeng/guns/modular/specialTrain/server/impl/OrderPrivateCarServiceImpl.java
index b5ba225..0142c10 100644
--- a/UserZYTravel/guns-admin/src/main/java/com/stylefeng/guns/modular/specialTrain/server/impl/OrderPrivateCarServiceImpl.java
+++ b/UserZYTravel/guns-admin/src/main/java/com/stylefeng/guns/modular/specialTrain/server/impl/OrderPrivateCarServiceImpl.java
@@ -33,6 +33,7 @@
import org.springframework.http.HttpHeaders;
import org.springframework.http.MediaType;
import org.springframework.stereotype.Service;
+import org.springframework.transaction.annotation.Transactional;
import org.springframework.util.LinkedMultiValueMap;
import org.springframework.util.MultiValueMap;
import org.springframework.web.client.RestTemplate;
@@ -929,6 +930,10 @@
@Override
public ResultUtil payPrivateCarOrder(Integer payType, Integer orderId, Integer couponId, Integer type) throws Exception {
+ String value = redisUtil.getValue(orderId + "_status_1");
+ if(ToolUtil.isNotEmpty(value) && "8".equals(value)){
+ return ResultUtil.error("订单已完成支付，不允许重复支付", "");
+ }
OrderPrivateCar orderPrivateCar = this.selectById(orderId);
if(orderPrivateCar.getState() == 8 || orderPrivateCar.getState() == 9){
return ResultUtil.error("订单已完成支付，不允许重复支付", "");
@@ -936,8 +941,7 @@
if(orderPrivateCar.getState() != 7){
return ResultUtil.error("订单不在待支付状态，不允许支付", "");
}
- String code = orderId + "_1_" + UUIDUtil.getRandomCode(5);
- PaymentRecord query3 = paymentRecordService.query(1, null, null, orderId, 1, payType, null);
+ PaymentRecord query3 = paymentRecordService.query(1, null, null, orderId, 1, null, 1);
if(null != query3){
ResultUtil<Map<String, Object>> resultUtil1 = payMoneyUtil.queryWXOrder("", query3.getSerialNumber(), "JSAPI");
if (resultUtil1.getCode() == 200) {
@@ -956,12 +960,14 @@
String s = resultUtil1.getData().get("trade_state").toString();
if ("REFUND".equals(s) || "CLOSED".equals(s) || "REVOKED".equals(s) || "PAYERROR".equals(s)) {
payMoneyUtil.closeWXOrder(query3.getSerialNumber());
+ paymentRecordService.deleteById(query3.getId());
}
if ("SUCCESS".equals(s) || "ACCEPT".equals(s)) {
return ResultUtil.error("不允许重复支付");
}
if ("NOTPAY".equals(s) || "USERPAYING".equals(s)) {
payMoneyUtil.closeWXOrder(query3.getSerialNumber());
+ paymentRecordService.deleteById(query3.getId());
}
}
}
@@ -980,7 +986,7 @@
UserCouponRecord userCouponRecord = null;
if(null != couponId){
userCouponRecord = userCouponRecordService.selectById(couponId);
- if(userCouponRecord.getCompanyId() != orderPrivateCar.getCompanyId()){
+ if(userCouponRecord.getCompanyId().compareTo(orderPrivateCar.getCompanyId()) != 0){
return ResultUtil.error("优惠券不能用于此订单", "");
}
if(userCouponRecord.getState() == 2){
@@ -1027,19 +1033,18 @@
if(ToolUtil.isEmpty(userInfo.getAppletsOpenId())){
return ResultUtil.error("未授权微信，无法完成支付");
}
+ String code = orderId + "_1_" + UUIDUtil.getRandomCode(5);
if(payType == 1){//微信支付
resultUtil = payMoneyUtil.weixinpay("完成订单",orderId +"", code,orderMoney+"","/base/wxPayOrderTaxi","JSAPI",userInfo.getAppletsOpenId());
if(resultUtil.getCode()==200){
- paymentRecordService.saveData(1, null, null, orderId, 1, 1, orderMoney, null, 1, code);//添加预支付数据
+ paymentRecordService.saveData(1, orderPrivateCar.getUserId(), 1, orderId, 1, 1, orderMoney, null, 1, code);//添加预支付数据
new Thread(()->{
- int num = 1;
- int min = 5000;
- int w = 0;
- while (num <= 10) {
+ long time = orderPrivateCar.getInsertTime().getTime();
+ //订单创建后15分钟
+ while (System.currentTimeMillis() - time <= 900000) {
try {
- w += min * num;
- OrderPrivateCar orderPrivateCar1 = orderPrivateCarMapper.selectById(orderId);
- if (orderPrivateCar1.getState() != 7) {
+ String value1 = redisUtil.getValue(orderId + "_status_1");
+ if(ToolUtil.isNotEmpty(value1) && "8".equals(value1)){
break;
}
ResultUtil<Map<String, Object>> resultUtil2 = payMoneyUtil.queryWXOrder("", code, "JSAPI");
@@ -1055,7 +1060,7 @@
* ACCEPT--已接收，等待扣款
*/
String s = resultUtil2.getData().get("trade_state").toString();
- if ("REFUND".equals(s) || "CLOSED".equals(s) || "REVOKED".equals(s) || "PAYERROR".equals(s) || num == 10) {
+ if ("REFUND".equals(s) || "CLOSED".equals(s) || "REVOKED".equals(s) || "PAYERROR".equals(s)) {
break;
}
if ("SUCCESS".equals(s) || "ACCEPT".equals(s)) {
@@ -1064,15 +1069,20 @@
break;
}
if ("NOTPAY".equals(s) || "USERPAYING".equals(s)) {
- Thread.sleep(w);
- num++;
}
- } else {
- Thread.sleep(w);
- num++;
}
+ Thread.sleep(5000);
}catch (Exception e){
e.printStackTrace();
+ }
+ }
+ String value1 = redisUtil.getValue(orderId + "_status_1");
+ if(ToolUtil.isNotEmpty(value1) && "7".equals(value1)){
+ //关闭订单，不允许支付
+ payMoneyUtil.closeWXOrder(code);
+ PaymentRecord paymentRecord = paymentRecordService.selectOne(new EntityWrapper<PaymentRecord>().eq("serialNumber", code));
+ if(null != paymentRecord){
+ paymentRecordService.deleteById(paymentRecord.getId());
}
}
}).start();
@@ -1084,7 +1094,7 @@
if(payType == 2) {//支付宝支付
resultUtil = payMoneyUtil.alipay("完成订单","完成订单", "",code,orderMoney+"","/base/aliPayOrderTaxi");
if (resultUtil.getCode()==200) {
- paymentRecordService.saveData(1, null, null, orderId, 1, 2, orderMoney, null, 1, code);//添加预支付数据
+ paymentRecordService.saveData(1, orderPrivateCar.getUserId(), 1, orderId, 1, 2, orderMoney, null, 1, code);//添加预支付数据
} else {
resultUtil = ResultUtil.error("支付失败", "");
}
@@ -1314,14 +1324,16 @@
}
@Override
- public void payOrderPrivateCarCallback(Integer id, String order_id, Integer type) throws Exception {
- OrderPrivateCar orderPrivateCar = this.selectById(id);
- if(orderPrivateCar.getState() != 7){
- return;
- }
- PaymentRecord query = paymentRecordService.query(1, null, null, Integer.valueOf(id), 1, type, 1);
+ @Transactional(rollbackFor = Exception.class)
+ public synchronized void payOrderPrivateCarCallback(Integer id, String order_id, Integer type) throws Exception {
+ PaymentRecord query = paymentRecordService.query(1, null, null, Integer.valueOf(id), 1, type, null);
if(null != query){
+ String value = redisUtil.getValue(order_id + "_status_1");
+ if(ToolUtil.isNotEmpty(value) && "8".equals(value)){
+ return;
+ }
//添加交易明细
+ OrderPrivateCar orderPrivateCar = this.selectById(id);
transactionDetailsService.saveData(orderPrivateCar.getUserId(), "完成订单", query.getAmount(), 2, 1, 1, 1, query.getOrderId());
orderPrivateCar.setState(8);
orderPrivateCar.setPayType(type);
@@ -1348,10 +1360,11 @@
userRedPacketRecordService.updateById(userRedPacketRecord);
}
-
query.setState(2);
query.setCode(order_id);
paymentRecordService.updateById(query);
+ redisUtil.setStrValue(order_id + "_status_1", "8");
+
if(orderPrivateCar.getIsplatPay()==1){
//添加已收入明细
Company company = companyService.selectById(orderPrivateCar.getCompanyId());
diff --git a/UserZYTravel/guns-admin/src/main/java/com/stylefeng/guns/modular/system/util/PayMoneyUtil.java b/UserZYTravel/guns-admin/src/main/java/com/stylefeng/guns/modular/system/util/PayMoneyUtil.java
index 30f0fc0..eb2213c 100644
--- a/UserZYTravel/guns-admin/src/main/java/com/stylefeng/guns/modular/system/util/PayMoneyUtil.java
+++ b/UserZYTravel/guns-admin/src/main/java/com/stylefeng/guns/modular/system/util/PayMoneyUtil.java
@@ -345,8 +345,9 @@
//将结果xml解析成map
body1 = body1.replaceAll("<!\\[CDATA\\[","");
body1 = body1.replaceAll("]]>", "");
+ System.err.println("调起支付结果-------------->" + body1);
try {
- map1 = this.xmlToMap(body1, "UTF-8");
+ map1 = PayMoneyUtil.xmlToMap(body1, "UTF-8");
} catch (UnsupportedEncodingException e) {
e.printStackTrace();
} catch (DocumentException e) {
@@ -366,7 +367,7 @@
map2.put("nonceStr", map1.get("nonce_str"));
map2.put("package", "prepay_id=" + prepay_id);
map2.put("signType", "MD5");
- map2.put("timeStamp", new Date().getTime() + "");
+ map2.put("timeStamp", System.currentTimeMillis() + "");
String s2 = this.weixinSignature(map2);
map2.put("prepay_id", prepay_id);
@@ -386,7 +387,7 @@
map3.put("package", "Sign=WXPay");
map3.put("partnerid", mchId);
map3.put("prepayid", prepay_id);
- map3.put("timestamp", new Date().getTime() / 1000);
+ map3.put("timestamp", System.currentTimeMillis() / 1000);
String s1 = this.weixinSignature(map3);
map3.put("sign", s1);
System.err.println(map3);
@@ -394,11 +395,11 @@
}
return null;
}else{
- System.err.println(map1.get("err_code_des"));
+ System.err.println("调起支付异常-------------->" + map1.get("err_code_des"));
return ResultUtil.error(map1.get("err_code_des"));
}
}else{//签名错误，请检查后再试1----1602881362
- System.err.println(map1.get("return_msg") + appid + "----" + mchId);
+ System.err.println("调起支付异常-------------->" + map1.get("return_msg") + appid + "----" + mchId);
return ResultUtil.error(map1.get("return_msg"), new JSONObject());
}
}
@@ -416,7 +417,7 @@
String param = this.getParam(request);
param = param.replaceAll("<!\\[CDATA\\[","");
param = param.replaceAll("]]>", "");
- Map<String, String> map = this.xmlToMap(param, "UTF-8");
+ Map<String, String> map = PayMoneyUtil.xmlToMap(param, "UTF-8");
String return_code = map.get("return_code");
if("SUCCESS".equals(return_code)){
String result_code = map.get("result_code");
@@ -819,7 +820,7 @@
body1 = body1.replaceAll("<!\\[CDATA\\[","");
body1 = body1.replaceAll("]]>", "");
try {
- map1 = this.xmlToMap(body1, "UTF-8");
+ map1 = PayMoneyUtil.xmlToMap(body1, "UTF-8");
} catch (UnsupportedEncodingException e) {
e.printStackTrace();
} catch (DocumentException e) {
diff --git a/UserZYTravel/guns-admin/src/main/java/com/stylefeng/guns/modular/taxi/service/impl/PaymentRecordServiceImpl.java b/UserZYTravel/guns-admin/src/main/java/com/stylefeng/guns/modular/taxi/service/impl/PaymentRecordServiceImpl.java
index 3948088..6222a56 100644
--- a/UserZYTravel/guns-admin/src/main/java/com/stylefeng/guns/modular/taxi/service/impl/PaymentRecordServiceImpl.java
+++ b/UserZYTravel/guns-admin/src/main/java/com/stylefeng/guns/modular/taxi/service/impl/PaymentRecordServiceImpl.java
@@ -1,6 +1,7 @@
package com.stylefeng.guns.modular.taxi.service.impl;
import com.baomidou.mybatisplus.service.impl.ServiceImpl;
+import com.stylefeng.guns.modular.system.util.RedisUtil;
import com.stylefeng.guns.modular.taxi.dao.PaymentRecordMapper;
import com.stylefeng.guns.modular.taxi.model.PaymentRecord;
import com.stylefeng.guns.modular.taxi.service.IPaymentRecordService;
@@ -15,6 +16,9 @@
@Resource
private PaymentRecordMapper paymentRecordMapper;
+
+ @Resource
+ private RedisUtil redisUtil;
@@ -31,11 +35,6 @@
@Override
public Integer saveData(Integer category, Integer userId, Integer type, Integer orderId, Integer orderType, Integer payType,
Double amount, String code, Integer state, String serialNumber) throws Exception {
- //先删除现有数据避免重复
- PaymentRecord query = paymentRecordMapper.query(category, userId, type, orderId, orderType, payType, state);
- if(null != query){
- this.deleteById(query.getId());
- }
PaymentRecord paymentRecord = new PaymentRecord();
paymentRecord.setCategory(category);
paymentRecord.setUserId(userId);
@@ -49,6 +48,9 @@
paymentRecord.setInsertTime(new Date());
paymentRecord.setSerialNumber(serialNumber);
this.insert(paymentRecord);
+ if(state == 1){
+ redisUtil.setStrValue(orderId + "_status_" + orderType, "7", 3600);
+ }
return paymentRecord.getId();
}
diff --git a/UserZYTravel/guns-admin/src/main/resources/application.yml b/UserZYTravel/guns-admin/src/main/resources/application.yml
index 142a295..8ebc582 100644
--- a/UserZYTravel/guns-admin/src/main/resources/application.yml
+++ b/UserZYTravel/guns-admin/src/main/resources/application.yml
@@ -31,9 +31,6 @@
mybatis-plus:
typeAliasesPackage: com.stylefeng.guns.modular
-log:
- path: guns-logs
-
eureka:
client:
service-url: #注册中心地址
diff --git a/UserZYTravel/guns-admin/src/test/java/com/stylefeng/guns/GunsApplicationTest.java b/UserZYTravel/guns-admin/src/test/java/com/stylefeng/guns/GunsApplicationTest.java
new file mode 100644
index 0000000..684fb1d
--- /dev/null
+++ b/UserZYTravel/guns-admin/src/test/java/com/stylefeng/guns/GunsApplicationTest.java
@@ -0,0 +1,48 @@
+//package com.stylefeng.guns;
+//
+//import com.stylefeng.guns.modular.system.util.PayMoneyUtil;
+//import com.stylefeng.guns.modular.system.util.ResultUtil;
+//import org.junit.Test;
+//import org.junit.runner.RunWith;
+//import org.springframework.beans.factory.annotation.Autowired;
+//import org.springframework.boot.test.context.SpringBootTest;
+//import org.springframework.test.context.junit4.SpringRunner;
+//
+//import java.util.Map;
+//
+///**
+// * @author zhibing.pu
+// * @Date 2024/9/24 9:24
+// */
+//@RunWith(SpringRunner.class)
+//@SpringBootTest
+//public class GunsApplicationTest {
+//
+// @Autowired
+// private PayMoneyUtil payMoneyUtil;
+//
+//
+// @Test
+// public void test(){
+// try {
+// ResultUtil<Map<String, Object>> resultUtil1 = payMoneyUtil.queryWXOrder("", "37551_1_74ed0", "JSAPI");
+// if (resultUtil1.getCode() == 200) {
+// /**
+// * SUCCESS--支付成功
+// * REFUND--转入退款
+// * NOTPAY--未支付
+// * CLOSED--已关闭
+// * REVOKED--已撤销(刷卡支付)
+// * USERPAYING--用户支付中
+// * PAYERROR--支付失败(其他原因，如银行返回失败)
+// * ACCEPT--已接收，等待扣款
+// */
+// System.err.println(resultUtil1.getData());
+// }
+//
+//// payMoneyUtil.closeWXOrder("37551_1_74ed0");
+// } catch (Exception e) {
+// throw new RuntimeException(e);
+// }
+// }
+//}
diff --git a/UserZYTravel/guns-core/src/main/resources/default-config.properties b/UserZYTravel/guns-core/src/main/resources/default-config.properties
index 8d458f7..3166d4a 100644
--- a/UserZYTravel/guns-core/src/main/resources/default-config.properties
+++ b/UserZYTravel/guns-core/src/main/resources/default-config.properties
@@ -22,7 +22,7 @@
# \u5F00\u542F\u7684\u8BDD\uFF0C\u5EF6\u65F6\u52A0\u8F7D\u4E00\u4E2A\u5C5E\u6027\u65F6\u4F1A\u52A0\u8F7D\u8BE5\u5BF9\u8C61\u5168\u90E8\u5C5E\u6027\uFF0C\u5426\u5219\u6309\u9700\u52A0\u8F7D\u5C5E\u6027
mybatis-plus.configuration.multipleResultSetsEnabled=true
# \u6253\u5370sql\u8BED\u53E5,\u8C03\u8BD5\u7528
-mybatis-plus.configuration.log-impl=org.apache.ibatis.logging.stdout.StdOutImpl
+#mybatis-plus.configuration.log-impl=org.apache.ibatis.logging.stdout.StdOutImpl
########################## beetl\u9ED8\u8BA4\u914D\u7F6E ###########################
--
Gitblit v1.7.1