|
@@ -182,7 +182,6 @@ public class StudentOrderController extends BaseController {
|
|
|
}
|
|
|
|
|
|
Date createTime = null;
|
|
|
- String merNos = null;
|
|
|
TenantPaymentOrder tenantPaymentOrder = null;
|
|
|
StudentPaymentOrder studentPaymentOrder = null;
|
|
|
if (platform != null && platform.equals("teacher")) {
|
|
@@ -194,15 +193,10 @@ public class StudentOrderController extends BaseController {
|
|
|
if (studentPaymentOrder == null && tenantPaymentOrder == null) {
|
|
|
return failed("订单不存在");
|
|
|
}
|
|
|
- BigDecimal payAmount;
|
|
|
if (studentPaymentOrder != null) {
|
|
|
createTime = studentPaymentOrder.getCreateTime();
|
|
|
- merNos = studentPaymentOrder.getMerNos();
|
|
|
- payAmount = studentPaymentOrder.getActualAmount();
|
|
|
} else {
|
|
|
createTime = tenantPaymentOrder.getCreateTime();
|
|
|
- merNos = tenantPaymentOrder.getMerNos();
|
|
|
- payAmount = tenantPaymentOrder.getActualAmount();
|
|
|
}
|
|
|
|
|
|
Calendar beforeTime = Calendar.getInstance();
|