@be-link/ecommerce-trade-service-node-sdk 0.1.100 → 0.1.102

package/consts.js

@@ -83,6 +83,8 @@ exports.ReverseRefundWayMap = {
     [enums_1.ENUM.ReverseRefundWay.USER_MANUAL]: '商家审核退款',
     [enums_1.ENUM.ReverseRefundWay.FAST]: '极速退款',
     [enums_1.ENUM.ReverseRefundWay.MERCHANT_MANUAL]: '商家主动退款',
+    [enums_1.ENUM.ReverseRefundWay.STORE_FAST]: '店长极速退款',
+    [enums_1.ENUM.ReverseRefundWay.STORE_MANUAL]: '店长主动退款',
 };
 exports.PayChannelMap = {
     [enums_1.ENUM.PayChannel.WX_PAY]: '微信支付',

package/enums.d.ts

@@ -180,7 +180,11 @@ export declare namespace ENUM {
         /** 极速退款 */
         FAST = "FAST",
         /** 商家主动退款 */
-        MERCHANT_MANUAL = "MERCHANT_MANUAL"
+        MERCHANT_MANUAL = "MERCHANT_MANUAL",
+        /** 店长极速退款 */
+        STORE_FAST = "STORE_FAST",
+        /** 店长主动退款（需要审核） */
+        STORE_MANUAL = "STORE_MANUAL"
     }
     /** 审批操作类型 */
     enum ApprovalOptType {

package/enums.js

@@ -202,6 +202,10 @@ var ENUM;
         ReverseRefundWay["FAST"] = "FAST";
         /** 商家主动退款 */
         ReverseRefundWay["MERCHANT_MANUAL"] = "MERCHANT_MANUAL";
+        /** 店长极速退款 */
+        ReverseRefundWay["STORE_FAST"] = "STORE_FAST";
+        /** 店长主动退款（需要审核） */
+        ReverseRefundWay["STORE_MANUAL"] = "STORE_MANUAL";
     })(ReverseRefundWay = ENUM.ReverseRefundWay || (ENUM.ReverseRefundWay = {}));
     /** 审批操作类型 */
     let ApprovalOptType;
@@ -614,6 +618,8 @@ var ENUM_CN;
         [ENUM.ReverseRefundWay.USER_MANUAL]: '商家审核退款',
         [ENUM.ReverseRefundWay.FAST]: '极速退款',
         [ENUM.ReverseRefundWay.MERCHANT_MANUAL]: '商家主动退款',
