merge

hmit-api/src/main/java/io/hmit/modules/appointment/controller/AppointmentOrderController.java

@@ -100,13 +100,14 @@ public class AppointmentOrderController {
         return new Result<List<ReservationOrderInfoDTO>>().ok(data);
     }
 
+    @Login
     @PostMapping
     @ApiOperation("预约保存")
-    public Result<ReservationSuccessDTO> save(@RequestBody ReservationDTO dto){
+    public Result<ReservationSuccessDTO> save(@RequestBody ReservationDTO dto,@ApiIgnore @LoginUser UserEntity userEntity){
         //校验数据
         ValidatorUtils.validateEntity(dto, AddGroup.class, DefaultGroup.class);
 
-        AppointmentOrderDTO appointmentOrderDTO =  new AppointmentOrderDTO().assembleAppointmentOrderDTO(dto);
+        AppointmentOrderDTO appointmentOrderDTO =  new AppointmentOrderDTO().assembleAppointmentOrderDTO(dto,userEntity);
 
         appointmentOrderService.save(appointmentOrderDTO);
 

hmit-api/src/main/java/io/hmit/modules/appointment/dto/AppointmentOrderDTO.java

 package io.hmit.modules.appointment.dto;
 
 import io.hmit.common.utils.SerialNumberTool;
+import io.hmit.entity.UserEntity;
 import io.swagger.annotations.ApiModel;
 import io.swagger.annotations.ApiModelProperty;
 import lombok.Data;
@@ -95,7 +96,7 @@ public class AppointmentOrderDTO implements Serializable {
 
 	private YynumberDTO yynumberDTO;
 
-	public AppointmentOrderDTO assembleAppointmentOrderDTO(ReservationDTO reservationDTO){
+	public AppointmentOrderDTO assembleAppointmentOrderDTO(ReservationDTO reservationDTO, UserEntity userEntity){
 	AppointmentOrderDTO dto = new AppointmentOrderDTO();
 
 		// 当天程序重启后标识位会重置，此处可以设置开始的标识位，4标识下一个生成的会是Y00004
@@ -111,16 +112,17 @@ public class AppointmentOrderDTO implements Serializable {
 	dto.setServiceName(reservationDTO.getServiceName());
 	dto.setIsApp(reservationDTO.getIsApp());
 	dto.setOrderQueueId(reservationDTO.getOrderQueueId());
-	dto.setAppointmentPerson(reservationDTO.getAppointmentPerson());
-	dto.setAppointmentPhone(reservationDTO.getAppointmentPhone());
-	dto.setAppointmentIdCard(reservationDTO.getAppointmentIdCard());
+	dto.setAppointmentPerson(userEntity.getUsername());
+	dto.setAppointmentPhone(userEntity.getMobile());
+	dto.setAppointmentIdCard(userEntity.getIdCardNo());
 	dto.setAppointmentTime(reservationDTO.getAppointmentTime());
 	dto.setServiceWindow(reservationDTO.getServiceWindow());
 	dto.setRemark(reservationDTO.getRemark());
 
+	dto.setCreator(Long.parseLong(userEntity.getUserId()) );
+	dto.setUpdater(Long.parseLong(userEntity.getUserId()) );
 	dto.setCreateDate(new Date());
 	dto.setUpdateDate(new Date());
-
 	return dto;
 }
 }