update customer package

src/pages/package/CustomerPackageDetail.vue

@@ -7,35 +7,36 @@
 					<template #title>
 						<div class="title">
 							<strong v-text="customerPackage.packageNameSnapshot || '未命名套餐'" />
-							<t-tag :content="getCustomerPackageStatusText(customerPackage.status)" variant="light-outline" :theme="getStatusTheme(customerPackage.status)" />
+							<t-tag :content="getSalesOrderStatusText(order?.status)" variant="light-outline" :theme="getStatusTheme(order?.status)" />
 						</div>
 					</template>
-					<template #description><span>购买于 </span><pass-time-label :timestamp="order?.purchasedAt" underline /></template>
+					<template #description><span>购买于 </span><pass-time-label :timestamp="order?.purchasedAt || customerPackage.salesOrder?.purchasedAt" underline /></template>
 				</t-cell>
 				<t-cell v-if="customerPackage.salesOrderId && canReadOrder" title="销售订单" :note="order?.orderNo || customerPackage.salesOrderId" arrow @click="toOrder" />
 				<t-cell v-if="canReadPackageConfig && customerPackage.packageConfigId" title="套餐方案详情" arrow @click="toPackageConfig" />
 			</t-cell-group>
-			<card-container title="套餐权益" description="权益数量来自客户套餐快照，履约状态来自统一履约单" v-entrance-transition="210">
+			<card-container title="套餐权益" description="权益数量来自销售订单项，履约状态来自统一履约单" v-entrance-transition="210">
 				<t-cell-group>
-					<t-cell v-for="item in customerPackage.itemList || []" :key="item.id" class="benefit">
+					<t-cell v-for="item in salesOrderItems" :key="item.id" class="benefit">
 						<template #title><div class="title"><strong v-text="item.productNameSnapshot || '未命名产品'" /><t-tag theme="primary" variant="light" :content="item.unitSnapshot || '未设置单位'" /></div></template>
 						<template #description>
 							<div class="stats">
-								<span>总数 <strong v-text="getPackageQuantityText(item.totalQuantity)" /></span>
+								<span>总数 <strong v-text="getPackageQuantityText(item.quantity)" /></span>
 								<span>可履约 <strong v-text="getPackageQuantityText(item.availableQuantity)" /></span>
 								<span>待核销 <strong v-text="getPackageQuantityText(item.pendingQuantity)" /></span>
 								<span>已履约 <strong v-text="getPackageQuantityText(item.fulfilledQuantity)" /></span>
+								<span>剩余 <strong v-text="getPackageQuantityText(item.remainingQuantity)" /></span>
 							</div>
 						</template>
 					</t-cell>
-					<div v-if="!customerPackage.itemList?.length" class="empty" v-text="'暂无产品权益'" />
+					<div v-if="!salesOrderItems.length" class="empty" v-text="'暂无产品权益'" />
 				</t-cell-group>
 			</card-container>
 			<t-cell-group title="统一履约" theme="card" v-entrance-transition="280">
 				<t-cell
 					v-for="item in customerPackage.fulfillmentList || []"
 					:key="item.id"
-					:title="`${getFulfillmentTypeText(item.fulfillmentType)} · ${getFulfillmentStatusText(item.status)}`"
+					:title="`${getSalesOrderItemTypeText(getFulfillmentItemType(item))} · ${getFulfillmentStatusText(item.status)}`"
 					:note="getFulfillmentSummary(item)"
 					arrow
 					@click="toFulfillment(item.id)"
@@ -43,6 +44,19 @@
 				<t-cell v-if="!customerPackage.fulfillmentList?.length" title="暂无履约记录" />
 				<t-cell v-if="canCreateFulfillment && hasAvailableItem" title="创建统一履约单" note="选择本次履约的权益数量" arrow @click="toCreateFulfillment" />
 			</t-cell-group>
