22

huimv-employment/app/common/config.js

@@ -28,7 +28,8 @@ export const PUBLIC_BASE_API = (() => {
 
 /**
  * 将后端返回的相对资源路径（如登记二维码）拼成可访问 URL。
- * 与接口同主机：BASE_API=http://host:port/api/v1/mp → 资源 /api/v1/public/... → http://host:port/api/v1/public/...
+ * BASE_API=https://host/deploymentApi/api/v1/mp
+ * → 相对路径 /api/v1/public/... 拼成 https://host/deploymentApi/api/v1/public/...
  */
 export function resolveApiAssetUrl(path) {
 	if (!path) return ''
@@ -38,12 +39,22 @@ export function resolveApiAssetUrl(path) {
 
 	const normalized = raw.startsWith('/') ? raw : `/${raw}`
 	const base = (BASE_API || '').replace(/\/$/, '')
-	const originMatch = base.match(/^(https?:\/\/[^/]+)/i)
-	if (originMatch) {
-		return `${originMatch[1]}${normalized}`
+	const originMatch = base.match(/^(https?:\/\/[^/]+)(\/.*)?$/i)
+	if (!originMatch) {
+		// H5 代理模式：BASE_API 为 /api/v1/mp，同源相对路径直接可用
+		return normalized
 	}
-	// H5 代理模式：BASE_API 为 /api/v1/mp，同源相对路径直接可用
-	return normalized
+
+	const origin = originMatch[1]
+	// 保留 /api 前的网关前缀（如 /deploymentApi）
+	const pathPart = originMatch[2] || ''
+	const apiIdx = pathPart.toLowerCase().indexOf('/api/')
+	const gatewayPrefix = apiIdx >= 0 ? pathPart.slice(0, apiIdx) : ''
+
+	if (gatewayPrefix && normalized.toLowerCase().indexOf(gatewayPrefix.toLowerCase()) === 0) {
+		return `${origin}${normalized}`
+	}
+	return `${origin}${gatewayPrefix}${normalized}`
 }
 
 /** 本地存储 Token 键名 */

huimv-employment/app/common/fe.scss

@@ -330,12 +330,38 @@ page {
 
 .fe-biz-card--draft {
 	border-left: 6rpx solid $fe-warning;
+	position: relative;
+	overflow: hidden;
 }
 
 .fe-biz-card--draft-confirmed {
 	border-left-color: $fe-success;
 }
 
+.fe-biz-card--draft-voided {
+	opacity: 0.62;
+	filter: grayscale(0.35);
+	border-left-color: #94A3B8;
+}
+
+.fe-draft-void-stamp {
+	position: absolute;
+	right: 20rpx;
+	bottom: 28rpx;
+	z-index: 2;
+	padding: 8rpx 18rpx;
+	border: 4rpx solid rgba(239, 68, 68, 0.85);
+	border-radius: 8rpx;
+	color: rgba(239, 68, 68, 0.9);
+	font-size: 28rpx;
+	font-weight: 700;
+	letter-spacing: 4rpx;
+	line-height: 1.2;
+	transform: rotate(-28deg);
+	background: rgba(255, 255, 255, 0.72);
+	pointer-events: none;
+}
+
 .fe-biz-card__header {
 	display: flex;
 	align-items: center;

huimv-employment/app/packageA/components/home/EnterpriseHome.vue

@@ -116,13 +116,14 @@
 					<view v-else-if="msg.type === 'draft'" class="fe-chat-msg fe-chat-msg--ai" :id="'msg-' + idx">
 						<view class="fe-chat-avatar fe-chat-avatar--ai">AI</view>
 						<view class="fe-chat-bubble">
-							<view class="fe-biz-card fe-biz-card--draft" :class="{ 'fe-biz-card--draft-confirmed': isDraftConfirmedByIndex(idx) }" @tap="openDraftByIndex(idx)">
+							<view
+								class="fe-biz-card fe-biz-card--draft"
+								:class="msg.draftRootClass"
+								@tap="openDraftByIndex(idx)"
+							>
 								<view class="fe-biz-card__header">
 									<text class="fe-biz-card__header-title">📄 {{ (msg.draft && msg.draft.title) || '用工草稿' }}</text>
-									<text
-										class="fe-draft-card-status"
-										:class="isDraftConfirmedByIndex(idx) ? 'fe-draft-card-status--confirmed' : 'fe-draft-card-status--pending'"
-									>{{ draftCardStatusLabelByIndex(idx) }}</text>
+									<text class="fe-draft-card-status" :class="msg.draftStatusClass">{{ msg.draftStatusLabel }}</text>
 								</view>
 								<view class="fe-biz-card__row">
 									<text>岗位类型</text>
@@ -144,6 +145,7 @@
 									<view class="fe-biz-btn fe-biz-btn--primary" @tap.stop="openDraftByIndex(idx)">查看详情</view>
 									<text class="fe-biz-card__hint">如需修改草稿，请直接在对话中说明</text>
 								</view>
+								<view v-if="msg.voided" class="fe-draft-void-stamp">已作废</view>
 							</view>
 						</view>
 					</view>
@@ -419,6 +421,7 @@ import {
 	isDraftCardContentType,
 	buildDraftCardMessage,
 	mapDraftDetailToCard,
+	syncDraftCardViewMeta,
 	getDraftStatus,
 	pickDraftQrCodeUrl,
 	pickDraftQrToken,
@@ -484,6 +487,8 @@ export default {
 			modal: '',
 			confirmInfo: null,
 			qrBatch: { ...BATCH_QR },
+			/** 已处理过「方案已确认 + 二维码」的草稿 id，同会话内只执行一次 */
+			orderConfirmHandledIds: {},
 			inbox: MESSAGES,
 			reportCardVisible: true,
 			reportObserver: null,
@@ -618,8 +623,10 @@ export default {
 			this.currentConversationId = session ? session.id : null
 			this.resetMessagePagination()
 			this.messages = []
+			this.orderConfirmHandledIds = {}
 			this.reportCardVisible = true
 			await this.fetchLatestMessages({ scrollBottom: true })
+			this.markOrderConfirmHandledFromMessages()
 			this.$nextTick(() => {
 				this.setupReportObserver()
 				setTimeout(() => this.checkReportVisibility(), 120)
@@ -951,11 +958,11 @@ export default {
 					} else if (!this.messages[aiIdx].content) {
 						this.$set(this.messages[aiIdx], 'content', '暂无回复，请稍后重试')
 					}
-					// 仅当本轮 SSE 明确提到某草稿 id（card_draft / card_order）时，才将该草稿卡沉底
+					// 本轮 SSE 带草稿卡：card_draft 作废旧卡并末尾新卡；card_order 仅首次补卡
 					if (shouldFetchDraftCard(cardMeta)) {
-						await this.appendDraftCardById(cardMeta.relatedDraftId, { sinkToBottom: true })
+						await this.handleDraftCardFromChat(cardMeta)
 					}
-					// next_action=show_order_qrcode → 弹出「方案已确认」
+					// next_action=show_order_qrcode：同草稿只生成一次确认文案 + 二维码
 					if (shouldShowOrderQrcode(cardMeta)) {
 						await this.showOrderConfirmFromChat(cardMeta)
 					}
@@ -986,16 +993,32 @@ export default {
 			this.canSend = true
 			this.sendMsg()
 		},
+		isDraftVoidedByIndex(idx) {
+			const msg = this.messages[idx]
+			return !!(msg && msg.type === 'draft' && msg.voided)
+		},
 		isDraftConfirmedByIndex(idx) {
 			const msg = this.messages[idx]
-			return !!(msg && msg.draft && getDraftStatus(msg.draft) === 'confirmed')
+			if (!msg || msg.voided) return false
+			return !!(msg.draft && getDraftStatus(msg.draft) === 'confirmed')
 		},
 		draftCardStatusLabelByIndex(idx) {
+			if (this.isDraftVoidedByIndex(idx)) return '已作废'
 			return this.isDraftConfirmedByIndex(idx) ? '已确认' : '未确认'
 		},
+		draftCardStatusClassByIndex(idx) {
+			if (this.isDraftVoidedByIndex(idx)) return 'fe-draft-card-status--cancelled'
+			return this.isDraftConfirmedByIndex(idx)
+				? 'fe-draft-card-status--confirmed'
+				: 'fe-draft-card-status--pending'
+		},
 		async openDraftByIndex(idx) {
 			const msg = this.messages[idx]
 			if (!msg || msg.type !== 'draft' || !msg.draft) return
+			if (msg.voided) {
+				this.toast('该草稿已作废')
+				return
+			}
 			let draft = msg.draft
 			this.closeAll()
 			this.activeDraft = draft
@@ -1033,42 +1056,84 @@ export default {
 			if (draftId == null) return
 			const id = Number(draftId)
 			if (Number.isNaN(id)) return
+			const key = String(id)
 			for (let i = this.messages.length - 1; i >= 0; i--) {
 				const msg = this.messages[i]
-				if (msg && msg.type === 'draft' && msg.draftId === id) {
+				if (msg && msg.type === 'draft' && String(msg.draftId) === key) {
 					this.messages.splice(i, 1)
 				}
 			}
 		},
 		/**
-		 * 更新草稿卡片
+		 * 更新草稿卡片（默认原地更新，不沉底）
 		 * @param {object} draftCard
-		 * @param {{ sinkToBottom?: boolean }} [options] sinkToBottom 默认 true：同 id 旧卡移除后沉底
+		 * @param {{ sinkToBottom?: boolean }} [options] 仅显式传 true 时才沉底
 		 */
 		onDraftUpdated(draftCard, options = {}) {
 			if (!draftCard || draftCard.draftId == null) return
 			this.activeDraft = draftCard
-			const sinkToBottom = options.sinkToBottom !== false
+			const sinkToBottom = options.sinkToBottom === true
+			const draftKey = String(draftCard.draftId)
 			if (!sinkToBottom) {
-				for (let i = 0; i < this.messages.length; i++) {
+				for (let i = this.messages.length - 1; i >= 0; i--) {
 					const msg = this.messages[i]
-					if (msg.type === 'draft' && msg.draftId === draftCard.draftId) {
+					if (
+						msg.type === 'draft'
+						&& String(msg.draftId) === draftKey
+						&& !msg.voided
+					) {
 						this.$set(this.messages[i], 'draft', draftCard)
-						break
+						syncDraftCardViewMeta(this.messages[i])
+						return
 					}
 				}
+				// 仅有已作废同草稿卡时不「复活」新卡（避免普通对话末尾再插一张）
+				const hasSameDraft = this.messages.some(
+					(m) => m && m.type === 'draft' && String(m.draftId) === draftKey
+				)
+				if (hasSameDraft) return
+
+				// 会话中尚无该草稿卡时追加一次
+				this.messages.push(syncDraftCardViewMeta({
+					type: 'draft',
+					role: 'ai',
+					msgKey: this.nextLocalMsgKey(),
+					draftId: draftCard.draftId,
+					voided: false,
+					draft: draftCard
+				}))
 				return
 			}
 			this.removeDraftCardById(draftCard.draftId)
-			this.messages.push({
+			this.messages.push(syncDraftCardViewMeta({
 				type: 'draft',
 				role: 'ai',
 				msgKey: this.nextLocalMsgKey(),
 				draftId: draftCard.draftId,
+				voided: false,
 				draft: draftCard
-			})
+			}))
 			this.ensureChatBottom()
 		},
+		/**
+		 * SSE 草稿卡：
+		 * - card_draft：作废旧卡并在末尾生成新卡（对话改草稿）
+		 * - card_order：后端在「已有确认订单+二维码」时每轮都会注入，已有有效卡则跳过，避免普通问答反复插卡
+		 */
+		async handleDraftCardFromChat(cardMeta) {
+			if (!shouldFetchDraftCard(cardMeta)) return null
+			const draftId = cardMeta.relatedDraftId
+			if (cardMeta.contentType === 'card_order') {
+				const exists = this.messages.some(
+					(m) => m
+						&& m.type === 'draft'
+						&& !m.voided
+						&& String(m.draftId) === String(draftId)
+				)
+				if (exists) return null
+			}
+			return this.appendDraftCardFromChat(draftId)
+		},
 		/**
 		 * 历史消息：每个 related_draft_id 对应一张草稿卡，插到「提到该 id」的文本之后；其它草稿互不影响
 		 * @param {Array} [sourceMessages]
@@ -1092,29 +1157,97 @@ export default {
 			}
 		},
 		/**
-		 * 查询草稿详情并插入聊天气泡卡片
-		 * @param {number} draftId
-		 * @param {{ afterRelatedText?: boolean, sinkToBottom?: boolean }} [options]
-		 *   afterRelatedText：插到提到该草稿 id 的文本后（历史还原）
-		 *   sinkToBottom：本轮对话提到该 id 时，移除同 id 旧卡并沉底（其它草稿卡不动）
+		 * 根据当前消息中已有的二维码卡 / 已确认草稿，标记对应草稿已处理过确认流程
 		 */
-		async appendDraftCardById(draftId, options = {}) {
+		markOrderConfirmHandledFromMessages() {
+			const map = Object.assign({}, this.orderConfirmHandledIds)
+			for (let i = 0; i < this.messages.length; i++) {
+				const msg = this.messages[i]
+				if (!msg) continue
+				if (msg.type === 'qr' && msg.draftId != null) {
+					map[String(msg.draftId)] = true
+				}
+				if (
+					msg.type === 'draft'
+					&& !msg.voided
+					&& msg.draftId != null
+					&& msg.draft
+					&& getDraftStatus(msg.draft) === 'confirmed'
+				) {
+					map[String(msg.draftId)] = true
+				}
+			}
+			this.orderConfirmHandledIds = map
+		},
+		isOrderConfirmHandled(draftId) {
+			if (draftId == null) return false
+			return !!this.orderConfirmHandledIds[String(draftId)]
+		},
+		markOrderConfirmHandled(draftId) {
+			if (draftId == null) return
+			this.$set(this.orderConfirmHandledIds, String(draftId), true)
+		},
+		/**
+		 * 将会话中同草稿 / 同订单的有效草稿卡标记为已作废
+		 */
+		voidRelatedDraftCards(options = {}) {
+			const draftId = options.draftId
+			const orderId = options.orderId
+			const draftKey = draftId != null ? String(draftId) : ''
+			const orderKey = orderId != null && orderId !== '' ? String(orderId) : ''
+			if (!draftKey && !orderKey) return
+
+			for (let i = 0; i < this.messages.length; i++) {
+				const msg = this.messages[i]
+				if (!msg || msg.type !== 'draft' || msg.voided) continue
+				const sameDraft = draftKey && String(msg.draftId) === draftKey
+				const msgOrderId = msg.draft && (msg.draft.orderId || msg.draft.order_id)
+				const sameOrder = orderKey && msgOrderId != null && String(msgOrderId) === orderKey
+				if (sameDraft || sameOrder) {
+					this.$set(this.messages[i], 'voided', true)
+					syncDraftCardViewMeta(this.messages[i])
+				}
+			}
+		},
+		/**
+		 * SSE 返回草稿卡：作废上方同订单/同草稿旧卡，并在会话末尾生成新卡
+		 */
+		async appendDraftCardFromChat(draftId) {
 			if (draftId == null) return null
 			const id = Number(draftId)
 			if (Number.isNaN(id)) return null
-			const exists = this.messages.some((m) => m.type === 'draft' && m.draftId === id)
-			if (exists && options.sinkToBottom) {
-				this.removeDraftCardById(id)
-			} else if (exists && options.afterRelatedText) {
-				return null
-			} else if (exists) {
+
+			try {
+				const detail = await getDraftDetail(id, { showError: false })
+				if (!detail || detail.id == null) return null
+				const orderId = detail.orderId || detail.order_id || ''
+				this.voidRelatedDraftCards({ draftId: id, orderId })
+				const cardMsg = buildDraftCardMessage(detail, this.nextLocalMsgKey())
+				cardMsg.voided = false
+				this.messages.push(cardMsg)
+				this.ensureChatBottom()
+				return cardMsg
+			} catch (e) {
 				return null
 			}
+		},
+		/**
+		 * 历史消息还原：插到提到该草稿 id 的文本后（不作废链路）
+		 * @param {number} draftId
+		 * @param {{ afterRelatedText?: boolean }} [options]
+		 */
+		async appendDraftCardById(draftId, options = {}) {
+			if (draftId == null) return null
+			const id = Number(draftId)
+			if (Number.isNaN(id)) return null
+			const exists = this.messages.some((m) => m.type === 'draft' && m.draftId === id && !m.voided)
+			if (exists) return null
 
 			try {
 				const detail = await getDraftDetail(id, { showError: false })
 				if (!detail || detail.id == null) return null
 				const cardMsg = buildDraftCardMessage(detail, this.nextLocalMsgKey())
+				cardMsg.voided = false
 
 				if (options.afterRelatedText) {
 					let insertAt = -1
@@ -1138,7 +1271,6 @@ export default {
 							}
 						}
 					}
-					// 只插到「提到该草稿 id」的消息后面，找不到则不误沉底
 					if (insertAt < 0) return null
 					this.messages.splice(insertAt, 0, cardMsg)
 				} else {
@@ -1267,18 +1399,14 @@ export default {
 			}
 		},
 		/**
-		 * 确认方案后在对话框追加二维码卡片（同 draft 只保留一张）
+		 * 确认方案后在对话框追加二维码卡片（同 draft 已有则不再追加）
 		 */
 		appendQrCardMessage(batch) {
 			if (!batch) return
 			const draftId = batch.draftId
 			if (draftId != null) {
-				for (let i = this.messages.length - 1; i >= 0; i--) {
-					const m = this.messages[i]
-					if (m && m.type === 'qr' && m.draftId === draftId) {
-						this.messages.splice(i, 1)
-					}
-				}
+				const exists = this.messages.some((m) => m && m.type === 'qr' && m.draftId === draftId)
+				if (exists) return
 			}
 			this.messages.push({
 				type: 'qr',
@@ -1331,13 +1459,16 @@ export default {
 			this.openProgressDetail(draftId)
 		},
 		/**
-		 * AI 对话 next_action=show_order_qrcode：弹出方案已确认弹框（并可查看二维码）
+		 * AI 对话 next_action=show_order_qrcode：
+		 * 同草稿只执行一次：写确认文案 + 二维码卡，草稿卡原地标已确认（不沉底）
 		 */
 		async showOrderConfirmFromChat(cardMeta) {
 			const payload = parseChatCardPayload(cardMeta && cardMeta.cardPayload)
 			const draftId = (cardMeta && cardMeta.relatedDraftId != null)
 				? cardMeta.relatedDraftId
 				: (payload && (payload.draft_id != null ? payload.draft_id : payload.draftId))
+			if (this.isOrderConfirmHandled(draftId)) return
+
 			let draft = null
 			if (this.activeDraft && String(this.activeDraft.draftId) === String(draftId)) {
 				draft = this.activeDraft
@@ -1372,30 +1503,6 @@ export default {
 			let qrToken = (payload && (payload.qr_token || payload.qrToken))
 				|| pickDraftQrToken(draft)
 				|| ''
-			const totalOutflow = payload && (payload.total_outflow != null ? payload.total_outflow : payload.totalOutflow)
-			const totalText = totalOutflow != null && totalOutflow !== ''
-				? formatDraftMoney(totalOutflow)
-				: ((draft && draft.estimatedTotalText) || '')
-			const workerCount = (payload && (payload.worker_count != null ? payload.worker_count : payload.workerCount))
-				|| (draft && draft.workerCount)
-			let avgCost = ''
-			if (totalOutflow != null && workerCount > 0) {
-				avgCost = `${formatDraftMoney(Number(totalOutflow) / Number(workerCount))}/人`
-			} else if (draft && draft.confirmedPlan && draft.confirmedPlan.avgCost) {
-				avgCost = draft.confirmedPlan.avgCost
-			}
-
-			this.confirmInfo = {
-				title: title || '方案已确认',
-				code: (draft && draft.selectedSchemeCode) || '',
-				total: totalText,
-				avgCost,
-				tagsText: '',
-				orderId,
-				qrToken,
-				qrCodeUrl,
-				draftId
-			}
 
 			const scene = qrToken || orderId || ''
 			this.qrBatch = this.buildQrBatch(draft, {
@@ -1413,16 +1520,16 @@ export default {
 				if (fromDetail && fromDetail.qrCodeUrl) {
 					qrCodeUrl = fromDetail.qrCodeUrl
 					this.$set(this.qrBatch, 'qrCodeUrl', fromDetail.qrCodeUrl)
-					this.$set(this.confirmInfo, 'qrCodeUrl', fromDetail.qrCodeUrl)
 				}
 				if (fromDetail && fromDetail.qrToken) {
 					qrToken = fromDetail.qrToken
 					this.$set(this.qrBatch, 'qrToken', fromDetail.qrToken)
 					this.$set(this.qrBatch, 'scene', fromDetail.qrToken)
-					this.$set(this.confirmInfo, 'qrToken', fromDetail.qrToken)
 				}
 			}
 
+			this.markOrderConfirmHandled(draftId)
+
 			if (draft && draftId != null) {
 				this.onDraftUpdated(Object.assign({}, draft, {
 					status: 'confirmed',
@@ -1430,12 +1537,18 @@ export default {
 					qrToken,
 					qrCodeUrl,
 					scene: qrToken || orderId || ''
-				}), { sinkToBottom: true })
+				}), { sinkToBottom: false })
 			}
 
-			this.appendQrCardMessage(this.qrBatch)
 			this.closeAll()
-			setTimeout(() => { this.modal = 'confirm' }, 300)
+			this.messages.push({
+				type: 'text',
+				role: 'ai',
+				msgKey: this.nextLocalMsgKey(),
+				content: '方案已确认。请将下方二维码分享给工人扫码登记。'
+			})
+			this.appendQrCardMessage(this.qrBatch)
+			this.ensureChatBottom()
 		},
 		async confirmPlan(payload) {
 			const scheme = (payload && payload.scheme) || null
@@ -1510,6 +1623,7 @@ export default {
 				msgKey: this.nextLocalMsgKey(),
 				content: '方案已确认。请将下方二维码分享给工人扫码登记。'
 			})
+			this.markOrderConfirmHandled(draftId)
 			this.appendQrCardMessage(this.qrBatch)
 			setTimeout(() => { this.modal = 'confirm' }, 400)
 		},

huimv-employment/app/utils/draft.js

@@ -15,7 +15,7 @@ export const NEXT_ACTION_SHOW_ORDER_QRCODE = 'show_order_qrcode'
 /**
  * 从 SSE 事件 JSON 提取卡片元数据（camelCase / snake_case 兼容）
  * - content_type=card_draft|card_order|card_cost
- * - 或 next_action=show_order_qrcode（方案已确认弹框）
+ * - 或 next_action=show_order_qrcode（对话写入确认文案 + 二维码卡）
  */
 export function extractChatCardMeta(data) {
 	if (!data || typeof data !== 'object') return null
@@ -77,7 +77,7 @@ export function shouldFetchDraftCard(meta) {
 }
 
 /**
- * AI 对话：下一步为展示订单二维码（方案已确认弹框）
+ * AI 对话：下一步为展示订单二维码（对话内确认文案 + 二维码卡）
  */
 export function shouldShowOrderQrcode(meta) {
 	if (!meta) return false
@@ -314,6 +314,7 @@ export function mapDraftDetailToCard(detail = {}) {
 			|| detail.selected_scheme_code
 			|| null,
 		status: detail.status,
+		orderId: detail.orderId || detail.order_id || '',
 		missingFields: detail.missingFields || [],
 		qrCodeUrl: pickDraftQrCodeUrl(detail),
 		qrToken: pickDraftQrToken(detail),
@@ -325,11 +326,30 @@ export function mapDraftDetailToCard(detail = {}) {
  * 构造聊天气泡：用工草稿卡片
  */
 export function buildDraftCardMessage(detail, msgKey) {
-	return {
+	const msg = {
 		type: 'draft',
 		role: 'ai',
 		msgKey,
 		draftId: detail.id,
+		voided: false,
 		draft: mapDraftDetailToCard(detail)
 	}
+	return syncDraftCardViewMeta(msg)
+}
+
+/**
+ * 同步草稿卡展示字段（供小程序模板直接绑定，避免 :class 调方法）
+ */
+export function syncDraftCardViewMeta(msg) {
+	if (!msg || msg.type !== 'draft') return msg
+	const voided = !!msg.voided
+	const confirmed = !voided && !!msg.draft && getDraftStatus(msg.draft) === 'confirmed'
+	msg.draftRootClass = voided
+		? 'fe-biz-card--draft-voided'
+		: (confirmed ? 'fe-biz-card--draft-confirmed' : '')
+	msg.draftStatusClass = voided
+		? 'fe-draft-card-status--cancelled'
+		: (confirmed ? 'fe-draft-card-status--confirmed' : 'fe-draft-card-status--pending')
+	msg.draftStatusLabel = voided ? '已作废' : (confirmed ? '已确认' : '未确认')
+	return msg
 }