修改管家核销订单列表

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

@@ -256,6 +256,15 @@ public class OrderVehicleCrosstownBiz extends BaseBiz<OrderVehicaleCrosstownMapp
                 }
             }
         }
+        if (StringUtils.isNotBlank(orderVehicleCrosstownDto.getViolateDetail())) {
+            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) {
+                    cost += Double.parseDouble(jsonObject.getString("cost"));
+                }
+            }
+        }
         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

@@ -182,7 +182,7 @@
             and b.user_id = #{userId}
         </if>
         <if test="status != null and status == -1">
-            AND b.status in (6,-1)
+            AND b.status = -1
             and b.refund_status in (0,2)
         </if>
         <if test="status != null and status != -1">