+			<t-cell-group v-if="order" class="finance-panel" title="订单资金摘要" theme="card" v-entrance-transition="350">
+				<t-cell title="成交金额" :note="formatPackageAmount(order.saleAmount)" />
+				<t-cell title="已生效收款" :note="formatPackageAmount(order.paidAmount)" />
+				<t-cell title="待核销收款" :note="formatPackageAmount(order.pendingPaidAmount)" />
+				<t-cell title="有效退款" :note="formatPackageAmount(order.refundedAmount)" />
+				<t-cell title="收款状态" :note="getSalesPaymentStatusText(order.paymentStatus)" />
+				<t-cell title="退款状态" :note="getSalesRefundStatusText(order.refundStatus)" />
+			</t-cell-group>
+			<t-cell-group v-if="order?.status === 'CANCELLED'" class="cancel-info" title="取消记录" theme="card" v-entrance-transition="420">
+				<t-cell title="取消时间" :note="order.cancelledAt ? Time.toDateTime(order.cancelledAt) : '未知'" />
+				<t-cell title="取消人" :note="order.cancelOperator?.name || customerPackage.cancelOperator?.name || order.cancelOperatorUserId || '未知'" />
+				<t-cell title="取消原因" :note="order.cancelReason || '未填写'" />
+			</t-cell-group>
 			<t-button v-if="canCancel" class="cell-button" theme="danger" @click="openCancel">取消客户套餐</t-button>
 		</template>
 		<t-empty v-else :description="isLoading ? '正在加载客户套餐' : '客户套餐不存在'" />
@@ -73,10 +87,10 @@ import CustomerProfileCard from "@/components/CustomerProfileCard.vue";
 import { useNavBarStore } from "@/store/navBarStore";
 import type { GaoCustomerPackage } from "@/types/Package";
 import type { OrderFulfillment } from "@/types/Fulfillment";
-import type { SalesOrder } from "@/types/SalesOrder";
+import type { GaoSalesOrderItemType, SalesOrder } from "@/types/SalesOrder";
 import { getErrorMessage } from "@/utils/error";
-import { getCustomerPackageStatusText, getPackageQuantityText } from "@/utils/package";
-import { getFulfillmentStatusText, getFulfillmentTypeText } from "@/utils/salesOrder";
+import { formatPackageAmount, getPackageQuantityText } from "@/utils/package";
+import { getFulfillmentStatusText, getSalesOrderItemTypeText, getSalesOrderStatusText, getSalesPaymentStatusText, getSalesRefundStatusText } from "@/utils/salesOrder";
 import { Message } from "@/utils/message";
 import { permissionCodes } from "@/utils/permission";
 
@@ -91,11 +105,15 @@ const isLoading = ref(false);
 const cancelVisible = ref(false);
 const cancelReason = ref("");
 const isCancelling = ref(false);
-const canCancel = computed(() => customerPackage.value?.status === "ACTIVE" && userStore.hasPermissions(permissionCodes.customerPackage.cancel));
-const canCreateFulfillment = computed(() => userStore.hasPermissions(permissionCodes.orderFulfillment.create));
+const hasPendingFulfillment = computed(() => customerPackage.value?.fulfillmentList?.some(item => item.status === "WAITING_STOCK" || item.status === "PENDING") ?? false);
+const canOperateStock = computed(() => userStore.hasPermissions(permissionCodes.productStock.create));
+const canFulfillByPayment = computed(() => order.value?.paymentStatus === "PAID" || (order.value?.paymentStatus === "PARTIALLY_PAID" && canOperateStock.value));
+const canCancel = computed(() => order.value?.status === "ACTIVE" && !hasPendingFulfillment.value && userStore.hasPermissions(permissionCodes.customerPackage.cancel));
+const canCreateFulfillment = computed(() => order.value?.status === "ACTIVE" && canFulfillByPayment.value && userStore.hasPermissions(permissionCodes.orderFulfillment.create));
 const canReadOrder = computed(() => userStore.hasPermissions(permissionCodes.salesOrder.read));
 const canReadPackageConfig = computed(() => userStore.hasPermissions(permissionCodes.packageConfig.read));
