|
@@ -21,6 +21,7 @@ import com.yonge.cooleshow.common.constant.SysConfigConstant;
|
|
|
import com.yonge.cooleshow.common.enums.EPayerType;
|
|
|
import com.yonge.toolset.base.exception.BizException;
|
|
|
import com.yonge.toolset.base.util.StringUtil;
|
|
|
+import org.apache.commons.lang.StringUtils;
|
|
|
import org.springframework.beans.factory.annotation.Autowired;
|
|
|
import org.springframework.stereotype.Service;
|
|
|
import lombok.extern.slf4j.Slf4j;
|
|
@@ -126,11 +127,16 @@ public class TenantMemberServiceImpl extends ServiceImpl<TenantMemberMapper, Ten
|
|
|
|
|
|
PaymentMerchant.MerchantMember merchantMember = getMerchantMember(tenantMember);
|
|
|
try {
|
|
|
- paymentService.createPaymentCorpMember(merchantConfig,merchantMember);
|
|
|
+ Map<String, Object> paymentCorpMember = paymentService.createPaymentCorpMember(merchantConfig, merchantMember);
|
|
|
+ Object errorMsg = paymentCorpMember.get("error_msg");
|
|
|
+ if (StringUtils.isNotBlank(errorMsg.toString())) {
|
|
|
+ throw new BizException(errorMsg.toString());
|
|
|
+ }
|
|
|
}catch (Exception e) {
|
|
|
log.error("创建子账户失败", e);
|
|
|
throw new BizException("创建子账户失败:" + e.getMessage());
|
|
|
}
|
|
|
+ tenantMember.setMultipartFile(null);
|
|
|
TenantMember member = JSON.parseObject(tenantMember.jsonString(), TenantMember.class);
|
|
|
member.setStatus(AuthStatusEnum.DOING);
|
|
|
return this.save(member);
|
|
@@ -227,15 +233,23 @@ public class TenantMemberServiceImpl extends ServiceImpl<TenantMemberMapper, Ten
|
|
|
|
|
|
try {
|
|
|
if (member.getPayerName().equals(tenantMember.getPayerName())) {
|
|
|
- paymentService.updatePaymentCorpMember(merchantConfig, merchantMember);
|
|
|
+ Boolean aBoolean = paymentService.updatePaymentCorpMember(merchantConfig, merchantMember);
|
|
|
+ if (!aBoolean) {
|
|
|
+ throw new BizException("更新子账户失败");
|
|
|
+ }
|
|
|
} else {
|
|
|
- paymentService.createPaymentCorpMember(merchantConfig, merchantMember);
|
|
|
+ Map<String, Object> paymentCorpMember = paymentService.createPaymentCorpMember(merchantConfig, merchantMember);
|
|
|
+ Object errorMsg = paymentCorpMember.get("error_msg");
|
|
|
+ if (StringUtils.isNotBlank(errorMsg.toString())) {
|
|
|
+ throw new BizException(errorMsg.toString());
|
|
|
+ }
|
|
|
}
|
|
|
}catch (Exception e) {
|
|
|
log.error("更新子账户失败", e);
|
|
|
throw new BizException("更新子账户失败:" + e.getMessage());
|
|
|
}
|
|
|
|
|
|
+ tenantMember.setMultipartFile(null);
|
|
|
TenantMember object = JSON.parseObject(tenantMember.jsonString(), TenantMember.class);
|
|
|
object.setStatus(AuthStatusEnum.DOING);
|
|
|
return this.updateById(object);
|