update

jsowell-admin/src/main/java/com/jsowell/service/OrderService.java

@@ -912,8 +912,6 @@ public class OrderService {
 		String data = request.getParameter("data");
 		//验签请参sign
 		String sign = request.getParameter("sign");
-		// type
-		String type = request.getParameter("type");
 
 		//验签请参publicKey
 		String publicKey = AdapayCore.PUBLIC_KEY;
@@ -925,12 +923,15 @@ public class OrderService {
 			return;
 		}
 
+		// type
+		String type = request.getParameter("type");
+		// 根据type执行不同逻辑
 		if (AdapayEventEnum.payment_succeeded.getValue().equals(type)) {
 			// 支付成功
 			paymentSucceeded(data);
 		} else if (AdapayEventEnum.refund_succeeded.getValue().equals(type)) {
 			// 退款成功
-			adapayRefundRecordService.saveAdapayRefundRecord(data);
+			refundSucceeded(data);
 		} else if (AdapayEventEnum.corp_member_failed.getValue().equals(type)) {
 			// 开户失败 删除
 			corpMemberFailed(data);
@@ -941,7 +942,6 @@ public class OrderService {
 			// 支付撤销成功
 
 		}
-
 	}
 
 	/**
@@ -1012,7 +1012,14 @@ public class OrderService {
 			dto.setUpdatePrincipalBalance(amount);
 			memberBasicInfoService.updateMemberBalance(dto);
 		}
+	}
 
+	/**
+	 * 汇付退款成功
+	 */
+	private void refundSucceeded(String data) {
+		// 保存退款回调记录
+		adapayRefundRecordService.saveAdapayRefundRecord(data);
 	}
 
 	/**
@@ -1051,26 +1058,4 @@ public class OrderService {
 		adapayMemberAccountService.updateAdapayMemberAccountByMemberId(adapayMemberAccount);
 	}
 
-	/**
-	 * 汇付支付 退款回调
-	 * @param request
-	 * @throws Exception
-	 */
-	public void adapayRefundCallback(HttpServletRequest request) throws Exception {
-		//验签请参data
-		String data = request.getParameter("data");
-		//验签请参sign
-		String sign = request.getParameter("sign");
-		//验签请参publicKey
-		String publicKey = AdapayCore.PUBLIC_KEY;
-		log.info("汇付支付退款回调验签请参data={}, sign={}", data, sign);
-		//验签标记
-		boolean checkSign = AdapaySign.verifySign(data, sign, publicKey);
-		if (!checkSign) {
-			log.info("汇付支付退款回调验签失败:{}", data);
-			return;
-		}
-		adapayRefundRecordService.saveAdapayRefundRecord(data);
-	}
-
 }