Merge branch 'master-modify-cutAmount' into dev

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

@@ -186,7 +186,7 @@ public class OrderCancelBiz {
                             //违约金封顶 租车身份价 * 2天
                             BigDecimal topAmount = orderItem.getUnitPrice().multiply(new BigDecimal(2+ ""));
                             if(freeDayAmount.compareTo(topAmount) > 0) {
-                                freeDayAmount = freeDayAmount;
+                                freeDayAmount = topAmount;
                             }
                         }
                         //退款流程

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

@@ -7,11 +7,14 @@ import com.github.wxiaoqi.security.common.exception.BaseException;
 import com.github.wxiaoqi.security.common.util.process.ResultCode;
 import com.xxfc.platform.app.entity.Cofig;
 import com.xxfc.platform.app.feign.ConfigFeign;
+import com.xxfc.platform.order.biz.OrderAccountBiz;
 import com.xxfc.platform.order.biz.OrderRefundBiz;
+import com.xxfc.platform.order.contant.enumerate.AccountTypeEnum;
 import com.xxfc.platform.order.contant.enumerate.OrderTypeEnum;
 import com.xxfc.platform.order.contant.enumerate.RefundStatusEnum;
 import com.xxfc.platform.order.contant.enumerate.RefundTypeEnum;
 import com.xxfc.platform.order.entity.*;
+import com.xxfc.platform.order.pojo.account.OrderAccountDetail;
 import com.xxfc.platform.universal.constant.DictionaryKey;
 import com.xxfc.platform.universal.dto.SmsTemplateDTO;
 import com.xxfc.platform.universal.entity.Dictionary;
