fix:完善订单数据入库

ship-module-otc/ship-module-otc-biz/src/main/java/com/yc/ship/module/otc/controller/admin/store/StoreController.java

@@ -7,6 +7,8 @@ import com.yc.ship.framework.common.util.object.BeanUtils;
 import com.yc.ship.framework.excel.core.util.ExcelUtils;
 import com.yc.ship.framework.operatelog.core.annotations.OperateLog;
 import com.yc.ship.framework.tenant.core.aop.TenantIgnore;
+import com.yc.ship.module.ota.api.OtaDistributorApi;
+import com.yc.ship.module.ota.api.dto.DistributorRespDTO;
 import com.yc.ship.module.otc.controller.admin.store.machine.SellerMachineRespVO;
 import com.yc.ship.module.otc.controller.admin.store.machine.StoreMachineRespVO;
 import com.yc.ship.module.otc.controller.admin.store.machineproduct.StoreMachineProductRespVO;
@@ -59,6 +61,9 @@ public class StoreController {
     @Resource
     private AdminUserApi adminUserApi;
 
+    @Resource
+    private OtaDistributorApi otaDistributorApi;
+
 //    @Resource
 //    private ProductApi productApi;
 
@@ -107,6 +112,8 @@ public class StoreController {
         respVO.setCredit(storeCardDO.getCredit());
         StoreCardRespVO cardRespVO = BeanUtils.toBean(storeCardDO, StoreCardRespVO.class);
         respVO.setCardRespVO(cardRespVO);
+        DistributorRespDTO distributor = otaDistributorApi.getDistributorById(store.getAgencyId());
+        respVO.setAgencyName(distributor.getName());
         return success(respVO);
     }
 

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

@@ -79,7 +79,7 @@ public class ShipTradeOrderCreateReqVO implements Serializable {
     private String groupNo;
 
     @Schema(description = "币种", example = "CNY 字典trade_order_currency")
-    private Integer currency;
+    private String currency;
     /**
      * 航次ID
      */

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

@@ -31,7 +31,7 @@ public class TradeOrderOtcCreateVO {
     private String groupNo;
 
     @Schema(description = "币种")
-    private Integer currency;
+    private String currency;
 
     @Schema(description = "国籍数据")
     List<TradeOrderCountryReqVO> countryData;
@@ -39,6 +39,6 @@ public class TradeOrderOtcCreateVO {
     @Schema(description = "订单汇总信息")
     private TradeOrderTotalVO summary;
 
-    private List<TradeVistorReqVO> visitorList;
+    private List<TradeVistorReqVO> tourist;
 
 }

ship-module-trade/ship-module-trade-biz/src/main/java/com/yc/ship/module/trade/dal/dataobject/order/TradeOrderDO.java

@@ -248,7 +248,7 @@ public class TradeOrderDO extends TenantBaseDO {
     /**
      * 币种 字典trade_order_currency
      */
-    private Integer currency;
+    private String currency;
 
     /**
      * 客户名称

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

@@ -2415,7 +2415,7 @@ public class OtcTradeOrderServiceImpl implements OtcTradeOrderService {
         tradeOrderFloorMapper.insertBatch(floorPlus);
 
         //创建订单游客数据
-        List<TradeVistorReqVO> visitorList = createVO.getVisitorList();
+        List<TradeVistorReqVO> visitorList = createVO.getTourist();
         List<TradeVisitorDO> visitorDOS = BeanUtils.toBean(visitorList, TradeVisitorDO.class);
         visitorDOS.stream().forEach(item -> {
             item.setOrderId(orderId);