新下单流程优化

ship-module-trade/ship-module-trade-biz/src/main/java/com/yc/ship/module/trade/service/otc/impl/OtcTradeOrderServiceImpl.java

@@ -310,25 +310,33 @@ public class OtcTradeOrderServiceImpl implements OtcTradeOrderService {
     }
 
     private CommonResult<TradeOrderRespDTO> doShipCreateOrder(LoginUser loginUser, ShipTradeOrderCreateReqVO otcTradeOrderCreateReqVO) {
-        ShipTradeOrderCreateReqVO.OrderProperty orderProperty = otcTradeOrderCreateReqVO.getOrderProperty();
-        if (orderProperty == null) {
-            orderProperty = new ShipTradeOrderCreateReqVO.OrderProperty();
+        try {
+            ShipTradeOrderCreateReqVO.OrderProperty orderProperty = otcTradeOrderCreateReqVO.getOrderProperty();
+            if (orderProperty == null) {
+                orderProperty = new ShipTradeOrderCreateReqVO.OrderProperty();
+            }
+            orderProperty.setSellMethod(otcTradeOrderCreateReqVO.getOrderProperty().getSellMethod());
+            setShipOrderPropertyFromLoginUser(loginUser, orderProperty);
+            otcTradeOrderCreateReqVO.setOrderProperty(orderProperty);
+            return tradeOrderService.createShipOrder(otcTradeOrderCreateReqVO);
+        }catch (Exception e) {
+            return CommonResult.error(500, e.getMessage());
         }
-        orderProperty.setSellMethod(otcTradeOrderCreateReqVO.getOrderProperty().getSellMethod());
-        setShipOrderPropertyFromLoginUser(loginUser, orderProperty);
-        otcTradeOrderCreateReqVO.setOrderProperty(orderProperty);
-        return tradeOrderService.createShipOrder(otcTradeOrderCreateReqVO);
     }
 
     private CommonResult<TradeOrderRespDTO> doShipModifyOrder(LoginUser loginUser, ShipTradeOrderCreateReqVO otcTradeOrderCreateReqVO) {
-        ShipTradeOrderCreateReqVO.OrderProperty orderProperty = otcTradeOrderCreateReqVO.getOrderProperty();
-        if (orderProperty == null) {
-            orderProperty = new ShipTradeOrderCreateReqVO.OrderProperty();
+        try {
+            ShipTradeOrderCreateReqVO.OrderProperty orderProperty = otcTradeOrderCreateReqVO.getOrderProperty();
+            if (orderProperty == null) {
+                orderProperty = new ShipTradeOrderCreateReqVO.OrderProperty();
+            }
+            orderProperty.setSellMethod(otcTradeOrderCreateReqVO.getOrderProperty().getSellMethod());
+            setShipOrderPropertyFromLoginUser(loginUser, orderProperty);
+            otcTradeOrderCreateReqVO.setOrderProperty(orderProperty);
+            return tradeOrderService.modifyShipOrder(otcTradeOrderCreateReqVO);
+        }catch (Exception e){
+            return CommonResult.error(500, e.getMessage());
         }
-        orderProperty.setSellMethod(otcTradeOrderCreateReqVO.getOrderProperty().getSellMethod());
-        setShipOrderPropertyFromLoginUser(loginUser, orderProperty);
-        otcTradeOrderCreateReqVO.setOrderProperty(orderProperty);
-        return tradeOrderService.modifyShipOrder(otcTradeOrderCreateReqVO);
     }