@be-link/pos-cli-nodejs 1.0.103 → 1.0.105

package/package.json

@@ -1,6 +1,6 @@
 {
   "name": "@be-link/pos-cli-nodejs",
-  "version": "1.0.103",
+  "version": "1.0.105",
   "description": "正向订单服务Nodejs客户端",
   "main": "index.js",
   "scripts": {
@@ -50,7 +50,7 @@
     "axios-retry": "^4.0.0",
     "uuid": "^9.0.1",
     "vitality-meta": "1.0.197",
-    "@be-link/cs-cli-nodejs": "0.1.1",
+    "@be-link/cs-cli-nodejs": "0.1.97",
     "lodash": "4.17.21"
   }
 }

package/pos/modules/orderTourMaterial/types.d.ts

@@ -1,5 +1,6 @@
-import * as PosEnums from 'vitality-meta/enums/pos';
-import { ITourMaterialSnapshot, ITradeOrderTourMaterialInfo } from '../../../types';
+import * as CommodityEnums from 'vitality-meta/enums/commodity';
+import { ITradeOrderTourMaterialInfo } from '../../../types';
+import * as CsDto from '@be-link/cs-cli-nodejs/types';
 export declare namespace Service {
     namespace Request {
         interface IGet {
@@ -13,11 +14,11 @@ export declare namespace Service {
         }
     }
     namespace Response {
-        interface IGetTourMaterialInfo extends ITourMaterialSnapshot {
+        type IGetTourMaterialInfo = CsDto.ITourMaterialSnapshot & {
             orderId: string;
-            process: PosEnums.TouristMaterialTotalStatus[];
-            process2: PosEnums.TouristMaterialTotalStatus[];
-        }
+            process: CommodityEnums.TouristMaterialStatus[];
+            process2: CommodityEnums.TouristMaterialStatus[];
+        };
     }
     interface Controller {
         /** 获取订单上的商品出行人材料快照信息 */

package/types.d.ts

@@ -981,7 +981,7 @@ export interface ITradeOrderTourMaterialSnapshot {
     createdAt: number;
     updatedAt: number;
     itemId: string;
-    tourMaterialSnapShot: ITourMaterialSnapshot;
+    tourMaterialSnapShot: CSDto.ITourMaterialSnapshot;
     tourMaterialStatus: number;
 }
 export interface IWxPrepayResult {
@@ -1236,7 +1236,7 @@ export interface ITradeOrderTourMaterialInfo {
     /**
      * 商品出行材料快照信息
      */
-    tourMaterialSnapShot: ITourMaterialSnapshot;
+    tourMaterialSnapShot: CSDto.ITourMaterialSnapshot;
     /**
      * 出行材料类型
      */
@@ -1250,49 +1250,6 @@ export interface ITradeOrderTourMaterialInfo {
      */
     tourMaterialStatus: number;
 }
-/**  商品出行材料项信息 */
-export interface ITourMaterialItem {
-    /** 材料项id */
-    id?: string;
-    createdAt?: number;
-    updatedAt?: number;
-    deletedAt?: number;
-    /** 商品id */
-    itemId: string;
-    /** 标题 */
-    title: string;
-    /** 签证类型 */
-    visaType: commodityEnums.TourMaterialVisaType;
-    /** 收集类型 */
-    collectType: commodityEnums.TourMaterialCollectType;
-    /** 具体要求 */
-    specificInfo: string;
-    /** 实例图片 */
-    attachments: string[];
-    /** 是否可用 */
-    isEnable: boolean;
-}
-/**  商品出行材料快照信息信息 */
-export interface ITourMaterialSnapshot {
-    /** 商品id */
-    id: string;
-    createdAt?: number;
-    updatedAt?: number;
-    /** 材料类型 */
-    materialType: commodityEnums.TourMaterialType;
-    /** 代办费用 */
-    agentCharge: number;
-    /** 是否面签 */
-    visaInterview: boolean;
-    /** 是否消签 */
-    visaCancel: boolean;
-    /** 是否可用 */
-    isEnable: boolean;
-    /** 材料项1:实体材料或 代办材料*/
-    items: ITourMaterialItem[];
-    /** 材料项2:自备材料 */
-    items2?: ITourMaterialItem[];
-}
 /**  订单查询结果 */
 export type QueryDataRes<K extends (keyof QueryDataBlockTypeMap)[]> = {
     [key in K[number]]: QueryDataBlockTypeMap[key];