bug修改

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

@@ -6,6 +6,7 @@ import com.yc.ship.framework.tenant.core.aop.TenantIgnore;
 import com.yc.ship.module.trade.dal.dataobject.order.TradeOrderTotalDO;
 import org.apache.ibatis.annotations.Mapper;
 import org.apache.ibatis.annotations.Param;
+import org.apache.ibatis.annotations.Select;
 import org.apache.ibatis.annotations.Update;
 
 import java.util.List;
@@ -31,4 +32,8 @@ public interface TradeOrderTotalMapper extends BaseMapperX<TradeOrderTotalDO> {
     @Update("UPDATE trade_order_total SET deleted = #{deleted},update_time = now() WHERE old_order_id = #{orderId}")
     @TenantIgnore
     void updateDeleted(@Param("orderId") Long orderId, @Param("deleted")  int deleted);
+
+    @Select("select * from trade_order_total where deleted = #{deleted} and old_order_id = #{orderId} limit 1")
+    @TenantIgnore
+    TradeOrderTotalDO selectByOrderId(@Param("orderId") Long orderId, @Param("deleted")  int deleted);
 }

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

@@ -394,10 +394,10 @@ public class OtcTradeOrderServiceImpl implements OtcTradeOrderService {
                 reqDTO.setVoyageId(lastTradeOrder.getVoyageId());
                 reqDTO.setDistributorId(Long.valueOf(lastTradeOrder.getSourceId()));
                 reqDTO.setStoreId(lastTradeOrder.getStoreId());
-                TradeOrderTotalDO tradeOrderTotal = tradeOrderTotalMapper.selectOne(new LambdaQueryWrapper<TradeOrderTotalDO>().eq(TradeOrderTotalDO::getOldOrderId, lastTradeOrder.getId()));
+                TradeOrderTotalDO tradeOrderTotal = tradeOrderTotalMapper.selectByOrderId(lastTradeOrder.getId(),1);
                 reqDTO.setUseRoomNum(BigDecimal.valueOf(tradeOrderTotal.getUseRoomTotalNum()));
 
-                List<OrderRoomUseDTO> orderRoomUseDTOList = tradeVisitorMapper.selectRoomShipVisitor(lastTradeOrder.getId());
+                List<OrderRoomUseDTO> orderRoomUseDTOList = tradeVisitorMapper.selectRoomShipVisitor2(lastTradeOrder.getId());
                 reqDTO.setOrderRoomList(orderRoomUseDTOList);
                 reqDTO.setOrderRoomList(orderRoomUseDTOList);
                 Integer orderStatus = reqDTO.getOrderStatus();
@@ -458,10 +458,10 @@ public class OtcTradeOrderServiceImpl implements OtcTradeOrderService {
             reqDTO.setVoyageId(lastTradeOrder.getVoyageId());
             reqDTO.setDistributorId(Long.valueOf(lastTradeOrder.getSourceId()));
             reqDTO.setStoreId(lastTradeOrder.getStoreId());
-            TradeOrderTotalDO tradeOrderTotal = tradeOrderTotalMapper.selectOne(new LambdaQueryWrapper<TradeOrderTotalDO>().eq(TradeOrderTotalDO::getOldOrderId, lastTradeOrder.getId()));
+            TradeOrderTotalDO tradeOrderTotal = tradeOrderTotalMapper.selectByOrderId(lastTradeOrder.getId(),1);
             reqDTO.setUseRoomNum(BigDecimal.valueOf(tradeOrderTotal.getUseRoomTotalNum()));
 
-            List<OrderRoomUseDTO> orderRoomUseDTOList = tradeVisitorMapper.selectRoomShipVisitor(lastTradeOrder.getId());
+            List<OrderRoomUseDTO> orderRoomUseDTOList = tradeVisitorMapper.selectRoomShipVisitor2(lastTradeOrder.getId());
             reqDTO.setOrderRoomList(orderRoomUseDTOList);
             Integer orderStatus = reqDTO.getOrderStatus();
             if (Objects.equals(orderStatus, TradeOrderStatusEnum.YD.getStatus())) {

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

@@ -106,7 +106,7 @@
     <select id="selectRoomShipVisitor2"
             resultType="com.yc.ship.module.product.api.dto.OrderRoomUseDTO">
         select room_model_id,floor,room_id,count(1) num from  trade_visitor
-        where order_id = #{orderId}
+        where order_id = #{orderId} and deleted =1
         group by room_model_id,floor,room_id
     </select>
     <select id="queryRelatedVisitor"