mirror of
https://codeup.aliyun.com/67c68d4e484ca2f0a13ac3c1/ydc/jsowell-charger-web.git
synced 2026-06-29 19:47:56 +08:00
新增运营商,添加alipayAppId
This commit is contained in:
@@ -72,6 +72,11 @@ public class CreateMerchantDTO {
|
|||||||
*/
|
*/
|
||||||
private String appId;
|
private String appId;
|
||||||
|
|
||||||
|
/**
|
||||||
|
* 运营商的支付宝appId
|
||||||
|
*/
|
||||||
|
private String alipayAppId;
|
||||||
|
|
||||||
/**
|
/**
|
||||||
* 部门id
|
* 部门id
|
||||||
*/
|
*/
|
||||||
|
|||||||
@@ -163,13 +163,17 @@ public class PileMerchantInfoServiceImpl implements PileMerchantInfoService {
|
|||||||
|
|
||||||
// 一级运营商取前端传来的appid,二级运营商取父级的appid
|
// 一级运营商取前端传来的appid,二级运营商取父级的appid
|
||||||
String appId;
|
String appId;
|
||||||
|
String alipayAppId;
|
||||||
if (StringUtils.equals(dto.getMerchantLevel(), Constants.TWO)) {
|
if (StringUtils.equals(dto.getMerchantLevel(), Constants.TWO)) {
|
||||||
PileMerchantInfo firstLevelMerchant = selectPileMerchantInfoById(Long.parseLong(dto.getParentId()));
|
PileMerchantInfo firstLevelMerchant = selectPileMerchantInfoById(Long.parseLong(dto.getParentId()));
|
||||||
appId = firstLevelMerchant.getAppId();
|
appId = firstLevelMerchant.getAppId();
|
||||||
|
alipayAppId = firstLevelMerchant.getAlipayAppId();
|
||||||
} else {
|
} else {
|
||||||
appId = dto.getAppId();
|
appId = dto.getAppId();
|
||||||
|
alipayAppId = dto.getAlipayAppId();
|
||||||
}
|
}
|
||||||
dto.setAppId(appId);
|
dto.setAppId(appId);
|
||||||
|
dto.setAlipayAppId(alipayAppId);
|
||||||
|
|
||||||
PileMerchantInfo pileMerchantInfo = new PileMerchantInfo();
|
PileMerchantInfo pileMerchantInfo = new PileMerchantInfo();
|
||||||
BeanUtils.copyProperties(dto, pileMerchantInfo);
|
BeanUtils.copyProperties(dto, pileMerchantInfo);
|
||||||
|
|||||||
Reference in New Issue
Block a user