Merge branch 'dev-chw' of http://113.105.137.151:22280/youjj/cloud-platform into dev-chw

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

@@ -56,11 +56,16 @@ public class OrderViolationController extends BaseController<OrderViolationBiz,
 	@PostMapping("/saveOrderViolation")
 	public ObjectRestResponse saveOrderViolation(@RequestBody OrderViolation orderViolation, HttpServletRequest request) {
 		log.info("保存违章记录：orderViolation = {}", orderViolation.toString());
-		if (orderViolation.getId() == null) {
-			getBaseBiz().insertOrderViolation(orderViolation);
-		} else {
-			getBaseBiz().updateOrderViolation(orderViolation);
+		try {
+			if (orderViolation.getId() == null) {
+				getBaseBiz().insertOrderViolation(orderViolation);
+			} else {
+				getBaseBiz().updateOrderViolation(orderViolation);
+			}
+		} catch (Exception e) {
+			return ObjectRestResponse.createFailedResult(500, e.getMessage());
 		}
+
 		orderDepositRefundRecordBiz.saveViolationDeposit(orderViolation);
 		return ObjectRestResponse.succ();
 	}