Merge branch 'master-modify-cutAmount' into dev

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

@@ -232,6 +232,13 @@ public class BaseOrderBiz extends BaseBiz<BaseOrderMapper, BaseOrder> {
         return a;
     }
 
+    public static void main(String[] args) {
+        DateTime dateTime = DateTime.parse("2019-09-20", DEFAULT_DATE_TIME_FORMATTER);
+        DateTime dateTime1 = DateTime.parse("2019-09-22", DEFAULT_DATE_TIME_FORMATTER);
+        BaseOrderBiz baseOrderBiz = new BaseOrderBiz();
+        int a = baseOrderBiz.getDaysBetweenDateTimeHasStartEnd(dateTime,dateTime1) -1 ;
+        System.out.println(a);
+    }
 
     public void updateCrossRefund(OrderPageVO orderPageVO) {
         //计算延期费用
@@ -246,7 +253,7 @@ public class BaseOrderBiz extends BaseBiz<BaseOrderMapper, BaseOrder> {
         orderPageVO.getOrderRentVehicleDetail().setUsedDay(userUsedDay);
         orderRentVehicleBiz.updateSelectiveById(orderPageVO.getOrderRentVehicleDetail());
         //实际预定的天数
-        int actualDay = getDaysBetweenDateTime(startTime, endTime);
+        int actualDay = getDaysBetweenDateTimeHasStartEnd(startTime, endTime);
         Integer orderId = orderPageVO.getId();
         List<OrderItem> items = orderItemBiz.selectList(new OrderItem() {{
             setOrderId(orderId);

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

@@ -109,7 +109,6 @@ public class OrderAccountBiz extends BaseBiz<OrderAccountMapper,OrderAccount> {
             topAmount = BigDecimal.ZERO;
         }
         BigDecimal refundMainGoodsAmount = originalRefundAmount.subtract(orderDeductAmount);
-        refundMainGoodsAmount = refundMainGoodsAmount.setScale(2, RoundingMode.HALF_UP);
 
         //退款金额 = 主要商品退款 + （其他商品退款） 即--> 主要商品退款 + （总商品款 - 主要商品款）
         oad.setOrderAmount(refundMainGoodsAmount.add(baseOrder.getGoodsAmount().subtract(mainItemRealAmount)));
@@ -132,7 +131,7 @@ public class OrderAccountBiz extends BaseBiz<OrderAccountMapper,OrderAccount> {
             }
 
             //返回押金
-            refundAmountDeposit = originalRefundAmount.subtract(orderDeductAmount);
+            refundAmountDeposit = originalRefundAmountDeposit.subtract(depositDeductAmount);
         }
 
         //设置违章款账单