新下单流程优化

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

@@ -4,6 +4,8 @@ import com.yc.ship.module.trade.enums.CredentialTypeEnum;
 import io.swagger.v3.oas.annotations.media.Schema;
 import lombok.Data;
 
+import java.math.BigDecimal;
+
 @Data
 public class TradeVistorReqVO {
     @Schema(description = "明细ID")
@@ -74,4 +76,7 @@ public class TradeVistorReqVO {
 
     @Schema(description = "楼层")
     private Integer floor;
+
+    @Schema(description = "价格")
+    private BigDecimal price;
 }

ship-module-trade/ship-module-trade-biz/src/main/java/com/yc/ship/module/trade/service/order/handler/TradeStockOrderHandler.java

@@ -34,7 +34,7 @@ public class TradeStockOrderHandler implements TradeOrderHandler{
     @Override
     public void beforeOrderCreate(TradeOrderBO order) {
         Integer sellMethod = order.getTradeOrderDO().getSellMethod();
-        if (sellMethod == 1) { //OTC
+        if (sellMethod == 1||sellMethod == 4||sellMethod == 7||sellMethod == 0||sellMethod == 3) {
             reduceStock(order);
         }
 

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

@@ -314,7 +314,7 @@ public class OtcTradeOrderServiceImpl implements OtcTradeOrderService {
         if (orderProperty == null) {
             orderProperty = new ShipTradeOrderCreateReqVO.OrderProperty();
         }
-        orderProperty.setSellMethod(SellMethodEnum.WINDOW.getType());
+        orderProperty.setSellMethod(otcTradeOrderCreateReqVO.getOrderProperty().getSellMethod());
         setShipOrderPropertyFromLoginUser(loginUser, orderProperty);
         otcTradeOrderCreateReqVO.setOrderProperty(orderProperty);
         return tradeOrderService.createShipOrder(otcTradeOrderCreateReqVO);
@@ -325,7 +325,7 @@ public class OtcTradeOrderServiceImpl implements OtcTradeOrderService {
         if (orderProperty == null) {
             orderProperty = new ShipTradeOrderCreateReqVO.OrderProperty();
         }
-        orderProperty.setSellMethod(SellMethodEnum.WINDOW.getType());
+        orderProperty.setSellMethod(otcTradeOrderCreateReqVO.getOrderProperty().getSellMethod());
         setShipOrderPropertyFromLoginUser(loginUser, orderProperty);
         otcTradeOrderCreateReqVO.setOrderProperty(orderProperty);
         return tradeOrderService.modifyShipOrder(otcTradeOrderCreateReqVO);