订单增加接口

mec-web/src/main/java/com/ym/mec/web/controller/StudentPaymentOrderController.java

@@ -70,10 +70,12 @@ public class StudentPaymentOrderController extends BaseController {
         int openHideMode = Integer.parseInt(sysConfigDao.findConfigValue("open_hide_mode"));
         if (openHideMode == 1) {
             for (StudentPaymentOrder row : studentPaymentOrderPageInfo.getRows()) {
-                BigDecimal balancePaymentAmount = row.getBalancePaymentAmount() == null ? BigDecimal.ZERO : row.getBalancePaymentAmount();
-                BigDecimal comAmount = row.getComAmount() == null ? BigDecimal.ZERO : row.getComAmount();
-                row.setExpectAmount(comAmount.add(balancePaymentAmount));
-                row.setActualAmount(comAmount.add(balancePaymentAmount));
+                if (row.getComAmount() != null) {
+                    BigDecimal balancePaymentAmount = row.getBalancePaymentAmount() == null ? BigDecimal.ZERO : row.getBalancePaymentAmount();
+                    BigDecimal comAmount = row.getComAmount() == null ? BigDecimal.ZERO : row.getComAmount();
+                    row.setExpectAmount(comAmount.add(balancePaymentAmount));
+                    row.setActualAmount(comAmount.add(balancePaymentAmount));
+                }
             }
         }
         return succeed(studentPaymentOrderPageInfo);
@@ -104,10 +106,11 @@ public class StudentPaymentOrderController extends BaseController {
         PageInfo<StudentPaymentOrder> studentPaymentOrderPageInfo = studentPaymentOrderService.queryPage(queryInfo);
 
         for (StudentPaymentOrder row : studentPaymentOrderPageInfo.getRows()) {
+            BigDecimal balancePaymentAmount = row.getBalancePaymentAmount() == null ? BigDecimal.ZERO : row.getBalancePaymentAmount();
             BigDecimal comAmount = row.getComAmount() == null ? BigDecimal.ZERO : row.getComAmount();
-            if(row.getComAmount() != null) {
-                row.setExpectAmount(comAmount);
-                row.setActualAmount(comAmount);
+            if (row.getComAmount() != null) {
+                row.setExpectAmount(comAmount.add(balancePaymentAmount));
+                row.setActualAmount(comAmount.add(balancePaymentAmount));
             }
         }
         return succeed(studentPaymentOrderPageInfo);
@@ -138,10 +141,11 @@ public class StudentPaymentOrderController extends BaseController {
         PageInfo<StudentPaymentOrder> studentPaymentOrderPageInfo = studentPaymentOrderService.queryPage(queryInfo);
 
         for (StudentPaymentOrder row : studentPaymentOrderPageInfo.getRows()) {
+            BigDecimal balancePaymentAmount = row.getBalancePaymentAmount() == null ? BigDecimal.ZERO : row.getBalancePaymentAmount();
             BigDecimal perAmount = row.getPerAmount() == null ? BigDecimal.ZERO : row.getPerAmount();
-            if(row.getPerAmount() != null) {
-                row.setExpectAmount(perAmount);
-                row.setActualAmount(perAmount);
+            if (row.getPerAmount() != null) {
+                row.setExpectAmount(perAmount.add(balancePaymentAmount));
+                row.setActualAmount(perAmount.add(balancePaymentAmount));
             }
         }
         return succeed(studentPaymentOrderPageInfo);