From 13e8593a7c3bbcda4cbf2fe24d1f70129d8332af Mon Sep 17 00:00:00 2001
From: Guoqs <123@jsowell.com>
Date: Fri, 9 Aug 2024 16:19:07 +0800
Subject: [PATCH] =?UTF-8?q?=E6=B1=87=E4=BB=98=E5=9B=9E=E8=B0=83?=
MIME-Version: 1.0
Content-Type: text/plain; charset=UTF-8
Content-Transfer-Encoding: 8bit

---
 .../com/jsowell/api/uniapp/customer/PayController.java     | 3 ++-
 .../pile/service/impl/AdapayCallbackRecordServiceImpl.java | 7 ++++++-
 .../pile/service/impl/OrderBasicInfoServiceImpl.java       | 4 +++-
 3 files changed, 11 insertions(+), 3 deletions(-)

diff --git a/jsowell-admin/src/main/java/com/jsowell/api/uniapp/customer/PayController.java b/jsowell-admin/src/main/java/com/jsowell/api/uniapp/customer/PayController.java
index 0a71b2d0a..25c6236f8 100644
--- a/jsowell-admin/src/main/java/com/jsowell/api/uniapp/customer/PayController.java
+++ b/jsowell-admin/src/main/java/com/jsowell/api/uniapp/customer/PayController.java
@@ -348,7 +348,7 @@ public class PayController extends BaseController {
 	 * <a href="https://api.jsowellcloud.com/uniapp/pay/adapayCallback">...</a>
 	 */
 	@PostMapping("/adapayCallback")
-	public void adapayCallback(HttpServletRequest request) {
+	public RestApiResponse<?> adapayCallback(HttpServletRequest request) {
 		try {
 			orderService.adapayCallback(request);
 			// String type = request.getParameter("type");
@@ -356,6 +356,7 @@ public class PayController extends BaseController {
 		} catch (Exception e) {
 			logger.error("1汇付支付回调失败 error", e);
 		}
+		return new RestApiResponse<>();
 	}
 
 	/**
diff --git a/jsowell-pile/src/main/java/com/jsowell/pile/service/impl/AdapayCallbackRecordServiceImpl.java b/jsowell-pile/src/main/java/com/jsowell/pile/service/impl/AdapayCallbackRecordServiceImpl.java
index 7189a536c..a620c5191 100644
--- a/jsowell-pile/src/main/java/com/jsowell/pile/service/impl/AdapayCallbackRecordServiceImpl.java
+++ b/jsowell-pile/src/main/java/com/jsowell/pile/service/impl/AdapayCallbackRecordServiceImpl.java
@@ -1,5 +1,6 @@
 package com.jsowell.pile.service.impl;
 
+import com.alibaba.fastjson2.JSON;
 import com.google.common.collect.Maps;
 import com.jsowell.common.constant.CacheConstants;
 import com.jsowell.common.core.redis.RedisCache;
@@ -26,7 +27,11 @@ public class AdapayCallbackRecordServiceImpl implements AdapayCallbackRecordServ
 
     @Override
     public void saveAdapayCallbackRecord(AdapayCallbackRecord callbackRecord) {
-        adapayCallbackRecordMapper.insert(callbackRecord);
+        try {
+            adapayCallbackRecordMapper.insert(callbackRecord);
+        } catch (Exception e) {
+            log.error("saveAdapayCallbackRecord:{}, error", JSON.toJSONString(callbackRecord), e);
+        }
     }
 
     /**
diff --git a/jsowell-pile/src/main/java/com/jsowell/pile/service/impl/OrderBasicInfoServiceImpl.java b/jsowell-pile/src/main/java/com/jsowell/pile/service/impl/OrderBasicInfoServiceImpl.java
index 03d75867c..74d549849 100644
--- a/jsowell-pile/src/main/java/com/jsowell/pile/service/impl/OrderBasicInfoServiceImpl.java
+++ b/jsowell-pile/src/main/java/com/jsowell/pile/service/impl/OrderBasicInfoServiceImpl.java
@@ -3204,7 +3204,9 @@ public class OrderBasicInfoServiceImpl implements OrderBasicInfoService {
     public void retryRefundOrder(String orderCode) throws BaseAdaPayException {
         // 查询订单信息
         OrderBasicInfo orderBasicInfo = getOrderInfoByOrderCode(orderCode);
-        retryRefundOrder(orderBasicInfo);
+        if (orderBasicInfo != null) {
+            retryRefundOrder(orderBasicInfo);
+        }
     }
 
     @Override