|
|
@@ -19,7 +19,6 @@ import com.github.microservice.types.payment.ChargeableType;
|
|
|
import com.github.microservice.types.payment.PaymentDeviceType;
|
|
|
import com.github.microservice.types.payment.PaymentType;
|
|
|
import com.zhongshu.card.client.model.base.SuperSearch;
|
|
|
-import com.zhongshu.card.client.model.org.OrganizationMiniModel;
|
|
|
import com.zhongshu.card.client.model.org.UserJoinBusOrgModel;
|
|
|
import com.zhongshu.card.client.model.payment.*;
|
|
|
import com.zhongshu.card.client.model.payment.statistic.BusinessMainStatisticModel;
|
|
|
@@ -404,7 +403,8 @@ public class ExpenseFlowServiceImpl extends SuperService implements ExpenseFlowS
|
|
|
}
|
|
|
ResultContent<ExpenseFlow> resultContent = payCallService.payOrder(expenseFlow);
|
|
|
expenseFlow = resultContent.getContent();
|
|
|
- if (expenseFlow.getIsPaySuccess() != null && resultContent.isSuccess()) {
|
|
|
+
|
|
|
+ if (expenseFlow.getIsPaySuccess() == null || !resultContent.isSuccess()) {
|
|
|
return ResultContent.buildFail(expenseFlow.getPaymentStatus());
|
|
|
}
|
|
|
return ResultContent.buildSuccess();
|