|
@@ -53,7 +53,11 @@ public class SubjectChangeController extends BaseController {
|
|
if (!isRepay && subjectChange.getStatus().equals(SubjectChangeStatusEnum.ING)) {
|
|
if (!isRepay && subjectChange.getStatus().equals(SubjectChangeStatusEnum.ING)) {
|
|
return failed(HttpStatus.CONTINUE, "您有待支付的订单");
|
|
return failed(HttpStatus.CONTINUE, "您有待支付的订单");
|
|
}
|
|
}
|
|
- return succeed(subjectChangeService.payChange(id, amount, isUseBalancePayment, isRepay));
|
|
|
|
|
|
+ Map payMap = subjectChangeService.payChange(id, amount, isUseBalancePayment, isRepay);
|
|
|
|
+ if (payMap.containsKey("tradeState")) {
|
|
|
|
+ return failed(HttpStatus.CREATED, payMap, "恭喜您,支付成功!");
|
|
|
|
+ }
|
|
|
|
+ return succeed(payMap);
|
|
}
|
|
}
|
|
|
|
|
|
|
|
|