LiRong 1 місяць тому
батько
коміт
0b8d1ee4d6

+ 5 - 3
leromro-core/src/main/java/com/leromro/core/service/impl/MainOrderServiceImpl.java

@@ -78,7 +78,6 @@ public class MainOrderServiceImpl extends ServiceImpl<MainOrdersMapper, MainOrde
         orders.setFinishTimes(0L);
         orders.setPaymentMethod(0);
         orders.setUserId(userId);
-        //博哥不传我,我只能先获取当前时间,后面再改
         orders.setCreateTime(DateTimeUtil.getNowTime());
         mainOrdersMapper.insertMainOrders(orders);
 
@@ -90,8 +89,9 @@ public class MainOrderServiceImpl extends ServiceImpl<MainOrdersMapper, MainOrde
         //新增按次数的小订单表
         //创建小订单模板
         SecondOrder secondOrder = SecondOrder.builder().mainOrderId(String.valueOf(orderId)).volunteerId(orders.getVolunteerId()).
-                serviceCategory(orders.getServiceCategory()).workStartTime(orders.getStartTime())
-                .serviceDuration(orders.getServiceDuration()).addressId(orders.getAddressId()).serviceOnePrice(orders.getServiceOnePrice()).orderStatus(0).serviceType(orders.getServiceType()).serviceSubject(orders.getServiceSubject()).build();
+                serviceCategory(orders.getServiceCategory()).serviceSubject(orders.getServiceSubject()).serviceType(orders.getServiceType())
+                .serviceDuration(orders.getServiceDuration()).addressId(orders.getAddressId()).serviceOnePrice(orders.getServiceOnePrice())
+                .orderStatus(0).serviceType(orders.getServiceType()).serviceSubject(orders.getServiceSubject()).build();
         secondOrder.setRemark(orders.getRemark());
         List<SecondOrder> secondOrderList = new ArrayList<>();
         //添加平台
@@ -112,6 +112,8 @@ public class MainOrderServiceImpl extends ServiceImpl<MainOrdersMapper, MainOrde
             SecondOrder secondOrder1 = new SecondOrder();
             BeanUtils.copyProperties(secondOrder,secondOrder1);
             secondOrder1.setWorkDate(workDate.getWorkDate());
+            secondOrder1.setWorkStartTime(workDate.getWorkStartTime());
+            secondOrder1.setWorkEndTime(workDate.getWorkStartTime().plus(Duration.ofMinutes(orders.getServiceDuration())));
             secondOrder1.setWorkNumber(number);
             secondOrder1.setSecondOrderId(String.valueOf(secondOrderIdL));
             secondOrderList.add(secondOrder1);