@be-link/ecommerce-trade-service-node-sdk 0.0.11 → 0.0.12

package/consts.js

@@ -21,6 +21,7 @@ exports.OrderOsTypeMap = {
 };
 exports.OrderStatusMap = {
     [enums_1.OrderStatus.WAIT_PAY]: '待付款',
+    [enums_1.OrderStatus.PAY_SUCCESS]: '支付成功',
     [enums_1.OrderStatus.WAIT_SHIP]: '待发货',
     [enums_1.OrderStatus.WAIT_RECEIVE]: '待收货',
     [enums_1.OrderStatus.COMPLETED]: '已完成',
@@ -56,7 +57,10 @@ exports.ReverseResourceTypeMap = {
     [enums_1.ReverseResourceType.VOUCHER]: '核销券',
 };
 exports.ReverseOrderStatusMap = {
-    [enums_1.ReverseOrderStatus.PENDING_REVIEW]: '待审核',
+    [enums_1.ReverseOrderStatus.APPROVED]: '审核通过',
+    [enums_1.ReverseOrderStatus.REJECTED]: '审核拒绝',
+    [enums_1.ReverseOrderStatus.CANCELED]: '用户主动取消',
+    [enums_1.ReverseOrderStatus.PENDING]: '待审核',
     [enums_1.ReverseOrderStatus.REFUNDED]: '已退款',
     [enums_1.ReverseOrderStatus.CLOSED]: '退款关闭',
 };

package/enums.d.ts

@@ -33,6 +33,8 @@ export declare enum OrderOsType {
 export declare enum OrderStatus {
     /** 待付款 */
     WAIT_PAY = "WAIT_PAY",
+    /** 支付成功 */
+    PAY_SUCCESS = "PAY_SUCCESS",
     /** 待发货 */
     WAIT_SHIP = "WAIT_SHIP",
     /** 待收货 */
@@ -99,7 +101,13 @@ export declare enum ReverseResourceType {
 /** 逆向订单状态 */
 export declare enum ReverseOrderStatus {
     /** 待审核 */
-    PENDING_REVIEW = "PENDING_REVIEW",
+    PENDING = "PENDING",
+    /** 审核通过 */
+    APPROVED = "APPROVED",
+    /** 审核拒绝 */
+    REJECTED = "REJECTED",
+    /** 用户主动取消 */
+    CANCELED = "CANCELED",
     /** 已退款 */
     REFUNDED = "REFUNDED",
     /** 退款关闭 */

package/enums.js

@@ -40,6 +40,8 @@ var OrderStatus;
 (function (OrderStatus) {
     /** 待付款 */
     OrderStatus["WAIT_PAY"] = "WAIT_PAY";
+    /** 支付成功 */
+    OrderStatus["PAY_SUCCESS"] = "PAY_SUCCESS";
     /** 待发货 */
     OrderStatus["WAIT_SHIP"] = "WAIT_SHIP";
     /** 待收货 */
@@ -111,7 +113,13 @@ var ReverseResourceType;
 var ReverseOrderStatus;
 (function (ReverseOrderStatus) {
     /** 待审核 */
-    ReverseOrderStatus["PENDING_REVIEW"] = "PENDING_REVIEW";
+    ReverseOrderStatus["PENDING"] = "PENDING";
+    /** 审核通过 */
+    ReverseOrderStatus["APPROVED"] = "APPROVED";
+    /** 审核拒绝 */
+    ReverseOrderStatus["REJECTED"] = "REJECTED";
+    /** 用户主动取消 */
+    ReverseOrderStatus["CANCELED"] = "CANCELED";
     /** 已退款 */
     ReverseOrderStatus["REFUNDED"] = "REFUNDED";
     /** 退款关闭 */

package/modules/pos/index.d.ts

@@ -1,4 +1,5 @@
 export { queryByWebService as orderQueryByWebService } from './orderQuery/webService';
+export { queryByUserService as orderQueryByUserService } from './orderQuery/userService';
 export { PosOrderQueryService as PosOrderQueryTypes } from './orderQuery/types';
 export { orderCoreByUserService } from './orderCore/userService';
 export { PosCoreService as PosOrderCoreTypes } from './orderCore/types';

package/modules/pos/index.js

@@ -1,7 +1,9 @@
 "use strict";
 Object.defineProperty(exports, "__esModule", { value: true });
-exports.orderCoreByUserService = exports.orderQueryByWebService = void 0;
+exports.orderCoreByUserService = exports.orderQueryByUserService = exports.orderQueryByWebService = void 0;
 var webService_1 = require("./orderQuery/webService");
 Object.defineProperty(exports, "orderQueryByWebService", { enumerable: true, get: function () { return webService_1.queryByWebService; } });
-var userService_1 = require("./orderCore/userService");
-Object.defineProperty(exports, "orderCoreByUserService", { enumerable: true, get: function () { return userService_1.orderCoreByUserService; } });
+var userService_1 = require("./orderQuery/userService");
+Object.defineProperty(exports, "orderQueryByUserService", { enumerable: true, get: function () { return userService_1.queryByUserService; } });
+var userService_2 = require("./orderCore/userService");
+Object.defineProperty(exports, "orderCoreByUserService", { enumerable: true, get: function () { return userService_2.orderCoreByUserService; } });

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

@@ -7,14 +7,18 @@ export declare namespace PosCoreService {
                 source: string;
                 platform: string;
                 osType: string;
-                userAddressId: string;
-                actualAmount: string;
-                totalAmount: string;
+                actualAmount: number;
+                totalAmount: number;
+                userAddressId?: string;
+                pickUpStoreUserInfo?: {
+                    username: string;
+                    phone: string;
+                };
                 couponInfo?: {
                     id: string;
-                    quantity: string;
+                    quantity: number;
                 }[];
-                pointNum?: string;
+                pointNum?: number;
             }
         }
         namespace Response {

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

@@ -12,76 +12,100 @@ export declare namespace PosOrderQueryService {
             end?: number;
         }
     }
-    namespace RequestByWeb {
-        interface IOrder {
-            /** 订单ID */
-            orderIds?: string[];
-            sourceList?: string[];
-            statusList?: string[];
-            orderTypeList?: string[];
-            refundStatusList?: string[];
-            verificationStatusList?: string[];
-            productPickList?: string[];
-            productDispatchList?: string[];
-            orderTime?: Dto.ITimeRange;
-            refundTime?: Dto.ITimeRange;
-            verificationTime?: Dto.ITimeRange;
+    namespace ByWeb {
+        namespace Request {
+            interface IOrder {
+                /** 订单ID */
+                orderIds?: string[];
+                sourceList?: string[];
+                statusList?: string[];
+                orderTypeList?: string[];
+                refundStatusList?: string[];
+                verificationStatusList?: string[];
+                productPickList?: string[];
+                productDispatchList?: string[];
+                createdAt?: Dto.ITimeRange;
+                payTime?: Dto.ITimeRange;
+                refundTime?: Dto.ITimeRange;
+                verificationTime?: Dto.ITimeRange;
+            }
+            interface IUser {
+                /** 用户ID */
+                userIds?: string[];
+                unionIds?: string[];
+                receiverPhone?: string;
+                receiverName?: string;
+            }
+            interface IProduct {
+                /** 商品ID */
+                productIds?: string[];
+                productTypeList?: string[];
+                skuCodes?: string[];
+            }
+            interface IStore {
+                /** 门店ID */
+                storeIds?: string[];
+            }
+            interface ILiveRoom {
+                liveRoomIds?: string[];
+                liveRoomGroupIds?: string[];
+            }
+            interface IOrderList {
+                /** 查询条件 */
+                conditions?: {
+                    order?: IOrder;
+                    /** 用户相关 */
+                    user?: IUser;
+                    /** 商品相关 */
+                    product?: IProduct;
+                    /** 门店 */
+                    store?: IStore;
+                    /** 直播间 */
+                    liveRoom?: ILiveRoom;
+                };
+                /** 分页 */
+                pagination: Dto.IPagination;
+                /** 排序 */
+                sort?: {
+                    /** 订单创建时间 */
+                    createdAt?: 'ASC' | 'DESC';
+                    /** 订单支付时间 */
+                    payTime?: 'ASC' | 'DESC';
+                    /** 完结时间 */
+                    completedAt?: 'ASC' | 'DESC';
+                };
+                /** 查询块 */
+                queryBlocks?: (keyof DTO.PosQueryBlockMap)[];
+            }
+            interface IOrderById {
+                orderId: string;
+                queryBlocks?: (keyof DTO.PosQueryBlockMap)[];
+            }
         }
-        interface IUser {
-            /** 用户ID */
-            userIds?: string[];
-            unionIds?: string[];
-            receiverPhone?: string;
-            receiverName?: string;
+        namespace Response {
+            interface IOrderList {
+            }
+            interface IRecentPickup {
+            }
         }
-        interface IProduct {
-            /** 商品ID */
-            productIds?: string[];
-            productTypeList?: string[];
-            skuCodes?: string[];
-        }
-        interface IStore {
-            /** 门店ID */
-            storeIds?: string[];
-        }
-        interface ILiveRoom {
-            liveRoomIds?: string[];
-            liveRoomGroupIds?: string[];
-        }
-        interface IOrderList {
-            /** 查询条件 */
-            conditions?: {
-                order?: IOrder;
-                /** 用户相关 */
-                user?: IUser;
-                /** 商品相关 */
-                product?: IProduct;
-                /** 门店 */
-                store?: IStore;
-                /** 直播间 */
-                liveRoom?: ILiveRoom;
-            };
-            /** 分页 */
-            pagination: Dto.IPagination;
-            /** 排序 */
-            sort?: {
-                /** 订单创建时间 */
-                createdAt?: 'ASC' | 'DESC';
-                /** 订单支付时间 */
-                payTime?: 'ASC' | 'DESC';
-                /** 完结时间 */
-                completedAt?: 'ASC' | 'DESC';
-            };
-            /** 查询块 */
-            queryBlocks?: (keyof DTO.PosQueryBlockMap)[];
+        interface QueryController {
+            /** 示例接口 */
+            orderList(request: Request.IOrderList, req: any): Promise<DTO.PosQueryResult[]>;
+            orderById(request: Request.IOrderById, req: any): Promise<DTO.PosQueryResult>;
         }
     }
-    namespace ResponseByWeb {
-        interface IOrderList {
+    namespace ByUser {
+        namespace Request {
+            interface ILastPickupStore {
+                /** 用户ID */
+                userId: string;
+                queryBlocks?: (keyof DTO.PosQueryBlockMap)[];
+            }
+        }
+        namespace Response { }
+        interface QueryController {
+            /** 查询用户最近门店自提订单 */
+            lastPickupStore(request: Request.ILastPickupStore, req: any): Promise<DTO.PosQueryResult>;
         }
-    }
-    interface QueryByWebController {
-        /** 示例接口 */
-        orderList(request: PosOrderQueryService.RequestByWeb.IOrderList, req: any): Promise<DTO.PosQueryResult[]>;
     }
 }

package/modules/pos/orderQuery/userService.d.ts

@@ -0,0 +1,9 @@
+import { PosOrderQueryService } from './types';
+import * as DTO from '../../../types';
+import BaseService from '../../BaseService';
+declare class OrderQueryByUserService extends BaseService {
+    protected prefixUrl: string;
+    lastPickupStore(request: PosOrderQueryService.ByUser.Request.ILastPickupStore): Promise<DTO.PosQueryResult>;
+}
+export declare const queryByUserService: OrderQueryByUserService;
+export default queryByUserService;

package/modules/pos/orderQuery/userService.js

@@ -1 +1,38 @@
 "use strict";
+var __decorate = (this && this.__decorate) || function (decorators, target, key, desc) {
+    var c = arguments.length, r = c < 3 ? target : desc === null ? desc = Object.getOwnPropertyDescriptor(target, key) : desc, d;
+    if (typeof Reflect === "object" && typeof Reflect.decorate === "function") r = Reflect.decorate(decorators, target, key, desc);
+    else for (var i = decorators.length - 1; i >= 0; i--) if (d = decorators[i]) r = (c < 3 ? d(r) : c > 3 ? d(target, key, r) : d(target, key)) || r;
+    return c > 3 && r && Object.defineProperty(target, key, r), r;
+};
+var __param = (this && this.__param) || function (paramIndex, decorator) {
+    return function (target, key) { decorator(target, key, paramIndex); }
+};
+var __importDefault = (this && this.__importDefault) || function (mod) {
+    return (mod && mod.__esModule) ? mod : { "default": mod };
+};
+Object.defineProperty(exports, "__esModule", { value: true });
+exports.queryByUserService = void 0;
+const tsoa_1 = require("tsoa");
+const http_1 = require("../../../utils/http");
+const BaseService_1 = __importDefault(require("../../BaseService"));
+let OrderQueryByUserService = class OrderQueryByUserService extends BaseService_1.default {
+    constructor() {
+        super(...arguments);
+        this.prefixUrl = '/pos/query/user';
+    }
+    lastPickupStore(request) {
+        return (0, http_1.callApi)(this.getApiUrl(this.lastPickupStore), request);
+    }
+};
+__decorate([
+    (0, tsoa_1.OperationId)('查询用户最近门店自提订单'),
+    (0, tsoa_1.Post)('last-pickup-store'),
+    __param(0, (0, tsoa_1.Body)())
+], OrderQueryByUserService.prototype, "lastPickupStore", null);
+OrderQueryByUserService = __decorate([
+    (0, tsoa_1.Route)('pos/query/user'),
+    (0, tsoa_1.Tags)('PosOrderQuery')
+], OrderQueryByUserService);
+exports.queryByUserService = new OrderQueryByUserService();
+exports.default = exports.queryByUserService;

package/modules/pos/orderQuery/webService.d.ts

@@ -1,9 +1,10 @@
 import { PosOrderQueryService } from './types';
 import * as DTO from '../../../types';
 import BaseService from '../../BaseService';
-declare class OrderQueryByWebService extends BaseService implements PosOrderQueryService.QueryByWebController {
+declare class OrderQueryByWebService extends BaseService {
     protected prefixUrl: string;
-    orderList(request: PosOrderQueryService.RequestByWeb.IOrderList): Promise<DTO.PosQueryResult[]>;
+    orderList(request: PosOrderQueryService.ByWeb.Request.IOrderList): Promise<DTO.PosQueryResult[]>;
+    orderById(request: PosOrderQueryService.ByWeb.Request.IOrderById): Promise<DTO.PosQueryResult>;
 }
 export declare const queryByWebService: OrderQueryByWebService;
 export default queryByWebService;

package/modules/pos/orderQuery/webService.js

@@ -24,12 +24,20 @@ let OrderQueryByWebService = class OrderQueryByWebService extends BaseService_1.
     orderList(request) {
         return (0, http_1.callApi)(this.getApiUrl(this.orderList), request);
     }
+    orderById(request) {
+        return (0, http_1.callApi)(this.getApiUrl(this.orderById), request);
+    }
 };
 __decorate([
     (0, tsoa_1.OperationId)('订单列表查询'),
     (0, tsoa_1.Post)('order-list'),
     __param(0, (0, tsoa_1.Body)())
 ], OrderQueryByWebService.prototype, "orderList", null);
+__decorate([
+    (0, tsoa_1.OperationId)('订单按ID查询'),
+    (0, tsoa_1.Post)('order-by-id'),
+    __param(0, (0, tsoa_1.Body)())
+], OrderQueryByWebService.prototype, "orderById", null);
 OrderQueryByWebService = __decorate([
     (0, tsoa_1.Route)('pos/query/web'),
     (0, tsoa_1.Tags)('PosOrderQuery')

package/package.json

@@ -1,6 +1,6 @@
 {
   "name": "@be-link/ecommerce-trade-service-node-sdk",
-  "version": "0.0.11",
+  "version": "0.0.12",
   "description": "EcommerceTradeService Node.js SDK",
   "main": "index.js",
   "types": "index.d.ts",

package/utils/http.d.ts

@@ -2,6 +2,9 @@ declare module '@fastify/request-context' {
     interface RequestContextData {
         requestId: string;
         traceMessageId?: string;
+        pandoraUserId?: string;
+        beLinkUserId?: string;
+        pandoraRoleId?: string;
     }
 }
 export declare function callApi<T extends (...args: any[]) => Promise<any>>(url: string, request?: Parameters<T>[0]): Promise<Awaited<ReturnType<T>>>;

package/utils/http.js

@@ -56,9 +56,19 @@ const request_context_1 = require("@fastify/request-context");
 });
 async function callApi(url, request) {
     const requestId = request_context_1.requestContext.get('requestId') || request_context_1.requestContext.get('traceMessageId') || (0, uuid_1.v4)();
+    const pandoraUserId = request_context_1.requestContext.get('pandoraUserId') || '';
+    const beLinkUserId = request_context_1.requestContext.get('beLinkUserId') || '';
+    const pandoraRoleId = request_context_1.requestContext.get('pandoraRoleId') || '';
     try {
         console.info(`准备发起ecommerce-trade-service请求[${requestId}]: ${url}, 参数: ${JSON.stringify(request)}`);
-        const response = await axios_1.default.post(url, request, { headers: { 'x-request-id': requestId } });
+        const response = await axios_1.default.post(url, request, {
+            headers: {
+                'x-request-id': requestId,
+                'x-pandora-user-id': pandoraUserId,
+                'x-be-link-user-id': beLinkUserId,
+                'x-pandora-role-id': pandoraRoleId,
+            },
+        });
         const responseData = response.data;
         return responseData.data;
     }