+        [ENUM.ReverseRefundWay.STORE_FAST]: '店长极速退款',
+        [ENUM.ReverseRefundWay.STORE_MANUAL]: '店长主动退款',
     };
     /** 门店审批类型中文映射 */
     ENUM_CN.StoreApprovalType = {

package/modules/pos/index.d.ts

@@ -1,7 +1,7 @@
 export { queryByWebService as orderQueryByWebService } from './orderQuery/webService';
 export { orderQueryByInternalService } from './orderQuery/internalService';
 export { queryByUserService as orderQueryByUserService } from './orderQuery/userService';
-export { queryByPandoraUserService as orderQueryByPandoraMiniProgramService } from '../ros/orderQuery/pandoraUserService';
+export { queryByPandoraUserService as orderQueryByPandoraUserService } from './orderQuery/pandoraUserService';
 export { PosOrderQueryService as PosOrderQueryTypes } from './orderQuery/types';
 export { orderCoreByUserService } from './orderCore/userService';
 export { orderCoreByInternalService } from './orderCore/internalService';

package/modules/pos/index.js

@@ -1,14 +1,14 @@
 "use strict";
 Object.defineProperty(exports, "__esModule", { value: true });
-exports.orderCoreByJobService = exports.orderCoreByPandoraMiniProgramService = exports.orderCoreByWebService = exports.orderCoreByInternalService = exports.orderCoreByUserService = exports.orderQueryByPandoraMiniProgramService = exports.orderQueryByUserService = exports.orderQueryByInternalService = exports.orderQueryByWebService = void 0;
+exports.orderCoreByJobService = exports.orderCoreByPandoraMiniProgramService = exports.orderCoreByWebService = exports.orderCoreByInternalService = exports.orderCoreByUserService = exports.orderQueryByPandoraUserService = exports.orderQueryByUserService = exports.orderQueryByInternalService = exports.orderQueryByWebService = void 0;
 var webService_1 = require("./orderQuery/webService");
 Object.defineProperty(exports, "orderQueryByWebService", { enumerable: true, get: function () { return webService_1.queryByWebService; } });
 var internalService_1 = require("./orderQuery/internalService");
 Object.defineProperty(exports, "orderQueryByInternalService", { enumerable: true, get: function () { return internalService_1.orderQueryByInternalService; } });
 var userService_1 = require("./orderQuery/userService");
 Object.defineProperty(exports, "orderQueryByUserService", { enumerable: true, get: function () { return userService_1.queryByUserService; } });
-var pandoraUserService_1 = require("../ros/orderQuery/pandoraUserService");
-Object.defineProperty(exports, "orderQueryByPandoraMiniProgramService", { enumerable: true, get: function () { return pandoraUserService_1.queryByPandoraUserService; } });
+var pandoraUserService_1 = require("./orderQuery/pandoraUserService");
+Object.defineProperty(exports, "orderQueryByPandoraUserService", { enumerable: true, get: function () { return pandoraUserService_1.queryByPandoraUserService; } });
 var userService_2 = require("./orderCore/userService");
 Object.defineProperty(exports, "orderCoreByUserService", { enumerable: true, get: function () { return userService_2.orderCoreByUserService; } });
 var internalService_2 = require("./orderCore/internalService");

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

@@ -0,0 +1,8 @@
+import { PosOrderQueryService } from './types';
+import BaseService from '../../BaseService';
+declare class OrderQueryByPandoraUserService extends BaseService {
+    protected prefixUrl: string;
+    queryUserOrderList(request: PosOrderQueryService.ByPandoraUser.Request.IQueryUserOrderList): Promise<PosOrderQueryService.ByPandoraUser.Response.IQueryUserOrderList>;
+}
+export declare const queryByPandoraUserService: OrderQueryByPandoraUserService;
+export {};

package/modules/pos/orderQuery/pandoraUserService.js

@@ -0,0 +1,37 @@
+"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.queryByPandoraUserService = void 0;
+const tsoa_1 = require("tsoa");
+const http_1 = require("../../../utils/http");
+const BaseService_1 = __importDefault(require("../../BaseService"));
+let OrderQueryByPandoraUserService = class OrderQueryByPandoraUserService extends BaseService_1.default {
+    constructor() {
+        super(...arguments);
+        this.prefixUrl = '/pos/query/pandora-user';
+    }
+    queryUserOrderList(request) {
+        return (0, http_1.callApi)(this.getApiUrl(this.queryUserOrderList), request);
+    }
+};
+__decorate([
+    (0, tsoa_1.OperationId)('查询用户订单列表'),
+    (0, tsoa_1.Post)('query-user-order-list'),
+    __param(0, (0, tsoa_1.Body)())
+], OrderQueryByPandoraUserService.prototype, "queryUserOrderList", null);
+OrderQueryByPandoraUserService = __decorate([
+    (0, tsoa_1.Route)('pos/query/pandora-user'),
+    (0, tsoa_1.Tags)('PosOrderQuery')
+], OrderQueryByPandoraUserService);
+exports.queryByPandoraUserService = new OrderQueryByPandoraUserService();

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

@@ -873,6 +873,85 @@ export declare namespace PosOrderQueryService {
             getOrderDetailByReverseOrderId(request: Request.IGetOrderDetailByReverseOrderId, req: any): Promise<Response.IGetOrderDetailByReverseOrderId>;
         }
     }
