优化销售渠道

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

@@ -141,6 +141,7 @@ public class OtcTradeOrderController {
   @OperateLog(type = TRADE)
   @TradeRateLimit(name = "createMoveOrder", limitNum = 2, limitTime = 5)
   public CommonResult<?> createMoveOrder(@Validated(value = WindowCreateOrderGroup.class) @RequestBody TradeOrderOtcCreateVO createVO) {
+    createVO.setMoveOrder(true);
     return otcTradeOrderService.createOtcOrder(agencyAuthUtils.getAgencyLoginUser(), createVO);
   }
 

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

@@ -37,6 +37,9 @@ public class ShipTradeOrderCreateReqVO implements Serializable {
     @Schema(description = "修改时间")
     private Date updateTime;
 
+    @Schema(description = "是否搬单")
+    private boolean moveOrder;
+
     @Schema(description = "第三方订单号，分销商下单", example = "MT1231312")
     @Hidden
     private String externalOrderNo;

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

@@ -38,6 +38,9 @@ public class TradeOrderOtcCreateVO {
     @Schema(description = "船ID")
     private Long shipId;
 
+    @Schema(description = "是否搬单")
+    private boolean moveOrder;
+
     @Schema(description = "航次ID")
     private Long voyageId;
 

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

@@ -1891,6 +1891,9 @@ public class OtcTradeOrderServiceImpl implements OtcTradeOrderService {
         BigDecimal otherMoney = summary.getOtherMoney();
         ShipTradeOrderCreateReqVO shipTradeOrderCreateReqVO = BeanUtils.toBean(createVO, ShipTradeOrderCreateReqVO.class);
         shipTradeOrderCreateReqVO.setDistributorId(loginUser.getDistributorId());
+        if(createVO.isMoveOrder()){
+            shipTradeOrderCreateReqVO.setMoveOrder(true);
+        }
         shipTradeOrderCreateReqVO.setGroupNo(createVO.getGroupNo());
         if (orderMoney != null && realAmount != null && realAmount.compareTo(orderMoney) != 0) {
             shipTradeOrderCreateReqVO.setAmount(orderMoney);
@@ -1936,7 +1939,6 @@ public class OtcTradeOrderServiceImpl implements OtcTradeOrderService {
             orderProperty.setStoreId(storeInfo.getId());
             orderProperty.setStoreName(storeInfo.getName());
         }
-        orderProperty.setSellMethod(SellMethodEnum.OTC.getType());
 
         shipTradeOrderCreateReqVO.setOrderProperty(orderProperty);