From 80a4c4f2fc54358878fe08c4759352c848b1d957 Mon Sep 17 00:00:00 2001
From: Guoqs <123@jsowell.com>
Date: Thu, 18 Sep 2025 14:30:38 +0800
Subject: [PATCH] =?UTF-8?q?=E6=96=B0=E5=A2=9E=E8=BF=90=E8=90=A5=E5=95=86?=
 =?UTF-8?q?=EF=BC=8C=E6=B7=BB=E5=8A=A0alipayAppId?=
MIME-Version: 1.0
Content-Type: text/plain; charset=UTF-8
Content-Transfer-Encoding: 8bit

---
 .../main/java/com/jsowell/pile/dto/CreateMerchantDTO.java    | 5 +++++
 .../pile/service/impl/PileMerchantInfoServiceImpl.java       | 4 ++++
 2 files changed, 9 insertions(+)

diff --git a/jsowell-pile/src/main/java/com/jsowell/pile/dto/CreateMerchantDTO.java b/jsowell-pile/src/main/java/com/jsowell/pile/dto/CreateMerchantDTO.java
index 89cf62bb6..af81a95e4 100644
--- a/jsowell-pile/src/main/java/com/jsowell/pile/dto/CreateMerchantDTO.java
+++ b/jsowell-pile/src/main/java/com/jsowell/pile/dto/CreateMerchantDTO.java
@@ -72,6 +72,11 @@ public class CreateMerchantDTO {
      */
     private String appId;
 
+    /**
+     * 运营商的支付宝appId
+     */
+    private String alipayAppId;
+
     /**
      * 部门id
      */
diff --git a/jsowell-pile/src/main/java/com/jsowell/pile/service/impl/PileMerchantInfoServiceImpl.java b/jsowell-pile/src/main/java/com/jsowell/pile/service/impl/PileMerchantInfoServiceImpl.java
index f0953b055..0662cd6d2 100644
--- a/jsowell-pile/src/main/java/com/jsowell/pile/service/impl/PileMerchantInfoServiceImpl.java
+++ b/jsowell-pile/src/main/java/com/jsowell/pile/service/impl/PileMerchantInfoServiceImpl.java
@@ -163,13 +163,17 @@ public class PileMerchantInfoServiceImpl implements PileMerchantInfoService {
 
 		// 一级运营商取前端传来的appid，二级运营商取父级的appid
 		String appId;
+		String alipayAppId;
 		if (StringUtils.equals(dto.getMerchantLevel(), Constants.TWO)) {
 			PileMerchantInfo firstLevelMerchant = selectPileMerchantInfoById(Long.parseLong(dto.getParentId()));
 			appId = firstLevelMerchant.getAppId();
+			alipayAppId = firstLevelMerchant.getAlipayAppId();
 		} else {
 			appId = dto.getAppId();
+			alipayAppId = dto.getAlipayAppId();
 		}
 		dto.setAppId(appId);
+		dto.setAlipayAppId(alipayAppId);
 
 		PileMerchantInfo pileMerchantInfo = new PileMerchantInfo();
 		BeanUtils.copyProperties(dto, pileMerchantInfo);