Browse Source

修改小程序订单金额

liu 1 year ago
parent
commit
abd2727f7a

+ 4 - 0
src/main/java/com/template/controller/ApplicationProcedureTemporaryController.java

@@ -57,6 +57,10 @@ public class ApplicationProcedureTemporaryController implements ApplicationProce
         if (ObjectUtils.isEmpty(applicationProcedureDto)) {
         if (ObjectUtils.isEmpty(applicationProcedureDto)) {
             return CommonResult.fail();
             return CommonResult.fail();
         }
         }
+        Integer usersId = applicationProcedureDto.getUsersId();
+//        一个人只能有一个待审批的
+
+
 
 
         ApplicationProcedureTemporary applicationProcedure = new ApplicationProcedureTemporary();
         ApplicationProcedureTemporary applicationProcedure = new ApplicationProcedureTemporary();
 
 

+ 9 - 0
src/main/java/com/template/controller/HouseOrderController.java

@@ -155,6 +155,15 @@ public class HouseOrderController implements HouseOrderAPI {
         if (house == null) {
         if (house == null) {
             return CommonResult.fail("无此房间,请重新查询");
             return CommonResult.fail("无此房间,请重新查询");
         }
         }
+
+        //        判断传过来的时间和当前时间比较
+        DateTimeFormatter dateTimeFormatter1 = DateTimeFormatter.ofPattern("yyyy-MM-dd HH:mm:ss");
+        LocalDateTime now = LocalDateTime.now();
+        LocalDateTime date = LocalDateTime.parse(liveTime, dateTimeFormatter1);
+        if (now.isAfter(date)) {
+            liveTime = now.format(dateTimeFormatter1);
+//            establishOrderDto.setReserveLiveTime(reserveLeaveTime);
+        }
 //        计算总金额
 //        计算总金额
         BigDecimal totalPrice = houseOrderService.getHouseOrderPrice(houseOrderNumber, userId, houseId, liveTime, leaveTime);
         BigDecimal totalPrice = houseOrderService.getHouseOrderPrice(houseOrderNumber, userId, houseId, liveTime, leaveTime);