liu 2 rokov pred
rodič
commit
856eef3cb3

+ 8 - 8
src/main/java/com/template/controller/HouseOrderController.java

@@ -1182,14 +1182,14 @@ public class HouseOrderController implements HouseOrderAPI {
             houseNumber.setHouseStatus(2);
 
 //            判断该房间是否免费的房间,是则需要支付水电费,并改成带结账状态
-            BigDecimal payPrice = houseOrder.getPayPrice();
-            if (ObjectUtils.isNotEmpty(payPrice) && payPrice.doubleValue() <= 0) {
-                houseOrder.setOrderStatus("5");
-                BigDecimal electricCost = houseOrder.getElectricCost();
-                BigDecimal waterCost = houseOrder.getWaterCost();
-                BigDecimal total = electricCost.add(waterCost);
-                houseOrder.setPayPrice(total);
-            }
+//            BigDecimal payPrice = houseOrder.getPayPrice();
+//            if (ObjectUtils.isNotEmpty(payPrice) && payPrice.doubleValue() <= 0) {
+//                houseOrder.setOrderStatus("5");
+//                BigDecimal electricCost = houseOrder.getElectricCost();
+//                BigDecimal waterCost = houseOrder.getWaterCost();
+//                BigDecimal total = electricCost.add(waterCost);
+//                houseOrder.setPayPrice(total);
+//            }
 
             houseOrderService.updateById(houseOrder);
             houseNumberStateService.updateById(houseNumberState);