+    namespace ByPandoraUser {
+        namespace Request {
+            interface IQueryUserOrderList {
+                /** 商品ID */
+                productId?: string;
+                /** 用户ID */
+                userId?: string;
+                /** 订单状态 */
+                orderStatus?: ENUM.OrderStatus;
+                /** 退款状态 */
+                refundStatus?: ENUM.OrderRefundStatus;
+                /** 商品提货方式 */
+                productPick?: PRODUCT_SERVICE_ENUM.PRODUCT_ENUM.PICK_TYPE;
+                /** 订单创建时间-开始时间(时间戳) */
+                startTime?: number;
+                /** 订单创建时间-结束时间(时间戳) */
+                endTime?: number;
+                /** 收货人姓名 */
+                receiverName?: string;
+                /** 收货人手机号 */
+                receiverPhone?: string;
+                /** 分页 */
+                pagination: Dto.IPagination;
+            }
+        }
+        namespace Response {
+            interface IUserOrderListItem {
+                /** 基础信息 */
+                basicInfo: {
+                    /** 订单ID */
+                    orderId: string;
+                    /** 实付金额(分) */
+                    actualAmount: number;
+                    /** 应付金额(分) */
+                    payableAmount: number;
+                    /** 订单状态 */
+                    orderStatus: ENUM.OrderStatus;
+                    /** 退款状态 */
+                    refundStatus: ENUM.OrderRefundStatus;
+                    /** 下单时间(时间戳) */
+                    createdAt: number;
+                };
+                /** 用户信息 */
+                userInfo: {
+                    /** 用户ID */
+                    userId: string;
+                    /** 用户昵称 */
+                    userNickname: string;
+                    /** 用户名称 */
+                    userName: string;
+                };
+                /** 商品信息 */
+                productInfo: {
+                    /** 商品名称 */
+                    productName: string;
+                    /** 商品规格 */
+                    productSpec: string;
+                    /** 商品单价(分) */
+                    unitPrice: number;
+                    /** 商品份数 */
+                    quantity: number;
+                    /** 商品会员价(分) */
+                    memberPrice?: number;
+                };
+                /** 是否允许申请退款 */
+                isAllowRefund: boolean;
+            }
+            interface IQueryUserOrderList {
+                /** 订单列表 */
+                list: IUserOrderListItem[];
+                /** 总数 */
+                total: number;
+            }
+        }
+        interface QueryController {
+            /** 查询用户订单列表 */
+            queryUserOrderList(request: Request.IQueryUserOrderList, req: any): Promise<Response.IQueryUserOrderList>;
+        }
+    }
     namespace ByUser {
         namespace Request {
             interface IGetLastOrderAddrByProductPick {

package/modules/ros/orderCore/pandoraUserService.d.ts

@@ -2,8 +2,8 @@ import { RosOrderCoreService } from './types';
 import BaseService from '../../BaseService';
 declare class OrderCoreByPandoraUserService extends BaseService {
     protected prefixUrl: string;
-    storeApproval(request: RosOrderCoreService.ByPandoraMiniProgram.Request.IStoreApproval): Promise<RosOrderCoreService.ByPandoraMiniProgram.Response.IStoreApproval>;
-    createReverseOrderForStore(request: RosOrderCoreService.ByPandoraMiniProgram.Request.ICreateReverseOrderForStore): Promise<RosOrderCoreService.ByPandoraMiniProgram.Response.ICreateReverseOrderForStore>;
+    storeApproval(request: RosOrderCoreService.ByPandoraUser.Request.IStoreApproval): Promise<RosOrderCoreService.ByPandoraUser.Response.IStoreApproval>;
+    createReverseOrderForStore(request: RosOrderCoreService.ByPandoraUser.Request.ICreateReverseOrderForStore): Promise<RosOrderCoreService.ByPandoraUser.Response.ICreateReverseOrderForStore>;
 }
 export declare const coreByPandoraUserService: OrderCoreByPandoraUserService;
 export default coreByPandoraUserService;

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

@@ -73,19 +73,6 @@ export declare namespace RosOrderCoreService {
                 /** 操作人姓名 */
                 operatorName: string;
             }
-            /** 门店审批 */
-            interface IStoreApproval {
-                /** 退款单ID */
-                reverseOrderId: string;
-                /** 审批类型 */
-                approvalType: ENUM.ApprovalOptType;
-                /** 拒绝原因（审批类型为拒绝时必填） */
-                rejectReason?: string;
-                /** 上传图片URL列表（审批类型为拒绝时必填） */
-                imageUrls?: string[];
-                /** 商品是否可二次销售 */
-                isSoldAgain?: boolean;
-            }
             /** 门店发起申请退款 */
             interface ICreateReverseOrderForStore {
                 /** 正向订单ID */
@@ -116,6 +103,13 @@ export declare namespace RosOrderCoreService {
                 /** 上传的图片url列表 */
                 imageUrls?: string[];
             }
+            /** 更新记损类型 */
+            interface IUpdateLossDamageType {
+                /** 退款单ID */
+                reverseOrderId: string;
+                /** 记损类型 */
+                lossDamageType: ENUM.LossDamageType;
+            }
         }
         namespace Response {
             type IOrderApproval = void;
@@ -135,6 +129,8 @@ export declare namespace RosOrderCoreService {
             type ICreateReverseOrderForStore = void;
             /** 退款单审批响应 */
             type IReverseOrderApproval = void;
+            /** 更新记损类型响应 */
+            type IUpdateLossDamageType = void;
         }
     }
     namespace ByJob {
@@ -186,12 +182,12 @@ export declare namespace RosOrderCoreService {
         orderCreate(request: ByWeb.Request.IOrderCreate, req: any): Promise<ByWeb.Response.IOrderCreate>;
         /** 批量退款（通过Excel） */
         batchRefundByExcel(request: ByWeb.Request.IBatchRefundByExcel, req: any): Promise<ByWeb.Response.IBatchRefundByExcel>;
-        /** 门店审批 */
-        storeApproval(request: ByWeb.Request.IStoreApproval, req: any): Promise<ByWeb.Response.IStoreApproval>;
         /** 门店发起申请退款 */
         createReverseOrderForStore(request: ByWeb.Request.ICreateReverseOrderForStore, req: any): Promise<ByWeb.Response.ICreateReverseOrderForStore>;
         /** 退款单审批 */
         reverseOrderApproval(request: ByWeb.Request.IReverseOrderApproval, req: any): Promise<ByWeb.Response.IReverseOrderApproval>;
+        /** 更新记损类型 */
+        updateLossDamageType(request: ByWeb.Request.IUpdateLossDamageType, req: any): Promise<ByWeb.Response.IUpdateLossDamageType>;
     }
     interface CoreByJobController {
         autoApprove(request: ByJob.Request.IAutoApprove, req: any): Promise<void>;
@@ -204,7 +200,7 @@ export declare namespace RosOrderCoreService {
         orderCreateForVerifyCoupon(request: ByInternal.Request.IOrderCreateForVerifyCoupon, req: any): Promise<ByInternal.Response.IOrderCreateForVerifyCoupon>;
     }
     /** 潘多拉小程序 */
-    namespace ByPandoraMiniProgram {
+    namespace ByPandoraUser {
         namespace Request {
             /** 门店审批 */
             interface IStoreApproval {

package/modules/ros/orderCore/webService.d.ts

@@ -5,9 +5,9 @@ declare class RosOrderCoreByWebService extends BaseService implements RosOrderCo
     orderApproval(request: RosOrderCoreService.ByWeb.Request.IOrderApproval): Promise<RosOrderCoreService.ByWeb.Response.IOrderApproval>;
     orderCreate(request: RosOrderCoreService.ByWeb.Request.IOrderCreate): Promise<RosOrderCoreService.ByWeb.Response.IOrderCreate>;
     batchRefundByExcel(request: RosOrderCoreService.ByWeb.Request.IBatchRefundByExcel): Promise<RosOrderCoreService.ByWeb.Response.IBatchRefundByExcel>;
-    storeApproval(request: RosOrderCoreService.ByWeb.Request.IStoreApproval): Promise<RosOrderCoreService.ByWeb.Response.IStoreApproval>;
     createReverseOrderForStore(request: RosOrderCoreService.ByWeb.Request.ICreateReverseOrderForStore): Promise<RosOrderCoreService.ByWeb.Response.ICreateReverseOrderForStore>;
     reverseOrderApproval(request: RosOrderCoreService.ByWeb.Request.IReverseOrderApproval): Promise<RosOrderCoreService.ByWeb.Response.IReverseOrderApproval>;
+    updateLossDamageType(request: RosOrderCoreService.ByWeb.Request.IUpdateLossDamageType): Promise<RosOrderCoreService.ByWeb.Response.IUpdateLossDamageType>;
 }
 export declare const orderCoreByWebService: RosOrderCoreByWebService;
 export default orderCoreByWebService;

package/modules/ros/orderCore/webService.js

@@ -30,15 +30,15 @@ let RosOrderCoreByWebService = class RosOrderCoreByWebService extends BaseServic
     batchRefundByExcel(request) {
         return (0, http_1.callApi)(this.getApiUrl(this.batchRefundByExcel), request);
     }
-    storeApproval(request) {
-        return (0, http_1.callApi)(this.getApiUrl(this.storeApproval), request);
-    }
     createReverseOrderForStore(request) {
         return (0, http_1.callApi)(this.getApiUrl(this.createReverseOrderForStore), request);
     }
     reverseOrderApproval(request) {
         return (0, http_1.callApi)(this.getApiUrl(this.reverseOrderApproval), request);
     }
+    updateLossDamageType(request) {
+        return (0, http_1.callApi)(this.getApiUrl(this.updateLossDamageType), request);
+    }
 };
 __decorate([
     (0, tsoa_1.OperationId)('批量审批退款订单'),
@@ -55,11 +55,6 @@ __decorate([
     (0, tsoa_1.Post)('batch-refund-by-excel'),
     __param(0, (0, tsoa_1.Body)())
 ], RosOrderCoreByWebService.prototype, "batchRefundByExcel", null);
-__decorate([
-    (0, tsoa_1.OperationId)('门店审批'),
-    (0, tsoa_1.Post)('store-approval'),
-    __param(0, (0, tsoa_1.Body)())
-], RosOrderCoreByWebService.prototype, "storeApproval", null);
 __decorate([
     (0, tsoa_1.OperationId)('门店发起申请退款'),
     (0, tsoa_1.Post)('create-reverse-order-for-store'),
@@ -70,6 +65,11 @@ __decorate([
     (0, tsoa_1.Post)('reverse-order-approval'),
     __param(0, (0, tsoa_1.Body)())
 ], RosOrderCoreByWebService.prototype, "reverseOrderApproval", null);
+__decorate([
+    (0, tsoa_1.OperationId)('更新记损类型'),
+    (0, tsoa_1.Post)('update-loss-damage-type'),
+    __param(0, (0, tsoa_1.Body)())
+], RosOrderCoreByWebService.prototype, "updateLossDamageType", null);
 RosOrderCoreByWebService = __decorate([
     (0, tsoa_1.Route)('ros/core/web'),
     (0, tsoa_1.Tags)('RosOrderCore')

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

@@ -2,8 +2,8 @@ import { RosOrderQueryService } from './types';
 import BaseService from '../../BaseService';
 declare class OrderQueryByPandoraUserService extends BaseService {
     protected prefixUrl: string;
-    queryReverseOrderList(request: RosOrderQueryService.ByPandoraMiniProgram.Request.IQueryOrderReverseList): Promise<RosOrderQueryService.ByPandoraMiniProgram.Response.IQueryOrderReverseList>;
-    getReverseOrderDetail(request: RosOrderQueryService.ByPandoraMiniProgram.Request.IGetReverseOrderDetail): Promise<RosOrderQueryService.ByPandoraMiniProgram.Response.IGetReverseOrderDetail>;
+    queryUserReverseOrderList(request: RosOrderQueryService.ByPandoraUser.Request.IQueryOrderReverseList): Promise<RosOrderQueryService.ByPandoraUser.Response.IQueryOrderReverseList>;
+    getReverseOrderDetail(request: RosOrderQueryService.ByPandoraUser.Request.IGetReverseOrderDetail): Promise<RosOrderQueryService.ByPandoraUser.Response.IGetReverseOrderDetail>;
 }
 export declare const queryByPandoraUserService: OrderQueryByPandoraUserService;
 export default queryByPandoraUserService;

package/modules/ros/orderQuery/pandoraUserService.js

@@ -21,18 +21,18 @@ let OrderQueryByPandoraUserService = class OrderQueryByPandoraUserService extend
         super(...arguments);
         this.prefixUrl = '/ros/query/pandora-user';
     }
-    queryReverseOrderList(request) {
-        return (0, http_1.callApi)(this.getApiUrl(this.queryReverseOrderList), request);
+    queryUserReverseOrderList(request) {
+        return (0, http_1.callApi)(this.getApiUrl(this.queryUserReverseOrderList), request);
     }
     getReverseOrderDetail(request) {
         return (0, http_1.callApi)(this.getApiUrl(this.getReverseOrderDetail), request);
     }
 };
 __decorate([
-    (0, tsoa_1.OperationId)('查询售后处理订单列表'),
-    (0, tsoa_1.Post)('query-reverse-order-list'),
+    (0, tsoa_1.OperationId)('查询用户售后订单列表'),
+    (0, tsoa_1.Post)('query-user-reverse-order-list'),
     __param(0, (0, tsoa_1.Body)())
-], OrderQueryByPandoraUserService.prototype, "queryReverseOrderList", null);
+], OrderQueryByPandoraUserService.prototype, "queryUserReverseOrderList", null);
 __decorate([
     (0, tsoa_1.OperationId)('查询退款单详情'),
     (0, tsoa_1.Post)('get-reverse-order-detail'),

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

@@ -383,7 +383,7 @@ export declare namespace RosOrderQueryService {
                 lossDamageType?: ENUM.LossDamageType;
             };
             /** 退款审批信息 */
-            refundApplications: {
+            refundApproval: {
                 /** 退款方式 */
                 refundWay: ENUM.ReverseRefundWay;
                 /** 退款单ID */
@@ -394,6 +394,8 @@ export declare namespace RosOrderQueryService {
                 imageUrls: string[];
                 /** 审批状态 */
                 approvalStatus: ENUM.ReverseOrderStatus;
+                /** 审批类型 */
+                approvalType?: ENUM.RefundApprovalType;
                 /** 是否已退货到店 */
                 isRefundedStore: boolean;
                 /** 是否可以二次售卖 */
@@ -591,12 +593,12 @@ export declare namespace RosOrderQueryService {
         getUserReverseAmount(request: RosOrderQueryService.ByUser.Request.IGetUserReverseAmount, req: any): Promise<RosOrderQueryService.ByUser.Response.IGetUserReverseAmount>;
     }
     /** 潘多拉小程序 */
-    namespace ByPandoraMiniProgram {
+    namespace ByPandoraUser {
         namespace Request {
             /** 查询售后处理订单列表 */
             interface IQueryOrderReverseList {
-                /** 商品ID列表 */
-                productIds: string[];
+                /** 商品ID */
+                productId?: string;
                 /** 退款状态 */
                 status?: ENUM.ReverseOrderStatus;
                 /** 退款单ID */
@@ -738,8 +740,8 @@ export declare namespace RosOrderQueryService {
             }
         }
         interface QueryController {
-            /** 查询售后处理订单列表 */
-            queryReverseOrderList(request: Request.IQueryOrderReverseList, req: any): Promise<Response.IQueryOrderReverseList>;
+            /** 查询用户售后订单列表 */
+            queryUserReverseOrderList(request: Request.IQueryOrderReverseList, req: any): Promise<Response.IQueryOrderReverseList>;
             /** 查询退款单详情 */
             getReverseOrderDetail(request: Request.IGetReverseOrderDetail, req: any): Promise<Response.IGetReverseOrderDetail>;
         }

package/package.json

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