Browse Source

下单流程

lishiqiang 1 tuần trước cách đây
mục cha
commit
f592398bfb

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

@@ -37,6 +37,9 @@ public class TradeOrderOtcCreateVO {
     @Schema(description = "币种")
     private String currency;
 
+    @Schema(description = "备注")
+    private String remark;
+
     @Schema(description = "国籍数据")
     List<TradeOrderCountryReqVO> countryData;
 

+ 1 - 1
ship-module-trade/ship-module-trade-biz/src/main/java/com/yc/ship/module/trade/service/order/impl/TradeOrderServiceImpl.java

@@ -182,7 +182,7 @@ public class TradeOrderServiceImpl implements TradeOrderService {
 //                return CommonResult.error(tradeSupplierOrderResp);
 //            }
             //4.2 供应商下单成功回调
-//            tradeSupplierCallbackService.afterAllOrderCreate(tradeOrderBO.getTradeOrderDO());
+            tradeSupplierCallbackService.afterAllOrderCreate(tradeOrderBO.getTradeOrderDO());
             //5.下单后处理
             afterOrderCreate(tradeOrderBO);
             TradeOrderRespDTO tradeOrderRespDTO = new TradeOrderRespDTO().setOrderId(tradeOrderBO.getTradeOrderDO().getId()).setOrderNo(tradeOrderBO.getTradeOrderDO().getOrderNo())

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

@@ -2340,11 +2340,13 @@ public class OtcTradeOrderServiceImpl implements OtcTradeOrderService {
         shipTradeOrderCreateReqVO.setDistributorId(loginUser.getDistributorId());
         shipTradeOrderCreateReqVO.setGroupNo(createVO.getGroupNo());
         shipTradeOrderCreateReqVO.setAmount(createVO.getSummary().getOrderMoney());
+        shipTradeOrderCreateReqVO.setPayAmount(createVO.getSummary().getOrderMoney());
         ShipTradeOrderCreateReqVO.OrderUser orderUser = new ShipTradeOrderCreateReqVO.OrderUser();
         orderUser.setContactName(createVO.getLinkMan());
         orderUser.setMobile(createVO.getLinkMobile());
         orderUser.setEmail(createVO.getLinkEmail());
         shipTradeOrderCreateReqVO.setOrderUser(orderUser);
+        shipTradeOrderCreateReqVO.setRemark(createVO.getRemark());
 
         shipTradeOrderCreateReqVO.setTravelDate(createVO.getBoardingTime());