@be-link/ecommerce-promotion-service-node-sdk 0.0.24 → 0.0.26

package/enum.d.ts

@@ -129,8 +129,8 @@ export declare namespace ENUM {
         }
         /** 券状态中文 */
         enum COUPON_STATUS_CHINESE {
-            AVAILABLE = "\u53EF\u7528",
-            ABANDONED = "\u4F5C\u5E9F"
+            AVAILABLE = "\u751F\u6548\u4E2D",
+            ABANDONED = "\u5DF2\u4F5C\u5E9F"
         }
         /** 领取限制类型 */
         enum RECEIVE_LIMIT_TYPE {

package/enum.js

@@ -150,8 +150,8 @@ var ENUM;
         /** 券状态中文 */
         let COUPON_STATUS_CHINESE;
         (function (COUPON_STATUS_CHINESE) {
-            COUPON_STATUS_CHINESE["AVAILABLE"] = "\u53EF\u7528";
-            COUPON_STATUS_CHINESE["ABANDONED"] = "\u4F5C\u5E9F";
+            COUPON_STATUS_CHINESE["AVAILABLE"] = "\u751F\u6548\u4E2D";
+            COUPON_STATUS_CHINESE["ABANDONED"] = "\u5DF2\u4F5C\u5E9F";
         })(COUPON_STATUS_CHINESE = COUPON_ENUM.COUPON_STATUS_CHINESE || (COUPON_ENUM.COUPON_STATUS_CHINESE = {}));
         /** 领取限制类型 */
         let RECEIVE_LIMIT_TYPE;

package/modules/pricingCalculation/service.d.ts

@@ -3,7 +3,7 @@ import BaseService from '../BaseService';
 declare class PricingCalculationService extends BaseService implements Service.PricingCalculationController {
     protected prefixUrl: string;
     calculateOrderPrice(request: Service.Request.calculateOrderPrice): Promise<Service.Response.calculateOrderPrice>;
-    calculateWithSelectedDiscounts(request: Service.Request.calculateWithSelectedDiscounts): Promise<Service.Response.calculateWithSelectedDiscounts>;
+    calculateWithSelectedDiscounts(request: Service.Request.calculateWithSelectedDiscounts): Promise<Service.Response.calculateOrderPrice>;
     calculatePointsMallOrder(request: Service.Request.calculatePointsMallOrder): Promise<Service.Response.calculatePointsMallOrder>;
     recalculatePointsMallOrder(request: Service.Request.recalculatePointsMallOrder): Promise<Service.Response.recalculatePointsMallOrder>;
 }

package/modules/pricingCalculation/types.d.ts

@@ -121,28 +121,6 @@ export declare namespace Service {
         }
     }
     namespace Response {
-        /** 提单页算价响应 */
-        interface calculateOrderPrice {
-            /** 商品原价总计（分） */
-            originalAmount: number;
-            /** 总优惠金额（分） */
-            totalDiscountAmount: number;
-            /** 优惠后金额（分） */
-            discountedAmount: number;
-            /** 最高抵扣金额（分） */
-            pointsMaxDeductionAmount: number;
-            /** 剩余待支付金额（分） */
-            remainingAmount: number;
-            /** 最优优惠券组合 */
-            optimalCoupons: {
-                couponCode: string;
-                discountAmount: number;
-            }[];
-            /** 可用优惠券模版 */
-            availableCouponTemplates?: string[];
-            /** 积分抵扣规则 */
-            pointsDeductionRule?: Entity.PointsDeductionRule;
-        }
         /** 优惠明细项 */
         interface DiscountDetailItem {
             /** 优惠类型（coupon-优惠券、points-积分） */
@@ -164,7 +142,7 @@ export declare namespace Service {
             invalidCoupons?: string[];
         }
         /** 用户手动选择优惠后算价响应 */
-        interface calculateWithSelectedDiscounts {
+        interface calculateOrderPrice {
             /** 本单最多可用积分 */
             maxUsablePoints: number;
             /** 价格计算结果 */
@@ -180,7 +158,15 @@ export declare namespace Service {
                 /** 剩余待支付金额（分） */
                 remainingAmount: number;
             };
-            validation: ValidateSelectedCouponResult;
+            /** 优惠券组合 */
+            selectedCoupons: {
+                couponCode: string;
+                discountAmount: number;
+            }[];
+            /** 可用优惠券模版 */
+            availableCouponTemplates: string[];
+            /** 校验结果 */
+            validation?: ValidateSelectedCouponResult;
         }
         /** 积分商城提单算价响应 */
         interface calculatePointsMallOrder {
@@ -229,7 +215,7 @@ export declare namespace Service {
         /** 提单页算价 */
         calculateOrderPrice(request: Service.Request.calculateOrderPrice, req: any): Promise<Service.Response.calculateOrderPrice>;
         /** 用户手动选择优惠后算价 */
-        calculateWithSelectedDiscounts(request: Service.Request.calculateWithSelectedDiscounts, req: any): Promise<Service.Response.calculateWithSelectedDiscounts>;
+        calculateWithSelectedDiscounts(request: Service.Request.calculateWithSelectedDiscounts, req: any): Promise<Service.Response.calculateOrderPrice>;
         /** 积分商城提单算价 */
         calculatePointsMallOrder(request: Service.Request.calculatePointsMallOrder, req: any): Promise<Service.Response.calculatePointsMallOrder>;
         /** 积分商城用户选择后再次算价 */

package/package.json

@@ -1,6 +1,6 @@
 {
   "name": "@be-link/ecommerce-promotion-service-node-sdk",
-  "version": "0.0.24",
+  "version": "0.0.26",
   "description": "EcommercePromotionService 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,10 +56,18 @@ 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-promotion-service请求[${requestId}]: ${url}, 参数: ${JSON.stringify(request)}`);
         const response = await axios_1.default.post(url, request || {}, {
-            headers: { 'x-request-id': requestId },
+            headers: {
+                'x-request-id': requestId,
+                'x-belink-pandora-userid': pandoraUserId,
+                'x-belink-userid': beLinkUserId,
+                'x-belink-pandora-roleid': pandoraRoleId,
+            },
         });
         const responseData = response.data;
         return responseData.data;