feat(partner): complete proxy order with dual SMS and pickup

Add partner/customer SMS confirm, address auto-receive or on-site
pickup, proxy placer fields, PARTNER_PROXY user source, and C-end badge.

Co-authored-by: Cursor <cursoragent@cursor.com>

server/dukang-api/src/modules/trade/trade.service.ts

@@ -1023,10 +1023,25 @@ export class TradeService {
     });
   }
 
-  async getPartnerProxyOrderOptions() {
-    const [products, promoCodes] = await Promise.all([
+  async getPartnerProxyOrderOptions(partnerAccountId: bigint) {
+    const primary = await this.partnerCityService.resolvePrimaryAccount(partnerAccountId);
+    const [products, promoCodes, stores] = await Promise.all([
       this.catalogService.listProducts(),
       this.promoCodeService.listActiveOptions(),
+      this.prisma.store.findMany({
+        where: { partnerAccountId: primary.id },
+        orderBy: { createdAt: 'desc' },
+        select: {
+          id: true,
+          name: true,
+          address: true,
+          phone: true,
+          province: true,
+          cityName: true,
+          district: true,
+          status: true,
+        },
+      }),
     ]);
     return serializeBigInt({
       products: products.map((p) => ({
@@ -1035,14 +1050,27 @@ export class TradeService {
         spec: p.spec,
         price: Number(p.price),
         benefitAmount: p.benefitAmount != null ? Number(p.benefitAmount) : null,
+        coverUrl: (p as { mainImageUrl?: string | null }).mainImageUrl ?? null,
+        allowOnSitePickup: !!(p as { allowOnSitePickup?: boolean }).allowOnSitePickup,
       })),
       promoCodes,
+      stores: stores.map((s) => ({
+        id: s.id,
+        name: s.name,
+        address: s.address,
+        phone: s.phone,
+        province: s.province,
+        cityName: s.cityName,
+        district: s.district,
+      })),
     });
   }
 
   async previewPartnerProxyOrder(body: {
     productId: string;
     quantity: number;
+    deliveryMode?: 'ADDRESS' | 'ON_SITE_PICKUP';
+    storeId?: string;
     receiverCity?: string;
     receiverDistrict?: string;
   }) {
@@ -1053,14 +1081,23 @@ export class TradeService {
     const city = await this.prisma.commonCity.findFirst({ where: { status: 'ACTIVE' } });
     if (!city) throw new BadRequestException('暂无开城城市');
 
-    let deliveryType: 'LOCAL' | 'CROSS_CITY' = 'LOCAL';
-    const receiverCity = body.receiverCity?.trim();
-    if (receiverCity && receiverCity !== city.name && receiverCity !== '郑州市') {
-      deliveryType = 'CROSS_CITY';
+    const deliveryMode = body.deliveryMode ?? 'ADDRESS';
+    let deliveryType: 'LOCAL' | 'CROSS_CITY' | 'ON_SITE_PICKUP' = 'LOCAL';
+
+    if (deliveryMode === 'ON_SITE_PICKUP') {
+      if (!product.allowOnSitePickup) {
+        throw new BadRequestException('该商品不支持现场提货');
+      }
+      deliveryType = 'ON_SITE_PICKUP';
+    } else {
+      const receiverCity = body.receiverCity?.trim();
+      if (receiverCity && receiverCity !== city.name && receiverCity !== '郑州市') {
+        deliveryType = 'CROSS_CITY';
+      }
     }
 
     const check = validateMinPurchase(
-      deliveryType,
+      deliveryType === 'CROSS_CITY' ? 'CROSS_CITY' : 'LOCAL',
       body.quantity,
       city.localMinQty,
       city.crossMinQty,
@@ -1083,9 +1120,9 @@ export class TradeService {
     };
   }
 
-  async sendPartnerProxyOrderSms(phone: string) {
+  async sendPartnerProxyCustomerSms(phone: string) {
     const normalizedPhone = phone.trim();
-    await this.authService.sendSms(normalizedPhone, SmsScene.PARTNER_PROXY_ORDER, {
+    await this.authService.sendSms(normalizedPhone, SmsScene.PARTNER_PROXY_CUSTOMER, {
       clientApp: ClientApp.PARTNER_H5,
     });
     const masked =
@@ -1095,16 +1132,41 @@ export class TradeService {
     return { ok: true, maskedPhone: masked };
   }
 
+  /** @deprecated 兼容旧前端：转发为客户短信 */
+  async sendPartnerProxyOrderSms(phone: string) {
+    return this.sendPartnerProxyCustomerSms(phone);
+  }
+
+  async sendPartnerProxyPartnerSms(partnerAccountId: bigint) {
+    const primary = await this.partnerCityService.resolvePrimaryAccount(partnerAccountId);
+    const partnerPhone = primary.phone?.trim();
+    if (!partnerPhone || !/^1\d{10}$/.test(partnerPhone)) {
+      throw new BadRequestException('合伙人手机号无效，无法发送确认验证码');
+    }
+    await this.authService.sendSms(partnerPhone, SmsScene.PARTNER_PROXY_ORDER, {
+      clientApp: ClientApp.PARTNER_H5,
+    });
+    const masked =
+      partnerPhone.length >= 7
+        ? `${partnerPhone.slice(0, 3)}****${partnerPhone.slice(-4)}`
+        : partnerPhone;
+    return { ok: true, maskedPhone: masked };
+  }
+
   async createPartnerProxyOrder(
     partnerAccountId: bigint,
     body: {
       phone: string;
-      smsCode: string;
+      customerSmsCode: string;
+      partnerSmsCode: string;
+      deliveryMode: 'ADDRESS' | 'ON_SITE_PICKUP';
+      autoReceive?: boolean;
+      storeId?: string;
       receiverName?: string;
-      province: string;
-      city: string;
-      district: string;
-      addressDetail: string;
+      province?: string;
+      city?: string;
+      district?: string;
+      addressDetail?: string;
       productId: string;
       quantity: number;
       promoCodeId?: string;
@@ -1112,16 +1174,43 @@ export class TradeService {
     req: Request,
   ) {
     const normalizedPhone = body.phone.trim();
+    const primary = await this.partnerCityService.resolvePrimaryAccount(partnerAccountId);
+    const partnerPhone = primary.phone?.trim();
+    if (!partnerPhone || !/^1\d{10}$/.test(partnerPhone)) {
+      throw new BadRequestException('合伙人手机号无效');
+    }
+
     await this.authService.verifySmsCode(
       normalizedPhone,
-      body.smsCode.trim(),
+      body.customerSmsCode.trim(),
+      SmsScene.PARTNER_PROXY_CUSTOMER,
+    );
+    await this.authService.verifySmsCode(
+      partnerPhone,
+      body.partnerSmsCode.trim(),
       SmsScene.PARTNER_PROXY_ORDER,
     );
 
-    const user = await this.authService.findOrCreateUserByPhone(normalizedPhone);
+    if (body.deliveryMode === 'ADDRESS' && body.autoReceive !== true) {
+      throw new BadRequestException('配送到址须勾选同意自动收货');
+    }
+
+    const maskedPartnerPhone =
+      partnerPhone.length >= 7
+        ? `${partnerPhone.slice(0, 3)}****${partnerPhone.slice(-4)}`
+        : partnerPhone;
+
+    const user = await this.authService.findOrCreateUserByPhone(normalizedPhone, {
+      sourceType: 'PARTNER_PROXY',
+      sourceRefId: primary.id,
+      sourceLabel: `代下单·${maskedPartnerPhone}`,
+    });
+
     const preview = await this.previewPartnerProxyOrder({
       productId: body.productId,
       quantity: body.quantity,
+      deliveryMode: body.deliveryMode,
+      storeId: body.storeId,
       receiverCity: body.city,
       receiverDistrict: body.district,
     });
@@ -1130,8 +1219,37 @@ export class TradeService {
       where: { id: BigInt(body.productId) },
     });
     const city = await this.prisma.commonCity.findFirstOrThrow({ where: { status: 'ACTIVE' } });
-    const primary = await this.partnerCityService.resolvePrimaryAccount(partnerAccountId);
-    const paySnapshot = await this.partnerCityService.resolveForOrder(city.id, body.district);
+
+    let receiverName = body.receiverName?.trim() || `用户${normalizedPhone.slice(-4)}`;
+    let receiverProvince = body.province?.trim() || '';
+    let receiverCity = body.city?.trim() || '';
+    let receiverDistrict = body.district?.trim() || '';
+    let receiverAddress = '';
+    let commissionDistrict = receiverDistrict;
+
+    if (body.deliveryMode === 'ON_SITE_PICKUP') {
+      if (!body.storeId?.trim()) throw new BadRequestException('请选择提货门店');
+      const store = await this.prisma.store.findFirst({
+        where: { id: BigInt(body.storeId.trim()), partnerAccountId: primary.id },
+      });
+      if (!store) throw new BadRequestException('门店不存在或不属于当前合伙人');
+      receiverName = store.name;
+      receiverProvince = store.province;
+      receiverCity = store.cityName;
+      receiverDistrict = store.district;
+      receiverAddress = `现场提货·${store.name}·${store.province}${store.cityName}${store.district}${store.address}`;
+      commissionDistrict = store.district;
+    } else {
+      if (!receiverProvince || !receiverCity || !receiverDistrict) {
+        throw new BadRequestException('请选择省市区');
+      }
+      if (!body.addressDetail?.trim()) {
+        throw new BadRequestException('请填写详细地址');
+      }
+      receiverAddress = `${receiverProvince}${receiverCity}${receiverDistrict}${body.addressDetail.trim()}`;
+    }
+
+    const paySnapshot = await this.partnerCityService.resolveForOrder(city.id, commissionDistrict);
 
     let promoCodeId: bigint | undefined;
     if (body.promoCodeId?.trim()) {
@@ -1139,11 +1257,8 @@ export class TradeService {
       await this.promoCodeService.attributeUserToPromo(user.id, promoCodeId);
     }
 
-    const receiverName = body.receiverName?.trim() || `用户${normalizedPhone.slice(-4)}`;
-    const receiverAddress = `${body.province}${body.city}${body.district}${body.addressDetail}`;
     const orderNo = generateOrderNo();
     const now = new Date();
-
     const location = buildOrderClientLocationSnapshot(
       req,
       this.ipGeoService.resolve(extractClientIp(req)),
@@ -1178,9 +1293,9 @@ export class TradeService {
           receiverName,
           receiverPhone: normalizedPhone,
           receiverAddress,
-          receiverProvince: body.province,
-          receiverCity: body.city,
-          receiverDistrict: body.district,
+          receiverProvince,
+          receiverCity,
+          receiverDistrict,
           clientIp: location.clientIp,
           ipProvince: location.ipProvince,
           ipCity: location.ipCity,
@@ -1190,7 +1305,10 @@ export class TradeService {
           completedAt: now,
           partnerAccountIdAtPay: paySnapshot?.partnerAccountId ?? primary.id,
           orderCommissionRateAtPay: paySnapshot?.orderCommissionRate ?? null,
-          remark: `合伙人代下单 partnerAccountId=${primary.id}`,
+          proxyPartnerAccountId: primary.id,
+          proxyPartnerName: primary.name,
+          proxyPartnerPhone: partnerPhone,
+          remark: `合伙人代下单 partnerAccountId=${primary.id} deliveryMode=${body.deliveryMode} customer=${normalizedPhone}`,
         },
         include: { product: true, imageResource: true },
       });
@@ -1211,7 +1329,7 @@ export class TradeService {
           fromStatus: 'PENDING_PAY',
           toStatus: 'COMPLETED',
           operator: 'PARTNER_PROXY',
-          remark: '合伙人线下代下单',
+          remark: `合伙人线下代下单 mode=${body.deliveryMode} customer=${normalizedPhone} partner=${primary.id}`,
         }),
       });
 
@@ -1237,6 +1355,7 @@ export class TradeService {
         userId: user.id.toString(),
         productId: body.productId,
         quantity: body.quantity,
+        deliveryMode: body.deliveryMode,
         promoCodeId: promoCodeId?.toString() ?? null,
       },
     });