merge

hmit-api/src/main/java/io/hmit/dto/UserInfoDTO.java

+package io.hmit.dto;
+
+/**
+ * @author Eve
+ * @email mengmengeve@gmail.com
+ * @create 2021/1/27
+ */
+public class UserInfoDTO {
+}

hmit-api/src/main/java/io/hmit/modules/serviceOrder/controller/PensionOrderController.java

@@ -186,17 +186,6 @@ public class PensionOrderController {
         //校验数据
         ValidatorUtils.validateEntity(dto, AddGroup.class, DefaultGroup.class);
 
-        dto.setId(null);
-        dto.setOrderNum(null);
-        dto.setStatus(0);
-        dto.setStatusName("未接单");
-        dto.setOrderRecipientTime(null);
-        dto.setOrderRecipientPhone(null);
-        dto.setOrderRecipientName(null);
-        dto.setOrderRecipientId(null);
-        //设置日期
-        dto.setCreateDate(new Date());
-        dto.setUpdateDate(new Date());
         pensionOrderService.save(dto);
 
         return new Result();
@@ -207,10 +196,8 @@ public class PensionOrderController {
     public Result update(@RequestBody PensionOrderDTO dto){
         //校验数据
         ValidatorUtils.validateEntity(dto, UpdateGroup.class, DefaultGroup.class);
-        PensionOrderDTO pensionOrderDTO = pensionOrderService.get(dto.getId());
-        BeanUtils.copyProperties(dto, pensionOrderDTO);
-        pensionOrderDTO.setUpdateDate(new Date());
-        pensionOrderService.update(pensionOrderDTO);
+
+        pensionOrderService.update(dto);
 
         return new Result();
     }

hmit-api/src/main/java/io/hmit/modules/serviceOrder/dto/ReservationDTO.java

+package io.hmit.modules.serviceOrder.dto;
+
+/**
+ * @author Eve
+ * @email mengmengeve@gmail.com
+ * @create 2021/1/28
+ */
+public class ReservationDTO {
+}

hmit-api/src/main/java/io/hmit/modules/serviceOrder/service/PensionOrderService.java

@@ -3,6 +3,7 @@ package io.hmit.modules.serviceOrder.service;
 import io.hmit.common.page.PageData;
 import io.hmit.common.service.CrudService;
 import io.hmit.modules.serviceOrder.dto.PensionOrderDTO;
+import io.hmit.modules.serviceOrder.dto.ReservationDTO;
 import io.hmit.modules.serviceOrder.entity.PensionOrderEntity;
 
 import java.util.Map;
@@ -42,4 +43,5 @@ public interface PensionOrderService extends CrudService<PensionOrderEntity, Pen
     //根据订单Id和订单状态查询
     PensionOrderDTO getOrderInfoByIdAndStatus(Long orderId, Integer status);
 
+    void reservation(ReservationDTO reservationDTO);
 }