Merge branch 'master-modify-cutAmount' into dev

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

@@ -215,7 +215,7 @@ public class BaseOrderBiz extends BaseBiz<BaseOrderMapper, BaseOrder> {
         return ObjectRestResponse.succ(orderPageVo);
     }
 
-    //获取两个日期之间的天数
+    //获取两个日期之间的天数（不包含头尾）
     public int getDaysBetweenDateTime(DateTime startDay, DateTime endDay) {
         int a = 0;
         for (DateTime curDate = startDay.plusDays(1); curDate.compareTo(endDay) < 0; curDate = curDate.plusDays(1)) {
@@ -224,6 +224,15 @@ public class BaseOrderBiz extends BaseBiz<BaseOrderMapper, BaseOrder> {
         return a;
     }
 
+    //获取两个日期之间的天数（包含头尾）
+    public int getDaysBetweenDateTimeHasStartEnd(DateTime startDay, DateTime endDay) {
+        int a = 0;
+        for (DateTime curDate = startDay; curDate.compareTo(endDay) <= 0; curDate = curDate.plusDays(1)) {
+            a++;
+        }
+        return a;
+    }
+
     public void updateCrossRefund(OrderPageVO orderPageVO) {
         //计算延期费用
         DedDetailDTO dedDetailDTO = new DedDetailDTO();
@@ -233,7 +242,7 @@ public class BaseOrderBiz extends BaseBiz<BaseOrderMapper, BaseOrder> {
         DateTime startTime = DateTime.parse(new DateTime(orderPageVO.getOrderRentVehicleDetail().getStartTime()).toString(DEFAULT_DATE_TIME_FORMATTER), DEFAULT_DATE_TIME_FORMATTER);
 
         //设置使用天数
-        int userUsedDay = getDaysBetweenDateTime(startTime, nowTime);
+        int userUsedDay = getDaysBetweenDateTimeHasStartEnd(startTime, nowTime);
         orderPageVO.getOrderRentVehicleDetail().setUsedDay(userUsedDay);
         orderRentVehicleBiz.updateSelectiveById(orderPageVO.getOrderRentVehicleDetail());
         //实际预定的天数

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

@@ -35,6 +35,7 @@ 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.universal.vo.OrderPayVo;
+import com.xxfc.platform.universal.vo.OrderRefundVo;
 import com.xxfc.platform.vehicle.feign.VehicleFeign;
 import io.swagger.annotations.Api;
 import io.swagger.annotations.ApiModelProperty;
@@ -343,4 +344,23 @@ public class BaseOrderController extends CommonBaseController implements UserRes
         List<Integer> companyIds;
 
     }
+
+    @RequestMapping(value = "/app/unauth/refund/{no}/{refundAmount}", method = RequestMethod.POST)
+    @ResponseBody
+    @ApiOperation(value = "退款")
+    @IgnoreClientToken
+    @IgnoreUserToken
+    public ObjectRestResponse refundAmount(@PathVariable("no") String no, @PathVariable("refundAmount") BigDecimal refundAmount) {
+        OrderRefundVo orv = new OrderRefundVo();
+        BaseOrder baseOrder = baseOrderBiz.selectOne(new BaseOrder(){{
+            setNo(no);
+        }});
+        orv.setAmount(baseOrder.getRealAmount().multiply(new BigDecimal("100")).intValue());
+        orv.setOrderNo(baseOrder.getNo());
+        orv.setRefundDesc("");
+        orv.setRefundAmount(refundAmount.multiply(new BigDecimal("100")).intValue());
+        ObjectRestResponse<String> result = thirdFeign.refund(orv);
+        return ObjectRestResponse.succ(result);
+    }
+
 }

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

@@ -181,7 +181,7 @@
         select b.*
         from base_order b
         LEFT JOIN order_rent_vehicle_detail r on r.order_id = b.id
-        where b.type = 1 and r.end_time >= unix_timestamp(now())*1000
+        where b.type = 1
         <if test="userIds != null and userIds.size > 0">
             and b.user_id in
             <foreach collection="userIds" item="id" open="(" separator="," close=")">