Merge branch 'feature-delay-add' into dev

# Conflicts:
#	ace-modules/ace-admin-api/src/main/java/com/github/wxiaoqi/security/admin/feign/UserFeign.java
#	xx-order/xx-order-server/src/main/java/com/xxfc/platform/order/biz/BaseOrderBiz.java
#	xx-order/xx-order-server/src/main/java/com/xxfc/platform/order/mapper/BaseOrderMapper.java
#	xx-order/xx-order-server/src/main/java/com/xxfc/platform/order/mapper/OrderAccountMapper.java
#	xx-order/xx-order-server/src/main/resources/mapper/BaseOrderMapper.xml
#	xx-vehicle/xx-vehicle-api/src/main/java/com/xxfc/platform/vehicle/feign/VehicleFeign.java

ace-common/src/main/java/com/github/wxiaoqi/security/common/constant/CommonConstants.java

@@ -2,6 +2,9 @@ package com.github.wxiaoqi.security.common.constant;
 
 import cn.hutool.core.date.format.FastDateFormat;
 
+import java.time.Instant;
+import java.time.LocalDateTime;
+import java.time.ZoneOffset;
 import java.time.format.DateTimeFormatter;
 
 /**
@@ -50,4 +53,8 @@ public class CommonConstants {
     public static final org.joda.time.format.DateTimeFormatter YMR_SLASH_FORMATTER_JODA = org.joda.time.format.DateTimeFormat.forPattern(YMR_SLASH);
     public static final FastDateFormat HOUR_MINUTE_FORMATTE_HUTOOL = FastDateFormat.getInstance(HOUR_MINUTE);
 
+    public static String stampTo8Zone(DateTimeFormatter dateTimeFormatter, Long timestamp) {
+        return dateTimeFormatter.format(LocalDateTime.ofInstant(Instant.ofEpochMilli(timestamp), ZoneOffset.ofHours(8)));
+    }
+
 }

ace-modules/ace-admin-api/src/main/java/com/github/wxiaoqi/security/admin/feign/UserFeign.java

@@ -178,6 +178,7 @@ public interface UserFeign {
     List<Integer> getUserIdByParentCompany(@RequestParam("parentCompanyId") List<Integer> parentCompanyId);
 
 
+
     @GetMapping("/app/user/list_staff")
     List<UserStaffBo> findAllStaffs();
 

xx-order/xx-order-api/src/main/java/com/xxfc/platform/order/contant/enumerate/OrderLogEnum.java

+package com.xxfc.platform.order.contant.enumerate;
+
+import java.util.HashMap;
+import java.util.Map;
+
+public enum OrderLogEnum {
+    //账款类型 1--订单常规操作；2--与账相关；3--延期相关
+    ORDER_ADD (101, "删除订单"),
+    DELAY_MODIFY (301, "延期增改", "订单号:{}, 延期增改", "旧:{}, 新:{}"),
+    ;
+
+    /**
+     * 编码
+     */
+    private Integer code;
+    /**
+     * 类型描述
+     */
+    private String desc;
+
+    /**
+     * 日志内容
+     */
+    private String content;
+
+    /**
+     * 细节
+     */
+    private String detail;
+
+    private static Map<Integer,String> codeAndDesc = new HashMap<Integer, String>();
+
+    OrderLogEnum(Integer code, String desc){
+        this.code=code;
+        this.desc=desc;
+    }
+
+    OrderLogEnum(Integer code, String desc, String content, String detail){
+        this.code=code;
+        this.desc=desc;
+        this.content=content;
+        this.detail=detail;
+    }
+
+
+    public Integer getCode() {
+        return code;
+    }
+
+    public void setCode(Integer code) {
+        this.code = code;
+    }
+
+    public String getDesc() {
+        return desc;
+    }
+
+    public void setDesc(String desc) {
+        this.desc = desc;
+    }
+
+    public String getContent() {
+        return content;
+    }
+
+    public void setContent(String content) {
+        this.content = content;
+    }
+
+    public static Boolean exists(Integer code){
+        return codeAndDesc.containsKey(code);
+    }
+}
\ No newline at end of file

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

@@ -88,7 +88,7 @@ public class OrderLog implements Serializable {
 	 */
 	@Column(name = "detail")
 	@ApiModelProperty(value = "详情")
-	private Integer detail;
+	private String detail;
 	
 
 }

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

 package com.xxfc.platform.order.entity;
 
+import cn.hutool.json.JSONUtil;
 import com.github.wxiaoqi.security.common.util.JsonUtil;
+import com.xxfc.platform.order.pojo.order.DelayRentOrderDTO;
 import com.xxfc.platform.order.pojo.price.CostDetailExtend;
+import com.xxfc.platform.order.pojo.price.DelayAddPriceVO;
 import io.swagger.annotations.ApiModelProperty;
 import lombok.Data;
 
@@ -333,4 +336,32 @@ public class OrderRentVehicleDetail implements Serializable {
 	public void handelCostDetailExtend(CostDetailExtend costDetailExtend) {
 		this.costDetailExtend = JsonUtil.objectToJson(((CostDetailExtend)costDetailExtend));
 	}
+
+	@Column(name = "delay_add_free_days")
+	@ApiModelProperty(value = "延期补充的免费天数")
+	private Integer delayAddFreeDays;
+
+	@Column(name = "delay_add_days")
+	@ApiModelProperty(value = "延期增加的天数")
+	private Integer delayAddDays;
+
+	@Column(name = "delay_add_detail")
+	@ApiModelProperty(value = "增加延期还车费用(计算)明细")
+	private String delayAddDetail;
+
+	@Column(name = "delay_add_damage_safe")
+	@ApiModelProperty(value = "延期增加天数是否购买车损免赔")
+	private Integer delayAddDamageSafe;
+
+	@Column(name = "delay_add_end_time")
+	@ApiModelProperty(value = "延期结束时间")
+	private Long delayAddEndTime;
+
+	public Integer obtainRealDayNum() {
+		return this.dayNum + this.delayAddDays;
+	}
+
+	public DelayAddPriceVO obtainDelayAddDetail() {
+		return JSONUtil.toBean(this.getDelayAddDetail(), DelayAddPriceVO.class);
+	}
 }

xx-order/xx-order-api/src/main/java/com/xxfc/platform/order/pojo/calculate/InProgressVO.java