-const hasAvailableItem = computed(() => customerPackage.value?.itemList?.some(item => 0 < Number(item.availableQuantity)) ?? false);
+const salesOrderItems = computed(() => order.value?.itemList || customerPackage.value?.itemList || []);
+const hasAvailableItem = computed(() => salesOrderItems.value.some(item => 0 < Number(item.availableQuantity)));
 
 async function loadData(): Promise<void> {
 	const id = String(route.params.id || "");
@@ -103,9 +121,10 @@ async function loadData(): Promise<void> {
 	isLoading.value = true;
 	try {
 		customerPackage.value = await PackageAPI.customerPackageDetail(id);
-		order.value = customerPackage.value.salesOrderId && canReadOrder.value
-			? await SalesOrderAPI.detail(customerPackage.value.salesOrderId)
-			: undefined;
+		order.value = customerPackage.value.salesOrder;
+		if (customerPackage.value.salesOrderId && canReadOrder.value) {
+			order.value = await SalesOrderAPI.detail(customerPackage.value.salesOrderId);
+		}
 	} catch (error) {
 		customerPackage.value = undefined;
 		Message.error(getErrorMessage(error, "客户套餐加载失败"));
@@ -115,6 +134,10 @@ async function loadData(): Promise<void> {
 }
 function getStatusTheme(status?: string): "success" | "warning" | "danger" | "default" { return status === "ACTIVE" ? "success" : status === "CANCELLED" ? "danger" : "default"; }
 function getFulfillmentSummary(item: OrderFulfillment): string { return `${item.deliveredAt ? Time.toDateTime(item.deliveredAt) : "时间未知"} · ${(item.itemList || []).length} 项`; }
+function getFulfillmentItemType(item: OrderFulfillment): GaoSalesOrderItemType | undefined {
+	const sourceOrderItemId = item.itemList?.[0]?.sourceOrderItemId;
+	return salesOrderItems.value.find(orderItem => orderItem.id === sourceOrderItemId)?.itemType;
+}
 async function toOrder(): Promise<void> {
 	if (order.value?.id) {
 		await router.push({
@@ -126,10 +149,10 @@ async function toOrder(): Promise<void> {
 async function toPackageConfig(): Promise<void> { if (customerPackage.value?.packageConfigId) await router.push(`/management/package-configs/${customerPackage.value.packageConfigId}`); }
 async function toFulfillment(id?: string): Promise<void> { if (id) await router.push(`/management/order-fulfillments/${id}`); }
 async function toCreateFulfillment(): Promise<void> {
-	if (order.value?.id && customerPackage.value?.id) {
+	if (order.value?.id) {
 		await router.push({
 			path: "/management/order-fulfillments/create",
-			query: { salesOrderId: order.value.id, customerPackageId: customerPackage.value.id }
+			query: { salesOrderId: order.value.id }
 		});
 	}
 }

src/pages/package/CustomerPackageList.vue

@@ -56,7 +56,7 @@
 								<span> - </span>
 								<span v-text="item.packageNameSnapshot || '未命名套餐'" />
 							</div>
-							<t-tag :content="getCustomerPackageStatusText(item.status)" variant="light-outline" :theme="getStatusTheme(item.status)" />
+							<t-tag :content="getSalesOrderStatusText(getPackageStatus(item))" variant="light-outline" :theme="getStatusTheme(getPackageStatus(item))" />
 						</div>
 					</template>
 					<template #description>
@@ -77,10 +77,11 @@ import { type DropdownValue } from "tdesign-mobile-vue";
 import { Text, Toolkit } from "timi-web";
 import PackageAPI from "@/api/PackageAPI";
 import { useNavBarStore } from "@/store/navBarStore";
-import type { CustomerPackageStatus, GaoCustomerPackage } from "@/types/Package";
+import type { GaoCustomerPackage } from "@/types/Package";
+import type { GaoSalesOrderStatus } from "@/types/SalesOrder";
 import { getCustomerPhotoURL } from "@/utils/customer";
 import { getErrorMessage } from "@/utils/error";
-import { getCustomerPackageStatusText } from "@/utils/package";
+import { getSalesOrderStatusText } from "@/utils/salesOrder";
 import { Message } from "@/utils/message";
 import { permissionCodes } from "@/utils/permission";
 
@@ -114,7 +115,7 @@ async function loadMore(): Promise<void> {
 			index: pageIndex.value,
 			size: 15,
 			keyword: keyword.value || undefined,
-			status: status.value === "ALL" ? undefined : status.value as CustomerPackageStatus
+			status: status.value === "ALL" ? undefined : status.value as GaoSalesOrderStatus
 		});
 		const list = result.list || [];
 		packageList.value = packageList.value.concat(list);
@@ -164,7 +165,11 @@ async function toDetail(item: GaoCustomerPackage): Promise<void> {
 	}
 }
 
-function getStatusTheme(statusValue?: CustomerPackageStatus): "success" | "warning" | "default" {
+function getPackageStatus(item: GaoCustomerPackage): GaoSalesOrderStatus | undefined {
+	return item.salesOrder?.status;
+}
+
+function getStatusTheme(statusValue?: GaoSalesOrderStatus): "success" | "warning" | "default" {
 	return statusValue === "ACTIVE" ? "success" : statusValue === "CANCELLED" ? "warning" : "default";
 }
 

src/pages/package/PackagePurchase.vue

@@ -409,12 +409,16 @@ async function submitRecord(): Promise<void> {
 	isSaving.value = true;
 	try {
 		const result = await submitPurchase();
-		if (!result?.id) {
+		if (!result?.id || !result.salesOrderId) {
+			Message.error("套餐购买成功但未返回完整订单关联，请联系管理员");
 			return;
 		}
 		await settingStore.playRegisterSuccessSound();
 		Message.success("套餐购买已提交");
-		await router.replace(`/management/customer-packages/${result.id}`);
+		await router.replace({
+			path: `/management/customer-packages/${result.id}`,
+			query: { salesOrderId: result.salesOrderId }
+		});
 	} catch (error) {
 		Message.error(getErrorMessage(error, "套餐购买提交失败"));
 	} finally {

src/pages/package/usePackagePurchase.ts

@@ -78,13 +78,13 @@ export function usePackagePurchase(options: UsePackagePurchaseOptions) {
 			saleAmount,
 			purchasedAt: options.buildRegisteredAt(),
 			attachmentList: options.buildAttachments(),
-			itemList: packagePurchaseItemList.value.map((item, index) => ({
+			itemList: packagePurchaseItemList.value.length ? packagePurchaseItemList.value.map((item, index) => ({
 				productId: item.productId,
 				productUnitId: item.productUnitId,
 				totalQuantity: normalizePackageQuantity(item.totalQuantity)!,
 				sort: item.sort ?? index,
 				remark: item.remark ?? null
-			})),
+			})) : undefined,
 			remark: options.note.value.trim() || null
 		});
 	}
@@ -110,10 +110,6 @@ export function usePackagePurchase(options: UsePackagePurchaseOptions) {
 			Message.warning("成交价必须是合法的元金额，最多两位小数");
 			return false;
 		}
-		if (!packagePurchaseItemList.value.length) {
-			Message.warning("购买权益至少需要一项");
-			return false;
-		}
 		for (const item of packagePurchaseItemList.value) {
 			const quantity = normalizePackageQuantity(item.totalQuantity);
 			if (!item.productId || !item.productUnitId || !quantity || quantity === "0") {