Merge remote-tracking branch 'origin/v4.9_create_goods_child_20230918' into test

performance-web/src/main/java/com/clx/performance/controller/pc/GoodsOrderController.java

@@ -8,6 +8,7 @@ import com.clx.order.vo.feign.FeignOrderVO;
 import com.clx.performance.component.GoodsOrderStrategyContext;
 import com.clx.performance.constant.RabbitKeyConstants;
 import com.clx.performance.constant.RedisConstants;
+import com.clx.performance.enums.PerformanceResultEnum;
 import com.clx.performance.mapper.OrderGoodsMapper;
 import com.clx.performance.service.OrderChildService;
 import com.clx.performance.service.OrderGoodsService;
@@ -15,6 +16,7 @@ import com.clx.performance.vo.pc.OrderChildPCVO;
 import com.clx.performance.vo.pc.OrderGoodsVO;
 import com.msl.common.base.PageData;
 import com.msl.common.convertor.aspect.UnitCovert;
+import com.msl.common.exception.ServiceSystemException;
 import com.msl.common.result.Result;
 import io.swagger.annotations.Api;
 import io.swagger.annotations.ApiOperation;
@@ -89,7 +91,9 @@ public class GoodsOrderController {
             sendLazyTime = goodsOrderStrategyContext.strategyContext.get(truckDemand).goodsOrderProcess(orderGoodsParams, orderInfo, now);
 
         } catch (Exception e) {
-            throw new RuntimeException(e);
+           // throw new ServiceSystemException(e);
+            throw new ServiceSystemException(PerformanceResultEnum.HTTP_ERROR, e.getMessage());
+
         } finally {
             try {
                 if (rLock != null && rLock.isLocked()) {