@@ -103,4 +103,26 @@ public class InProgressVO {
      * 添加的延期费用
      */
     DelayAddPriceVO delayAddPriceVO = new DelayAddPriceVO();
+
+    /**
+     * 返还的原来订单的免费天数
+     */
+    Integer metaOrderBackFreeDays = 0;
+
+    /**
+     * 返还的延期增加的免费天数
+     */
+    Integer delayAddBackFreeDays = 0;
+
+    /**
+     * 原来订单的已使用的金额
+     */
+    BigDecimal metaOrderUsedAmount = BigDecimal.ZERO;
+
+    /**
+     * 延期增加的已使用的金额
+     */
+    BigDecimal delayAddUsedAmount = BigDecimal.ZERO;
+
+
 }

xx-order/xx-order-api/src/main/java/com/xxfc/platform/order/pojo/order/DelayRentOrderDTO.java

+package com.xxfc.platform.order.pojo.order;
+
+import com.github.wxiaoqi.security.common.constant.CommonConstants;
+import lombok.Data;
+
+import static com.github.wxiaoqi.security.common.constant.CommonConstants.*;
+
+@Data
+public class DelayRentOrderDTO {
+    Integer operateId;
+    String no;
+    Integer needDamageSafe = 0;
+    Long delayEndTime;
+    Long endTime;
+    String bookEndDate;
+    String bookEndDateTime;
+    Long startTime;
+    String bookStartDate;
+    String bookStartDateTime;
+
+    public void setStartTime(Long startTime) {
+        this.startTime = startTime;
+        this.bookStartDate = stampTo8Zone(YMR_SLASH_FORMATTER, startTime);
+        this.bookStartDateTime = stampTo8Zone(DATE_TIME_LINE_FORMATTER, startTime);
+    }
+
+    public void setEndTime(Long endTime) {
+        this.endTime = endTime;
+        this.bookEndDate = stampTo8Zone(YMR_SLASH_FORMATTER, endTime);
+        this.bookEndDateTime = stampTo8Zone(DATE_TIME_LINE_FORMATTER, endTime);
+    }
+}
\ No newline at end of file

xx-order/xx-order-api/src/main/java/com/xxfc/platform/order/pojo/order/VehicleItemDTO.java

@@ -119,6 +119,23 @@ public class VehicleItemDTO extends OrderItem {
         return usedAmount;
     }
 
