fix(partner): drop pickup store and reorder promo on proxy order
CI / verify (pull_request) Has been cancelled

On-site pickup no longer requires a store; move optional promo above fulfillment mode.

Co-authored-by: Cursor <cursoragent@cursor.com>
This commit is contained in:
2026-07-28 00:19:52 +08:00
parent aa9d689c76
commit a49d8d99b6
3 changed files with 37 additions and 73 deletions
@@ -1228,17 +1228,12 @@ export class TradeService {
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;
receiverName = body.receiverName?.trim() || `用户${normalizedPhone.slice(-4)}`;
receiverProvince = '现场';
receiverCity = '现场';
receiverDistrict = '取货';
receiverAddress = '现场提货';
commissionDistrict = '';
} else {
if (!receiverProvince || !receiverCity || !receiverDistrict) {
throw new BadRequestException('请选择省市区');