TRX hai 1 ano
pai
achega
3d04e6fdcc

+ 5 - 1
FullCardServer/src/main/java/com/zhongshu/card/server/core/service/payment/ExpenseFlowServiceImpl.java

@@ -402,7 +402,11 @@ public class ExpenseFlowServiceImpl extends SuperService implements ExpenseFlowS
         if (!orderPayModel.isSuccess()) {
             return ResultContent.buildFail(orderPayModel.getPayMsg());
         }
-
+        ResultContent<ExpenseFlow> resultContent = payCallService.payOrder(expenseFlow);
+        expenseFlow = resultContent.getContent();
+        if (expenseFlow.getIsPaySuccess() != null && resultContent.isSuccess()) {
+            return ResultContent.buildFail(expenseFlow.getPaymentStatus());
+        }
         return ResultContent.buildSuccess();
     }
 

+ 2 - 2
FullCardServer/src/main/java/com/zhongshu/card/server/core/service/payment/PayCallService.java

@@ -98,7 +98,7 @@ public class PayCallService extends SuperService {
      * @param entity
      * @return
      */
-    public ResultContent payOrder(ExpenseFlow entity) {
+    public ResultContent<ExpenseFlow> payOrder(ExpenseFlow entity) {
         OrderState orderType = entity.getOrderState();
         if (orderType != OrderState.WAIT_PAYMENT) {
             return ResultContent.buildFail(String.format("订单不能支付:%s", orderType.getRemark()));
@@ -182,7 +182,7 @@ public class PayCallService extends SuperService {
             expenseFlowDao.save(entity);
         }
         log.info("支付过程: {}", stopWatch.prettyPrint());
-        return ResultContent.buildSuccess();
+        return ResultContent.buildSuccess(entity);
     }
 
     /**