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);