修复(#122): 补齐促销价档位提交

apps/user/public/assets/locales/en-US/affiliate.json

@@ -16,10 +16,6 @@
   "inviteCode": "Invite Code",
   "inviteRecords": "Invite Records",
   "noReason": "None",
-  "recordsTabs": {
-    "withdrawal": "Withdrawal Records",
-    "refund": "Refund Records"
-  },
   "rejectReason": "Reject Reason",
   "registrationTime": "Registration Time",
   "submitWithdraw": "Submit Request",
@@ -32,27 +28,10 @@
   "withdrawDescription": "Submit the withdrawal amount and payout details, then wait for review.",
   "withdrawError": "Failed to submit withdrawal request",
   "withdrawRecords": "Withdrawal Records",
-  "withdrawalRecordsDescription": "Review your withdrawal requests, statuses, and payout details.",
-  "withdrawalEmpty": "No withdrawal records yet",
   "withdrawStatus": {
     "approved": "Approved",
     "pending": "Pending Review",
     "rejected": "Rejected"
   },
-  "withdrawSuccess": "Withdrawal request submitted",
+  "withdrawSuccess": "Withdrawal request submitted"
-  "commissionReturn": {
-    "description": "Review order refunds and returned withdrawal commissions.",
-    "empty": "No refund records yet",
-    "eventType": {
-      "orderRefund": "Order Refund",
-      "withdrawRejectReturn": "Withdrawal Rejected Return",
-      "withdrawCancelReturn": "Withdrawal Cancel Return",
-      "unknown": "Commission Return"
-    },
-    "fields": {
-      "eventType": "Type",
-      "orderNo": "Order No.",
-      "createdAt": "Created At"
-    }
-  }
 }

apps/user/public/assets/locales/en-US/subscribe.json

@@ -9,7 +9,6 @@
     "originalPrice": "Original Price (Monthly)",
     "price": "Price",
     "productDiscount": "Product Discount",
-    "promoDiscount": "Promo Discount",
     "total": "Total"
   },
   "buy": "Buy",

apps/user/public/assets/locales/zh-CN/affiliate.json

@@ -16,10 +16,6 @@
   "inviteCode": "邀请码",
   "inviteRecords": "邀请记录",
   "noReason": "无",
-  "recordsTabs": {
-    "withdrawal": "提现记录",
-    "refund": "退款记录"
-  },
   "rejectReason": "拒绝原因",
   "registrationTime": "注册时间",
   "submitWithdraw": "提交申请",
@@ -32,27 +28,10 @@
   "withdrawDescription": "填写提现金额和收款信息后提交申请，等待后台审核。",
   "withdrawError": "提现申请提交失败",
   "withdrawRecords": "提现记录",
-  "withdrawalRecordsDescription": "查看你的提现申请、审核状态和收款信息。",
-  "withdrawalEmpty": "暂无提现记录",
   "withdrawStatus": {
     "approved": "已通过",
     "pending": "审核中",
     "rejected": "已拒绝"
   },
-  "withdrawSuccess": "提现申请已提交",
+  "withdrawSuccess": "提现申请已提交"
-  "commissionReturn": {
-    "description": "查看订单退款和提现退回记录。",
-    "empty": "暂无退款记录",
-    "eventType": {
-      "orderRefund": "订单退款",
-      "withdrawRejectReturn": "提现拒绝退回",
-      "withdrawCancelReturn": "用户取消提现退回",
-      "unknown": "佣金返回"
-    },
-    "fields": {
-      "eventType": "类型",
-      "orderNo": "订单号",
-      "createdAt": "创建时间"
-    }
-  }
 }

apps/user/public/assets/locales/zh-CN/subscribe.json

@@ -9,7 +9,6 @@
     "originalPrice": "原价（按月）",
     "price": "价格",
     "productDiscount": "商品折扣",
-    "promoDiscount": "促销优惠",
     "total": "总价"
   },
   "buy": "购买",

apps/user/src/sections/subscribe/billing.tsx

@@ -10,7 +10,6 @@ interface SubscribeBillingProps {
       unit_price: number;
       unit_time: string;
       subscribe_discount: number;
-      promo_discount: number;
       show_original_price?: boolean;
     }
   >;
