Merge branch 'master-modify-cutAmount' into dev

# Conflicts:
#	xx-order/xx-order-api/src/main/java/com/xxfc/platform/order/pojo/order/OrderPageVO.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/biz/OrderVehicleCrosstownBiz.java
#	xx-order/xx-order-server/src/main/java/com/xxfc/platform/order/biz/inner/OrderCancelBiz.java
#	xx-order/xx-order-server/src/main/java/com/xxfc/platform/order/rest/BaseOrderController.java

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

@@ -180,7 +180,6 @@ public class BaseOrderBiz extends BaseBiz<BaseOrderMapper, BaseOrder> {
                 getDriverInfo(orderPageVo);
             } else if (orderPageVo.getStatus() >= 5 || orderPageVo.getStatus() == -1) {//出行中 已交车
                 //设置违约金金额
-                updateCrossRefund(orderPageVo);
                 getDriverInfo(orderPageVo);
                 getUserLicense(orderPageVo);
             }
@@ -330,7 +329,7 @@ public class BaseOrderBiz extends BaseBiz<BaseOrderMapper, BaseOrder> {
                 orderVehicleCrosstownDto.setLicenseName(orderUserLicenses.get(0).getLicenseName());
                 orderVehicleCrosstownDto.setLicensePhone(orderUserLicenses.get(0).getLicensePhone());
             }
-            //设置保留金
+            //设置违约明细
             for (OrderVehicleCrosstownDto a : orderVehicleCrosstown) {
                 if(a.getType() != CrosstownTypeEnum.DEPARTURE.getCode()) {
                     if(StringUtils.isNotBlank(a.getViolateDetail())) {
@@ -339,6 +338,9 @@ public class BaseOrderBiz extends BaseBiz<BaseOrderMapper, BaseOrder> {
                 }
             }
         }
+        if (StringUtils.isBlank(orderPageVo.getDedDetailDTO())) {
+            updateCrossRefund(orderPageVo);
+        }
         orderPageVo.setOrderVehicleCrosstownDto(orderVehicleCrosstownDto);
     }
 

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

@@ -250,6 +250,7 @@ public class OrderVehicleCrosstownBiz extends BaseBiz<OrderVehicaleCrosstownMapp
         //定损扣除费用
         if (StringUtils.isNotBlank(orderVehicleCrosstownDto.getDedDetail())) {
             JSONArray jsonArray = JSONArray.parseArray(orderVehicleCrosstownDto.getDedDetail());
+            if(jsonArray != null && jsonArray.size() > 0) {
                 for (int i = 0; i < jsonArray.size(); i++) {
                     JSONObject jsonObject = JSONObject.parseObject(jsonArray.get(i).toString());
                     if (jsonObject != null) {
@@ -257,9 +258,11 @@ public class OrderVehicleCrosstownBiz extends BaseBiz<OrderVehicaleCrosstownMapp
                     }
                 }
             }
+        }
         //延期扣除费用
         if (StringUtils.isNotBlank(orderVehicleCrosstownDto.getViolateDetail())) {
             JSONArray jsonArray = JSONArray.parseArray(orderVehicleCrosstownDto.getDedDetail());
+            if(jsonArray != null && jsonArray.size() > 0) {
                 for (int i = 0; i < jsonArray.size(); i++) {
                     JSONObject jsonObject = JSONObject.parseObject(jsonArray.get(i).toString());
                     if (jsonObject != null) {
@@ -272,6 +275,7 @@ public class OrderVehicleCrosstownBiz extends BaseBiz<OrderVehicaleCrosstownMapp
                     }
                 }
             }
+        }
         orderVehicleCrosstownDto.getViolateDetail();
         BigDecimal amount = new BigDecimal(cost.toString()).divide(new BigDecimal("1"), 2, BigDecimal.ROUND_UP);
         //出车成功后修改订单状态

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

@@ -178,8 +178,11 @@
         from base_order b
         LEFT JOIN order_rent_vehicle_detail r on r.order_id = b.id
         where b.type = 1
-        <if test="userId != null">
-            and b.user_id = #{userId}
+        <if test="userIds != null and userIds.size > 0">
+            and b.user_id in
+            <foreach collection="userIds" item="id" open="(" separator="," close=")">
+                #{id}
+            </foreach>
         </if>
         <if test="status != null and status == -1">
             AND b.status = -1

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

@@ -26,6 +26,7 @@
       <result column="deduction_cost" jdbcType="INTEGER" property="deductionCost"/>
       <result column="rest_deposit" jdbcType="INTEGER" property="restDeposit"/>
       <result column="user_license_id" jdbcType="VARCHAR" property="userLicenseId"/>
+      <result column="violate_amount_detail" jdbcType="VARCHAR" property="violateDetail"/>
   </resultMap>
     <resultMap id="orderMap" type="com.xxfc.platform.order.pojo.order.OrderVehicleCrosstownDto">
         <result column="id" javaType="java.lang.Integer" property="id"/>
@@ -34,20 +35,20 @@
                      javaType="com.xxfc.platform.order.entity.DepositRefundRecord"/>
     </resultMap>
     <select id="selectByOrderId" parameterType="com.xxfc.platform.order.pojo.order.OrderVehicleCrosstownDto" resultType="com.xxfc.platform.order.pojo.order.OrderVehicleCrosstownDto">
-        select *
-        from order_vehicle_crosstown
+        select o.*, o.violate_amount_detail violateDetail
+        from order_vehicle_crosstown o
         <where>
             <if test="status != null">
-                and status = #{status}
+                and o.status = #{status}
             </if>
             <if test="type != null">
-                and type = #{type}
+                and o.type = #{type}
             </if>
             <if test="orderId != null">
-                and order_id = #{orderId}
+                and o.order_id = #{orderId}
             </if>
             <if test="orderNo != null">
-                and order_no = #{orderNo}
+                and o.order_no = #{orderNo}
             </if>
         </where>
     </select>