Merge branch 'main' of http://117.174.100.38:3000/lishiqiang/ship-ota-server into main1

ship-module-product/ship-module-product-biz/src/main/java/com/yc/ship/module/product/api/VoyageApiImpl.java

@@ -82,7 +82,6 @@ public class VoyageApiImpl implements VoyageApi {
     private VoyageStockDetailLogMapper voyageStockDetailLogMapper;
 
     @Override
-    @Transactional(rollbackFor = Exception.class)
     public void preReduceStock(ReduceStockReqDTO reqDTO) {
         //TODO: 当前阶段不考虑门店库存
         log.info("开始初定订单扣库存：订单ID:"+reqDTO.getOrderId()+"old订单ID:"+reqDTO.getOldOrderId());
@@ -122,7 +121,6 @@ public class VoyageApiImpl implements VoyageApi {
         }
     }
 
-    @Transactional(rollbackFor = Exception.class)
     @Override
     public void preCancelReduceStock(ReduceStockReqDTO reqDTO) {
         //TODO: 当前阶段不考虑门店库存
@@ -149,7 +147,6 @@ public class VoyageApiImpl implements VoyageApi {
         }
     }
 
-    @Transactional(rollbackFor = Exception.class)
     @Override
     public void reduceStock(ReduceStockReqDTO reqDTO) {
         //TODO: 当前阶段不考虑门店库存
@@ -179,11 +176,9 @@ public class VoyageApiImpl implements VoyageApi {
         }
     }
 
-    @Transactional(rollbackFor = Exception.class)
     @Override
     public void cancelReduceStock(ReduceStockReqDTO reqDTO) {
         //TODO: 当前阶段不考虑门店库存
-
         Long voyageId = reqDTO.getVoyageId();
         //现在给整个航次的库存加锁
         String lockKey = String.format(ProductRedisKeyConstants.STOCK_REDIS_KEY_PREFIX, voyageId);
@@ -294,7 +289,6 @@ public class VoyageApiImpl implements VoyageApi {
     /**
      * 确定时扣库存,有限扣实际库存，不足再扣虚拟库存
      *
-     * @param reqDTO
      */
     private void reduceStockDistributor(ReduceStockReqDTO reqDTO) {
         //航次库存操作日志

ship-module-trade/ship-module-trade-biz/src/main/java/com/yc/ship/module/trade/controller/admin/order/vo/order/TradeOrderRespNewVO.java

@@ -5,25 +5,16 @@ import com.alibaba.excel.annotation.ExcelProperty;
 import com.fasterxml.jackson.annotation.JsonFormat;
 import com.yc.ship.framework.excel.core.annotations.DictFormat;
 import com.yc.ship.framework.excel.core.convert.DictConvert;
-import com.yc.ship.module.member.api.address.dto.MemberAddressRespDTO;
-import com.yc.ship.module.product.api.dto.ProductSaleRuleRespDTO;
-import com.yc.ship.module.product.api.dto.ProductSpuRespDTO;
 import com.yc.ship.module.product.controller.admin.voyage.vo.VoyageRespVO;
-import com.yc.ship.module.resource.controller.admin.productRoute.vo.ProductRouteRespVO;
 import com.yc.ship.module.resource.dal.dataobject.route.ResourceRouteDO;
-import com.yc.ship.module.trade.api.dto.TradeOrderPayDTO;
-import com.yc.ship.module.trade.controller.admin.order.vo.market.MarketingRespVO;
-import com.yc.ship.module.trade.controller.admin.order.vo.market.RuleSpecNum;
 import com.yc.ship.module.trade.dal.dataobject.contract.ContractDO;
 import com.yc.ship.module.trade.dal.dataobject.insurance.InsuranceDO;
-import com.yc.ship.module.trade.dal.dataobject.order.TradeOrderDeliveryVO;
 import com.yc.ship.module.trade.dal.dataobject.order.TradeVisitorDO;
 import com.yc.ship.module.trade.dal.dataobject.orderjz.OrderJzDO;
 import io.swagger.v3.oas.annotations.media.Schema;
 import lombok.Data;
 
 import java.math.BigDecimal;
-import java.time.LocalDate;
 import java.time.LocalDateTime;
 import java.util.Date;
 import java.util.List;