Merge branch 'feature-delay-add' into dev

ace-common/src/main/java/com/github/wxiaoqi/security/common/rest/CommonBaseController.java

@@ -31,4 +31,8 @@ public class CommonBaseController {
     public String getCurrentUserName(){
         return BaseContextHandler.getUsername();
     }
+
+    public String getCurrentUserId(){
+        return BaseContextHandler.getUserID();
+    }
 }

xx-order/xx-order-api/src/main/java/com/xxfc/platform/order/entity/OrderRentVehicleDetail.java

@@ -357,21 +357,17 @@ public class OrderRentVehicleDetail implements Serializable {
 	@ApiModelProperty(value = "延期结束时间")
 	private Long delayAddEndTime;
 
-	public Long obtainRealEndTime() {
-		if(null != getDelayAddEndTime()) {
-			return getDelayAddEndTime();
-		}else {
-			return getEndTime();
-		}
+	@Column(name = "meta_end_time")
+	@ApiModelProperty(value = "原结束时间")
+	private Long metaEndTime;
+
+	public Long getEndTime() {
+		return endTime;
 	}
 
-//	public Integer obtainRealDayNum() {
-//		if(null != getDelayAddDays()) {
-//			return (getDelayAddDays() + getDayNum());
-//		}else {
-//			return getDayNum();
-//		}
-//	}
+	public void setEndTime(Long endTime) {
+		this.endTime = endTime;
+	}
 
 	public Integer obtainRealDayNum() {
 		return this.dayNum + this.delayAddDays;

xx-order/xx-order-server/src/main/java/com/xxfc/platform/order/biz/BaseOrderBiz.java

@@ -341,7 +341,7 @@ public class BaseOrderBiz extends BaseBiz<BaseOrderMapper, BaseOrder> implements
 		DedDetailDTO dedDetailDTO = new DedDetailDTO();
 		//提前还车,结束时间大于当前时间
 		Long nowTime = System.currentTimeMillis();
-		Long endTime = orderPageVO.getOrderRentVehicleDetail().obtainRealEndTime();
+		Long endTime = orderPageVO.getOrderRentVehicleDetail().getEndTime();
 		Long startTime = orderPageVO.getOrderRentVehicleDetail().getStartTime();
 
 		//设置使用天数

xx-order/xx-order-server/src/main/java/com/xxfc/platform/order/biz/OrderVehicleCrosstownBiz.java

@@ -237,7 +237,7 @@ public class OrderVehicleCrosstownBiz extends BaseBiz<OrderVehicaleCrosstownMapp
 
         OrderRentVehicleDetail orderRentVehicleDetail = orderRentVehicleBiz.selectById(baseOrder.getDetailId());
         if (orderVehicleCrosstownDto.getType() == CrosstownTypeEnum.DEPARTURE.getCode()) {
-            boolean flag = getTodayTime(orderRentVehicleDetail.getStartTime(), orderRentVehicleDetail.obtainRealEndTime());
+            boolean flag = getTodayTime(orderRentVehicleDetail.getStartTime(), orderRentVehicleDetail.getEndTime());
             if (!flag) {
                 return ObjectRestResponse.createFailedResult(3502, "已超过预定还车时间，不能进行交车操作！");
             }

xx-order/xx-order-server/src/main/java/com/xxfc/platform/order/biz/inner/OrderDelayBiz.java

@@ -203,6 +203,8 @@ public class OrderDelayBiz {
             orvd.setDelayAddDays(delayAddDays);
             orvd.setDelayAddFreeDays(delayAddFreeDays);
             orvd.setDelayAddEndTime(dto.getDelayEndTime());
+            //修改还车时间
+            orvd.setEndTime(dto.getDelayEndTime());
             DelayAddPriceVO delayAddPriceVO = new DelayAddPriceVO(){{
                 setDamageSafePrice(new BigDecimal(dictionaryMap.get(APP_ORDER+ "_"+ DictionaryKey.DAMAGE_SAFE).getDetail()));
                 setDelayAddDays(orvd.getDelayAddDays());

xx-order/xx-order-server/src/main/java/com/xxfc/platform/order/biz/inner/OrderMsgBiz.java

@@ -506,7 +506,7 @@ public class OrderMsgBiz {
     private void handelSmsParam(OrderRentVehicleDetail orvd, BaseOrder baseOrder, List<String> smsParams, AppUserDTO appUserDTO, int handelType) {
         if(RENT_DELIVERY == handelType) {
             smsParams.add(appUserDTO.obtainRealname());
-            smsParams.add(DateUtil.formatDateTime(DateUtil.date(orvd.obtainRealEndTime())));
+            smsParams.add(DateUtil.formatDateTime(DateUtil.date(orvd.getEndTime())));
             smsParams.add(orvd.getEndAddr());
             smsParams.add(baseOrder.getName());
             smsParams.add(appUserDTO.getUsername());
@@ -516,7 +516,7 @@ public class OrderMsgBiz {
             smsParams.add(orvd.getStartAddr());
             smsParams.add(orvd.getEndAddr());
             smsParams.add(DateUtil.formatDateTime(DateUtil.date(orvd.getStartTime())));
-            smsParams.add(DateUtil.formatDateTime(DateUtil.date(orvd.obtainRealEndTime())));
+            smsParams.add(DateUtil.formatDateTime(DateUtil.date(orvd.getEndTime())));
             smsParams.add(orvd.obtainRealDayNum().toString());
             smsParams.add(appUserDTO.getUsername());
         }

xx-order/xx-order-server/src/main/java/com/xxfc/platform/order/rest/BackStageOrderController.java

@@ -434,9 +434,9 @@ public class BackStageOrderController extends CommonBaseController implements Us
         bo.setOrder(orderPageVO);
         bo.setBookVehicleVO(new BookVehicleVO() {{
             setBookStartDate(YMR_SLASH_FORMATTER.format(LocalDateTime.ofInstant(Instant.ofEpochMilli(bo.getStartTime()), ZoneOffset.ofHours(8))));
-            setBookEndDate(YMR_SLASH_FORMATTER.format(LocalDateTime.ofInstant(Instant.ofEpochMilli(bo.obtainRealEndTime()), ZoneOffset.ofHours(8))));
+            setBookEndDate(YMR_SLASH_FORMATTER.format(LocalDateTime.ofInstant(Instant.ofEpochMilli(bo.getEndTime()), ZoneOffset.ofHours(8))));
             setBookStartDateTime(DATE_TIME_LINE_FORMATTER.format(LocalDateTime.ofInstant(Instant.ofEpochMilli(bo.getStartTime()), ZoneOffset.ofHours(8))));
-            setBookEndDateTime(DATE_TIME_LINE_FORMATTER.format(LocalDateTime.ofInstant(Instant.ofEpochMilli(bo.obtainRealEndTime()), ZoneOffset.ofHours(8))));
+            setBookEndDateTime(DATE_TIME_LINE_FORMATTER.format(LocalDateTime.ofInstant(Instant.ofEpochMilli(bo.getEndTime()), ZoneOffset.ofHours(8))));
         }});
 
         List<OrderAccompanyDTO> oads = JSONUtil.toList(JSONUtil.parseArray(orderItemBiz.selectOne(new OrderItem() {{
@@ -457,12 +457,13 @@ public class BackStageOrderController extends CommonBaseController implements Us
         return ObjectRestResponse.succ();
     }
 
-    @ApiOperation("修改租车订单延期")
+    @ApiOperation("修改租车订单延长时间")
     @RequestMapping(value = "/baseOrder/bg/delay-rent-order", method = RequestMethod.POST)
     @IgnoreClientToken
     @ResponseBody
     public ObjectRestResponse<OrderPageVO> delayRentOrder(@RequestBody DelayRentOrderDTO dto) {
         checkAdminUser();
+        dto.setOperateId(Integer.valueOf("-1"+ getCurrentUserId()));
 
         Query query = baseOrderBiz.initBgQuery(dto.getNo());
 

xx-order/xx-order-server/src/main/java/com/xxfc/platform/order/service/OrderRentVehicleService.java

@@ -207,6 +207,8 @@ public class OrderRentVehicleService extends AbstractOrderHandle<OrderRentVehicl
                 bo.getOrder().setCrtUser(bo.getCrtUser());
             }
 
+            //
+            bo.setMetaEndTime(bo.getEndTime());
             super.handleDetail(bo);
         }catch (Exception e) {
             //事务补偿处理