新下单流程优化

ship-module-trade/ship-module-trade-biz/src/main/java/com/yc/ship/module/trade/dal/mysql/order/TradeOrderMapper.java

@@ -208,4 +208,5 @@ public interface TradeOrderMapper extends BaseMapperX<TradeOrderDO> {
     List<Map<String, Object>> regionStatic(@Param("vo") TradeStaticReqVO regionStatic);
 
     List<TradeOrderDO> queryOrderByLast(@Param("orderNo")  String orderNo);
+    List<TradeOrderDO> queryOrderById(@Param("orderId")  Long orderId);
 }

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

@@ -2470,8 +2470,14 @@ public class OtcTradeOrderServiceImpl implements OtcTradeOrderService {
     @Override
     public CommonResult<TradeOrderVO> getOrderById(Long orderId) {
         TradeOrderVO tradeOrderVO = new TradeOrderVO();
-        TradeOrderDO tradeOrderDO = tradeOrderMapper.selectById(orderId);
-        if(tradeOrderDO !=null && tradeOrderDO.getDeleted()) {
+        TradeOrderDO tradeOrderDO;
+        List<TradeOrderDO> orderList = tradeOrderMapper.queryOrderById(orderId);
+        if(orderList!=null && !orderList.isEmpty()){
+            tradeOrderDO = orderList.get(0);
+        }else{
+            return CommonResult.error(ErrorCodeConstants.ORDER_NOT_EXIST);
+        }
+        if(tradeOrderDO.getDeleted()) {
             tradeOrderDO = tradeOrderMapper.queryOneByOrderNo(tradeOrderDO.getOrderNo());
         }
         if(tradeOrderDO==null){

ship-module-trade/ship-module-trade-biz/src/main/resources/mapper/order/TradeOrderMapper.xml

@@ -2443,4 +2443,8 @@
     <select id="queryOrderByLast" resultType="com.yc.ship.module.trade.dal.dataobject.order.TradeOrderDO">
         SELECT  * FROM trade_order WHERE order_no = #{orderNo} and deleted=1   ORDER BY update_time DESC limit 1
     </select>
+
+    <select id="queryOrderById" resultType="com.yc.ship.module.trade.dal.dataobject.order.TradeOrderDO">
+        SELECT  * FROM trade_order WHERE id = #{orderId}   ORDER BY update_time DESC limit 1
+    </select>
 </mapper>