From 0f638db757941ab42466286a8ff5d0532dc59e10 Mon Sep 17 00:00:00 2001
From: nickchange <126672920+nickchange@users.noreply.github.com>
Date: 星期五, 27 十月 2023 17:56:04 +0800
Subject: [PATCH] 10.27.5
---
cloud-server-competition/src/main/java/com/dsh/competition/service/impl/CompetitionServiceImpl.java | 27 +++++++++++++++++++++------
1 files changed, 21 insertions(+), 6 deletions(-)
diff --git a/cloud-server-competition/src/main/java/com/dsh/competition/service/impl/CompetitionServiceImpl.java b/cloud-server-competition/src/main/java/com/dsh/competition/service/impl/CompetitionServiceImpl.java
index 385c6c4..0e35e4b 100644
--- a/cloud-server-competition/src/main/java/com/dsh/competition/service/impl/CompetitionServiceImpl.java
+++ b/cloud-server-competition/src/main/java/com/dsh/competition/service/impl/CompetitionServiceImpl.java
@@ -10,6 +10,7 @@
import com.alipay.api.request.AlipayTradeOrderSettleRequest;
import com.alipay.api.request.AlipayTradeRoyaltyRelationBindRequest;
import com.alipay.api.response.AlipayTradeOrderSettleResponse;
+import com.alipay.api.response.AlipayTradeQueryResponse;
import com.alipay.api.response.AlipayTradeRoyaltyRelationBindResponse;
import com.baomidou.mybatisplus.core.conditions.query.QueryWrapper;
import com.baomidou.mybatisplus.extension.service.impl.ServiceImpl;
@@ -125,7 +126,18 @@
HashMap<String, Object> map = new HashMap<>();
Store store = storeClient.queryStoreById(Integer.valueOf(s));
map.put("name",store.getName());
- map.put("address",store.getAddress());
+
+
+ String str = store.getAddress();
+ str = str.substring(str.indexOf("省") + 1);
+
+ // 去掉第一个“市”及之前的字符串
+ str = str.substring(str.indexOf("市") + 1);
+
+ // 去掉第一个“区”及之前的字符串
+ str = str.substring(str.indexOf("区") + 1);
+
+ map.put("address",str);
map.put("storeLon",store.getLon());
map.put("storeLat",store.getLat());
map.put("storeCoverDrawing",store.getCoverDrawing());
@@ -385,17 +397,20 @@
if(paymentCompetition.getPayStatus() == 2){
break;
}
- ResultUtil<Map<String, String>> resultUtil = payMoneyUtil.queryALIOrder(code);
- if(resultUtil.getCode() == 200 && paymentCompetition.getPayStatus() == 1){
+ AlipayTradeQueryResponse resultUtil = payMoneyUtil.queryALIOrder(code);
+ if(resultUtil.getCode().equals("10000") && paymentCompetition.getPayStatus() == 1){
/**
* WAIT_BUYER_PAY（交易创建，等待买家付款）、
* TRADE_CLOSED（未付款交易超时关闭，或支付完成后全额退款）、
* TRADE_SUCCESS（交易支付成功）、
* TRADE_FINISHED（交易结束，不可退款）
*/
- Map<String, String> data1 = resultUtil.getData();
- String s = data1.get("tradeStatus");
- String tradeNo = data1.get("tradeNo");
+// Map<String, String> data1 = resultUtil.getData();
+// String s = data1.get("tradeStatus");
+// String tradeNo = data1.get("tradeNo");
+ String tradeNo = resultUtil.getTradeNo();
+ String s = resultUtil.getTradeStatus();
+
if("TRADE_CLOSED".equals(s) || "TRADE_FINISHED".equals(s) || num == 10){
paymentCompetition.setAppUserId(null);
paymentCompetition.setState(3);
--
Gitblit v1.7.1