新下单流程优化

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) {
+            throw e;
         }
-        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) {
+            throw e;
         }
-        orderProperty.setSellMethod(otcTradeOrderCreateReqVO.getOrderProperty().getSellMethod());
-        setShipOrderPropertyFromLoginUser(loginUser, orderProperty);
-        otcTradeOrderCreateReqVO.setOrderProperty(orderProperty);
-        return tradeOrderService.modifyShipOrder(otcTradeOrderCreateReqVO);
     }
 
 
@@ -2070,7 +2078,7 @@ public class OtcTradeOrderServiceImpl implements OtcTradeOrderService {
 
         CommonResult<TradeOrderRespDTO> result = doShipCreateOrder(loginUser, shipTradeOrderCreateReqVO);
         if (result.isError()) {
-            return CommonResult.error(result);
+            return CommonResult.error(result.getCode(), result.getMsg());
         }
         TradeOrderTotalDO tradeOrderTotalDO = BeanUtils.toBean(summary, TradeOrderTotalDO.class);
         Long orderId = result.getCheckedData().getOrderId();
@@ -2101,7 +2109,6 @@ public class OtcTradeOrderServiceImpl implements OtcTradeOrderService {
         }
         OtcTradeOrderCreateRespVO respVO = TradeOrderConvert.INSTANCE.convert(result.getData());
         return CommonResult.success(respVO);
-
     }
 
     private static ShipTradeOrderCreateReqVO.@NotNull Visitor getVisitor1(TradeVistorReqVO tradeVistorReqVO) {
@@ -2182,12 +2189,10 @@ public class OtcTradeOrderServiceImpl implements OtcTradeOrderService {
         if (tradeOrderDO.getOrderStatus() == 6) {
             shipTradeOrderCreateReqVO.setConfirmType(1);
         }
-
         shipTradeOrderCreateReqVO.setDiscountId(discountId);
         if (createVO.getSummary().getRealOrderMoney() != null) {
             shipTradeOrderCreateReqVO.setPayAmount(createVO.getSummary().getRealOrderMoney());
         }
-
         ShipTradeOrderCreateReqVO.OrderUser orderUser = new ShipTradeOrderCreateReqVO.OrderUser();
         orderUser.setContactName(createVO.getLinkMan());
         orderUser.setMobile(createVO.getLinkMobile());
@@ -2195,7 +2200,6 @@ public class OtcTradeOrderServiceImpl implements OtcTradeOrderService {
         shipTradeOrderCreateReqVO.setOrderUser(orderUser);
         shipTradeOrderCreateReqVO.setRemark(createVO.getRemark());
         shipTradeOrderCreateReqVO.setIsYd(createVO.getIsYd());
-
         shipTradeOrderCreateReqVO.setTravelDate(createVO.getBoardingTime());
         shipTradeOrderCreateReqVO.setOrderNo(orderNo);
 
@@ -2208,9 +2212,7 @@ public class OtcTradeOrderServiceImpl implements OtcTradeOrderService {
             orderProperty.setStoreName(storeInfo.getName());
         }
         orderProperty.setSellMethod(SellMethodEnum.OTC.getType());
-
         shipTradeOrderCreateReqVO.setOrderProperty(orderProperty);
-
         ShipTradeOrderCreateReqVO.OrderItem orderItem = new ShipTradeOrderCreateReqVO.OrderItem();
         List<ShipTradeOrderCreateReqVO.OrderDetail> detailList = new ArrayList<>();
         ShipTradeOrderCreateReqVO.OrderDetail orderDetail = new ShipTradeOrderCreateReqVO.OrderDetail();
@@ -2238,7 +2240,6 @@ public class OtcTradeOrderServiceImpl implements OtcTradeOrderService {
         }
         orderDetail.setVisitorList(visitorList);
         orderDetail.setCount(visitorList.size());
-
         BigDecimal spuMoney = new BigDecimal(0);
         for (TradeSpuReqVO tradeSpuReqVO : createVO.getSpuList()) {
             ShipTradeOrderCreateReqVO.OrderDetail orderDetail1 = new ShipTradeOrderCreateReqVO.OrderDetail();
@@ -2255,8 +2256,6 @@ public class OtcTradeOrderServiceImpl implements OtcTradeOrderService {
                 orderDetail1.setProductType(0);
             }
             List<ShipTradeOrderCreateReqVO.Visitor> visitorList1 = new ArrayList<>();
-
-
             if (orderDetail1.getProductType() == 0 || orderDetail1.getProductType() == 1) {
                 for (String touristId : tradeSpuReqVO.getTourist()) {
                     TradeVistorReqVO tradeVistorReqVO = createVO.getTourist().stream().filter(v -> v.getId().equals(touristId)).findFirst().orElseGet(TradeVistorReqVO::new);
@@ -2315,7 +2314,6 @@ public class OtcTradeOrderServiceImpl implements OtcTradeOrderService {
             orderDetail1.setCount(visitorList1.size());
             detailList.add(orderDetail1);
         }
-
         BigDecimal price;
         if (createVO.getSummary().getOrderMoney() != null && createVO.getSummary().getOrderMoney().compareTo(new BigDecimal(0)) > 0) {
             if (createVO.getSummary().getOrderMoney().compareTo(spuMoney) < 0 || visitorList.isEmpty()) {
@@ -2328,26 +2326,18 @@ public class OtcTradeOrderServiceImpl implements OtcTradeOrderService {
         }
         orderDetail.setPrice(price);
         orderDetail.setOriginPrice(price);
-
         orderDetail.setProductType(0);
         detailList.add(orderDetail);
-
-
         orderItem.setDetailList(detailList);
-
         shipTradeOrderCreateReqVO.setItemlList(Collections.singletonList(orderItem));
-
         shipTradeOrderCreateReqVO.setSpuAmount(spuMoney);
-
-
         Date travelDate = tradeOrderDO.getTravelDate();
-
         if (loginUser.getDistributorId() != null && DateUtil.compare(DateUtil.beginOfDay(travelDate), DateUtil.offsetDay(new Date(), 3)) < 0) {
-            Asserts.isTrue(false, "已过最晚修改时间");
+            return CommonResult.error(500, "已过最晚修改时间");
         }
 
         if (loginUser.getDistributorId() == null && DateUtil.compare(travelDate, DateUtil.offsetDay(new Date(), -2)) < 0) {
-            Asserts.isTrue(false, "已过最晚修改时间");
+            return CommonResult.error(500, "已过最晚修改时间");
         }
         shipTradeOrderCreateReqVO.setUpdateTime(updateTime);
         shipTradeOrderCreateReqVO.setOldtradeOrderDO(tradeOrderDO);
@@ -2361,7 +2351,8 @@ public class OtcTradeOrderServiceImpl implements OtcTradeOrderService {
         shipTradeOrderCreateReqVO.setChangedFields1(changedFields1);
         CommonResult<TradeOrderRespDTO> result = doShipModifyOrder(loginUser, shipTradeOrderCreateReqVO);
         if (result.isError()) {
-            return CommonResult.error(result);
+//            throw new ServiceException(result.getCode(), result.getMsg());
+            return CommonResult.error(result.getCode(), result.getMsg());
         }
         Long neworderId = result.getCheckedData().getOrderId();
 
@@ -2495,15 +2486,15 @@ public class OtcTradeOrderServiceImpl implements OtcTradeOrderService {
         TradeOrderVO tradeOrderVO = new TradeOrderVO();
         TradeOrderDO tradeOrderDO;
         List<TradeOrderDO> orderList = tradeOrderMapper.queryOrderById(orderId);
-        if(orderList!=null && !orderList.isEmpty()){
+        if (orderList != null && !orderList.isEmpty()) {
             tradeOrderDO = orderList.get(0);
-        }else{
+        } else {
             return CommonResult.error(ErrorCodeConstants.ORDER_NOT_EXIST);
         }
-        if(tradeOrderDO.getDeleted()) {
+        if (tradeOrderDO.getDeleted()) {
             tradeOrderDO = tradeOrderMapper.selectFirstOne(TradeOrderDO::getOrderNo, tradeOrderDO.getOrderNo(), TradeOrderDO::getDeleted, 0);
         }
-        if(tradeOrderDO==null){
+        if (tradeOrderDO == null) {
             return CommonResult.error(ErrorCodeConstants.ORDER_NOT_EXIST);
         }
         tradeOrderVO.setOrderDO(tradeOrderDO);