|
|
@@ -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);
|
|
|
}
|
|
|
|
|
|
/**
|