Merge remote-tracking branch 'origin/dev' into dev

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

@@ -252,31 +252,31 @@ public class BaseOrder implements Serializable {
 	@Column(name = "member_level")
 	private Integer memberLevel;
 
-	/**
-	 * 违约金
-	 */
-	@ApiModelProperty(value = "违约金")
-	@Column(name = "violate_amount")
-	BigDecimal ViolateAmount;
-
-	/**
-	 * 赔偿金
-	 */
-	@ApiModelProperty(value = "赔偿金")
-	@Column(name = "damages_amount")
-	BigDecimal damagesAmount;
-
-	/**
-	 * 额外费用
-	 */
-	@ApiModelProperty(value = "额外费用")
-	@Column(name = "extra_amount")
-	BigDecimal extraAmount;
-
-	/**
-	 * 返还的优惠券
-	 */
-	@ApiModelProperty(value = "返回的优惠券")
-	@Column(name = "back_coupon")
-	String backCoupon;
+//	/**
+//	 * 违约金
+//	 */
+//	@ApiModelProperty(value = "违约金")
+//	@Column(name = "violate_amount")
+//	BigDecimal ViolateAmount;
+//
+//	/**
+//	 * 赔偿金
+//	 */
+//	@ApiModelProperty(value = "赔偿金")
+//	@Column(name = "damages_amount")
+//	BigDecimal damagesAmount;
+//
+//	/**
+//	 * 额外费用
+//	 */
+//	@ApiModelProperty(value = "额外费用")
+//	@Column(name = "extra_amount")
+//	BigDecimal extraAmount;
+//
+//	/**
+//	 * 返还的优惠券
+//	 */
+//	@ApiModelProperty(value = "返回的优惠券")
+//	@Column(name = "back_coupon")
+//	String backCoupon;
 }

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

@@ -308,11 +308,11 @@ public class OrderRentVehicleDetail implements Serializable {
 	@Column(name = "fixed_loss_status")
 	private Integer fixedLossStatus;
 
-	/**
-	 * 返还的免费天数
-	 */
-	@ApiModelProperty(value = "返回的免费天数")
-	@Column(name = "back_free_days")
-	Integer backFreeDays;
+//	/**
+//	 * 返还的免费天数
+//	 */
+//	@ApiModelProperty(value = "返回的免费天数")
+//	@Column(name = "back_free_days")
+//	Integer backFreeDays;
 
 }

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

@@ -13,12 +13,11 @@ import com.github.wxiaoqi.security.common.exception.BaseException;
 import com.github.wxiaoqi.security.common.msg.ObjectRestResponse;
 import com.github.wxiaoqi.security.common.util.process.ResultCode;
 import com.xxfc.platform.activity.user.UserInfoBiz;
-import com.xxfc.platform.order.biz.inner.OrderCalculateBiz;
-import com.xxfc.platform.order.contant.enumerate.*;
+import com.xxfc.platform.order.contant.enumerate.CrosstownTypeEnum;
+import com.xxfc.platform.order.contant.enumerate.DepositRefundStatus;
+import com.xxfc.platform.order.contant.enumerate.OrderStatusEnum;
 import com.xxfc.platform.order.entity.*;
 import com.xxfc.platform.order.mapper.OrderVehicaleCrosstownMapper;
-import com.xxfc.platform.order.pojo.DedDetailDTO;
-import com.xxfc.platform.order.pojo.calculate.InProgressVO;
 import com.xxfc.platform.order.pojo.mq.OrderMQDTO;
 import com.xxfc.platform.order.pojo.order.OrderPageVO;
 import com.xxfc.platform.order.pojo.order.OrderVehicleCrosstownDto;
@@ -35,15 +34,11 @@ import com.xxfc.platform.vehicle.pojo.VehicleDepartureVo;
 import lombok.extern.slf4j.Slf4j;
 import org.apache.commons.collections4.map.HashedMap;
 import org.apache.commons.lang3.StringUtils;
-import org.joda.time.DateTime;
-import org.joda.time.format.DateTimeFormat;
-import org.joda.time.format.DateTimeFormatter;
 import org.springframework.beans.factory.annotation.Autowired;
 import org.springframework.stereotype.Service;
 import org.springframework.transaction.annotation.Transactional;
 
 import java.math.BigDecimal;
