Authored by qinchao

fix alipay id

@@ -206,7 +206,7 @@ public class StoredSellerDepositServiceImpl implements IStoredSellerDepositServi @@ -206,7 +206,7 @@ public class StoredSellerDepositServiceImpl implements IStoredSellerDepositServi
206 throw new UfoServiceException(400,"商户存在出售中商品,不允许退驻!"); 206 throw new UfoServiceException(400,"商户存在出售中商品,不允许退驻!");
207 } 207 }
208 208
209 - String aliPayAccount = getAlipayAccount(uid); 209 + String aliPayAccount = getAlipayIDOrAccount(uid);
210 if(StringUtils.isBlank(aliPayAccount)){ 210 if(StringUtils.isBlank(aliPayAccount)){
211 logger.error("quitStoredSeller not allowed cause of aliPayAccount is blank ,uid {}" ,uid); 211 logger.error("quitStoredSeller not allowed cause of aliPayAccount is blank ,uid {}" ,uid);
212 throw new UfoServiceException(400,"支付宝账号未绑定,不允许退驻!"); 212 throw new UfoServiceException(400,"支付宝账号未绑定,不允许退驻!");
@@ -272,12 +272,18 @@ public class StoredSellerDepositServiceImpl implements IStoredSellerDepositServi @@ -272,12 +272,18 @@ public class StoredSellerDepositServiceImpl implements IStoredSellerDepositServi
272 272
273 273
274 @SuppressWarnings("unchecked") 274 @SuppressWarnings("unchecked")
275 - private String getAlipayAccount(int targetUid) { 275 + private String getAlipayIDOrAccount(int targetUid) {
276 ApiResponse<AuthorizeResultRespVO> resp = ufoServiceCaller.call("ufo.user.aliPayAccountQuery", ApiResponse.class, targetUid); 276 ApiResponse<AuthorizeResultRespVO> resp = ufoServiceCaller.call("ufo.user.aliPayAccountQuery", ApiResponse.class, targetUid);
277 if (resp != null) { 277 if (resp != null) {
278 AuthorizeResultRespVO data = (AuthorizeResultRespVO) resp.getData(); 278 AuthorizeResultRespVO data = (AuthorizeResultRespVO) resp.getData();
279 - if (data != null && data.getAlipayAccount() != null) {  
280 - return data.getAlipayAccount(); 279 + if (data != null ) {
  280 + if(StringUtils.isNotBlank(data.getAlipayId()) ){
  281 + return data.getAlipayId();
  282 + }else if(StringUtils.isNotBlank(data.getAlipayAccount())){
  283 + return data.getAlipayAccount();
  284 + }else{
  285 + return null;
  286 + }
281 } 287 }
282 } 288 }
283 return null; 289 return null;