jacy/dukang
1
0
Fork 0
Code Issues Pull Requests Actions 5 Packages Projects Releases Wiki Activity

v4.0.18版本更新

Browse Source
This commit is contained in:
jacy
2026-09-08 13:47:42 +08:00
parent 23ba639e9b
commit 253430b291
14 changed files with 136 additions and 25 deletions
Download Patch File Download Diff File Expand all files Collapse all files
server/dukang-api/src/common/system-config/system-config.registry.ts
+9
View File
@@ -83,6 +83,14 @@ export const SYSTEM_CONFIG_FIELDS: SystemConfigFieldMeta[] = [
requiresRestart: false,
description: '总开关。开启后连接 HQ「企微机器人 → 智能机器人」中已启用且配置完整的 Bot（每 Bot 同时仅 1 条长连接）',
},
{
key: 'SHOW_STORE_REDEEM_COUNT',
label: 'C 端展示门店核销次数',
group: G.feature,
type: 'boolean',
requiresRestart: false,
description: '关闭后小程序门店列表/详情不再展示「核销N次」，接口也不再返回核销次数',
},
{ key: 'ALIYUN_SMS_SIGN_NAME', label: '短信签名', group: G.sms, type: 'string', requiresRestart: false },
{ key: 'ALIYUN_SMS_TEMPLATE_CODE', label: '默认短信模板', group: G.sms, type: 'string', requiresRestart: false },
@@ -612,6 +620,7 @@ export const SYSTEM_CONFIG_KEY_SET = new Set(SYSTEM_CONFIG_FIELDS.map((f) => f.k
/** 表单空值时展示 / 启动补种的默认值（与 shared-types 常量对齐） */
export const SYSTEM_CONFIG_DEFAULTS: Record<string, string> = {
SHOW_STORE_REDEEM_COUNT: 'true',
USER_H5_URL: DEFAULT_USER_H5_URL.replace(/\/$/, ''),
SHOP_H5_URL: DEFAULT_SHOP_H5_URL.replace(/\/$/, ''),
BRAND_LOGO_OSS_BASE: BRAND_LOGO_OSS_BASE,
server/dukang-api/src/modules/common/client-config.controller.ts
+2
View File
@@ -1,5 +1,6 @@
import { Controller, Get } from '@nestjs/common';
import {
isShowStoreRedeemCountEnabled,
parseMiniHomeBanners,
resolveClientBrandRuntime,
resolveMiniShareRuntime,
@@ -44,6 +45,7 @@ export class ClientConfigController {
(env.PARTNER_ONBOARD_CS_HINT ?? '').trim() ||
'使用问题、提现问题等随时可联系【杜康好客】客服',
share,
showStoreRedeemCount: isShowStoreRedeemCountEnabled(env),
};
}
}
server/dukang-api/src/modules/ops/admin-partners.controller.ts
+13 -1
View File
@@ -1,4 +1,5 @@
import { Body, Controller, Delete, Get, Param, Post, Put, Query, UseGuards } from '@nestjs/common';
import { Body, Controller, Delete, Get, Param, Post, Put, Query, Res, UseGuards } from '@nestjs/common';
import type { Response } from 'express';
import { HqAuthGuard } from '../../common/guards/hq-auth.guard';
import {
HqPermissionGuard,
@@ -80,6 +81,17 @@ export class AdminPartnersController {
return this.assoc.listUsers(BigInt(id), Number(page) || 1, Number(pageSize) || 20);
}
@Get(':id/assoc/qrcode')
async assocQrcode(@Param('id') id: string, @Res() res: Response) {
const { buffer, fileName } = await this.assoc.getQrcodeBuffer(BigInt(id));
res.setHeader('Content-Type', 'image/png');
res.setHeader(
'Content-Disposition',
`attachment; filename="${fileName}"; filename*=UTF-8''${encodeURIComponent(fileName)}`,
);
res.send(buffer);
}
@Post(':id/assoc/qrcode')
regenQrcode(@Param('id') id: string) {
return this.assoc.ensureQrcode(BigInt(id), true);
server/dukang-api/src/modules/store/store.service.ts
+12 -6
View File
@@ -5,7 +5,7 @@ import {
Logger,
NotFoundException,
} from '@nestjs/common';
import { loadAppConfig, ClientApp, SmsScene } from '@dukang/shared-types';
import { loadAppConfig, ClientApp, SmsScene, isShowStoreRedeemCountEnabled } from '@dukang/shared-types';
import { PARTNER_STAFF_ROLE_LABELS, PartnerStaffRole, type PartnerLeaderboardPeriod } from '@dukang/shared-types';
import { normalizeStorePackageImageUrls } from '@dukang/shared-types';
import {
@@ -36,6 +36,7 @@ import {
} from '../../common/test-whitelist/test-whitelist.service';
import { WecomMessagePushService } from '../../integrations/wecom/wecom-message-push.service';
import { formatPartnerWecomLabel } from './wecom-submitter-label';
import { SystemConfigService } from '../../common/system-config/system-config.service';
function haversineMeters(lat1: number, lng1: number, lat2: number, lng2: number): number {
const toRad = (d: number) => (d * Math.PI) / 180;
@@ -86,6 +87,7 @@ export class StoreService {
private readonly tencentLbs: TencentLbsProvider,
private readonly testWhitelist: TestWhitelistService,
private readonly wecomPush: WecomMessagePushService,
private readonly systemConfig: SystemConfigService,
) {}
/** 门店进入 PENDING 或 HQ 新建时通知企微（失败不挡业务） */
@@ -218,11 +220,12 @@ export class StoreService {
latitude?: unknown;
longitude?: unknown;
sortOrder?: number;
redeemCount: number;
redeemCount?: number;
};
const showRedeemCount = isShowStoreRedeemCountEnabled(this.systemConfig.getMergedEnv());
const redeemGroups =
visible.length === 0
!showRedeemCount || visible.length === 0
? []
: await this.prisma.redeemRecord.groupBy({
by: ['storeId'],
@@ -252,7 +255,9 @@ export class StoreService {
items.push({
...mapped,
distanceMeters,
redeemCount: redeemCountByStore.get(store.id.toString()) ?? 0,
...(showRedeemCount
? { redeemCount: redeemCountByStore.get(store.id.toString()) ?? 0 }
: {}),
});
}
@@ -286,6 +291,7 @@ export class StoreService {
throw new NotFoundException('门店不存在');
}
const coords = await this.ensureStoreCoordinates(store);
const showRedeemCount = isShowStoreRedeemCountEnabled(this.systemConfig.getMergedEnv());
const [media, packageRows, redeemCount] = await Promise.all([
this.prisma.commonResource.findMany({
where: { ownerType: 'STORE', ownerId: id, status: 'ACTIVE', bizType: 'ENV' },
@@ -295,7 +301,7 @@ export class StoreService {
where: { storeId: id },
orderBy: [{ sortOrder: 'asc' }, { id: 'asc' }],
}),
this.prisma.redeemRecord.count({ where: { storeId: id } }),
showRedeemCount ? this.prisma.redeemRecord.count({ where: { storeId: id } }) : Promise.resolve(null),
]);
const { visibilityWhitelistEnabled: _wl, ...rest } = store;
return serializeBigInt(
@@ -304,7 +310,7 @@ export class StoreService {
...rest,
latitude: coords?.latitude ?? store.latitude,
longitude: coords?.longitude ?? store.longitude,
redeemCount,
...(showRedeemCount && redeemCount != null ? { redeemCount } : {}),
media,
packages: packageRows.map((p) => {
const imageUrls = normalizeStorePackageImageUrls({