@@ -67,14 +66,6 @@ export function SubscribeBilling({ order }: Readonly<SubscribeBillingProps>) {
             <Display type="currency" value={order?.discount} />
           </span>
         </li>
-        <li>
-          <span className="text-muted-foreground">
-            {t("billing.promoDiscount", "Promo Discount")}
-          </span>
-          <span>
-            <Display type="currency" value={order?.promo_discount} />
-          </span>
-        </li>
         <li>
           <span className="text-muted-foreground">
             {t("billing.couponDiscount", "Coupon Discount")}

apps/user/src/sections/subscribe/promo-info.tsx

@@ -18,10 +18,10 @@ export function PromoInfo({ discount }: Readonly<PromoInfoProps>) {
         <span className="font-medium">
           {promo.rule_name || t("promo.available", "Promo Available")}
         </span>
-        {promo.expires_at && (
+        {promo.end_time && (
           <span className="text-muted-foreground text-xs">
             {t("promo.validUntil", "Valid until")}:{" "}
-            {new Date(promo.expires_at * 1000).toLocaleString()}
+            {new Date(promo.end_time * 1000).toLocaleString()}
           </span>
         )}
       </div>

apps/user/src/sections/user/affiliate/commission-return.test.ts

@@ -1,37 +0,0 @@
-import { describe, expect, it, vi } from "vitest";
-import { getCommissionReturnEventLabel } from "./commission-return";
-
-const translations = {
-  "commissionReturn.eventType.orderRefund": "订单退款",
-  "commissionReturn.eventType.withdrawRejectReturn": "提现拒绝退回",
-  "commissionReturn.eventType.withdrawCancelReturn": "用户取消提现退回",
-  "commissionReturn.eventType.unknown": "佣金返回",
-} as const;
-
-describe("getCommissionReturnEventLabel", () => {
-  const t = (key: string, defaultValue: string) =>
-    translations[key as keyof typeof translations] ?? defaultValue ?? key;
-
-  it("maps 333 to order refund", () => {
-    expect(getCommissionReturnEventLabel(333, t)).toBe("订单退款");
-  });
-
-  it("maps 337 to withdraw reject return", () => {
-    expect(getCommissionReturnEventLabel(337, t)).toBe("提现拒绝退回");
-  });
-
-  it("maps 338 to withdraw cancel return", () => {
-    expect(getCommissionReturnEventLabel(338, t)).toBe("用户取消提现退回");
-  });
-
-  it("falls back for unknown event types and warns", () => {
-    const warnSpy = vi.spyOn(console, "warn").mockImplementation(() => {
-      /* intentional noop */
-    });
-
-    expect(getCommissionReturnEventLabel(999, t)).toBe("佣金返回");
-    expect(warnSpy).toHaveBeenCalledWith(999);
-
-    warnSpy.mockRestore();
-  });
-});

apps/user/src/sections/user/affiliate/commission-return.ts

@@ -1,27 +0,0 @@
-export type AffiliateTranslation = (
-  key: string,
-  defaultValue: string
-) => string;
-
-export function getCommissionReturnEventLabel(
-  eventType: number,
-  t: AffiliateTranslation
-) {
-  switch (eventType) {
-    case 333:
-      return t("commissionReturn.eventType.orderRefund", "Order Refund");
-    case 337:
-      return t(
-        "commissionReturn.eventType.withdrawRejectReturn",
-        "Withdrawal Rejected Return"
-      );
-    case 338:
-      return t(
-        "commissionReturn.eventType.withdrawCancelReturn",
-        "Withdrawal Cancel Return"
-      );
-    default:
-      console.warn(eventType);
-      return t("commissionReturn.eventType.unknown", "Commission Return");
-  }
-}

apps/user/src/sections/user/affiliate/index.tsx

@@ -35,21 +35,13 @@ import {
   SelectTrigger,
   SelectValue,
 } from "@workspace/ui/components/select";
-import {
-  Tabs,
-  TabsContent,
-  TabsList,
-  TabsTrigger,
-} from "@workspace/ui/components/tabs";
 import { Textarea } from "@workspace/ui/components/textarea";
 import { ConfirmButton } from "@workspace/ui/composed/confirm-button";
-import Empty from "@workspace/ui/composed/empty";
 import type { ProListActions } from "@workspace/ui/composed/pro-list/pro-list";
 import { ProList } from "@workspace/ui/composed/pro-list/pro-list";
 import { UploadImage } from "@workspace/ui/composed/upload-image";
 import {
   commissionWithdraw,
-  queryCommissionReturnLog,
   queryUserAffiliate,
   queryUserAffiliateList,
   queryWithdrawalLog,
@@ -67,7 +59,6 @@ import { toast } from "sonner";
 import { z } from "zod";
 import { Display } from "@/components/display";
 import { useGlobalStore } from "@/stores/global";
-import { getCommissionReturnEventLabel } from "./commission-return";
 
 const WITHDRAWAL_METHODS = [
   { value: 1, label: "支付宝" },
@@ -120,21 +111,13 @@ function QrCodeView({ url }: { url: string }) {
         <img
           alt="收款码"
           className="h-16 w-16 cursor-zoom-in object-cover"
-          height={64}
           src={url}
-          width={64}
         />
       </button>
       {zoomOpen && (
         <Dialog onOpenChange={setZoomOpen} open={zoomOpen}>
           <DialogContent className="max-w-sm">
-            <img
+            <img alt="收款码" className="w-full" src={url} />
-              alt="收款码"
-              className="w-full"
-              height={512}
-              src={url}
-              width={512}
-            />
           </DialogContent>
         </Dialog>
       )}
@@ -174,12 +157,14 @@ const withdrawalFormSchema = z
           path: ["account"],
         });
       }
-    } else if (data.method === 0 && !(data.account || data.content)) {
+    } else if (data.method === 0) {
-      ctx.addIssue({
+      if (!data.account && !data.content) {
-        code: z.ZodIssueCode.custom,
+        ctx.addIssue({
-        message: "收款账号和备注至少填一项",
+          code: z.ZodIssueCode.custom,
-        path: ["account"],
+          message: "收款账号和备注至少填一项",
-      });
+          path: ["account"],
+        });
+      }
     }
   });
 
@@ -188,7 +173,6 @@ type WithdrawalFormValues = z.infer<typeof withdrawalFormSchema>;
 export default function Affiliate() {
   const { t } = useTranslation("affiliate");
   const { user, common, getUserInfo } = useGlobalStore();
-  const [activeRecordTab, setActiveRecordTab] = useState("withdrawal");
   const [withdrawalOpen, setWithdrawalOpen] = useState(false);
   const [submitting, startTransition] = useTransition();
   const [qrUploading, setQrUploading] = useState(false);
@@ -437,7 +421,9 @@ export default function Affiliate() {
                             <FormItem>
                               <FormLabel>
                                 收款码
-                                <span className="ml-1 text-destructive">*</span>
+                                <span className="ml-1 text-destructive">
+                                  *
+                                </span>
                               </FormLabel>
                               {watchedQrCodeUrl ? (
                                 <div className="relative inline-block">
@@ -460,9 +446,7 @@ export default function Affiliate() {
                                   returnType="file"
                                 >
                                   <div className="flex h-24 w-24 flex-col items-center justify-center rounded border-2 border-dashed text-muted-foreground text-xs">
-                                    {qrUploading
+                                    {qrUploading ? "上传中..." : "点击上传\n收款码"}
-                                      ? "上传中..."
-                                      : "点击上传\n收款码"}
                                   </div>
                                 </UploadImage>
                               )}
@@ -535,7 +519,9 @@ export default function Affiliate() {
                     </Button>
                     <Button
                       disabled={
-                        submitting || qrUploading || availableCommission <= 0
+                        submitting ||
+                        qrUploading ||
+                        availableCommission <= 0
                       }
                       form="withdrawal-form"
                       type="submit"
@@ -578,218 +564,107 @@ export default function Affiliate() {
           </div>
         </CardContent>
       </Card>
-      <Card>
+      <ProList<API.WithdrawalLog, Record<string, unknown>>
-        <CardHeader className="gap-3">
+        action={withdrawalListActionRef}
-          <CardTitle>{t("withdrawRecords", "Withdrawal Records")}</CardTitle>
+        header={{
-          <CardDescription>
+          title: t("withdrawal.records", "Withdrawal Records"),
-            {activeRecordTab === "withdrawal"
+        }}
-              ? t(
+        renderItem={(item) => {
-                  "withdrawalRecordsDescription",
+          const statusMeta = getWithdrawalStatusMeta(item.status, t);
-                  "Review your withdrawal requests, statuses, and payout details."
+          return (
-                )
+            <Card className="overflow-hidden">
-              : t(
+              <CardContent className="space-y-3 p-4 text-sm">
-                  "commissionReturn.description",
+                <div className="flex flex-wrap items-center justify-between gap-2">
-                  "Review order refunds and returned withdrawal commissions."
+                  <div className="font-semibold text-lg">
-                )}
+                    <Display type="currency" value={item.amount} />
-          </CardDescription>
+                  </div>
-          <Tabs
+                  <div className="flex items-center gap-2">
-            defaultValue="withdrawal"
+                    <span
-            onValueChange={setActiveRecordTab}
+                      className={`inline-flex rounded-full px-3 py-1 font-medium text-xs ${statusMeta.className}`}
-            value={activeRecordTab}
+                    >
-          >
+                      {statusMeta.label}
-            <TabsList className="grid w-full grid-cols-2 md:w-fit">
+                    </span>
-              <TabsTrigger value="withdrawal">
+                    {item.status === 0 && (
-                {t("recordsTabs.withdrawal", "Withdrawal Records")}
+                      <ConfirmButton
-              </TabsTrigger>
+                        cancelText="取消"
-              <TabsTrigger value="refund">
+                        confirmText="确认取消"
-                {t("recordsTabs.refund", "Refund Records")}
+                        description="取消后该提现申请将关闭，佣金不会退还。确定取消吗？"
-              </TabsTrigger>
+                        onConfirm={async () => {
-            </TabsList>
+                          await cancelMutation.mutateAsync(item.id);
-
+                        }}
-            <TabsContent className="mt-4" value="withdrawal">
+                        title="取消提现申请"
-              <ProList<API.WithdrawalLog, Record<string, unknown>>
+                        trigger={
-                action={withdrawalListActionRef}
+                          <Button
-                empty={
+                            disabled={cancelMutation.isPending}
-                  <Empty
+                            size="sm"
-                    description={t(
+                            variant="outline"
-                      "withdrawalEmpty",
+                          >
-                      "No withdrawal records yet"
+                            取消申请
+                          </Button>
+                        }
+                      />
                     )}
-                  />
+                  </div>
-                }
+                </div>
-                renderItem={(item) => {
+                <ul className="grid gap-3 md:grid-cols-2">
-                  const statusMeta = getWithdrawalStatusMeta(item.status, t);
+                  <li className="flex flex-col gap-1">
-                  return (
+                    <span className="text-muted-foreground">收款方式</span>
-                    <Card className="overflow-hidden">
+                    <span>{getWithdrawalMethodLabel(item.method)}</span>
-                      <CardContent className="space-y-3 p-4 text-sm">
+                  </li>
-                        <div className="flex flex-wrap items-center justify-between gap-2">
+                  {item.account && (
-                          <div className="font-semibold text-lg">
+                    <li className="flex flex-col gap-1">
-                            <Display type="currency" value={item.amount} />
+                      <span className="text-muted-foreground">收款账号</span>
-                          </div>
+                      <span className="break-all">{item.account}</span>
-                          <div className="flex items-center gap-2">
+                    </li>
-                            <span
+                  )}
-                              className={`inline-flex rounded-full px-3 py-1 font-medium text-xs ${statusMeta.className}`}
+                  {item.qr_code_url && (
-                            >
+                    <li className="flex flex-col gap-1">
-                              {statusMeta.label}
+                      <span className="text-muted-foreground">收款码</span>
-                            </span>
+                      <QrCodeView url={item.qr_code_url} />
-                            {item.status === 0 && (
+                    </li>
-                              <ConfirmButton
+                  )}
-                                cancelText="取消"
+                  {item.content && (
-                                confirmText="确认取消"
+                    <li className="flex flex-col gap-1">
-                                description="取消后该提现申请将关闭，佣金不会退还。确定取消吗？"
+                      <span className="text-muted-foreground">
-                                onConfirm={async () => {
+                        {t("withdrawal.record.content", "Payout Information")}
-                                  await cancelMutation.mutateAsync(item.id);
+                      </span>
-                                }}
+                      <span className="whitespace-pre-wrap break-words">
-                                title="取消提现申请"
+                        {item.content}
-                                trigger={
+                      </span>
-                                  <Button
+                    </li>
-                                    disabled={cancelMutation.isPending}
+                  )}
-                                    size="sm"
+                  <li className="flex flex-col gap-1">
-                                    variant="outline"
+                    <span className="text-muted-foreground">
-                                  >
+                      {t("withdrawal.record.createdAt", "Created At")}
-                                    取消申请
+                    </span>
-                                  </Button>
+                    <time>{formatDate(item.created_at)}</time>
-                                }
+                  </li>
-                              />
+                  {item.reason && (
-                            )}
+                    <li className="flex flex-col gap-1 md:col-span-2">
-                          </div>
+                      <span className="text-muted-foreground">
-                        </div>
+                        {t("withdrawal.record.reason", "Reject Reason")}
-                        <ul className="grid gap-3 md:grid-cols-2">
+                      </span>
-                          <li className="flex flex-col gap-1">
+                      <span className="whitespace-pre-wrap break-words text-destructive">
-                            <span className="text-muted-foreground">
+                        {item.reason}
-                              收款方式
+                      </span>
-                            </span>
+                    </li>
-                            <span>{getWithdrawalMethodLabel(item.method)}</span>
+                  )}
-                          </li>
+                </ul>
-                          {item.account && (
+              </CardContent>
-                            <li className="flex flex-col gap-1">
+            </Card>
-                              <span className="text-muted-foreground">
+          );
-                                收款账号
+        }}
-                              </span>
+        request={async (pagination) => {
-                              <span className="break-all">{item.account}</span>
+          const response = await queryWithdrawalLog({
-                            </li>
+            page: pagination.page,
-                          )}
+            size: pagination.size,
-                          {item.qr_code_url && (
+          });
-                            <li className="flex flex-col gap-1">
+          return {
-                              <span className="text-muted-foreground">
+            list: response.data.data?.list || [],
-                                收款码
+            total: response.data.data?.total || 0,
-                              </span>
+          };
-                              <QrCodeView url={item.qr_code_url} />
+        }}
-                            </li>
+      />
-                          )}
-                          {item.content && (
-                            <li className="flex flex-col gap-1">
-                              <span className="text-muted-foreground">
-                                {t(
-                                  "withdrawal.record.content",
-                                  "Payout Information"
-                                )}
-                              </span>
-                              <span className="whitespace-pre-wrap break-words">
-                                {item.content}
-                              </span>
-                            </li>
-                          )}
-                          <li className="flex flex-col gap-1">
-                            <span className="text-muted-foreground">
-                              {t("withdrawal.record.createdAt", "Created At")}
-                            </span>
-                            <time>{formatDate(item.created_at)}</time>
-                          </li>
-                          {item.reason && (
-                            <li className="flex flex-col gap-1 md:col-span-2">
-                              <span className="text-muted-foreground">
-                                {t("withdrawal.record.reason", "Reject Reason")}
-                              </span>
-                              <span className="whitespace-pre-wrap break-words text-destructive">
-                                {item.reason}
-                              </span>
-                            </li>
-                          )}
-                        </ul>
-                      </CardContent>
-                    </Card>
-                  );
-                }}
-                request={async (pagination) => {
-                  const response = await queryWithdrawalLog({
-                    page: pagination.page,
-                    size: pagination.size,
-                  });
-                  return {
-                    list: response.data.data?.list || [],
-                    total: response.data.data?.total || 0,
-                  };
-                }}
-              />
-            </TabsContent>
-
-            <TabsContent className="mt-4" value="refund">
-              <ProList<API.CommissionReturnLog, Record<string, unknown>>
-                empty={
-                  <Empty
-                    description={t(
-                      "commissionReturn.empty",
-                      "No refund records yet"
-                    )}
-                  />
-                }
-                renderItem={(item) => (
-                  <Card className="overflow-hidden">
-                    <CardContent className="space-y-3 p-4 text-sm">
-                      <div className="flex flex-wrap items-center justify-between gap-2">
-                        <div className="font-semibold text-lg">
-                          <Display type="currency" value={item.amount} />
-                        </div>
-                        <span className="inline-flex rounded-full bg-primary/10 px-3 py-1 font-medium text-primary text-xs">
-                          {getCommissionReturnEventLabel(item.event_type, t)}
-                        </span>
-                      </div>
-                      <ul className="grid gap-3 md:grid-cols-2">
-                        <li className="flex flex-col gap-1">
-                          <span className="text-muted-foreground">
-                            {t("commissionReturn.fields.eventType", "Type")}
-                          </span>
-                          <span>
-                            {getCommissionReturnEventLabel(item.event_type, t)}
-                          </span>
-                        </li>
-                        <li className="flex flex-col gap-1">
-                          <span className="text-muted-foreground">
-                            {t("commissionReturn.fields.orderNo", "Order No.")}
-                          </span>
-                          <span className="break-all">
-                            {item.order_no || "-"}
-                          </span>
-                        </li>
-                        <li className="flex flex-col gap-1">
-                          <span className="text-muted-foreground">
-                            {t(
-                              "commissionReturn.fields.createdAt",
-                              "Created At"
-                            )}
-                          </span>
-                          <time>{formatDate(item.created_at)}</time>
-                        </li>
-                      </ul>
-                    </CardContent>
-                  </Card>
-                )}
-                request={async (pagination) => {
-                  const response = await queryCommissionReturnLog({
-                    page: pagination.page,
-                    size: pagination.size,
-                  });
-                  return {
-                    list: response.data.data?.list || [],
-                    total: response.data.data?.total || 0,
-                  };
-                }}
-              />
-            </TabsContent>
-          </Tabs>
-        </CardHeader>
-      </Card>
       <ProList<API.UserAffiliate, Record<string, unknown>>
         header={{
           title: t("inviteRecords", "Invite Records"),

packages/ui/src/services/user/typings.d.ts

@@ -170,17 +170,6 @@ declare namespace API {
     timestamp: number;
   };
 
-  type CommissionReturnLog = {
-    id: number;
-    user_id: number;
-    amount: number;
-    event_type: number;
-    order_no?: string;
-    content?: string;
-    created_at: number;
-    updated_at: number;
-  };
-
   type CommissionWithdrawRequest = {
     amount: number;
     method: number;
@@ -559,7 +548,6 @@ declare namespace API {
     price: number;
     amount: number;
     discount: number;
-    promo_discount: number;
     gift_amount: number;
     coupon: string;
     coupon_discount: number;
@@ -832,21 +820,6 @@ declare namespace API {
     size: number;
   };
 
-  type QueryCommissionReturnLogListRequest = {
-    page: number;
-    size: number;
-  };
-
-  type QueryCommissionReturnLogListResponse = {
-    list: CommissionReturnLog[];
-    total: number;
-  };
-
-  type QueryCommissionReturnLogParams = {
-    page: number;
-    size: number;
-  };
-
   type QueryUserSubscribeListResponse = {
     list: UserSubscribe[];
     total: number;
@@ -1051,9 +1024,8 @@ declare namespace API {
 
   type SubscribeDiscountPromo = {
     rule_name?: string;
-    rule_type?: string;
     promo_price: number;
-    expires_at?: number;
+    end_time?: number;
   };
 
   type SubscribeGroup = {

packages/ui/src/services/user/user.ts

@@ -1,3 +1,4 @@
+// @ts-expect-error
 /* eslint-disable */
 import request from "@workspace/ui/lib/request";
 
@@ -470,25 +471,6 @@ export async function queryWithdrawalLog(
   );
 }
 
-/** Query Commission Return Log GET /v1/public/user/commission_return_log */
-export async function queryCommissionReturnLog(
-  params: API.QueryCommissionReturnLogParams,
-  options?: { [key: string]: any }
-) {
-  return request<
-    API.Response & { data?: API.QueryCommissionReturnLogListResponse }
-  >(
-    `${import.meta.env.VITE_API_PREFIX || ""}/v1/public/user/commission_return_log`,
-    {
-      method: "GET",
-      params: {
-        ...params,
-      },
-      ...(options || {}),
-    }
-  );
-}
-
 /** Cancel Withdrawal POST /v1/public/user/withdrawal_cancel */
 export async function withdrawalCancel(
   body: API.WithdrawalCancelRequest,