订单核销接口修改

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

@@ -71,24 +71,30 @@ public class OrderViolationBiz extends BaseBiz<OrderViolationMapper, OrderViolat
         if (userDTO == null ) {
             throw new BaseException(ResultCode.RSTOKEN_EXPIRED_CODE);
         }
-        OrderRentVehicleDetail orderRentVehicleDetail = new OrderRentVehicleDetail();
-        orderRentVehicleDetail.setId(orderViolation.getDetailId());
-        orderRentVehicleDetail.setHandelViolation(0);
-        Map<String, Object> status = mapper.getOrderAndVehicleStatus(orderViolation.getDetailId());
-        Integer orderStatus = (Integer) status.get("status");
-        Integer refundStatus = (Integer) status.get("refundStatus");
-        if (orderStatus >= 6 || (refundStatus <= 2 && refundStatus != 1)) {
-            orderViolation.setIsDel(0);
-            orderViolation.setCrtHost(getRequest().getRemoteHost());
-            orderViolation.setCrtName(userDTO.getName());
-            orderViolation.setCrtUserId(userDTO.getId());
-            orderViolation.setCrtTime(new BigInteger(String.valueOf(System.currentTimeMillis())));
-            insertSelective(orderViolation);
-            detailMapper.updateByPrimaryKeySelective(orderRentVehicleDetail);
+        OrderViolation old = mapper.selectOne(new OrderViolation(){{setDetailId(orderViolation.getDetailId());}});
+        if (old  != null) {
+            throw new BaseException("违章记录已存在!");
         } else {
-            throw new BaseException("The operation cannot be changed at this time");
+            OrderRentVehicleDetail orderRentVehicleDetail = new OrderRentVehicleDetail();
+            orderRentVehicleDetail.setId(orderViolation.getDetailId());
+            orderRentVehicleDetail.setHandelViolation(0);
+            Map<String, Object> status = mapper.getOrderAndVehicleStatus(orderViolation.getDetailId());
+            Integer orderStatus = (Integer) status.get("status");
+            Integer refundStatus = (Integer) status.get("refundStatus");
+            if (orderStatus >= 6 || (refundStatus <= 2 && refundStatus != 1)) {
+                orderViolation.setIsDel(0);
+                orderViolation.setCrtHost(getRequest().getRemoteHost());
+                orderViolation.setCrtName(userDTO.getName());
+                orderViolation.setCrtUserId(userDTO.getId());
+                orderViolation.setCrtTime(new BigInteger(String.valueOf(System.currentTimeMillis())));
+                insertSelective(orderViolation);
+                detailMapper.updateByPrimaryKeySelective(orderRentVehicleDetail);
+            } else {
+                throw new BaseException("The operation cannot be changed at this time");
+            }
         }
 
+
     }
 
     /**