@@ -69,6 +72,9 @@ public class OrderMsgBiz {
     @Autowired
     OrderRefundBiz orderRefundBiz;
 
+    @Autowired
+    OrderAccountBiz orderAccountBiz;
+
     /**
      * 处理App用户提醒短信的发送
      * @param orvd
@@ -277,19 +283,14 @@ public class OrderMsgBiz {
                     CompanyDetail startCompanyDetail = vehicleFeign.getCompanyDetail(orvd.getStartCompanyId()).getData();
                     CompanyDetail endCompanyDetail = vehicleFeign.getCompanyDetail(orvd.getEndCompanyId()).getData();
                     if(null != orvd.getEndCompanyId() && !SYS_FALSE.equals(orvd.getEndCompanyId())) {
-                        //查询订单退款记录
-                        OrderRefund orderRefund = orderRefundBiz.selectOne(new OrderRefund(){{
-                            setOrderId(baseOrder.getId());
-                            setRefundType(RefundTypeEnum.ORDER_FUND.getCode());
-                        }});
 
-                        //查询押金退款记录
-                        OrderRefund depositOrderRefund = orderRefundBiz.selectOne(new OrderRefund(){{
+                        //新的账单 记录
+                        OrderAccount orderAccount = orderAccountBiz.selectOne(new OrderAccount(){{
                             setOrderId(baseOrder.getId());
-                            setRefundType(RefundTypeEnum.DEPOSIT.getCode());
+                            setAccountType(AccountTypeEnum.IN_ORDER_PAY.getCode());
                         }});
 
-                        if(BigDecimal.ZERO.equals(orderRefund.getDeductAmount())) {
+                        if(BigDecimal.ZERO.equals(orderAccount.getDeductAmount())) {
                             //使用免费天数
                             if(null != orvd.getFreeDays() && orvd.getFreeDays() > 0) {
                                 smstype = SmsTemplateDTO.CANCEL_B;
@@ -309,8 +310,8 @@ public class OrderMsgBiz {
                         sms2AppUser(startCompanyDetail, endCompanyDetail, orvd, otd, omd, baseOrder, appUserDTO, smstype, smsParams);
 
                         //发送用户退款消息
-//                        smsParams.clear();
-//                        sms2RefundAppUser(BigDecimal.ZERO, orderRefund.getDeductAmount(), depositOrderRefund.getRefundAmount().add(orderRefund.getRefundAmount()), BigDecimal.ZERO, baseOrder, appUserDTO, smstype, smsParams);
+                        smsParams.clear();
+                        sms2RefundAppUser(BigDecimal.ZERO, orderAccount.getDeductAmount(), orderAccount.getAccountAmount(), BigDecimal.ZERO, baseOrder, appUserDTO, smstype, smsParams);
 
                         //后台发送消息(出车人)
                         smsParams.clear();

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

@@ -130,7 +130,8 @@ public class OrderRentVehicleService extends AbstractOrderHandle<OrderRentVehicl
         //设置订单状态为3
         bo.getOrder().setStatus(OrderStatusEnum.ORDER_UNPAY.getCode());
         //设置订单图片
-        bo.getOrder().setPicture(bo.getVehicleModel().getPicture());
+
+        bo.getOrder().setPicture(StrUtil.isNotBlank(bo.getVehicleModel().getCoverPic())? bo.getVehicleModel().getCoverPic(): bo.getVehicleModel().getPicture());
         //设置订单名称
         bo.getOrder().setName(bo.getVehicleModel().getName());
 

xx-vehicle/xx-vehicle-server/src/main/java/com/xxfc/platform/vehicle/biz/VehicleBiz.java

@@ -259,9 +259,9 @@ public class VehicleBiz extends BaseBiz<VehicleMapper, Vehicle> implements UserR
         if (addOrUpdateVehicleVo.getNumberPlate() == null) {
             throw new BaseException(ResultCode.NUMBER_PLAT_CAN_NOT_BE_NULL);
         }
-         boolean exist = checkCodeExist(addOrUpdateVehicleVo.getCode(),addOrUpdateVehicleVo.getId());
-        if (exist){
-            throw new BaseException("车辆编码已经被占用",400);
+        boolean exist = checkCodeExist(addOrUpdateVehicleVo.getCode(), addOrUpdateVehicleVo.getId());
+        if (exist) {
+            throw new BaseException("车辆编码已经被占用", 400);
         }
         List<Vehicle> vehicles = mapper.lockByCode(addOrUpdateVehicleVo);
         return vehicles;
@@ -449,7 +449,7 @@ public class VehicleBiz extends BaseBiz<VehicleMapper, Vehicle> implements UserR
         DateTime endDay = DateTime.parse(bookVehicleVo.getBookEndDate(), DATE_TIME_FORMATTER);
         //转换日期范围为列表，并检查是否合法
         fillDateList4DatePeriod(yearMonthAndDate, DateTime.parse(startDay.toString(DEFAULT_DATE_TIME_FORMATTER), DEFAULT_DATE_TIME_FORMATTER), DateTime.parse(endDay.toString(DEFAULT_DATE_TIME_FORMATTER), DEFAULT_DATE_TIME_FORMATTER));
-               if (yearMonthAndDate.size() > 3) {//连续的日期最多夸3个月
+        if (yearMonthAndDate.size() > 3) {//连续的日期最多夸3个月
             throw new BaseException(ResultCode.ONLY_BOOK_TWO_MONTH);
         }
 

xx-vehicle/xx-vehicle-server/src/main/resources/mapper/VehicleBookRecordMapper.xml

@@ -327,7 +327,7 @@
 
     <select id="selectByVehicleIdAndTime" parameterType="java.util.Map" resultMap="searchBookRecord">
         select v1.* from vehicle_book_record v1
-         where v1.vehicle_id = #{vehicleId} and v1.book_end_date > #{time} and v1.status BETWEEN 1 and 2
+         where v1.vehicle_id = #{vehicleId} and v1.book_end_date &gt; #{time} and v1.status BETWEEN 1 and 2
     </select>
 
     <select id="selectZeroHourRecord" resultMap="searchBookRecord" parameterType="java.util.Map">