|
|
@@ -12,6 +12,7 @@ import com.microsvc.toolkit.middleware.payment.common.api.BasePaymentService;
|
|
|
import com.microsvc.toolkit.middleware.payment.common.api.PaymentServiceContext;
|
|
|
import com.microsvc.toolkit.middleware.payment.common.api.entity.DivideReq;
|
|
|
import com.microsvc.toolkit.middleware.payment.common.api.entity.DivideResp;
|
|
|
+import com.microsvc.toolkit.middleware.payment.common.api.enums.PaymentStatus;
|
|
|
import com.yonge.cooleshow.biz.dal.dao.CourseScheduleStudentPaymentDao;
|
|
|
import com.yonge.cooleshow.biz.dal.dao.UserOrderDao;
|
|
|
import com.yonge.cooleshow.biz.dal.dao.VideoLessonGroupDao;
|
|
|
@@ -892,6 +893,7 @@ public class PaymentDivMemberRecordServiceImpl extends ServiceImpl<PaymentDivMem
|
|
|
TenantMember tenantMember = null;
|
|
|
String divideOrderNo = IdWorker.getIdStr();
|
|
|
BigDecimal feeAmt = BigDecimal.ZERO;
|
|
|
+ DivideResp divide = new DivideResp();
|
|
|
if (merchantConfig != null && newestPayment != null) {
|
|
|
if (accountTenantTo.getIncomeTenant() > 0) {
|
|
|
tenantMember = tenantMemberService
|
|
|
@@ -913,7 +915,7 @@ public class PaymentDivMemberRecordServiceImpl extends ServiceImpl<PaymentDivMem
|
|
|
.divMembers(Lists.newArrayList(divMember))
|
|
|
.build();
|
|
|
try {
|
|
|
- DivideResp divide = paymentService.divide(divideReq);
|
|
|
+ divide = paymentService.divide(divideReq);
|
|
|
feeAmt = divide.getFeeAmount();
|
|
|
tenantEnterFlag = true;
|
|
|
} catch (Exception e) {
|
|
|
@@ -931,7 +933,7 @@ public class PaymentDivMemberRecordServiceImpl extends ServiceImpl<PaymentDivMem
|
|
|
.divOrderNo(divideOrderNo)
|
|
|
.transNo(newestPayment != null ? newestPayment.getTransNo() : null)
|
|
|
.amount(amount)
|
|
|
- .tenantEnterFlag(tenantEnterFlag)
|
|
|
+ .tenantEnterFlag(divide.getStatus()!=null && divide.getStatus().equals(PaymentStatus.SUCCESSED))
|
|
|
.status("SUCCESS")
|
|
|
.feeFlag(true)
|
|
|
.feeAmt(feeAmt)
|
liujc