-import java.util.Date;
 import java.util.List;
 import java.util.Map;
 import java.util.TimeZone;
@@ -76,25 +71,19 @@ public class OrderVehicleCrosstownBiz extends BaseBiz<OrderVehicaleCrosstownMapp
     @Autowired
     BaseOrderBiz baseOrderBiz;
 
-    @Autowired
-    OrderItemBiz orderItemBiz;
-
-    @Autowired
-    OrderCalculateBiz orderCalculateBiz;
-
     public OrderVehicleCrosstown get(Integer id) {
         return selectById(id);
     }
-    public static final DateTimeFormatter DEFAULT_DATE_TIME_FORMATTER = DateTimeFormat.forPattern("yyyy-MM-dd");
+
     public List<OrderVehicleCrosstownDto> selectByOrderId(OrderVehicleCrosstownDto orderVehicleCrosstownDto) {
 
         List<OrderVehicleCrosstownDto> list = mapper.selectByOrderId(orderVehicleCrosstownDto);
         for (OrderVehicleCrosstownDto value : list) {
-            if (value != null && value.getOrperaterId() != null && value.getType() != 1) {
+            if(value != null && value.getOrperaterId() != null && value.getType() != 1) {
                 UserDTO userDTO = userFeign.userinfoByUid(value.getOrperaterId()).getData();
-                if (userDTO != null) {
+                if(userDTO != null) {
                     CompanyDetail branchCompany = vehicleFeign.getCompanyDetail(userDTO.getCompanyId()).getData();
-                    if (branchCompany != null) {
+                    if(branchCompany != null) {
                         value.setCustomerPhone(branchCompany.getVehiceServicePhone());
                     }
                 }
@@ -159,7 +148,7 @@ public class OrderVehicleCrosstownBiz extends BaseBiz<OrderVehicaleCrosstownMapp
 
     @Transactional(rollbackFor = Exception.class)
     public ObjectRestResponse<OrderVehicleCrosstownDto> add(OrderVehicleCrosstownDto orderVehicleCrosstownDto) {
-        log.info("交还车参数：orderVehicaleCrosstown = {}", orderVehicleCrosstownDto);
+        log.info("添加的参数：orderVehicaleCrosstown = {}", orderVehicleCrosstownDto);
         UserDTO userDTO = userInfoBiz.getAdminUserInfo();
         if (userDTO == null) {
             return ObjectRestResponse.createFailedResult(ResultCode.RSTOKEN_EXPIRED_CODE, "token is null or invalid");
@@ -174,20 +163,20 @@ public class OrderVehicleCrosstownBiz extends BaseBiz<OrderVehicaleCrosstownMapp
         }
 
         OrderRentVehicleDetail orderRentVehicleDetail = orderRentVehicleBiz.selectById(baseOrder.getDetailId());
-        if (orderVehicleCrosstownDto.getType() == CrosstownTypeEnum.DEPARTURE.getCode()) {
+        if(orderVehicleCrosstownDto.getType() == CrosstownTypeEnum.DEPARTURE.getCode()) {
             boolean flag = getTodayTime(orderRentVehicleDetail.getEndTime());
             if (!flag) {
                 return ObjectRestResponse.createFailedResult(3502, "今日不是交车日期");
             }
-            if (userDTO.getCompanyId() != orderRentVehicleDetail.getStartCompanyId()) {
+            if(userDTO.getCompanyId() != orderRentVehicleDetail.getStartCompanyId()) {
                 return ObjectRestResponse.createFailedResult(3501, "无交车权限");
             }
         } else {
-            if (userDTO.getCompanyId() != orderRentVehicleDetail.getEndCompanyId()) {
+            if(userDTO.getCompanyId() != orderRentVehicleDetail.getEndCompanyId()) {
                 return ObjectRestResponse.createFailedResult(3503, "无收车权限");
             }
         }
-        if (baseOrder.getStatus() != -1) {
+        if(baseOrder.getStatus() != -1) {
             Vehicle vehicle = null;
             RestResponse<Vehicle> restResponse = vehicleFeign.findById(orderRentVehicleDetail.getVehicleId());
             log.info("获取车辆信息返回消息：{}", restResponse.getMessage());
@@ -197,7 +186,7 @@ public class OrderVehicleCrosstownBiz extends BaseBiz<OrderVehicaleCrosstownMapp
             if (vehicle == null) {
                 return ObjectRestResponse.createFailedResult(ResCode.VEHICLE_DEPARTURE_VEHICLE_UNEXIST.getCode(), ResCode.VEHICLE_DEPARTURE_VEHICLE_UNEXIST.getDesc());
             }
-            if (vehicle.getMileageLastUpdate() != null) {
+            if( vehicle.getMileageLastUpdate() != null) {
                 //判断车辆公里数
                 if (orderVehicleCrosstownDto.getMileage() == null || orderVehicleCrosstownDto.getMileage() <= vehicle.getMileageLastUpdate()) {
                     return ObjectRestResponse.createFailedResult(ResCode.VEHICLE_BOOKED_RECORD_MILEAGE_CHANGED.getCode(), ResCode.VEHICLE_BOOKED_RECORD_MILEAGE_CHANGED.getDesc());
@@ -215,7 +204,7 @@ public class OrderVehicleCrosstownBiz extends BaseBiz<OrderVehicaleCrosstownMapp
             vehicleDepartureVo.setDepartureBranchCompanyId(orderRentVehicleDetail.getStartCompanyId());
             vehicleDepartureVo.setExpectArrivalBranchCompanyId(orderRentVehicleDetail.getEndCompanyId());
             vehicleDepartureVo.setMileage(orderVehicleCrosstownDto.getMileage());
-            if (appUserDTO != null) {
+            if(appUserDTO != null) {
                 vehicleDepartureVo.setUser(appUserDTO.getNickname());
                 vehicleDepartureVo.setUserTel(appUserDTO.getUsername());
             } else {
@@ -240,7 +229,7 @@ public class OrderVehicleCrosstownBiz extends BaseBiz<OrderVehicaleCrosstownMapp
             vehicleArrivalVo.setMileage(orderVehicleCrosstownDto.getMileage());
             vehicleArrivalVo.setRecycleMan(userDTO.getName());
             vehicleArrivalVo.setBookRecordId(orderRentVehicleDetail.getBookRecordId());
-            if (appUserDTO != null) {
+            if(appUserDTO != null) {
                 vehicleArrivalVo.setRecycleManTel(appUserDTO.getUsername());
             } else {
                 vehicleArrivalVo.setRecycleManTel("13565235623");
@@ -257,21 +246,21 @@ public class OrderVehicleCrosstownBiz extends BaseBiz<OrderVehicaleCrosstownMapp
             JSONArray jsonArray = JSONArray.parseArray(orderVehicleCrosstownDto.getDedDetail());
             for (int i = 0; i < jsonArray.size(); i++) {
                 JSONObject jsonObject = JSONObject.parseObject(jsonArray.get(i).toString());
-                if (jsonObject != null) {
+                if(jsonObject!= null) {
                     cost += Double.parseDouble(jsonObject.getString("cost"));
                 }
             }
         }
-        BigDecimal amount = new BigDecimal(cost.toString()).divide(new BigDecimal("1"), 2, BigDecimal.ROUND_UP);
+        BigDecimal amount =  new BigDecimal(cost.toString()).divide(new BigDecimal("1"), 2, BigDecimal.ROUND_UP);
+        orderVehicleCrosstownDto.setDeductionCost(amount);
+        //扣除费用
+        orderVehicleCrosstownDto.setRestDeposit(orderRentVehicleDetail.getDeposit().subtract(amount));
+        if(orderVehicleCrosstownDto.getRestDeposit().compareTo(getAmount()) == -1) { //剩余金额小于保证金
+            return ObjectRestResponse.createFailedResult(500,"押金不足，不能交车，请联系客服！");
+        }
         //出车成功后修改订单状态
         List<OrderVehicleCrosstownDto> oldValue = orderVehicleCrosstownBiz.selectByOrderId(orderVehicleCrosstownDto);
         if (oldValue.size() == 1) {
-            orderVehicleCrosstownDto.setDeductionCost(oldValue.get(0).getDeductionCost().add(amount));
-            //扣除费用
-            orderVehicleCrosstownDto.setRestDeposit(orderRentVehicleDetail.getDeposit().subtract(orderVehicleCrosstownDto.getDeductionCost()));
-            if (orderVehicleCrosstownDto.getRestDeposit().compareTo(getAmount()) == -1) { //剩余金额小于保证金
-                return ObjectRestResponse.createFailedResult(500, "押金不足，不能交车，请联系客服！");
-            }
             BeanUtil.copyProperties(orderVehicleCrosstownDto, oldValue.get(0), CopyOptions.create().setIgnoreNullValue(true).setIgnoreError(true));
             getOrderLicense(orderVehicleCrosstownDto);
             handleOrderStatus(baseOrder, orderRentVehicleDetail, oldValue.get(0));
@@ -282,12 +271,6 @@ public class OrderVehicleCrosstownBiz extends BaseBiz<OrderVehicaleCrosstownMapp
             }
             return ObjectRestResponse.succ(oldValue.get(0));
         } else if (oldValue.size() <= 0) {
-            orderVehicleCrosstownDto.setDeductionCost(amount);
-            //扣除费用
-            orderVehicleCrosstownDto.setRestDeposit(orderRentVehicleDetail.getDeposit().subtract(orderVehicleCrosstownDto.getDeductionCost()));
-            if (orderVehicleCrosstownDto.getRestDeposit().compareTo(getAmount()) == -1) { //剩余金额小于保证金
-                return ObjectRestResponse.createFailedResult(500, "押金不足，不能交车，请联系客服！");
-            }
             getOrderLicense(orderVehicleCrosstownDto);
             orderVehicleCrosstownBiz.insertSelective(orderVehicleCrosstownDto);
             OrderVehicleCrosstown orderVehicleCrosstown = orderVehicleCrosstownBiz.selectOne(orderVehicleCrosstownDto);
@@ -303,80 +286,32 @@ public class OrderVehicleCrosstownBiz extends BaseBiz<OrderVehicaleCrosstownMapp
 
     private void handleOrderStatus(BaseOrder baseOrder, OrderRentVehicleDetail orderRentVehicleDetail, OrderVehicleCrosstown orderVehicleCrosstown) {
         //交车完成 设置订单状态为出行中
-        BigDecimal totalAmount = orderRentVehicleDetail.getDeposit();
+        BigDecimal totalAmount = new BigDecimal(0);
+        ObjectRestResponse<OrderPageVO> objectRestResponse = baseOrderBiz.getOrderDetail(baseOrder.getNo());
+        if (objectRestResponse.getData() != null && objectRestResponse.getData().getOrderRentVehicleDetail() != null) {
+            //总押金-保留金
+            totalAmount = objectRestResponse.getData().getOrderRentVehicleDetail().getDeposit();
+        }
+
         if (baseOrder.getStatus() == OrderStatusEnum.ORDER_TOSTART.getCode()) {//交车
             baseOrder.setStatus(OrderStatusEnum.ORDER_WAIT.getCode());
             baseOrder = baseOrderBiz.updateSelectiveByIdReT(baseOrder);
         } else if (baseOrder.getStatus() == OrderStatusEnum.ORDER_WAIT.getCode()) { //还车
-            //提前还车,结束时间大于当前时间
-            DateTime nowTime = DateTime.parse(DateTime.now().toString(DEFAULT_DATE_TIME_FORMATTER), DEFAULT_DATE_TIME_FORMATTER);
-            DateTime endTime = DateTime.parse(new DateTime(orderRentVehicleDetail.getEndTime()).toString(DEFAULT_DATE_TIME_FORMATTER), DEFAULT_DATE_TIME_FORMATTER);
-            DateTime startTime = DateTime.parse(new DateTime(orderRentVehicleDetail.getStartTime()).toString(DEFAULT_DATE_TIME_FORMATTER), DEFAULT_DATE_TIME_FORMATTER);
-            //实际预定的天数
-            int actualDay = getDaysBetweenDateTime(startTime, endTime);
-            if (orderRentVehicleDetail.getEndTime() > nowTime.getMillis()) {
-                //提前的天数, 当天就算使用一天
-                int noUsedDay = getDaysBetweenDateTime(nowTime, endTime) - 1;
-                //退还未使用的天数，或者金额，扣除违约金，实际未使用天数的金额，最多3000元
-                InProgressVO inProgressVO = orderCalculateBiz.inProgressCalculate(baseOrder, actualDay - noUsedDay);
-                if (inProgressVO != null) {
-                    baseOrder.setViolateAmount(inProgressVO.getViolateAmount());
-                    baseOrder.setExtraAmount(inProgressVO.getExtraAmount());
-                    if (inProgressVO.getBackCoupons() != null && inProgressVO.getBackCoupons().size() > 0) {
-                        StringBuilder backCoupons = new StringBuilder();
-                        inProgressVO.getBackCoupons().forEach((a) -> backCoupons.append(a + ","));
-                        baseOrder.setBackCoupon(backCoupons.toString());
-                    }
-                }
-                BigDecimal cost = new BigDecimal(0);
-                cost.add(inProgressVO.getExtraAmount()).add(inProgressVO.getViolateAmount());
-                updateCrossRefund(orderVehicleCrosstown, cost, OrderViolateEnum.BEFORE.getCode());
-                //延期还车,结束时间小于当前时间
-            } else if (orderRentVehicleDetail.getEndTime() < nowTime.getMillis()) {
-                //延期的天数, 延期违约金是延期天数*200%
-                int usedDay = getDaysBetweenDateTime(endTime, nowTime);
-                Integer orderId = baseOrder.getId();
-                List<OrderItem> items = orderItemBiz.selectList(new OrderItem() {{
-                    setOrderId(orderId);
-                }});
-                BigDecimal amount = new BigDecimal(0);
-                if (items != null && items.size() > 0) {
-                    for (OrderItem orderItem : items) {
-                        if (orderItem.getType() == ItemTypeEnum.VEHICLE_MODEL.getCode()) {
-                            amount = orderItem.getUnitPrice();
-                            break;
-                        }
-                    }
-                }
-                BigDecimal cost = amount.multiply(new BigDecimal(usedDay)).multiply(new BigDecimal(2));
-                updateCrossRefund(orderVehicleCrosstown, cost, OrderViolateEnum.AFTER.getCode());
-            }
-
             if (orderVehicleCrosstown.getType() == CrosstownTypeEnum.ARRIVE.getCode()) {//不定损直接还车
                 //添加非定损记录
-                Integer orderId = baseOrder.getId();
-                List<OrderVehicleCrosstownDto> list = orderVehicleCrosstownBiz.selectByOrderId(new OrderVehicleCrosstownDto(){{
-                    setOrderId(orderId);
-                    setType(CrosstownTypeEnum.ARRIVE.getCode());
-                }});
-                if(list != null && list.size() > 0) {
-                    OrderVehicleCrosstownDto orderVehicleCrosstownDto = list.get(0);
-                    OrderVehicleCrosstown orderVehicleCrosstown1 = new OrderVehicleCrosstown();
-                    BeanUtil.copyProperties(orderVehicleCrosstownDto, orderVehicleCrosstown1, CopyOptions.create().setIgnoreNullValue(true).setIgnoreError(true));
-                    DepositRefundRecord depositRefundRecord = new DepositRefundRecord();
-                    depositRefundRecord.setAmount(orderVehicleCrosstown.getDeductionCost());
-                    depositRefundRecord.setRestAmount(totalAmount.subtract(getAmount()).subtract(orderVehicleCrosstown1.getDeductionCost()));
-                    depositRefundRecord.setTotalAmount(totalAmount.subtract(getAmount()));
-                    depositRefundRecord.setCrosstownId(orderVehicleCrosstown.getId());
-                    orderDepositRefundRecordBiz.saveNormalRecord(depositRefundRecord);
-                    //修改订单状态为已完成
-                    baseOrder.setStatus(OrderStatusEnum.ORDER_FINISH.getCode());
-                    baseOrder = baseOrderBiz.updateSelectiveByIdReT(baseOrder);
-                    //修改订单详情是否押金全部退还
-                    orderRentVehicleDetail.setFixedLossStatus(0);
-                    orderRentVehicleBiz.updateSelectiveByIdRe(orderRentVehicleDetail);
-                    baseOrderBiz.sendOrderMq(orderRentVehicleDetail, null, null, baseOrder, OrderMQDTO.ORDER_FINISH);
-                }
+                DepositRefundRecord depositRefundRecord = new DepositRefundRecord();
+                depositRefundRecord.setAmount(orderVehicleCrosstown.getDeductionCost());
+                depositRefundRecord.setRestAmount(totalAmount.subtract(getAmount()).subtract(orderVehicleCrosstown.getDeductionCost()));
+                depositRefundRecord.setTotalAmount(totalAmount.subtract(getAmount()));
+                depositRefundRecord.setCrosstownId(orderVehicleCrosstown.getId());
+                orderDepositRefundRecordBiz.saveNormalRecord(depositRefundRecord);
+                //修改订单状态为已完成
+                baseOrder.setStatus(OrderStatusEnum.ORDER_FINISH.getCode());
+                baseOrder = baseOrderBiz.updateSelectiveByIdReT(baseOrder);
+                //修改订单详情是否押金全部退还
+                orderRentVehicleDetail.setFixedLossStatus(0);
+                orderRentVehicleBiz.updateSelectiveByIdRe(orderRentVehicleDetail);
+                baseOrderBiz.sendOrderMq(orderRentVehicleDetail, null, null, baseOrder, OrderMQDTO.ORDER_FINISH);
             } else if (orderVehicleCrosstown.getType() == CrosstownTypeEnum.FIXED_LOSS.getCode()) { //定损还车，添加定损记录
                 //添加定损记录
                 DepositRefundRecord depositRefundRecord = new DepositRefundRecord();
@@ -406,7 +341,7 @@ public class OrderVehicleCrosstownBiz extends BaseBiz<OrderVehicaleCrosstownMapp
                 newValue.setId(null);
                 orderDepositRefundRecordBiz.save(newValue);
                 DepositRefundRecord nextValue = orderDepositRefundRecordBiz.findByCrossIdAndStatus(orderVehicleCrosstown.getId(), DepositRefundStatus.FIXLOSSREFUNDARRIVAL.getCode());
-                if (nextValue != null) {
+                if(nextValue != null) {
                     nextValue.setRestAmount(newValue.getRestAmount());
                     orderDepositRefundRecordBiz.update(nextValue);
                 }
@@ -419,31 +354,6 @@ public class OrderVehicleCrosstownBiz extends BaseBiz<OrderVehicaleCrosstownMapp
         }
     }
 
-
-    public void updateCrossRefund(OrderVehicleCrosstown orderVehicleCrosstown, BigDecimal cost, Integer type) {
-        DedDetailDTO dedDetailDTO = new DedDetailDTO();
-        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 = "延期还车违约金";
-        }
-        dedDetailDTO.setDeductions(detailName);
-        dedDetailDTO.setCost(cost);
-        dedDetailDTO.setId(1);
-        dedDetailDTO.setStatusIndex(1);
-        dedDetailDTO.setStatusName(detailName);
-        orderVehicleCrosstown.setViolateDetail(JSONObject.toJSONString(dedDetailDTO));
-        BigDecimal restDeposit = orderVehicleCrosstown.getRestDeposit().subtract(dedDetailDTO.getCost());
-        orderVehicleCrosstown.setRestDeposit(restDeposit);
-        orderVehicleCrosstown.setDeductionCost(orderVehicleCrosstown.getDeductionCost().add(dedDetailDTO.getCost()));
-        orderVehicleCrosstownBiz.updateSelectiveByIdRe(orderVehicleCrosstown);
-    }
-
-
-    //添加订单驾驶人信息
     public void getOrderLicense(OrderVehicleCrosstownDto orderVehicleCrosstownDto) {
         if (StringUtils.isNotBlank(orderVehicleCrosstownDto.getLicenseIdCard())) {
             OrderUserLicense orderUserLicense = new OrderUserLicense();
@@ -467,18 +377,9 @@ public class OrderVehicleCrosstownBiz extends BaseBiz<OrderVehicaleCrosstownMapp
 
     public boolean getTodayTime(Long time) {
         long current = System.currentTimeMillis();
-        if (current <= (time / (1000 * 3600 * 24) * (1000 * 3600 * 24) - TimeZone.getDefault().getRawOffset()) + 24 * 60 * 60 * 1000 - 1) {
+        if (current <= (time / (1000 * 3600 * 24) * (1000 * 3600 * 24) - TimeZone.getDefault().getRawOffset() ) + 24 * 60 * 60 * 1000 -1) {
             return true;
         }
         return false;
     }
-
-    //获取两个日期之间的天数
+}
\ No newline at end of file
-    public int getDaysBetweenDateTime(DateTime startDay, DateTime endDay) {
-        int a = 0;
-        for (DateTime curDate = startDay.plusDays(1); curDate.compareTo(endDay) < 0; curDate = curDate.plusDays(1)) {
-            a++;
-        }
-        return a;
-    }
-}

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

@@ -4,19 +4,15 @@ 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.entity.Coupon;
-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.calculate.InProgressVO;
 import com.xxfc.platform.order.pojo.mq.OrderMQDTO;
 import com.xxfc.platform.tour.feign.TourFeign;
 import com.xxfc.platform.universal.feign.ThirdFeign;
 import com.xxfc.platform.vehicle.common.RestResponse;
 import com.xxfc.platform.vehicle.feign.VehicleFeign;
 import lombok.extern.slf4j.Slf4j;
-import org.assertj.core.util.Lists;
 import org.springframework.beans.factory.annotation.Autowired;
 import org.springframework.stereotype.Service;
 import org.springframework.transaction.annotation.Transactional;
@@ -59,9 +55,6 @@ public class OrderCancelBiz {
     @Autowired
     OrderMsgBiz orderMsgBiz;
 
-    @Autowired
-    OrderCalculateBiz orderCalculateBiz;
-
     @Autowired
     UserFeign userFeign;
 
@@ -74,9 +67,6 @@ public class OrderCancelBiz {
     @Autowired
     ThirdFeign thirdFeign;
 
-    @Autowired
-    ActivityFeign activityFeign;
-
     private static Map<Integer, List<Integer>> cancelAble;
     static {
         cancelAble = new HashMap<Integer, List<Integer>>();
@@ -120,47 +110,34 @@ public class OrderCancelBiz {
                         setOrderId(baseOrder.getId());
                     }});
 
-                    OrderItem orderItem = orderItemBiz.selectOne(new OrderItem(){{
-                        setType(ItemTypeEnum.VEHICLE_MODEL.getCode());
-                        setOrderId(baseOrder.getId());
-                    }});
-
                     //原退还押金
-                    Integer freeDays = (null == orderItem.getCutNum())?0 :orderItem.getCutNum();
                     BigDecimal freeDayAmount = BigDecimal.ZERO;
+                    //判断是否使用免费天数，并且进行扣款
+                    if(null != orvd.getFreeDays() && orvd.getFreeDays() > 0) {
+                        OrderItem orderItem = orderItemBiz.selectOne(new OrderItem(){{
+                            setType(ItemTypeEnum.VEHICLE_MODEL.getCode());
+                            setOrderId(baseOrder.getId());
+                        }});
+                        freeDayAmount = orderItem.getUnitPrice().multiply(new BigDecimal(orvd.getFreeDays()+ ""));
+                    }
 
 
                     //如果超过出发时间，不能取消订单
                     //根据时间处理goodsAmount
                     //获取出发时间 到现在 距离时间
                     Long timeLag = orvd.getStartTime() - System.currentTimeMillis();
-                    if(timeLag < 0 ) {
-                        //计算：使用天数 当前时间 - 开始时间的0时0分0秒
-                        Long useTimeLag = System.currentTimeMillis() - orvd.getStartTime();
-                        Integer useDays = new BigDecimal(useTimeLag + "").divide(new BigDecimal((24 * 60 * 60 * 1000)+ "")).setScale(0, BigDecimal.ROUND_UP).intValue();
-                        orderCalculateBiz.inProgressCalculate(baseOrder, orderItem, freeDays, useDays);
-
-                    }else {
-                        //没到出车时间
-                        //判断是否使用免费天数，并且进行扣款
-                        if(freeDays > 0) {
-                            freeDayAmount = orderItem.getUnitPrice().multiply(new BigDecimal(orvd.getFreeDays()+ ""));
-
-                            //违约金封顶 租车身份价 * 2天
-                            BigDecimal topAmount = orderItem.getUnitPrice().multiply(new BigDecimal("2"));
-                            if(freeDayAmount.compareTo(topAmount) > 0) {
-                                freeDayAmount = freeDayAmount;
-                            }
-                        }
-                    }
-
-
+                    //后面允许开始时间过后可以取消订单
+//                    if(timeLag < 0) {
+//                        throw new BaseException(ResultCode.FAILED_CODE, new HashSet<String>(){{
+//                            add("已超过出发时间，不能取消订单");
+//                        }});
+//                    }
 
                     //退款流程
-                        //退订单款
+                    //退订单款
                     orderRefundBiz.rentRefundProcess(hasUpdateOrder, timeLag, APP_ORDER+ "_"+ RENT_REFUND);
 
-                        //退押金
+                    //退押金
                     orderRefundBiz.rentRefundDepositProcess(hasUpdateOrder, orvd.getDeposit(), timeLag, APP_ORDER+ "_"+ RENT_REFUND, freeDayAmount);
 
                     //已付款的取消订单发送消息
@@ -186,9 +163,6 @@ public class OrderCancelBiz {
                     }
                     //退款流程
                     orderRefundBiz.rentRefundProcess(hasUpdateOrder, timeLag, APP_ORDER+ "_"+ key);
-
-                    //站点总人数减少
-                    tourFeign.updateTourGoodPersonNum(otd.getVerificationId(), TourFeign.TOTAL_PERSON, (otd.getTotalNumber() * -1));
                 }
             }
 

xx-uccn/xx-uccn-server/src/main/java/com/xxfc/platform/uccn/biz/ArticleBiz.java

@@ -171,9 +171,9 @@ public class ArticleBiz extends BaseBiz<ArticleMapper, Article> {
     @Transactional(rollbackFor = Exception.class)
     public int updateSelectiveByIdRe(Article article){
         article.setUpdTime(new Date());
-        if (article.getTagTitle()==null||article.getKeywords()==null||article.getDescription()==null) {
-            throw  new BaseException("必须设置seo");
-        }
+//        if (article.getTagTitle()==null||article.getKeywords()==null||article.getDescription()==null) {
+//            throw  new BaseException("必须设置seo");
+//        }
         return mapper.updateByPrimaryKeySelective(article);
     }
 

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

@@ -216,7 +216,9 @@ public class JPushBiz extends BaseBiz<MessagePushMapper, MessagePush> {
     }
 
     //删除推送内容
-    public  ObjectRestResponse delMessagePush(MessagePush messagePush){
+    public  ObjectRestResponse delMessagePush(Integer id){
+        MessagePush messagePush=new MessagePush();
+        messagePush.setId(id);
         messagePush.setIsDel(1);
         updateSelectiveById(messagePush);
         return  ObjectRestResponse.succ();

xx-universal/xx-universal-server/src/main/java/com/xxfc/platform/universal/controller/JPushController.java

@@ -51,9 +51,9 @@ public class JPushController {
     }
 
 
-    @RequestMapping(value = "/del", method = RequestMethod.POST)
-    public ObjectRestResponse delMessagePush(@RequestBody MessagePush messagePush){
-        return jPushBiz.delMessagePush(messagePush);
+    @RequestMapping(value = "/del/{id}", method = RequestMethod.DELETE)
+    public ObjectRestResponse delMessagePush(@PathVariable Integer id){
+        return jPushBiz.delMessagePush(id);
     }
     @RequestMapping(value = "/list", method = RequestMethod.GET)
     public ObjectRestResponse getList(@RequestParam(value = "page",defaultValue = "1") Integer page,
@@ -63,7 +63,10 @@ public class JPushController {
         return jPushBiz.getList(page,limit,title,type);
     }
 
-
+    @RequestMapping(value = "/getOne/{id}", method = RequestMethod.GET)
+    public ObjectRestResponse getOne(@PathVariable Integer id){
+        return ObjectRestResponse.succ(jPushBiz.selectById(id));
+    }
 
 }
 

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

@@ -248,7 +248,7 @@ public class SmsService {
 
                 }
 
-                if (i>3){
+                if (i>2){
                     jsonParams.put(param+(i+2),para);
                 }else {
                     jsonParams.put(param+(i+1),para);