Merge branch 'local/share_1008' into develop-new

cooleshow-user/user-biz/src/main/java/com/yonge/cooleshow/biz/dal/service/impl/TenantMemberServiceImpl.java

@@ -125,7 +125,12 @@ public class TenantMemberServiceImpl extends ServiceImpl<TenantMemberMapper, Ten
         BasePaymentService paymentService = paymentServiceContext.getPaymentService(tenantMember.getPayerName());
 
         PaymentMerchant.MerchantMember merchantMember = getMerchantMember(tenantMember);
-        paymentService.createPaymentCorpMember(merchantConfig,merchantMember);
+        try {
+            paymentService.createPaymentCorpMember(merchantConfig,merchantMember);
+        }catch (Exception e) {
+            log.error("创建子账户失败", e);
+            throw new BizException("创建子账户失败:" + e.getMessage());
+        }
         TenantMember member = JSON.parseObject(tenantMember.jsonString(), TenantMember.class);
         member.setStatus(AuthStatusEnum.DOING);
         return this.save(member);
@@ -220,11 +225,17 @@ public class TenantMemberServiceImpl extends ServiceImpl<TenantMemberMapper, Ten
 
         PaymentMerchant.MerchantMember merchantMember = getMerchantMember(tenantMember);
 
-        if (member.getPayerName().equals(tenantMember.getPayerName())) {
-            paymentService.updatePaymentCorpMember(merchantConfig, merchantMember);
-        } else {
-            paymentService.createPaymentCorpMember(merchantConfig, merchantMember);
+        try {
+            if (member.getPayerName().equals(tenantMember.getPayerName())) {
+                paymentService.updatePaymentCorpMember(merchantConfig, merchantMember);
+            } else {
+                paymentService.createPaymentCorpMember(merchantConfig, merchantMember);
+            }
+        }catch (Exception e) {
+            log.error("更新子账户失败", e);
+            throw new BizException("更新子账户失败:" + e.getMessage());
         }
+
         TenantMember object = JSON.parseObject(tenantMember.jsonString(), TenantMember.class);
         object.setStatus(AuthStatusEnum.DOING);
         return this.updateById(object);