yml/hfb_sys
1
0
Fork 0
Code Issues Pull Requests Actions Packages Projects Releases Wiki Activity

移除摸大红支付后建群逻辑，仅保留扫码与复制

Browse Source 
支付成功只固化客服二维码与订单文案；同步清理迁移、配置与前后端相关字段。
This commit is contained in:
yml2213
2026-07-16 19:52:40 +08:00
parent 094a91c985
commit e07532a188
17 changed files with 16 additions and 192 deletions
Download Patch File Download Diff File Expand all files Collapse all files
backend/internal/model/chat.go
-1
View File
@@ -10,7 +10,6 @@ type ChatConversation struct {
ID uint64 `gorm:"primaryKey" json:"id"`
OrderID *uint64 `gorm:"uniqueIndex" json:"order_id"`
ListingID *uint64 `gorm:"index" json:"listing_id"`
MohongOrderID *uint64 `gorm:"column:mohong_order_id;uniqueIndex" json:"mohong_order_id"`
Type string `gorm:"size:32;not null;default:'order_group'" json:"type"`
Title string `gorm:"size:128;not null" json:"title"`
Status string `gorm:"size:32;not null;default:'active'" json:"status"`
backend/internal/model/mohong.go
-1
View File
@@ -68,7 +68,6 @@ type MohongOrder struct {
ProductSnapshot datatypes.JSON `gorm:"column:product_snapshot" json:"product_snapshot"`
QrcodeURLSnapshot string `gorm:"column:qrcode_url_snapshot;size:512;not null;default:''" json:"qrcode_url_snapshot"`
CopyText string `gorm:"type:text;not null" json:"copy_text"`
ConversationID *uint64 `gorm:"column:conversation_id" json:"conversation_id"`
PaidAt *time.Time `json:"paid_at"`
CompletedAt *time.Time `json:"completed_at"`
CancelledAt *time.Time `json:"cancelled_at"`
backend/internal/modules/mohong/config.go
+1 -17
View File
@@ -12,10 +12,8 @@ import (
const (
configKeyDefaultQrcodeURL = "mohong.default_qrcode_url"
configKeyGroupWelcomeText = "mohong.group_welcome_text"
configKeyOrderCopyTemplate = "mohong.order_copy_template"
defaultGroupWelcomeText = "订单已支付，请扫码联系客服，并将下方订单信息复制发送给客服。"
defaultOrderCopyTemplate = "【摸大红订单】\n订单号：{{order_no}}\n下单时间：{{created_at}}\n商品：{{product_title}}\n数量：{{quantity}}\n金额：{{amount}}\n下单人：{{buyer_name}}（{{buyer_phone}}）"
)
@@ -23,7 +21,7 @@ func (r *Repository) GetConfig(ctx context.Context) (*ConfigDTO, error) {
if r.db == nil {
return nil, ErrDependencyUnavailable
}
keys := []string{configKeyDefaultQrcodeURL, configKeyGroupWelcomeText, configKeyOrderCopyTemplate}
keys := []string{configKeyDefaultQrcodeURL, configKeyOrderCopyTemplate}
var rows []model.SystemConfig
if err := r.db.WithContext(ctx).Where("`key` IN ?", keys).Find(&rows).Error; err != nil {
return nil, err
@@ -34,7 +32,6 @@ func (r *Repository) GetConfig(ctx context.Context) (*ConfigDTO, error) {
}
return &ConfigDTO{
DefaultQrcodeURL: strings.TrimSpace(values[configKeyDefaultQrcodeURL]),
GroupWelcomeText: firstNonEmpty(values[configKeyGroupWelcomeText], defaultGroupWelcomeText),
OrderCopyTemplate: firstNonEmpty(values[configKeyOrderCopyTemplate], defaultOrderCopyTemplate),
}, nil
}
@@ -49,11 +46,6 @@ func (r *Repository) UpdateConfig(ctx context.Context, req UpdateConfigRequest)
return err
}
}
if req.GroupWelcomeText != nil {
if err := upsertConfig(tx, configKeyGroupWelcomeText, strings.TrimSpace(*req.GroupWelcomeText), "摸大红订单群欢迎语"); err != nil {
return err
}
}
if req.OrderCopyTemplate != nil {
if err := upsertConfig(tx, configKeyOrderCopyTemplate, strings.TrimSpace(*req.OrderCopyTemplate), "摸大红订单一键复制文案模板"); err != nil {
return err
@@ -100,14 +92,6 @@ func (r *Repository) resolveQrcodeURL(tx *gorm.DB, productQrcode string) string
return ""
}
func (r *Repository) loadWelcomeText(tx *gorm.DB) string {
var cfg model.SystemConfig
if err := tx.Where("`key` = ?", configKeyGroupWelcomeText).First(&cfg).Error; err == nil && strings.TrimSpace(cfg.Value) != "" {
return strings.TrimSpace(cfg.Value)
}
return defaultGroupWelcomeText
}
func (r *Repository) loadCopyTemplate(tx *gorm.DB) string {
var cfg model.SystemConfig
if err := tx.Where("`key` = ?", configKeyOrderCopyTemplate).First(&cfg).Error; err == nil && strings.TrimSpace(cfg.Value) != "" {
backend/internal/modules/mohong/dto.go
-3
View File
@@ -108,7 +108,6 @@ type OrderDTO struct {
ProductUnit string `json:"product_unit"`
QrcodeURLSnapshot string `json:"qrcode_url_snapshot"`
CopyText string `json:"copy_text"`
ConversationID *uint64 `json:"conversation_id"`
BuyerNickname string `json:"buyer_nickname,omitempty"`
BuyerPhone string `json:"buyer_phone,omitempty"`
AdminRemark string `json:"admin_remark,omitempty"`
@@ -138,13 +137,11 @@ type AdminCancelOrderRequest struct {
type ConfigDTO struct {
DefaultQrcodeURL string `json:"default_qrcode_url"`
GroupWelcomeText string `json:"group_welcome_text"`
OrderCopyTemplate string `json:"order_copy_template"`
}
type UpdateConfigRequest struct {
DefaultQrcodeURL *string `json:"default_qrcode_url"`
GroupWelcomeText *string `json:"group_welcome_text"`
OrderCopyTemplate *string `json:"order_copy_template"`
}
backend/internal/modules/mohong/order_repo.go
+6 -98
View File
@@ -10,9 +10,7 @@ import (
"time"
"hfb_sys/backend/internal/model"
"hfb_sys/backend/internal/modules/chat"
"hfb_sys/backend/internal/modules/notification"
"hfb_sys/backend/internal/modules/supportgroup"
"hfb_sys/backend/internal/timeutil"
"hfb_sys/backend/pkg/money"
@@ -21,8 +19,6 @@ import (
"gorm.io/gorm/clause"
)
const ConversationTypeMohongOrder = "mohong_order"
func (r *Repository) CreateOrder(ctx context.Context, userID uint64, req CreateOrderRequest) (*OrderDTO, error) {
if userID == 0 || req.ProductID == 0 || req.Quantity < 1 || req.Quantity > 99 {
return nil, ErrInvalidRequest
@@ -257,7 +253,8 @@ func (r *Repository) AdminCompleteOrder(ctx context.Context, orderID uint64, rem
return r.AdminFindOrder(ctx, orderID)
}
// ConfirmPaidFromChannelTx 支付成功后推进摸大红订单：建群、发固定码、写复制文案。
// ConfirmPaidFromChannelTx 支付成功后推进摸大红订单：固化二维码快照与可复制文案。
// 返回值固定为 0，兼容支付模块会话通知签名（摸大红无订单群）。
func (r *Repository) ConfirmPaidFromChannelTx(tx *gorm.DB, orderID uint64) (uint64, error) {
var order model.MohongOrder
if err := tx.Clauses(clause.Locking{Strength: "UPDATE"}).First(&order, orderID).Error; err != nil {
@@ -265,9 +262,6 @@ func (r *Repository) ConfirmPaidFromChannelTx(tx *gorm.DB, orderID uint64) (uint
}
if order.Status == model.MohongOrderStatusPaid ||
order.Status == model.MohongOrderStatusCompleted {
if order.ConversationID != nil {
return *order.ConversationID, nil
}
return 0, nil
}
if order.Status != model.MohongOrderStatusPendingPayment {
@@ -283,34 +277,10 @@ func (r *Repository) ConfirmPaidFromChannelTx(tx *gorm.DB, orderID uint64) (uint
copyText := buildCopyText(r.loadCopyTemplate(tx), order, snap, user)
now := time.Now()
conv, err := ensureMohongOrderConversation(tx, order, user)
if err != nil {
return 0, err
}
welcome := r.loadWelcomeText(tx)
if err := chat.SendSystemMessageForTx(tx, conv.ID, welcome); err != nil {
return 0, err
}
if qrcodeURL != "" {
if err := chat.SendImageMessageForTx(tx, conv.ID, "👇 请扫码联系客服", qrcodeURL); err != nil {
return 0, err
}
} else {
if err := chat.SendSystemMessageForTx(tx, conv.ID, "固定二维码尚未配置，请将下方订单信息复制后联系客服。"); err != nil {
return 0, err
}
}
if copyText != "" {
if err := chat.SendSystemMessageForTx(tx, conv.ID, copyText+"\n\n（长按/复制后发送给客服）"); err != nil {
return 0, err
}
}
order.Status = model.MohongOrderStatusPaid
order.PaidAt = &now
order.QrcodeURLSnapshot = qrcodeURL
order.CopyText = copyText
order.ConversationID = &conv.ID
if err := tx.Save(&order).Error; err != nil {
return 0, err
}
@@ -320,20 +290,17 @@ func (r *Repository) ConfirmPaidFromChannelTx(tx *gorm.DB, orderID uint64) (uint
UserID: order.UserID,
Type: "order",
Title: "摸大红订单支付成功",
Content: "支付已完成，请在群内查看二维码与订单信息。",
Content: "支付已完成，请在订单详情扫码联系客服，并复制订单信息发送。",
BizType: "mohong_order",
BizID: &orderIDCopy,
}); err != nil {
return 0, err
}
return conv.ID, nil
return 0, nil
}
func (r *Repository) NotifyNewConversation(conversationID uint64) {
if conversationID > 0 && r.chatNotifier != nil {
r.chatNotifier.NotifyNewConversation(conversationID)
}
}
// NotifyNewConversation 兼容支付模块接口；摸大红不创建会话，空实现。
func (r *Repository) NotifyNewConversation(conversationID uint64) {}
func (r *Repository) cancelPendingOrderTx(tx *gorm.DB, order *model.MohongOrder, reason string) error {
// 归还预扣库存
@@ -367,65 +334,6 @@ func (r *Repository) orderDTO(ctx context.Context, row model.MohongOrder, includ
return &dto, nil
}
func ensureMohongOrderConversation(tx *gorm.DB, order model.MohongOrder, user model.User) (*model.ChatConversation, error) {
var existing model.ChatConversation
err := tx.Where("mohong_order_id = ?", order.ID).First(&existing).Error
if err == nil {
return &existing, nil
}
if err != gorm.ErrRecordNotFound {
return nil, err
}
now := time.Now()
title := "摸大红 " + order.OrderNo
if name := strings.TrimSpace(user.Nickname); name != "" {
title = "摸大红-" + name
}
conversation := model.ChatConversation{
MohongOrderID: &order.ID,
Type: ConversationTypeMohongOrder,
Title: title,
Status: "active",
}
if err := tx.Create(&conversation).Error; err != nil {
return nil, err
}
participants := []model.ChatParticipant{
{
ConversationID: conversation.ID,
ParticipantType: "user",
ParticipantID: order.UserID,
Role: "buyer",
JoinedAt: now,
LastReadAt: &now,
},
}
supportID, err := supportgroup.PickSupportAdmin(tx, supportgroup.GroupCodeRenterHandoff)
if err != nil {
return nil, err
}
if supportID <= 0 {
supportID = chat.DefaultSupportAdminID(tx)
}
if supportID > 0 {
participants = append(participants, model.ChatParticipant{
ConversationID: conversation.ID,
ParticipantType: "admin",
ParticipantID: supportID,
Role: "support",
JoinedAt: now,
})
}
for _, p := range participants {
if err := tx.Clauses(clause.OnConflict{DoNothing: true}).Create(&p).Error; err != nil {
return nil, err
}
}
return &conversation, nil
}
func buildCopyText(template string, order model.MohongOrder, snap productSnapshot, user model.User) string {
if strings.TrimSpace(template) == "" {
template = defaultOrderCopyTemplate
backend/internal/modules/mohong/presenter.go
-1
View File
@@ -59,7 +59,6 @@ func toOrderDTO(row model.MohongOrder, snap productSnapshot, buyerNickname, buye
ProductUnit: snap.Unit,
QrcodeURLSnapshot: row.QrcodeURLSnapshot,
CopyText: row.CopyText,
ConversationID: row.ConversationID,
CancelReason: row.CancelReason,
PaidAt: row.PaidAt,
CompletedAt: row.CompletedAt,
backend/internal/modules/mohong/repository.go
+2 -8
View File
@@ -2,18 +2,12 @@ package mohong
import "gorm.io/gorm"
// ChatNotifier 会话创建后的异步通知接口。
type ChatNotifier interface {
NotifyNewConversation(conversationID uint64)
}
// Repository 摸大红数据访问。
type Repository struct {
db *gorm.DB
chatNotifier ChatNotifier
}
// NewRepository 创建仓库。
func NewRepository(db *gorm.DB, chatNotifier ChatNotifier) *Repository {
return &Repository{db: db, chatNotifier: chatNotifier}
func NewRepository(db *gorm.DB) *Repository {
return &Repository{db: db}
}
backend/internal/router/router.go
+1 -1
View File
@@ -259,7 +259,7 @@ func New(cfg config.Config, deps Dependencies, logger *zap.Logger) *gin.Engine {
var mohongService *mohong.Service
var mohongHandler *mohong.Handler
if deps.DB != nil {
mohongRepo = mohong.NewRepository(deps.DB, chatRepo)
mohongRepo = mohong.NewRepository(deps.DB)
mohongService = mohong.NewService(mohongRepo)
mohongHandler = mohong.NewHandler(mohongService)
}
backend/migrations/000028_mohong.sql
+1 -13
View File
@@ -21,7 +21,7 @@ CREATE TABLE IF NOT EXISTS mohong_products (
KEY idx_mohong_products_status_sort (status, sort_order, id)
) ENGINE=InnoDB DEFAULT CHARSET=utf8mb4 COLLATE=utf8mb4_unicode_ci COMMENT='摸大红商品';
-- 摸大红订单表
-- 摸大红订单表（支付后展示固定二维码 + 可复制文案，不建群）
CREATE TABLE IF NOT EXISTS mohong_orders (
id BIGINT UNSIGNED PRIMARY KEY AUTO_INCREMENT,
order_no VARCHAR(64) NOT NULL COMMENT '订单号',
@@ -34,7 +34,6 @@ CREATE TABLE IF NOT EXISTS mohong_orders (
product_snapshot JSON NULL COMMENT '商品快照',
qrcode_url_snapshot VARCHAR(512) NOT NULL DEFAULT '' COMMENT '支付时解析的二维码快照',
copy_text TEXT NOT NULL COMMENT '可复制订单文案',
conversation_id BIGINT UNSIGNED NULL COMMENT '订单群会话ID',
paid_at DATETIME NULL COMMENT '支付时间',
completed_at DATETIME NULL COMMENT '完成时间',
cancelled_at DATETIME NULL COMMENT '取消时间',
@@ -48,15 +47,9 @@ CREATE TABLE IF NOT EXISTS mohong_orders (
KEY idx_mohong_orders_status_created (status, created_at)
) ENGINE=InnoDB DEFAULT CHARSET=utf8mb4 COLLATE=utf8mb4_unicode_ci COMMENT='摸大红订单';
-- 会话表增加摸大红订单关联
ALTER TABLE chat_conversations
ADD COLUMN mohong_order_id BIGINT UNSIGNED NULL COMMENT '摸大红订单ID' AFTER listing_id,
ADD UNIQUE KEY uk_chat_conversations_mohong_order_id (mohong_order_id);
-- 业务配置
INSERT INTO system_configs (`key`, `value`, description) VALUES
('mohong.default_qrcode_url', '', '摸大红全局默认固定二维码图片URL'),
('mohong.group_welcome_text', '订单已支付，请扫码联系客服，并将下方订单信息复制发送给客服。', '摸大红订单群欢迎语'),
('mohong.order_copy_template', '【摸大红订单】\n订单号：{{order_no}}\n下单时间：{{created_at}}\n商品：{{product_title}}\n数量：{{quantity}}\n金额：{{amount}}\n下单人：{{buyer_name}}（{{buyer_phone}}）', '摸大红订单一键复制文案模板')
ON DUPLICATE KEY UPDATE description = VALUES(description);
@@ -111,14 +104,9 @@ DELETE FROM permissions WHERE code IN (
DELETE FROM system_configs WHERE `key` IN (
'mohong.default_qrcode_url',
'mohong.group_welcome_text',
'mohong.order_copy_template'
);
ALTER TABLE chat_conversations
DROP INDEX uk_chat_conversations_mohong_order_id,
DROP COLUMN mohong_order_id;
DROP TABLE IF EXISTS mohong_orders;
DROP TABLE IF EXISTS mohong_products;
backend/migrations/000029_mohong_categories_and_seed.sql
-2
View File
@@ -2399,12 +2399,10 @@ WHERE p.title = '1亿哈弗币';
-- +goose StatementEnd
-- +goose Down
-- +goose StatementBegin
-- 种子数据不回滚；仅移除关联表与权限（category_id 列保留）
DROP TABLE IF EXISTS mohong_product_categories;
DELETE rp FROM role_permissions rp
JOIN permissions p ON p.id = rp.permission_id
WHERE p.code = 'mohong:category';
DELETE FROM permissions WHERE code = 'mohong:category';
-- +goose StatementEnd
frontend/src/features/admin/views/AdminMohongConfigView.vue
+1 -6
View File
@@ -14,7 +14,6 @@ const loading = ref(false)
const saving = ref(false)
const form = reactive<MohongConfig>({
default_qrcode_url: '',
group_welcome_text: '',
order_copy_template: '',
})
@@ -37,7 +36,6 @@ async function handleSave() {
try {
const config = await updateAdminMohongConfig({
default_qrcode_url: form.default_qrcode_url,
group_welcome_text: form.group_welcome_text,
order_copy_template: form.order_copy_template,
})
Object.assign(form, config)
@@ -66,7 +64,7 @@ async function uploadQrcode(file: File) {
<div class="page-head">
<div>
<h2>摸大红配置</h2>
<p>全局默认固定二维码、群欢迎语、订单复制模板。商品可覆盖默认二维码。</p>
<p>全局默认固定二维码与订单复制模板。商品可覆盖默认二维码；支付后用户在订单详情扫码并复制信息联系客服。</p>
</div>
<el-button type="primary" :loading="saving" @click="handleSave">保存配置</el-button>
</div>
@@ -88,9 +86,6 @@ async function uploadQrcode(file: File) {
</div>
</div>
</el-form-item>
<el-form-item label="群欢迎语">
<el-input v-model="form.group_welcome_text" type="textarea" :rows="3" />
</el-form-item>
<el-form-item label="复制文案模板">
<el-input v-model="form.order_copy_template" type="textarea" :rows="8" />
<div class="hint">
frontend/src/features/admin/views/AdminMohongOrdersView.vue
-3
View File
@@ -174,9 +174,6 @@ async function copyText(text: string) {
<el-descriptions-item label="买家">
{{ detail.buyer_nickname }} {{ detail.buyer_phone }}
</el-descriptions-item>
<el-descriptions-item label="会话ID">
{{ detail.conversation_id || '-' }}
</el-descriptions-item>
</el-descriptions>
<div v-if="detail.copy_text" class="copy-box">
<div class="copy-head">
frontend/src/features/mohong/api/mohong.ts
-2
View File
@@ -50,7 +50,6 @@ export interface MohongOrder {
product_unit: string
qrcode_url_snapshot: string
copy_text: string
conversation_id?: number | null
buyer_nickname?: string
buyer_phone?: string
admin_remark?: string
@@ -64,7 +63,6 @@ export interface MohongOrder {
export interface MohongConfig {
default_qrcode_url: string
group_welcome_text: string
order_copy_template: string
}
frontend/src/features/mohong/views/MobileMohongOrderDetailView.vue
-17
View File
@@ -102,13 +102,6 @@ async function copyText() {
}
}
function openChat() {
if (!order.value?.conversation_id) {
showToast({ message: '群聊尚未创建', icon: 'warning-o' })
return
}
router.push(`/chats/${order.value.conversation_id}`)
}
</script>
<template>
@@ -177,16 +170,6 @@ function openChat() {
>
取消订单
</van-button>
<van-button
v-if="order.conversation_id"
type="primary"
color="#ff6a00"
block
round
@click="openChat"
>
进入订单群
</van-button>
<van-button v-if="order.copy_text" plain block round @click="copyText">
复制订单信息
</van-button>
frontend/src/features/mohong/views/MohongDetailView.vue
+2 -2
View File
@@ -223,8 +223,8 @@ async function handleBuy() {
<p>购买须知</p>
<ul>
<li>下单需登录并完成实名认证</li>
<li>支付成功后自动创建订单群，发送固定客服二维码</li>
<li>群内与订单详情可一键复制订单信息发给客服</li>
<li>支付成功后可在订单详情扫码联系客服</li>
<li>订单详情支持一键复制订单信息发给客服</li>
</ul>
</div>
</div>
frontend/src/features/mohong/views/MohongListView.vue
+1 -1
View File
@@ -155,7 +155,7 @@ const activeCategoryName = () => {
<div class="title-block">
<h1>摸大红</h1>
<span class="count">{{ total }} 件</span>
<span class="tip">{{ activeCategoryName() }} · 支付后自动进群</span>
<span class="tip">{{ activeCategoryName() }} · 支付后扫码联系客服</span>
</div>
<div class="actions">
<div class="search-box">
frontend/src/features/mohong/views/MohongOrderDetailView.vue
-15
View File
@@ -123,13 +123,6 @@ async function copyText() {
}
}
function openChat() {
if (!order.value?.conversation_id) {
ElMessage.warning('群聊尚未创建')
return
}
router.push(`/messages/${order.value.conversation_id}`)
}
</script>
<template>
@@ -197,14 +190,6 @@ function openChat() {
>
取消订单
</button>
<button
v-if="order.conversation_id"
type="button"
class="btn outline"
@click="openChat"
>
进入订单群
</button>
<button v-if="order.copy_text" type="button" class="btn outline" @click="copyText">
复制订单信息
</button>