+
+
+
+
-
-
+
-
-
-
-
-
+
-
-
-
-
+
+
+
+
[number]): string {
const quantity = getPackageQuantityText(item.quantity);
const skuText = getProductSkuSnapshotText(item.productNameSnapshot, item.skuNameSnapshot, item.specSummarySnapshot);
- return `${item.productNameSnapshot || "未命名产品"}${skuText ? ` · ${skuText}` : ""} × ${quantity}${item.unitSnapshot ? ` ${item.unitSnapshot}` : ""}`;
+ const giftText = item.gifted ? "赠送 · " : "";
+ return `${giftText}${item.productNameSnapshot || "未命名产品"}${skuText ? ` · ${skuText}` : ""} × ${quantity}${item.unitSnapshot ? ` ${item.unitSnapshot}` : ""}`;
}
diff --git a/src/types/Package.ts b/src/types/Package.ts
index c108a89..ef05030 100644
--- a/src/types/Package.ts
+++ b/src/types/Package.ts
@@ -61,8 +61,12 @@ export type PackagePurchaseItem = {
skuId: string;
skuUnitId: string;
totalQuantity: number | string;
+ gifted?: boolean;
sort?: number;
remark?: string | null;
+ productNameSnapshot?: string;
+ skuNameSnapshot?: string;
+ specSummarySnapshot?: string | null;
};
export type PackageAttachment = Partial & { tempFileId?: string; attachType?: string; name?: string };
diff --git a/src/types/SalesOrder.ts b/src/types/SalesOrder.ts
index c0a0ba3..79a7587 100644
--- a/src/types/SalesOrder.ts
+++ b/src/types/SalesOrder.ts
@@ -15,6 +15,7 @@ export type FundRecordStatus = "PENDING" | "VERIFIED" | "REJECTED" | "CANCELLED"
export type GaoSalesOrderItem = {
salesOrderId?: string;
itemType?: GaoSalesOrderItemType;
+ gifted?: boolean;
skuId?: string;
skuUnitId?: string;
attachmentList?: Attachment[];
diff --git a/src/utils/permission.ts b/src/utils/permission.ts
index f03c8e3..18523af 100644
--- a/src/utils/permission.ts
+++ b/src/utils/permission.ts
@@ -70,7 +70,8 @@ export const permissionCodes = {
create: "GAO:CUSTOMER_PACKAGE:CREATE",
read: "GAO:CUSTOMER_PACKAGE:READ",
cancel: "GAO:CUSTOMER_PACKAGE:CANCEL",
- priceOverride: "GAO:CUSTOMER_PACKAGE:PRICE_OVERRIDE"
+ priceOverride: "GAO:CUSTOMER_PACKAGE:PRICE_OVERRIDE",
+ giftCreate: "GAO:CUSTOMER_PACKAGE:GIFT_CREATE"
},
salesOrder: {
create: "GAO:SALES_ORDER:CREATE",
@@ -207,6 +208,7 @@ export const gaoStoreScopePermissionCodes = [
permissionCodes.customerPackage.read,
permissionCodes.customerPackage.cancel,
permissionCodes.customerPackage.priceOverride,
+ permissionCodes.customerPackage.giftCreate,
permissionCodes.salesOrder.create,
permissionCodes.salesOrder.read,
permissionCodes.salesOrder.update,