将trade_order_total中的order_id改为id

ship-module-product/ship-module-product-biz/src/main/java/com/yc/ship/module/product/dal/mysql/voyagestockdetail/VoyageStockDetailMapper.java

@@ -59,7 +59,7 @@ public interface VoyageStockDetailMapper extends BaseMapperX<VoyageStockDetailDO
      */
     @Select("SELECT IFNULL(SUM(t.leader_total_num + t.with_total_num) / 2.0, 0) " +
             "FROM trade_order_total t " +
-            "INNER JOIN trade_order o ON t.old_order_id = o.id or  t.order_id = o.id  " +
+            "INNER JOIN trade_order o ON t.old_order_id = o.id  " +
             "WHERE o.voyage_id = #{voyageId} AND o.deleted = 0 AND t.deleted = 0")
     @TenantIgnore
     Double selectAllocatedRoomCountByVoyageId(@Param("voyageId") Long voyageId);

ship-module-trade/ship-module-trade-biz/src/main/java/com/yc/ship/module/trade/dal/dataobject/order/TradeOrderTotalDO.java

@@ -29,7 +29,7 @@ public class TradeOrderTotalDO extends TenantBaseDO {
      * 订单ID
      */
     @TableId
-    private Long orderId;
+    private Long id;
     /**
      * 旧订单ID
      */

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

@@ -242,7 +242,7 @@ public class AppOtcTradeOrderServiceImpl implements AppOtcTradeOrderService {
             }
             TradeOrderTotalDO tradeOrderTotalDO = BeanUtils.toBean(summary, TradeOrderTotalDO.class);
             Long orderId = result.getCheckedData().getOrderId();
-            tradeOrderTotalDO.setOrderId(IdWorker.getId());
+            tradeOrderTotalDO.setId(IdWorker.getId());
             tradeOrderTotalDO.setOldOrderId(orderId);
             tradeOrderTotalDO.setOtherRemark(summary.getOtherRemark());
             tradeOrderTotalMapper.insert(tradeOrderTotalDO);

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

@@ -1810,7 +1810,7 @@ public class OtcTradeOrderServiceImpl implements OtcTradeOrderService {
             TradeOrderTotalDO tradeOrderTotalDO = BeanUtils.toBean(summary, TradeOrderTotalDO.class);
             Long orderId = result.getCheckedData().getOrderId();
             Integer orderStatus = result.getCheckedData().getOrderStatus();
-            tradeOrderTotalDO.setOrderId(IdWorker.getId());
+            tradeOrderTotalDO.setId(IdWorker.getId());
             tradeOrderTotalDO.setOldOrderId(orderId);
             tradeOrderTotalDO.setOtherRemark(summary.getOtherRemark());
             tradeOrderTotalMapper.insert(tradeOrderTotalDO);
@@ -2143,7 +2143,7 @@ public class OtcTradeOrderServiceImpl implements OtcTradeOrderService {
                     .set(TradeOrderTotalDO::getUpdateTime, updateTime)
                     .eq(TradeOrderTotalDO::getOldOrderId, orderId)
             );
-            tradeOrderTotalDO.setOrderId(IdWorker.getId());
+            tradeOrderTotalDO.setId(IdWorker.getId());
             tradeOrderTotalDO.setOldOrderId(neworderId);
             tradeOrderTotalMapper.insert(tradeOrderTotalDO);