+//    public BigDecimal getUsedAmountHasDelay(Integer useDays, List<VMCalendarPriceCostDTO> delayAmountList) {
+//
+//        BigDecimal usedAmount = getUsedAmount(useDays);
+//        if((useDays - getTotalNum()) > 0) {
+//            Integer delayAddDays = useDays - getTotalNum();
+//            if(delayAddDays > delayAmountList.size()) {
+//                delayAddDays = delayAmountList.size();
+//            }
+//
+//            for(int i = 0; i < delayAddDays; i++) {
+//                usedAmount = usedAmount.add(delayAmountList.get(i).getPrice());
+//            }
+//        }
+//
+//        return usedAmount;
+//    }
+
     //由于免费天数可以抵消不是完整的天数，所以处理比较不同
     public BigDecimal getFreeAmount(Integer offsetDay) {
         List<VMCalendarPriceCostDTO> vmcpds = getVehicleDetail();
@@ -187,8 +204,12 @@ public class VehicleItemDTO extends OrderItem {
             if(ableFreeDays > cycleNum && cycleNum+ dto.getFreeDays() > ableFreeDays) { //本次累加天数 大于 可用免费天数
                 paramDTO.setFreeNum(ableFreeDays);
 
+                //分子
                 Integer up = (ableFreeDays - cycleNum);
+                //分母
                 Integer down = dto.getFreeDays();
+                //设置当前生效免费天数
+                dto.setValidFreeDays(up);
                 //根据百分比计算消费价格
                 dto.setFreeAndConsumeAmount(dto.getPrice(), dto.getPrice().multiply(
                     new BigDecimal(up+ "").divide(new BigDecimal(down+ ""), 2, RoundingMode.HALF_UP))
@@ -198,6 +219,7 @@ public class VehicleItemDTO extends OrderItem {
                 paramDTO.setFreeNum(paramDTO.getFreeNum()+ dto.getFreeDays());
                 //直接设置价格
                 dto.setFreeAndConsumeAmount(dto.getPrice(), dto.getPrice());
+                dto.setValidFreeDays(dto.getFreeDays());
                 paramDTO.offsetNum += 1;
             }else { //上次累加天数 大于 可用天数
                 //直接设置价格

xx-order/xx-order-api/src/main/java/com/xxfc/platform/order/pojo/price/DelayAddPriceVO.java

@@ -3,6 +3,7 @@ package com.xxfc.platform.order.pojo.price;
 import cn.hutool.core.collection.CollUtil;
 import com.xxfc.platform.vehicle.pojo.dto.order.VMCalendarPriceCostDTO;
 import lombok.Data;
+import org.springframework.data.mongodb.core.aggregation.ArrayOperators;
 
 import java.math.BigDecimal;
 import java.util.List;
@@ -28,4 +29,52 @@ public class DelayAddPriceVO {
      * 使用（消耗）详情列表
      */
     List<VMCalendarPriceCostDTO> delayAmountList = CollUtil.newArrayList();
+
+    public void initDelayDamageSafeAmount() {
+        this.delayDamageSafeAmount = this.damageSafePrice.add(new BigDecimal(delayAddDays+ ""));
+    }
+
+    public Integer residueDelayFreeDays(Integer realResidueDays) {
+        if(realResidueDays > delayAddDays) {
+            realResidueDays = delayAddDays;
+        }
+
+        //已使用的延长天数
+        Integer useDelayDays = delayAddDays - realResidueDays;
+        //延长的免费天数
+        Integer residueDelayFreeDays = 0;
+
+        List<VMCalendarPriceCostDTO> delayAmountList = getDelayAmountList();
+        for(int i = useDelayDays; i < delayAddDays; i++) {
+            residueDelayFreeDays += delayAmountList.get(i).getFreeDays();
+        }
+
+        return residueDelayFreeDays;
+    }
+
+    public BigDecimal delayAddUseAmount(Integer delayAddUseDays) {
+        BigDecimal delayUsedAmount = BigDecimal.ZERO;
+        if(delayAddUseDays > getDelayAddDays()) {
+            delayAddUseDays = getDelayAddDays();
+        }
+
+        for(int i = 0; i < delayAddUseDays; i++) {
+            delayUsedAmount = delayUsedAmount.add(delayAmountList.get(i).getPrice());
+        }
+
+        return delayUsedAmount;
+    }
+
+    public BigDecimal delayAddFreeAmount(Integer delayAddUseDays) {
+        BigDecimal delayFreeAmount = BigDecimal.ZERO;
+        if(delayAddUseDays > getDelayAddDays()) {
+            delayAddUseDays = getDelayAddDays();
+        }
+
+        for(int i = 0; i < delayAddUseDays; i++) {
+            delayFreeAmount = delayFreeAmount.add(delayAmountList.get(i).getFreeAmount());
+        }
+
+        return delayFreeAmount;
+    }
 }

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

@@ -336,13 +336,13 @@ public class BaseOrderBiz extends BaseBiz<BaseOrderMapper, BaseOrder> implements
 //        System.out.println(a);
 //    }
 
-    public void updateCrossRefund(OrderPageVO orderPageVO) {
-        //计算延期费用
-        DedDetailDTO dedDetailDTO = new DedDetailDTO();
-        //提前还车,结束时间大于当前时间
-        Long nowTime = System.currentTimeMillis();
-        Long endTime = orderPageVO.getOrderRentVehicleDetail().getEndTime();
-        Long startTime = orderPageVO.getOrderRentVehicleDetail().getStartTime();
+	public void updateCrossRefund(OrderPageVO orderPageVO) {
+		//计算延期费用
+		DedDetailDTO dedDetailDTO = new DedDetailDTO();
+		//提前还车,结束时间大于当前时间
+		Long nowTime = System.currentTimeMillis();
+		Long endTime = orderPageVO.getOrderRentVehicleDetail().getEndTime();
+		Long startTime = orderPageVO.getOrderRentVehicleDetail().getStartTime();
 
 		//设置使用天数
 		int userUsedDay = orderCalculateBiz.getIncludeDays(startTime, nowTime);
@@ -450,24 +450,28 @@ public class BaseOrderBiz extends BaseBiz<BaseOrderMapper, BaseOrder> implements
 	}
 
 
-    /**
-     * 初始化违约金实体
-     * @param dedDetailDTO
-     * @param type
-     * @param cost
-     * @param stringBuilder
-     */
-    public void initDedDetail(DedDetailDTO dedDetailDTO, Integer type, BigDecimal cost, StringBuilder stringBuilder) {
-        String detailName = null;
-        if (type == OrderViolateEnum.BEFORE.getCode()) {
-            dedDetailDTO.setType(OrderViolateEnum.BEFORE.getCode());
-            detailName = "提前还车违约金";
-        } else if (type == OrderViolateEnum.AFTER.getCode()) {
-            dedDetailDTO.setType(OrderViolateEnum.AFTER.getCode());
-            detailName = "延期还车违约金";
-        } else if (type == OrderViolateEnum.CHANGE.getCode()) {
-            dedDetailDTO.setType(OrderViolateEnum.CHANGE.getCode());
-            detailName = "更换还车公司";
+	/**
+	 * 初始化违约金实体
+	 *
+	 * @param dedDetailDTO
+	 * @param type
+	 * @param cost
+	 * @param stringBuilder
+	 */
+	public void initDedDetail(DedDetailDTO dedDetailDTO, Integer type, BigDecimal cost, StringBuilder stringBuilder) {
+		String detailName = null;
+		if (type == OrderViolateEnum.BEFORE.getCode()) {
+			dedDetailDTO.setType(OrderViolateEnum.BEFORE.getCode());
+			detailName = "提前还车违约金";
+		} else if (type == OrderViolateEnum.AFTER.getCode()) {
+			dedDetailDTO.setType(OrderViolateEnum.AFTER.getCode());
+			detailName = "延期还车违约金";
+		} else if (type == OrderViolateEnum.CHANGE.getCode()) {
+			dedDetailDTO.setType(OrderViolateEnum.CHANGE.getCode());
+			detailName = "更换还车公司";
+		} else if (type == OrderViolateEnum.DELAY_VEHICLE.getCode()) {
+            dedDetailDTO.setType(1);
+            detailName = "延长还车";
         }
         //900元+违约金（￥900x2天=）1800元
         dedDetailDTO.setDeductions(stringBuilder.toString());
@@ -566,20 +570,21 @@ public class BaseOrderBiz extends BaseBiz<BaseOrderMapper, BaseOrder> implements
         orderPageVo.setVehicleUserLicenses(vehicleUserLicenses);
     }
 
-    /**
-     * 修改订单还车公司
-     * @param orderRentVehicleDetail
-     * @return
-     */
-    public ObjectRestResponse save(OrderRentVehicleDetail orderRentVehicleDetail) {
-        if (orderRentVehicleDetail == null || orderRentVehicleDetail.getId() == null) {
-            return ObjectRestResponse.paramIsEmpty();
-        }
-        log.info("更新订单还车地点》》》 orderRentVehicleDetail = {}", orderRentVehicleDetail.toString());
-        UserDTO userDTO = getAdminUserInfo();
-        if (userDTO == null) {
-            return ObjectRestResponse.createFailedResult(ResultCode.RSTOKEN_EXPIRED_CODE, ResultCode.getMsg(ResultCode.RSTOKEN_EXPIRED_CODE));
-        }
+	/**
+	 * 修改订单还车公司
+	 *
+	 * @param orderRentVehicleDetail
+	 * @return
+	 */
+	public ObjectRestResponse save(OrderRentVehicleDetail orderRentVehicleDetail) {
+		if (orderRentVehicleDetail == null || orderRentVehicleDetail.getId() == null) {
+			return ObjectRestResponse.paramIsEmpty();
+		}
+		log.info("更新订单还车地点》》》 orderRentVehicleDetail = {}", orderRentVehicleDetail.toString());
+		UserDTO userDTO = getAdminUserInfo();
+		if (userDTO == null) {
+			return ObjectRestResponse.createFailedResult(ResultCode.RSTOKEN_EXPIRED_CODE, ResultCode.getMsg(ResultCode.RSTOKEN_EXPIRED_CODE));
+		}
 
         StringBuilder stringBuilder = new StringBuilder();
         OrderRentVehicleDetail oldValue = orderRentVehicleBiz.selectById(orderRentVehicleDetail.getId());
@@ -843,72 +848,80 @@ public class BaseOrderBiz extends BaseBiz<BaseOrderMapper, BaseOrder> implements
         return zero;
     }
 
-    private void sendQueue(OrderMQDTO orderMQDTO, Integer sign) {
-        try {
-            orderMQDTO.setSign(sign);
-            SendMsgDTO sendMsgDTO = new SendMsgDTO(){{
-                setExchange(ORDER_TOPIC);
-            }};
-            sendMsgDTO.setJson(JSONUtil.toJsonStr(orderMQDTO));
-            switch (sign) {
-                case 2:
-                    sendMsgDTO.setRoutKey(KEY_ORDER_CANCEL);
-                    break;
-                case 4:
-                    sendMsgDTO.setRoutKey(KEY_ORDER_PAY);
-                    break;
-                case 6:
-                    sendMsgDTO.setRoutKey(KEY_ORDER_FINLISH);
-                    break;
-                case 101:
-                    sendMsgDTO.setRoutKey(KEY_ORDER_PART_DEPOSIT);
-                    break;
-                default:
-                    break;
-            }
-            mqSenderFeign.postSendMessage(sendMsgDTO);
-        } catch (Exception e) {
-            log.error(e.getMessage(), e);
-        }
-    }
+	private void sendQueue(OrderMQDTO orderMQDTO, Integer sign) {
+		try {
+			orderMQDTO.setSign(sign);
+			SendMsgDTO sendMsgDTO = new SendMsgDTO() {{
+				setExchange(ORDER_TOPIC);
+			}};
+			sendMsgDTO.setJson(JSONUtil.toJsonStr(orderMQDTO));
+			switch (sign) {
+				case 2:
+					sendMsgDTO.setRoutKey(KEY_ORDER_CANCEL);
+					break;
+				case 4:
+					sendMsgDTO.setRoutKey(KEY_ORDER_PAY);
+					break;
+				case 6:
+					sendMsgDTO.setRoutKey(KEY_ORDER_FINLISH);
+					break;
+				case 101:
+					sendMsgDTO.setRoutKey(KEY_ORDER_PART_DEPOSIT);
+					break;
+				default:
+					break;
+			}
+			mqSenderFeign.postSendMessage(sendMsgDTO);
+		} catch (Exception e) {
+			log.error(e.getMessage(), e);
+		}
+	}
 
-    public Query initQuery(String no) {
-        QueryOrderDetailDTO qodd = new QueryOrderDetailDTO();
-        //qodd.setCrtUser(Integer.valueOf(BaseContextHandler.getUserID()));
-        qodd.setUserId(Integer.valueOf(BaseContextHandler.getUserID()));
-        qodd.setNo(no);
-        qodd.setLimit(1);
-        qodd.setPage(1);
-        Query query = new Query(qodd);
-        return query;
-    }
+	public Query initQuery(String no) {
+		QueryOrderDetailDTO qodd = new QueryOrderDetailDTO();
+		//qodd.setCrtUser(Integer.valueOf(BaseContextHandler.getUserID()));
+		qodd.setUserId(Integer.valueOf(BaseContextHandler.getUserID()));
+		qodd.setNo(no);
+		qodd.setLimit(1);
+		qodd.setPage(1);
+		Query query = new Query(qodd);
+		return query;
+	}
 
-    @Override
-    public UserFeign getUserFeign() {
-        return userFeign;
-    }
+	public Query initBgQuery(String no) {
+		Query query = initQuery(no);
+		query.put("crtUser", null);
+		query.put("userId", null);
+		return query;
+	}
 
-    /**
-     * 订单查询类
-     */
-    @Data
-    public static class QueryOrderDetailDTO extends QueryOrderDTO {
-        private String no;
-    }
+	@Override
+	public UserFeign getUserFeign() {
+		return userFeign;
+	}
 
-    /**
-     * 获取退还优惠卷
-     * @param orderId
-     */
-    public List<Coupon> getReturnCouponByOrderId(Integer orderId) {
-        BaseOrder baseOrder = mapper.selectByPrimaryKey(orderId);
-        String backCoupon = baseOrder.getBackCoupon();
-        if (StringUtils.isNotBlank(backCoupon)) {
-            String[] couponArray = backCoupon.split(",");
-            return activityFeign.couponsByTickerNoList(Lists.newArrayList(couponArray));
-        }
-        return Lists.newArrayList();
-    }
+	/**
+	 * 订单查询类
+	 */
+	@Data
+	public static class QueryOrderDetailDTO extends QueryOrderDTO {
+		private String no;
+	}
+
+	/**
+	 * 获取退还优惠卷
+	 *
+	 * @param orderId
+	 */
+	public List<Coupon> getReturnCouponByOrderId(Integer orderId) {
+		BaseOrder baseOrder = mapper.selectByPrimaryKey(orderId);
+		String backCoupon = baseOrder.getBackCoupon();
+		if (StringUtils.isNotBlank(backCoupon)) {
+			String[] couponArray = backCoupon.split(",");
+			return activityFeign.couponsByTickerNoList(Lists.newArrayList(couponArray));
+		}
+		return Lists.newArrayList();
+	}
 
     public List<OrderDTO> selectOrdersByTypeAndTime(List<Integer> types, Integer hasPay, Date startDate, Date endDate) {
         List<OrderDTO>  orderDTOS = mapper.selectOrdersByTypeAndTime(types,hasPay,startDate,endDate);
@@ -924,6 +937,10 @@ public class BaseOrderBiz extends BaseBiz<BaseOrderMapper, BaseOrder> implements
         return mapper.selectAllRentVehicleOrder(paramMap);
     }
 
+    public List<OrderPageVO> selectAllCountOrder(Map<String, Object> paramMap) {
+        return mapper.selectAllCountOrder(paramMap);
+    }
+
 
     public List<Achievement> entryStatisticalData(QueryCriteria queryCriteria) {
        return mapper.selectTotalStatistical(queryCriteria);
@@ -938,8 +955,4 @@ public class BaseOrderBiz extends BaseBiz<BaseOrderMapper, BaseOrder> implements
     }
 
 
-    public List<OrderPageVO> selectAllCountOrder(Map<String, Object> paramMap) {
-        return mapper.selectAllCountOrder(paramMap);
-    }
-
 }
\ No newline at end of file

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

 package com.xxfc.platform.order.biz;
 
+import cn.hutool.core.util.StrUtil;
+import com.xxfc.platform.order.contant.enumerate.OrderLogEnum;
+import lombok.extern.slf4j.Slf4j;
 import org.springframework.stereotype.Service;
 
 import com.xxfc.platform.order.entity.OrderLog;
@@ -14,5 +17,22 @@ import com.github.wxiaoqi.security.common.biz.BaseBiz;
  * @date 2019-07-23 17:33:06
  */
 @Service
+@Slf4j
 public class OrderLogBiz extends BaseBiz<OrderLogMapper,OrderLog> {
+
+    public void logChange(Object newObj, Object oldObj, Integer logUserId, String orderNo, OrderLogEnum orderLogEnum) {
+        try {
+            OrderLog orderLog = new OrderLog(){{
+//              setLogUserType();
+                setType(orderLogEnum.getCode());
+                setLogUserId(logUserId);
+                setLogContent(StrUtil.format(orderLogEnum.getContent(), orderNo));
+                setDetail(StrUtil.format(orderLogEnum.getDesc(), oldObj, newObj));
+            }};
+
+            updateSelectiveByIdRe(orderLog);
+        }catch (Exception e) {
+            log.error(e.getMessage(), e);
+        }
+    }
 }
\ No newline at end of file

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

@@ -148,8 +148,8 @@ public class OrderCancelBiz {
                     Long timeLag = orvd.getStartTime() - System.currentTimeMillis();
                     if(timeLag < 0 ) {
                         Integer useDays = orderCalculateBiz.getIncludeDays(orvd.getStartTime(), System.currentTimeMillis());
-                        if(useDays > orvd.getDayNum()) {
-                            useDays = orvd.getDayNum();
+                        if(useDays > orvd.obtainRealDayNum()) {
+                            useDays = orvd.obtainRealDayNum();
                         }
                         inProgressVO = orderCalculateBiz.calculateOrderComplete(baseOrder, orvd, oad, vehicleItemDTO, useDays, Boolean.TRUE);
 

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

+package com.xxfc.platform.order.biz.inner;
+
+import cn.hutool.core.bean.BeanUtil;
+import cn.hutool.core.collection.CollUtil;
+import cn.hutool.core.convert.Convert;
+import cn.hutool.core.date.DateUtil;
+import cn.hutool.core.util.StrUtil;
+import cn.hutool.json.JSONUtil;
+import com.github.wxiaoqi.security.admin.feign.UserFeign;
+import com.github.wxiaoqi.security.admin.feign.dto.AppUserDTO;
+import com.github.wxiaoqi.security.common.exception.BaseException;
+import com.github.wxiaoqi.security.common.util.process.ResultCode;
+import com.xxfc.platform.activity.feign.ActivityFeign;
+import com.xxfc.platform.order.biz.*;
+import com.xxfc.platform.order.contant.enumerate.*;
+import com.xxfc.platform.order.entity.*;
+import com.xxfc.platform.order.pojo.account.OrderAccountDeduction;
+import com.xxfc.platform.order.pojo.account.OrderAccountDetail;
+import com.xxfc.platform.order.pojo.calculate.InProgressVO;
+import com.xxfc.platform.order.pojo.mq.OrderMQDTO;
+import com.xxfc.platform.order.pojo.order.DelayRentOrderDTO;
+import com.xxfc.platform.order.pojo.order.OrderPageVO;
+import com.xxfc.platform.order.pojo.order.VehicleItemDTO;
+import com.xxfc.platform.order.pojo.price.CancelNoStartVO;
+import com.xxfc.platform.order.pojo.price.CancelStartedVO;
+import com.xxfc.platform.order.pojo.price.CostDetailExtend;
+import com.xxfc.platform.order.pojo.price.DelayAddPriceVO;
+import com.xxfc.platform.tour.feign.TourFeign;
+import com.xxfc.platform.universal.constant.DictionaryKey;
+import com.xxfc.platform.universal.entity.Dictionary;
+import com.xxfc.platform.universal.feign.ThirdFeign;
+import com.xxfc.platform.vehicle.common.RestResponse;
+import com.xxfc.platform.vehicle.feign.VehicleFeign;
+import com.xxfc.platform.vehicle.pojo.BookVehicleVO;
+import com.xxfc.platform.vehicle.pojo.dto.order.VMCalendarPriceCostDTO;
+import io.swagger.annotations.ApiModelProperty;
+import lombok.extern.slf4j.Slf4j;
+import org.mockito.internal.util.collections.Sets;
+import org.springframework.beans.BeanUtils;
+import org.springframework.beans.factory.annotation.Autowired;
+import org.springframework.stereotype.Service;
+import org.springframework.transaction.annotation.Transactional;
+
+import javax.persistence.Column;
+import java.math.BigDecimal;
+import java.util.HashMap;
+import java.util.LinkedList;
+import java.util.List;
+import java.util.Map;
+
+import static com.github.wxiaoqi.security.common.constant.CommonConstants.SYS_TRUE;
+import static com.xxfc.platform.universal.constant.DictionaryKey.*;
+
+/**
+ * 订单退款记录表
+ *
+ * @author zjw
+ * @email nishijjo@qq.com
+ * @date 2019-06-18 11:08:09
+ */
+@Slf4j
+@Service
+public class OrderDelayBiz {
+
+    @Autowired
+    BaseOrderBiz baseOrderBiz;
+
+    @Autowired
+    OrderItemBiz orderItemBiz;
+
+    @Autowired
+    OrderMemberDetailBiz orderMemberDetailBiz;
+
+    @Autowired
+    OrderTourDetailBiz orderTourDetailBiz;
+
+    @Autowired
+    OrderRentVehicleBiz orderRentVehicleBiz;
+
+    @Autowired
+    OrderMsgBiz orderMsgBiz;
+
+    @Autowired
+    OrderCalculateBiz orderCalculateBiz;
+
+    @Autowired
+    OrderAccountBiz orderAccountBiz;
+
+    @Autowired
+    OrderTemplateBiz orderTemplateBiz;
+
+    @Autowired
+    OrderLogBiz orderLogBiz;
+
+    @Autowired
+    UserFeign userFeign;
+
+    @Autowired
+    VehicleFeign vehicleFeign;
+
+    @Autowired
+    TourFeign tourFeign;
+
+    @Autowired
+    ThirdFeign thirdFeign;
+
+    @Autowired
+    ActivityFeign activityFeign;
+
+    public void delayRentOrder(OrderPageVO orderPageVO, DelayRentOrderDTO dto) {
+        OrderRentVehicleDetail orvd = orderPageVO.getOrderRentVehicleDetail();
+        OrderRentVehicleDetail oldOrvd = BeanUtil.toBean(orvd, OrderRentVehicleDetail.class);
+        Integer delayAddDays = 0;
+        Integer delayAddFreeDays = 0;
+        //分布式事务执行标记
+        Integer cloudTransact = 0;
+
+        //计算delay多少天
+        delayAddDays = orderCalculateBiz.getIncludeDays(orvd.getStartTime(), dto.getDelayEndTime());
+        delayAddDays = delayAddDays - orderPageVO.getOrderRentVehicleDetail().getDayNum();
+
+        //判断
+        if(delayAddDays < 0) {
+            throw new BaseException(ResultCode.PARAM_ILLEGAL_CODE, Sets.newSet("延期时间不对"));
+        }else {
+            //变化的延期免费天数
+            Integer changeDelayFreeDays = 0;
+            List<VMCalendarPriceCostDTO> delayAmountList;
+
+            if(delayAddDays > 0) {
+                //获得延期天数费用
+                delayAmountList = orderItemBiz.getOverAmountList(DateUtil.date(orvd.getEndTime()), delayAddDays, orvd.getModelId(), orderPageVO.getUserId());
+                //处理免费天数和免费金额
+                delayAmountList.parallelStream().forEach( vmcpcd -> {
+                    vmcpcd.setValidFreeDays(vmcpcd.getFreeDays());
+                    vmcpcd.setFreeAmount(vmcpcd.getPrice());
+                });
+
+                delayAddFreeDays = delayAmountList.parallelStream().mapToInt(VMCalendarPriceCostDTO::getFreeDays).sum();
+            }else {
+                delayAmountList = CollUtil.newArrayList();
+                delayAddFreeDays = 0;
+            }
+
+            //初始化变化的延期免费天数为延期天数
+            changeDelayFreeDays = delayAddFreeDays;
+
+            //判断是否已经设置了延期, 修改变化的延期免费天数
+            if(orvd.getDelayAddDays() > 0) {
+                //extendDelayDays = delayAddDays - orvd.getDelayAddDays();
+                changeDelayFreeDays = delayAddFreeDays - orvd.getDelayAddFreeDays();
+            }
+
+            //根据 changeDelayFreeDays 判断 是否拥有那么足够的天数
+            if(changeDelayFreeDays > 0) {
+                AppUserDTO appUserDTO = userFeign.userDetailById(orderPageVO.getUserId()).getData();
+                if(appUserDTO.getRentFreeDays() < changeDelayFreeDays) {
+                    throw new BaseException(ResultCode.FAILED_CODE, Sets.newSet("免费天数不够"));
+                }
+            }
+
+            //触发调用修改预约
+            dto.setEndTime(dto.getDelayEndTime());
+            dto.setStartTime(orderPageVO.getOrderRentVehicleDetail().getStartTime());
+
+            //根据订单号获取订单
+            RestResponse restResponse = vehicleFeign.updateOrderBookRecord(new BookVehicleVO() {{
+                setVehicleId(orderPageVO.getOrderRentVehicleDetail().getVehicleId());
+                setBookStartDate(dto.getBookStartDate());
+                setBookEndDate(dto.getBookEndDate());
+                setBookStartDateTime(dto.getBookStartDateTime());
+                setBookEndDateTime(dto.getBookEndDateTime());
+            }});
+
+            if( !SYS_TRUE.equals(restResponse.getCode())) {
+                throw new BaseException(ResultCode.FAILED_CODE, Sets.newSet("延期失败"));
+            }
+            cloudTransact = 1;
+
+            //扣减免费天数
+            if(changeDelayFreeDays > 0) {
+                int result = userFeign.memberDays(orderPageVO.getUserId(), changeDelayFreeDays, UserFeign.MEMBER_DAYS_LOCK);
+                if (result < 0) {
+                    throw new BaseException(ResultCode.FAILED_CODE);
+                }
+            }else if(changeDelayFreeDays < 0){
+                int result = userFeign.memberDays(orderPageVO.getUserId(), 0 - changeDelayFreeDays, UserFeign.MEMBER_DAYS_WITHDRAW);
+                if (result < 0) {
+                    throw new BaseException(ResultCode.FAILED_CODE);
+                }
+            }
+            cloudTransact = 2;
+
+            //更新OrderRentVehicleDetail
+            Map<String, Dictionary> dictionaryMap = thirdFeign.dictionaryGetAll4Map().getData();
+            orvd.setDelayAddDamageSafe(dto.getNeedDamageSafe());
+            orvd.setDelayAddDays(delayAddDays);
+            orvd.setDelayAddFreeDays(delayAddFreeDays);
+            orvd.setDelayAddEndTime(dto.getDelayEndTime());
+            DelayAddPriceVO delayAddPriceVO = new DelayAddPriceVO(){{
+                setDamageSafePrice(new BigDecimal(dictionaryMap.get(APP_ORDER+ "_"+ DictionaryKey.DAMAGE_SAFE).getDetail()));
+                setDelayAddDays(orvd.getDelayAddDays());
+                setDelayAmountList(delayAmountList);
+            }};
+
+            if(SYS_TRUE.equals(dto.getNeedDamageSafe())) {
+                delayAddPriceVO.initDelayDamageSafeAmount();
+            }
+            orvd.setDelayAddDetail(JSONUtil.toJsonStr(delayAddPriceVO));
+            orderRentVehicleBiz.updateSelectiveByIdRe(orvd);
+            orderLogBiz.logChange(orvd, oldOrvd, dto.getOperateId(), orderPageVO.getNo(), OrderLogEnum.DELAY_MODIFY);
+        }
+    }
+}
\ No newline at end of file

xx-order/xx-order-server/src/main/java/com/xxfc/platform/order/mapper/BaseOrderMapper.java

@@ -48,7 +48,7 @@ public interface BaseOrderMapper extends Mapper<BaseOrder> {
                                              @Param("startDate") Date startDate,
                                              @Param("endDate") Date endDate);
 
+    List<OrderDTO> selectBaeOrderByOrderIds(@Param("orderIds") List<Integer> orderIds);
     List<Achievement> selectTotalStatistical(QueryCriteria queryCriteria);
 
-    List<OrderDTO> selectBaeOrderByOrderIds(@Param("orderIds") List<Integer> orderIds);
 }

xx-order/xx-order-server/src/main/java/com/xxfc/platform/order/mapper/OrderAccountMapper.java

@@ -25,8 +25,6 @@ public interface OrderAccountMapper extends Mapper<OrderAccount> {
 
     List<OrderAccountDTO> getOrderAccountByOrderType(Term term);
 
-    List<ReturnOrderAmount> outStatisticalData(@Param("queryCriteria")QueryCriteria queryCriteria, @Param("startTime") Long startTime, @Param("endTime")Long endTime);
-
     List<OrderAccountBo> selectOrderAccountByOrderTypeAndStartTimeAndEndTime(@Param("orderType") Integer orderType,
                                                                              @Param("startTime") long startTime,
                                                                              @Param("endTime") long endTime);
@@ -34,4 +32,6 @@ public interface OrderAccountMapper extends Mapper<OrderAccount> {
     List<OrderAccountBo> selectByDateAndStatffIds(@Param("startDate") Date startDate,
                                                   @Param("endDate") Date endDate,
                                                   @Param("staffUserIds") List<Integer> staffUserIds);
+
+    List<ReturnOrderAmount> outStatisticalData(@Param("queryCriteria")QueryCriteria queryCriteria, @Param("startTime") Long startTime, @Param("endTime")Long endTime);
 }

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

 package com.xxfc.platform.order.rest;
 
 import cn.hutool.core.bean.BeanUtil;
+import cn.hutool.core.collection.CollUtil;
 import cn.hutool.core.collection.CollectionUtil;
+import cn.hutool.core.date.DateUtil;
 import cn.hutool.json.JSONUtil;
 import com.fasterxml.jackson.databind.ObjectMapper;
 import com.github.wxiaoqi.security.admin.entity.AppUserLogin;
@@ -22,15 +24,21 @@ import com.google.common.collect.Lists;
 import com.xxfc.platform.activity.entity.Coupon;
 import com.xxfc.platform.activity.feign.ActivityFeign;
 import com.xxfc.platform.order.biz.*;
+import com.xxfc.platform.order.biz.inner.OrderCalculateBiz;
 import com.xxfc.platform.order.contant.enumerate.ItemTypeEnum;
+import com.xxfc.platform.order.contant.enumerate.OrderTypeEnum;
 import com.xxfc.platform.order.entity.OrderItem;
 import com.xxfc.platform.order.entity.OrderRentVehicleDetail;
 import com.xxfc.platform.order.pojo.OrderAccompanyDTO;
 import com.xxfc.platform.order.pojo.order.*;
+import com.xxfc.platform.order.pojo.price.DelayAddPriceVO;
 import com.xxfc.platform.order.pojo.price.RentVehiclePriceVO;
 import com.xxfc.platform.order.service.OrderRentVehicleService;
 import com.xxfc.platform.tour.entity.TourUser;
 import com.xxfc.platform.tour.feign.TourFeign;
+import com.xxfc.platform.universal.constant.DictionaryKey;
+import com.xxfc.platform.universal.entity.Dictionary;
+import com.xxfc.platform.universal.feign.ThirdFeign;
 import com.xxfc.platform.vehicle.common.RestResponse;
 import com.xxfc.platform.vehicle.constant.VehicleBookRecordStatus;
 import com.xxfc.platform.vehicle.entity.BranchCompany;
@@ -39,6 +47,7 @@ import com.xxfc.platform.vehicle.entity.VehicleUserLicense;
 import com.xxfc.platform.vehicle.feign.VehicleFeign;
 import com.xxfc.platform.vehicle.pojo.BookVehicleVO;
 import com.xxfc.platform.vehicle.pojo.CompanyDetail;
+import com.xxfc.platform.vehicle.pojo.dto.order.VMCalendarPriceCostDTO;
 import io.swagger.annotations.Api;
 import io.swagger.annotations.ApiOperation;
 import jodd.util.StringUtil;
@@ -52,14 +61,15 @@ import org.springframework.web.bind.annotation.*;
 
 import javax.annotation.Resource;
 import java.io.IOException;
+import java.math.BigDecimal;
 import java.time.Instant;
 import java.time.LocalDateTime;
 import java.time.ZoneOffset;
 import java.util.*;
 import java.util.stream.Collectors;
 
-import static com.github.wxiaoqi.security.common.constant.CommonConstants.DATE_TIME_LINE_FORMATTER;
-import static com.github.wxiaoqi.security.common.constant.CommonConstants.YMR_SLASH_FORMATTER;
+import static com.github.wxiaoqi.security.common.constant.CommonConstants.*;
+import static com.xxfc.platform.universal.constant.DictionaryKey.APP_ORDER;
 
 @Controller
 //@RequestMapping("baseOrder")
@@ -83,6 +93,9 @@ public class BackStageOrderController extends CommonBaseController implements Us
     @Autowired
     OrderItemBiz orderItemBiz;
 
+    @Autowired
+    OrderCalculateBiz orderCalculateBiz;
+
     @Autowired
     UserFeign userFeign;
 
@@ -95,6 +108,9 @@ public class BackStageOrderController extends CommonBaseController implements Us
     @Resource
     VehicleFeign vehicleFeign;
 
+    @Autowired
+    ThirdFeign thirdFeign;
+
     @Autowired
     BackgroundBaseOrderBiz backgroundBaseOrderBiz;
     @Override
@@ -402,9 +418,8 @@ public class BackStageOrderController extends CommonBaseController implements Us
         checkAdminUser();
         //根据订单号获取订单
         //查询列表数据
-        Query query = baseOrderBiz.initQuery(dto.getNo());
-        query.put("crtUser", null);
-        query.put("userId", null);
+        Query query = baseOrderBiz.initBgQuery(dto.getNo());
+
         PageDataVO<OrderPageVO> page = PageDataVO.pageInfo(query, () -> baseOrderBiz.pageByParm(query.getSuper()));
         OrderPageVO orderPageVO = page.getData().get(0);
         if (null == orderPageVO) {
@@ -442,10 +457,17 @@ public class BackStageOrderController extends CommonBaseController implements Us
     @RequestMapping(value = "/baseOrder/bg/delay-rent-order", method = RequestMethod.POST)
     @IgnoreClientToken
     @ResponseBody
-    public ObjectRestResponse<OrderPageVO> delayRentOrder(@RequestBody delayRentOrderDTO dto) {
+    public ObjectRestResponse<OrderPageVO> delayRentOrder(@RequestBody DelayRentOrderDTO dto) {
         checkAdminUser();
-        //根据订单号获取订单
 
+        Query query = baseOrderBiz.initBgQuery(dto.getNo());
+
+        PageDataVO<OrderPageVO> page = PageDataVO.pageInfo(query, () -> baseOrderBiz.pageByParm(query.getSuper()));
+        OrderPageVO orderPageVO = page.getData().get(0);
+
+        if (null == orderPageVO || !OrderTypeEnum.RENT_VEHICLE.getCode().equals(orderPageVO.getType())) {
+            throw new BaseException(ResultCode.PARAM_ILLEGAL_CODE, Sets.newSet("订单不存在,或不是租车订单"));
+        }
 
         return ObjectRestResponse.succ();
     }
@@ -468,12 +490,6 @@ public class BackStageOrderController extends CommonBaseController implements Us
         String numberPlate;
     }
 
-    @Data
-    public static class delayRentOrderDTO {
-        Integer no;
-        Long delayEndTime;
-    }
-
     private Query initCompanyQuery(String no) {
         BackStageOrderController.QueryOrderDetailDTO qodd = new BackStageOrderController.QueryOrderDetailDTO();
         //查询公司id

xx-order/xx-order-server/src/main/resources/mapper/BaseOrderMapper.xml

@@ -116,14 +116,14 @@
     <select id="listOrder" parameterType="Map" resultMap="orderListMap">
         select b.*
         <if test="type==1">
-            ,i.detail as carArticlesJson
+            ,i.detail  as carArticlesJson
         </if>
         from base_order b
         LEFT JOIN order_rent_vehicle_detail r on r.order_id = b.id
         LEFT JOIN order_tour_detail t on t.order_id = b.id
         LEFT JOIN order_member_detail m on m.order_id = b.id
         <if test="type==1">
-            LEFT JOIN (select * from order_item where type = 104) i on b.id = i.order_id
+            LEFT JOIN (select * from  order_item where type = 104) i on  b.id = i.order_id
         </if>
         <where>
             <if test="crtUser != null">
@@ -376,7 +376,7 @@
     </select>
 
     <select id="findMemberOrders" resultType="com.xxfc.platform.order.pojo.dto.MemberOrderBo">
-        select bo.*,omd.member_level AS `memberLevel` from (
+    select bo.*,omd.member_level AS `memberLevel` from (
         SELECT
         `id`,
         `no` AS `orderNo`,
@@ -432,7 +432,7 @@
         ) AS `bo`
         INNER JOIN (select  * from `order_member_detail` where  1=1
         <if test="level!=null">
-            and  `member_level`=#{level}
+          and  `member_level`=#{level}
         </if>
         ) AS `omd` ON omd.order_id=bo.id
         ORDER BY bo.`creatTime` DESC

xx-universal/xx-universal-server/src/main/java/com/xxfc/platform/universal/biz/OrderPayBiz.java

@@ -449,7 +449,7 @@ public class OrderPayBiz extends BaseBiz<OrderPayMapper, OrderPay>{
         stringBuilder.append("&app_id=");
         stringBuilder.append(SystemConfig.ALIPAY_APPID);
         stringBuilder.append("&app_name=");
-        stringBuilder.append("xinxinRV");
+        stringBuilder.append("mc");
         stringBuilder.append("&auth_type=AUTHACCOUNT");
         stringBuilder.append("&biz_type=openservice");
         stringBuilder.append("&method=alipay.open.auth.sdk.code.get");

xx-universal/xx-universal-server/src/main/java/com/xxfc/platform/universal/service/CertificationService.java

@@ -126,7 +126,7 @@ public class CertificationService {
         exa.createCriteria().andEqualTo("idNumber", number);
         List<IdInformation> idInformatics = idInformationMapper.selectByExample(exa);
 
-        if (CollectionUtils.isNotEmpty(idInformatics) && idInformatics.size() >getCofig() ) {
+        if (CollectionUtils.isNotEmpty(idInformatics) && idInformatics.size() >=getCofig() ) {
             log.error("该身份证已超过最大认证次数");
             return ObjectRestResponse.createFailedResult(ResultCode.FAILED_CODE, "该身份证已超过最大认证次数");
         }

xx-vehicle/xx-vehicle-api/src/main/java/com/xxfc/platform/vehicle/feign/VehicleFeign.java

@@ -210,6 +210,6 @@ public interface VehicleFeign {
      * @return
      */
     @RequestMapping(value = "/vehicleInfo/bookRecord/order-update", method = RequestMethod.POST)
-    public RestResponse updateOrderBookRecord(@RequestBody  BookVehicleVO bookVehicleVo) throws Exception;
+    public RestResponse updateOrderBookRecord(@RequestBody BookVehicleVO bookVehicleVo);
 
 }

xx-vehicle/xx-vehicle-api/src/main/java/com/xxfc/platform/vehicle/pojo/dto/order/VMCalendarPriceCostDTO.java

@@ -23,6 +23,11 @@ public class VMCalendarPriceCostDTO extends VehicleModelCalendarPriceDTO {
      */
     private BigDecimal freeAmount = BigDecimal.ZERO;
 
+    /**
+     * 生效的免费天数
+     */
+    private Integer validFreeDays = 0;
+
     public void setFreeAndConsumeAmount(BigDecimal realAmount, BigDecimal freeAmount) {
         setFreeAmount(freeAmount);
         setConsumeAmount(realAmount.subtract(freeAmount));