merge

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

@@ -12,6 +12,7 @@ import io.hmit.common.validator.group.DefaultGroup;
 import io.hmit.common.validator.group.UpdateGroup;
 import io.hmit.entity.UserEntity;
 import io.hmit.modules.serviceOrder.dto.PensionOrderDTO;
+import io.hmit.modules.serviceOrder.dto.ReservationDTO;
 import io.hmit.modules.serviceOrder.service.PensionOrderService;
 import io.swagger.annotations.Api;
 import io.swagger.annotations.ApiImplicitParam;
@@ -192,8 +193,18 @@ public class PensionOrderController {
     @ApiOperation("信息")
     public Result<PensionOrderDTO> get(@PathVariable("id") Long id){
         PensionOrderDTO data = pensionOrderService.get(id);
-//        return new Result<PensionOrderDTO>().ok(data);
-        return null;
+
+        return new Result<PensionOrderDTO>().ok(data);
+    }
+
+    @Login
+    @PostMapping("reservationOrder")
+    @ApiOperation("预约保存")
+    public Result reservationOrder(@ApiIgnore @LoginUser UserEntity user,@RequestBody ReservationDTO dto){
+
+        PensionOrderDTO data = new PensionOrderDTO().assemblePensionOrder(dto,user);
+        pensionOrderService.reservation(data);
+        return new Result();
     }
 
     @PostMapping

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

 package io.hmit.modules.serviceOrder.dto;
 
+import io.hmit.common.constant.Constant;
+import io.hmit.entity.UserEntity;
 import io.swagger.annotations.ApiModel;
 import io.swagger.annotations.ApiModelProperty;
 import lombok.Data;
+import sun.plugin2.util.SystemUtil;
 
 import java.io.Serializable;
 import java.util.Date;
+import java.util.UUID;
 
 
 /**
@@ -17,7 +21,7 @@ import java.util.Date;
 @Data
 @ApiModel(value = "订单表")
 public class PensionOrderDTO implements Serializable {
-    private static final long serialVersionUID = 1L;
+	private static final long serialVersionUID = 1L;
 
 	@ApiModelProperty(value = "id")
 	private Long id;
@@ -85,5 +89,21 @@ public class PensionOrderDTO implements Serializable {
 	@ApiModelProperty(value = "更新时间")
 	private Date updateDate;
 
-
+	public PensionOrderDTO assemblePensionOrder(ReservationDTO reservationDTO, UserEntity user){
+		PensionOrderDTO pensionOrder = new PensionOrderDTO();
+		pensionOrder.setOrderNum("");
+		pensionOrder.setStatus(Constant.OrderStatus.BOOKED.geStatus());
+		pensionOrder.setStatusName(Constant.OrderStatus.BOOKED.getMessage());
+		pensionOrder.setAddress(reservationDTO.getAddress());
+		pensionOrder.setServiceId(reservationDTO.getServiceId());
+		pensionOrder.setServiceName(reservationDTO.getServiceName());
+		pensionOrder.setRemark(reservationDTO.getRemark());
+		pensionOrder.setCreator(user.getId());
+		pensionOrder.setCreatorName(user.getUsername());
+		pensionOrder.setCreatorTel(user.getMobile());
+		pensionOrder.setAppointmentPerson(reservationDTO.getAppointmentPerson());
+		pensionOrder.setAppointmentPhone(reservationDTO.getAppointmentPhone());
+		pensionOrder.setAppointmentTime(reservationDTO.getAppointmentTime());
+		return pensionOrder;
+	}
 }

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

@@ -43,7 +43,8 @@ public interface PensionOrderService extends CrudService<PensionOrderEntity, Pen
     //根据订单Id和订单状态查询
     PensionOrderDTO getOrderInfoByIdAndStatus(Long orderId, Integer status);
 
-    void reservation(ReservationDTO reservationDTO);
+    //服务订单预约
+    void reservation(PensionOrderDTO pensionOrderDTO);
 
     //查询已完成订单
     PageData<PensionOrderDTO> getOrderPageByStatus(Map<String, Object> params, Long userId, Integer status);

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

@@ -8,9 +8,11 @@ import io.hmit.common.service.impl.CrudServiceImpl;
 import io.hmit.common.utils.ConvertUtils;
 import io.hmit.modules.serviceOrder.dao.PensionOrderDao;
 import io.hmit.modules.serviceOrder.dto.PensionOrderDTO;
+import io.hmit.modules.serviceOrder.dto.PensionOrderServiceDTO;
 import io.hmit.modules.serviceOrder.dto.ReservationDTO;
 import io.hmit.modules.serviceOrder.entity.PensionOrderEntity;
 import io.hmit.modules.serviceOrder.service.PensionOrderService;
+import io.hmit.modules.serviceOrder.service.PensionOrderServiceService;
 import org.apache.commons.lang3.StringUtils;
 import org.springframework.beans.factory.annotation.Autowired;
 import org.springframework.stereotype.Service;
@@ -44,6 +46,9 @@ public class PensionOrderServiceImpl extends CrudServiceImpl<PensionOrderDao, Pe
     @Autowired
     private PensionOrderDao pensionOrderDao;
 
+    @Autowired
+    private PensionOrderServiceService pensionOrderServiceService;
+
     @Override
     public PageData<PensionOrderDTO> getAllOrderPage(Map<String, Object> params, Long userId) {
         //分页
@@ -116,8 +121,11 @@ public class PensionOrderServiceImpl extends CrudServiceImpl<PensionOrderDao, Pe
     }
 
     @Override
-    public void reservation(ReservationDTO reservationDTO) {
+    public void reservation(PensionOrderDTO pensionOrderDTO) {
 
+        save(pensionOrderDTO);
+        PensionOrderServiceDTO orderServiceDTO = new PensionOrderServiceDTO().assemblePensionOrderService(pensionOrderDTO);
+        pensionOrderServiceService.save(orderServiceDTO);
 
     }