@be-link/ecommerce-trade-service-node-sdk 0.1.84 → 0.1.86

package/enums.d.ts

@@ -103,6 +103,21 @@ export declare namespace ENUM {
         /** 核销券 */
         VOUCHER = "VOUCHER"
     }
+    /** 订单资源类型 */
+    enum OrderResourceType {
+        /** 资金 */
+        FUNDS = "FUNDS",
+        /** 商品库存 */
+        STOCK = "STOCK",
+        /** 积分 */
+        POINTS = "POINTS",
+        /** 兑换券 */
+        COUPON = "COUPON",
+        /** 满减券 */
+        FULL_REDUCTION = "FULL_REDUCTION",
+        /** 核销券 */
+        VOUCHER = "VOUCHER"
+    }
     /** 逆向订单状态 */
     enum ReverseOrderStatus {
         /** 待审核 */

package/enums.js

@@ -115,6 +115,22 @@ var ENUM;
         /** 核销券 */
         ReverseResourceType["VOUCHER"] = "VOUCHER";
     })(ReverseResourceType = ENUM.ReverseResourceType || (ENUM.ReverseResourceType = {}));
+    /** 订单资源类型 */
+    let OrderResourceType;
+    (function (OrderResourceType) {
+        /** 资金 */
+        OrderResourceType["FUNDS"] = "FUNDS";
+        /** 商品库存 */
+        OrderResourceType["STOCK"] = "STOCK";
+        /** 积分 */
+        OrderResourceType["POINTS"] = "POINTS";
+        /** 兑换券 */
+        OrderResourceType["COUPON"] = "COUPON";
+        /** 满减券 */
+        OrderResourceType["FULL_REDUCTION"] = "FULL_REDUCTION";
+        /** 核销券 */
+        OrderResourceType["VOUCHER"] = "VOUCHER";
+    })(OrderResourceType = ENUM.OrderResourceType || (ENUM.OrderResourceType = {}));
     /** 逆向订单状态 */
     let ReverseOrderStatus;
     (function (ReverseOrderStatus) {

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

@@ -3,6 +3,7 @@ import BaseService from '../../BaseService';
 declare class OrderCoreByInternalService extends BaseService {
     protected prefixUrl: string;
     createOrderByVerifyCoupon(request: PosCoreService.ByInternal.Request.ICreateOrderByVerifyCoupon): Promise<PosCoreService.ByInternal.Response.ICreateOrderByVerifyCoupon>;
+    switchPaymentMerchantNo(request: PosCoreService.ByInternal.Request.ISwitchPaymentMerchantNo): Promise<void>;
     stressTestOrderPaid(request: PosCoreService.ByInternal.Request.IStressTestOrderPaid): Promise<void>;
 }
 export declare const orderCoreByInternalService: OrderCoreByInternalService;

package/modules/pos/orderCore/internalService.js

@@ -24,6 +24,9 @@ let OrderCoreByInternalService = class OrderCoreByInternalService extends BaseSe
     createOrderByVerifyCoupon(request) {
         return (0, http_1.callApi)(this.getApiUrl(this.createOrderByVerifyCoupon), request);
     }
+    switchPaymentMerchantNo(request) {
+        return (0, http_1.callApi)(this.getApiUrl(this.switchPaymentMerchantNo), request);
+    }
     stressTestOrderPaid(request) {
         return (0, http_1.callApi)(this.getApiUrl(this.stressTestOrderPaid), request);
     }
@@ -33,6 +36,11 @@ __decorate([
     (0, tsoa_1.Post)('create-order-by-verify-coupon'),
     __param(0, (0, tsoa_1.Body)())
 ], OrderCoreByInternalService.prototype, "createOrderByVerifyCoupon", null);
+__decorate([
+    (0, tsoa_1.OperationId)('切换支付商户号'),
+    (0, tsoa_1.Post)('switch-payment-merchant-no'),
+    __param(0, (0, tsoa_1.Body)())
+], OrderCoreByInternalService.prototype, "switchPaymentMerchantNo", null);
 __decorate([
     (0, tsoa_1.OperationId)('压测支付回调'),
     (0, tsoa_1.Post)('stress-test-order-paid'),

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

@@ -109,6 +109,10 @@ export declare namespace PosCoreService {
                 couponInfos?: Dto.ICoupon[];
                 /** 用户选择使用的积分数 */
                 pointNum?: number;
+                /** 小程序 appId（可选） */
+                appId?: string;
+                /** 用户 openId（可选） */
+                openId?: string;
             }
             interface IUpdateAddress {
                 userId: string;
@@ -154,6 +158,11 @@ export declare namespace PosCoreService {
                 userId: string;
                 skuId: string;
             }
+            /** 切换支付商户号请求参数 */
+            interface ISwitchPaymentMerchantNo {
+                /** 商户号序号（0、1、2、3） */
+                merIndex: number;
+            }
             /** 压测支付回调请求参数 */
             interface IStressTestOrderPaid {
                 /** 订单ID */
@@ -199,6 +208,8 @@ export declare namespace PosCoreService {
     interface CoreByInternalController {
         /** 核销券创建订单 */
         createOrderByVerifyCoupon(request: ByInternal.Request.ICreateOrderByVerifyCoupon, req: any): Promise<ByInternal.Response.ICreateOrderByVerifyCoupon>;
+        /** 切换支付商户号 */
+        switchPaymentMerchantNo(request: ByInternal.Request.ISwitchPaymentMerchantNo, req: any): Promise<void>;
         /** 压测支付回调（内部使用，跳过宝付回调解析） */
         stressTestOrderPaid(request: ByInternal.Request.IStressTestOrderPaid, req: any): Promise<void>;
     }

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

@@ -614,6 +614,10 @@ export declare namespace PosOrderQueryService {
                 /** 时间范围结束时间（时间戳） */
                 endTime?: number;
             }
+            interface IGetTradeSnapshot {
+                /** 订单ID */
+                orderId: string;
+            }
         }
         /** 微信支付请求参数 */
         interface IWePayReq {
@@ -854,6 +858,45 @@ export declare namespace PosOrderQueryService {
                 /** 时间范围结束时间 */
                 endTime?: number;
             }
+            interface IGetTradeSnapshot {
+                /** 商品快照信息 */
+                productSnapshot: {
+                    /** 商品ID */
+                    productId: string;
+                    /** 商品名称 */
+                    productName: string;
+                    /** 商品主图URL */
+                    productImage: string;
+                    /** 商品提货方式 */
+                    productPick: string;
+                    /** 商品发货方式 */
+                    productDispatch: string;
+                };
+                /** SKU快照信息 */
+                skuSnapshot: {
+                    /** SKU ID */
+                    skuId: string;
+                    /** SKU编码 */
+                    skuCode: string;
+                    /** 商品单价（分） */
+                    price: number;
+                    /** 商品规格属性列表 */
+                    attrs: Array<{
+                        attrName: string;
+                        attrValue: string;
+                    }>;
+                };
+                /** 商品数量 */
+                quantity: number;
+                /** 子商品SKU信息列表 */
+                subProductSkuInfos?: Array<{
+                    productId: string;
+                    skuId: string;
+                    quantity: number;
+                    productSnapshot: any;
+                    skuSnapshot: any;
+                }>;
+            }
         }
         interface QueryController {
             /** 根据商品提货方式查询用户最近一条订单 */
@@ -870,6 +913,8 @@ export declare namespace PosOrderQueryService {
             getOrderPayParams(request: Request.IGetOrderPayParams, req: any): Promise<Response.IGetOrderPayParams>;
             /** 查询用户一段时间内的正向金额 */
             getUserPositiveAmount(request: Request.IGetUserPositiveAmount, req: any): Promise<Response.IGetUserPositiveAmount>;
+            /** 查询交易快照（商品快照） */
+            getTradeSnapshot(request: Request.IGetTradeSnapshot, req: any): Promise<Response.IGetTradeSnapshot>;
         }
     }
 }

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

@@ -10,6 +10,7 @@ declare class OrderQueryByUserService extends BaseService {
     orderDetail(request: PosOrderQueryService.ByUser.Request.IOrderDetail): Promise<PosOrderQueryService.ByUser.Response.IOrderDetail>;
     getOrderPayParams(request: PosOrderQueryService.ByUser.Request.IGetOrderPayParams): Promise<PosOrderQueryService.ByUser.Response.IGetOrderPayParams>;
     getUserPositiveAmount(request: PosOrderQueryService.ByUser.Request.IGetUserPositiveAmount): Promise<PosOrderQueryService.ByUser.Response.IGetUserPositiveAmount>;
+    getTradeSnapshot(request: PosOrderQueryService.ByUser.Request.IGetTradeSnapshot): Promise<PosOrderQueryService.ByUser.Response.IGetTradeSnapshot>;
 }
 export declare const queryByUserService: OrderQueryByUserService;
 export default queryByUserService;

package/modules/pos/orderQuery/userService.js

@@ -45,6 +45,9 @@ let OrderQueryByUserService = class OrderQueryByUserService extends BaseService_
     getUserPositiveAmount(request) {
         return (0, http_1.callApi)(this.getApiUrl(this.getUserPositiveAmount), request);
     }
+    getTradeSnapshot(request) {
+        return (0, http_1.callApi)(this.getApiUrl(this.getTradeSnapshot), request);
+    }
 };
 __decorate([
     (0, tsoa_1.OperationId)('根据商品提货方式查询用户最近订单'),
@@ -86,6 +89,11 @@ __decorate([
     (0, tsoa_1.Post)('get-user-positive-amount'),
     __param(0, (0, tsoa_1.Body)())
 ], OrderQueryByUserService.prototype, "getUserPositiveAmount", null);
+__decorate([
+    (0, tsoa_1.OperationId)('查询交易快照（商品快照）'),
+    (0, tsoa_1.Post)('get-trade-snapshot'),
+    __param(0, (0, tsoa_1.Body)())
+], OrderQueryByUserService.prototype, "getTradeSnapshot", null);
 OrderQueryByUserService = __decorate([
     (0, tsoa_1.Route)('pos/query/user'),
     (0, tsoa_1.Tags)('PosOrderQuery')

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

@@ -383,6 +383,17 @@ export declare namespace RosOrderQueryService {
                     pointNum: number;
                     /** 拒绝原因（状态为拒绝时返回） */
                     rejectReason?: string;
+                    /** 退回优惠券数量 */
+                    exchangeCouponNum: number;
+                    /** 退回优惠券详情 */
+                    refundedCoupons: string[];
+                };
+                /** 积分商城订单信息 */
+                pointsOrderInfo?: {
+                    /** 兑换积分数量 */
+                    exchangePointsAmount: number;
+                    /** 兑换优惠券数量 */
+                    exchangeCouponsAmount: number;
                 };
                 /** 商品信息 */
                 product: {
@@ -394,6 +405,8 @@ export declare namespace RosOrderQueryService {
                     productSpec: string;
                     /** 商品单价 */
                     unitPrice: number;
+                    /** 商品会员价 */
+                    memberPrice: number;
                 };
             }
             interface IGetRefundableResource {

package/package.json

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

package/types.d.ts

@@ -2,6 +2,17 @@
 /** 基础信息 */
 import { ENUM } from './enums';
 import { PRODUCT_SERVICE_ENUM } from '@be-link/ecommerce-product-service-node-sdk';
+/**
+ * 商户号信息
+ */
+export interface IMerchantInfo {
+    /** 交易终端号 */
+    terId: string;
+    /** 商户ID */
+    merId: string;
+    /** 子商户ID */
+    subMchId: string;
+}
 export interface ITradeOrder {
     id: string;
     userId: string;
@@ -108,7 +119,7 @@ export interface ITradeOrderPayment {
     payAmount: number;
     payWay: ENUM.PayWay;
     bizId: string;
-    extraInfo: any;
+    extraInfo: ITradeOrderPaymentExtraInfo;
     createdAt: number;
     updatedAt: number;
 }
@@ -119,12 +130,8 @@ export interface ITradeOrderPromotion {
     quantity: number;
     discount: number;
     snapshot: {
-        coupon?: {
-            id: string;
-            code: string;
-            name: string;
-            discount: number;
-        }[];
+        coupon?: ICouponInfo[];
+        member?: IMemberInfo[];
     };
     createdAt: number;
     updatedAt: number;
@@ -201,6 +208,8 @@ export interface IBizExtraInfo {
         name: string;
         code: string;
     }[];
+    /** 商户号信息（资金类型时，用于退款） */
+    merchantInfo?: IMerchantInfo;
 }
 export interface ITradeReverseOrderResource {
     id: string;
@@ -321,3 +330,46 @@ export interface IWePayParam {
     paySign: string;
     signType: string;
 }
+/** 优惠券信息 */
+export interface ICouponInfo {
+    /** 券模板ID */
+    id: string;
+    /** 券码 */
+    code: string;
+    /** 券模板名称 */
+    name: string;
+    /** 数量 */
+    quantity?: number;
+    /** 优惠金额 */
+    discount?: number;
+    /** 有效期开始 */
+    validStartTime?: number;
+    /** 有效期结束 */
+    validEndTime?: number;
+}
+/** 会员信息 */
+export interface IMemberInfo {
+    /** 会员优惠金额 */
+    discount: number;
+    /** 份数 */
+    quantity: number;
+}
+/** 订单支付额外信息 */
+export interface ITradeOrderPaymentExtraInfo {
+    /** 现金支付信息 */
+    cash?: {
+        subMchId: string;
+        prepayId: string;
+        payment: IWePayParam;
+        /** 用户openId */
+        openId?: string;
+        /** 小程序appId */
+        appId?: string;
+        /** 商户号信息 */
+        merchantInfo: IMerchantInfo;
+    };
+    /** 兑换券信息 */
+    exchangeCoupon?: ICouponInfo[];
+    /** 核销券信息 */
+    coupon?: ICouponInfo;
+}