From 685a8b32f4d65eff4d78dc33959fe0e8bc7da22d Mon Sep 17 00:00:00 2001
From: “wangming” <“wangming@antissoft.com”>
Date: Thu, 5 Feb 2026 17:11:22 +0800
Subject: [PATCH] feat: enhance customer detail and form with lunar birthday support

---
 antis-ncc-admin/src/views/lqKhxx/Form.vue                                                         | 231 +++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++--------------
 antis-ncc-admin/src/views/lqKhxx/detail-dialog.vue                                                |  46 +++++++++++++++++++++++++++++++++++++++-------
 netcore/ExportFiles/合作成本表 (202601).xlsx                                                 | Bin 0 -> 11409 bytes
 netcore/src/Modularity/Extend/NCC.Extend.Entitys/Dto/LqKhxx/LqKhxxBirthdayOutput.cs               |   7 ++++++-
 netcore/src/Modularity/Extend/NCC.Extend.Entitys/Dto/LqKhxx/LqKhxxCrInput.cs                      |  10 +++++++---
 netcore/src/Modularity/Extend/NCC.Extend.Entitys/Dto/LqKhxx/LqKhxxInfoOutput.cs                   |   9 +++++++--
 netcore/src/Modularity/Extend/NCC.Extend.Entitys/Dto/LqKhxx/LqKhxxListOutput.cs                   |   9 +++++++--
 netcore/src/Modularity/Extend/NCC.Extend.Entitys/Dto/LqXhHyhk/LqXhHyhkNoFeedbackListQueryInput.cs |  30 ++++++++++++++++++++++++++++++
 netcore/src/Modularity/Extend/NCC.Extend.Entitys/Entity/lq_khxx/LqKhxxEntity.cs                   |  12 +++++++++---
 netcore/src/Modularity/Extend/NCC.Extend.Entitys/Enum/BirthdayTypeEnum.cs                         |  22 ++++++++++++++++++++++
 netcore/src/Modularity/Extend/NCC.Extend/LqCooperationCostService.cs                              |   6 +++---
 netcore/src/Modularity/Extend/NCC.Extend/LqKhxxService.cs                                         | 242 ++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++--------------------------------------
 netcore/src/Modularity/Extend/NCC.Extend/LqTestService.cs                                         | 131 +++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++
 netcore/src/Modularity/Extend/NCC.Extend/LqXhHyhkService.cs                                       | 215 +++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++
 sql/添加会员生日类型字段.sql                                                            |   7 +++++++
 15 files changed, 904 insertions(+), 73 deletions(-)
 create mode 100644 netcore/ExportFiles/合作成本表 (202601).xlsx
 create mode 100644 netcore/src/Modularity/Extend/NCC.Extend.Entitys/Dto/LqXhHyhk/LqXhHyhkNoFeedbackListQueryInput.cs
 create mode 100644 netcore/src/Modularity/Extend/NCC.Extend.Entitys/Enum/BirthdayTypeEnum.cs
 create mode 100644 netcore/src/Modularity/Extend/NCC.Extend/LqTestService.cs
 create mode 100644 sql/添加会员生日类型字段.sql

diff --git a/antis-ncc-admin/src/views/lqKhxx/Form.vue b/antis-ncc-admin/src/views/lqKhxx/Form.vue
index 91d078b..9f36d09 100644
--- a/antis-ncc-admin/src/views/lqKhxx/Form.vue
+++ b/antis-ncc-admin/src/views/lqKhxx/Form.vue
@@ -1,9 +1,12 @@
-<template>
+<template>
 	<el-dialog :title="!dataForm.id ? '新建客户信息' : isDetail ? '客户信息详情' : '编辑客户信息'" :close-on-click-modal="false"
-		:visible.sync="visible" class="NCC-dialog NCC-dialog_center" lock-scroll width="1200px">
+		:visible.sync="visible" class="NCC-dialog NCC-dialog_center customer-form-dialog" lock-scroll width="1200px">
 		<el-row :gutter="20" class="compact-form">
 			<el-form ref="elForm" :model="dataForm" size="mini" label-width="100px" label-position="right"
 				:disabled="!!isDetail" :rules="rules">
+				<el-col :span="24">
+					<div class="form-section-title">基本信息</div>
+				</el-col>
 				<el-col :span="6">
 					<el-form-item label="客户名称" prop="khmc" required>
 						<el-input v-model="dataForm.khmc" placeholder="请输入客户姓名" clearable :style='{ "width": "100%" }'>
@@ -30,13 +33,43 @@
 						</el-select>
 					</el-form-item>
 				</el-col>
-				<el-col :span="6">
-					<el-form-item label="出生日期" prop="yanglsr">
-						<el-date-picker v-model="dataForm.yanglsr" placeholder="请选择出生日期" clearable
-							:style='{ "width": "100%" }' type='date' format="yyyy-MM-dd" value-format="timestamp">
+				<el-col :span="24">
+					<div class="form-section-title">生日信息</div>
+				</el-col>
+				<el-col :span="6" class="birthday-field">
+					<el-form-item label="阳历生日" prop="yanglsr">
+						<el-date-picker v-model="dataForm.yanglsr" placeholder="请选择阳历生日" clearable
+							:style='{ "width": "100%" }' type='date' format="yyyy-MM-dd" value-format="timestamp"
+							@change="onYanglsrChange">
 						</el-date-picker>
 					</el-form-item>
 				</el-col>
+				<el-col :span="6" class="birthday-field">
+					<el-form-item label="阴历生日" prop="yinlsr" class="yinlsr-form-item">
+						<div class="yinlsr-selects">
+							<el-select v-model="yinlsrMonth" placeholder="月" clearable
+								@change="onYinlsrSelectChange">
+								<el-option v-for="item in lunarMonthOptions" :key="item.value" :label="item.label" :value="item.value" />
+							</el-select>
+							<el-select v-model="yinlsrDay" placeholder="日" clearable
+								@change="onYinlsrSelectChange">
+								<el-option v-for="item in lunarDayOptions" :key="item.value" :label="item.label" :value="item.value" />
+							</el-select>
+						</div>
+						<div v-if="dataForm.yanglsr" class="form-tip">选阳历可自动填入</div>
+					</el-form-item>
+				</el-col>
+				<el-col :span="6" class="birthday-field">
+					<el-form-item label="过生日类型" prop="birthdayType">
+						<el-select v-model="dataForm.birthdayType" placeholder="请选择" :style='{ "width": "100%" }'>
+							<el-option label="阳历生日" :value="0" />
+							<el-option label="农历生日" :value="1" />
+						</el-select>
+					</el-form-item>
+				</el-col>
+				<el-col :span="24">
+					<div class="form-section-title">门店与顾问</div>
+				</el-col>
 				<el-col :span="6">
 					<el-form-item label="归属门店" prop="gsmd">
 						<el-select v-model="dataForm.gsmd" placeholder="请选择" clearable :style='{"width":"100%"}' filterable >
@@ -95,6 +128,9 @@
 						</el-select>
 					</el-form-item>
 				</el-col>
+				<el-col :span="24">
+					<div class="form-section-title">其他信息</div>
+				</el-col>
 				<el-col :span="6" v-if="dataForm.id">
 					<el-form-item label="拓客人员" prop="expandUserName">
 						<el-input  v-model="dataForm.expandUserName" placeholder="无拓客人员" clearable :style='{ "width": "100%" }' readonly>
@@ -170,6 +206,7 @@ export default {
 				bz: undefined,
 				yanglsr: undefined,
 				yinlsr: undefined,
+				birthdayType: 0,
 				ml: undefined,
 				expandUser: undefined,
 				expandUserName: undefined,
@@ -208,6 +245,30 @@ export default {
 			fzgwOptions: [],
 			mrsOptions: [],
 			kdhyOptions: [],
+			yinlsrMonth: '',
+			yinlsrDay: '',
+			lunarMonthOptions: [
+				{ label: '正月', value: '正月' }, { label: '二月', value: '二月' }, { label: '三月', value: '三月' },
+				{ label: '四月', value: '四月' }, { label: '五月', value: '五月' }, { label: '六月', value: '六月' },
+				{ label: '七月', value: '七月' }, { label: '八月', value: '八月' }, { label: '九月', value: '九月' },
+				{ label: '十月', value: '十月' }, { label: '冬月', value: '冬月' }, { label: '腊月', value: '腊月' },
+				{ label: '闰正月', value: '闰正月' }, { label: '闰二月', value: '闰二月' }, { label: '闰三月', value: '闰三月' },
+				{ label: '闰四月', value: '闰四月' }, { label: '闰五月', value: '闰五月' }, { label: '闰六月', value: '闰六月' },
+				{ label: '闰七月', value: '闰七月' }, { label: '闰八月', value: '闰八月' }, { label: '闰九月', value: '闰九月' },
+				{ label: '闰十月', value: '闰十月' }, { label: '闰冬月', value: '闰冬月' }, { label: '闰腊月', value: '闰腊月' }
+			],
+			lunarDayOptions: [
+				{ label: '初一', value: '初一' }, { label: '初二', value: '初二' }, { label: '初三', value: '初三' },
+				{ label: '初四', value: '初四' }, { label: '初五', value: '初五' }, { label: '初六', value: '初六' },
+				{ label: '初七', value: '初七' }, { label: '初八', value: '初八' }, { label: '初九', value: '初九' },
+				{ label: '初十', value: '初十' }, { label: '十一', value: '十一' }, { label: '十二', value: '十二' },
+				{ label: '十三', value: '十三' }, { label: '十四', value: '十四' }, { label: '十五', value: '十五' },
+				{ label: '十六', value: '十六' }, { label: '十七', value: '十七' }, { label: '十八', value: '十八' },
+				{ label: '十九', value: '十九' }, { label: '二十', value: '二十' }, { label: '廿一', value: '廿一' },
+				{ label: '廿二', value: '廿二' }, { label: '廿三', value: '廿三' }, { label: '廿四', value: '廿四' },
+				{ label: '廿五', value: '廿五' }, { label: '廿六', value: '廿六' }, { label: '廿七', value: '廿七' },
+				{ label: '廿八', value: '廿八' }, { label: '廿九', value: '廿九' }, { label: '三十', value: '三十' }
+			]
 		}
 	},
 	computed: {},
@@ -243,6 +304,63 @@ export default {
 	},
 	methods: {
 		// 更新推荐人验证规则
+		onYanglsrChange(val) {
+			if (val) {
+				const d = new Date(val)
+				const dateStr = `${d.getFullYear()}-${String(d.getMonth() + 1).padStart(2, '0')}-${String(d.getDate()).padStart(2, '0')}`
+				request({
+					url: `/api/Extend/LqKhxx/solar-to-lunar`,
+					method: 'GET',
+					params: { date: dateStr }
+				}).then(res => {
+					const inner = res.data && res.data.data
+					if (res.code === 200 && inner && inner.yinlsr) {
+						this.dataForm.yinlsr = inner.yinlsr
+						this.parseYinlsrToSelect(inner.yinlsr)
+					}
+				})
+			} else {
+				this.dataForm.yinlsr = undefined
+				this.yinlsrMonth = ''
+				this.yinlsrDay = ''
+			}
+		},
+		onYinlsrSelectChange() {
+			if (this.yinlsrMonth && this.yinlsrDay) {
+				this.dataForm.yinlsr = this.yinlsrMonth + this.yinlsrDay
+			} else {
+				this.dataForm.yinlsr = undefined
+			}
+		},
+		parseYinlsrToSelect(yinlsr) {
+			if (!yinlsr || typeof yinlsr !== 'string') {
+				this.yinlsrMonth = ''
+				this.yinlsrDay = ''
+				return
+			}
+			const months = ['正月', '二月', '三月', '四月', '五月', '六月', '七月', '八月', '九月', '十月', '冬月', '腊月',
+				'闰正月', '闰二月', '闰三月', '闰四月', '闰五月', '闰六月', '闰七月', '闰八月', '闰九月', '闰十月', '闰冬月', '闰腊月']
+			const days = ['初一', '初二', '初三', '初四', '初五', '初六', '初七', '初八', '初九', '初十',
+				'十一', '十二', '十三', '十四', '十五', '十六', '十七', '十八', '十九', '二十',
+				'廿一', '廿二', '廿三', '廿四', '廿五', '廿六', '廿七', '廿八', '廿九', '三十']
+			let month = ''
+			let day = ''
+			for (const m of months) {
+				if (yinlsr.startsWith(m)) {
+					month = m
+					const rest = yinlsr.slice(m.length)
+					for (const d of days) {
+						if (rest === d || rest.startsWith(d)) {
+							day = d
+							break
+						}
+					}
+					break
+				}
+			}
+			this.yinlsrMonth = month
+			this.yinlsrDay = day
+		},
 		updateTjrRules(jdqd) {
 			console.log(jdqd)
 			// 移除现有的推荐人验证规则
@@ -382,6 +500,7 @@ export default {
 					}).then(res => {
 						this.dataForm = res.data;
 						this.dataForm.khxf = this.dataForm.khxf?this.dataForm.khxf.split(','):[];
+						this.parseYinlsrToSelect(this.dataForm.yinlsr);
 						// 编辑时，根据归属门店加载负责顾问和美容师选项
 						if (this.dataForm.gsmd) {
 							this.getfzgwOptions();
@@ -421,10 +540,13 @@ export default {
 						bz: undefined,
 						yanglsr: undefined,
 						yinlsr: undefined,
+						birthdayType: 0,
 						ml: undefined,
 						expandUser: undefined,
 						expandUserName: undefined,
 					}
+					this.yinlsrMonth = '';
+					this.yinlsrDay = '';
 				}
 			})
 		},
@@ -435,6 +557,8 @@ export default {
 				type: 'warning'
 			}).then(() => {
 				this.$refs['elForm'].resetFields();
+				this.yinlsrMonth = '';
+				this.yinlsrDay = '';
 				this.$message.success('表单已重置');
 			}).catch(() => {
 				// 用户取消
@@ -495,17 +619,49 @@ export default {
 </script>
 
 <style scoped>
+/* 现代化弹窗：圆角、柔和阴影、过渡 */
+.customer-form-dialog >>> .el-dialog {
+	border-radius: 12px;
+	box-shadow: 0 12px 48px rgba(0, 0, 0, 0.12);
+	overflow: hidden;
+	transition: box-shadow 0.2s ease;
+}
+
+.customer-form-dialog >>> .el-dialog__header {
+	padding: 18px 20px;
+	border-bottom: 1px solid #f0f2f5;
+	background: #fafbfc;
+}
+
+.customer-form-dialog >>> .el-dialog__body {
+	padding: 20px 24px;
+	background: #fff;
+}
+
+.customer-form-dialog >>> .el-dialog__footer {
+	padding: 16px 24px;
+	border-top: 1px solid #f0f2f5;
+	background: #fafbfc;
+}
+
+/* 分组标题：柔和现代风格，保持主色 */
 .form-section-title {
 	display: flex;
 	align-items: center;
-	margin: 15px 0 10px 0;
-	padding: 8px 12px;
-	background: #409EFF;
+	margin: 20px 0 12px 0;
+	padding: 10px 14px;
+	background: linear-gradient(135deg, #409EFF 0%, #66b1ff 100%);
 	color: white;
-	border-radius: 6px;
+	border-radius: 8px;
 	font-size: 14px;
 	font-weight: 600;
-	box-shadow: 0 2px 4px rgba(64, 158, 255, 0.2);
+	letter-spacing: 0.3px;
+	box-shadow: 0 2px 8px rgba(64, 158, 255, 0.25);
+	transition: box-shadow 0.2s ease;
+}
+
+.form-section-title:first-of-type {
+	margin-top: 0;
 }
 
 .form-section-title i {
@@ -515,10 +671,46 @@ export default {
 
 .el-form-item {
 	margin-bottom: 12px;
+	transition: opacity 0.15s ease;
 }
 
 .compact-form .el-form-item {
-	margin-bottom: 8px;
+	margin-bottom: 10px;
+}
+
+/* 输入框 focus 过渡 */
+.compact-form .el-input__inner,
+.compact-form .el-textarea__inner {
+	transition: border-color 0.2s ease, box-shadow 0.2s ease;
+}
+
+.form-tip {
+	font-size: 12px;
+	color: #909399;
+	margin-top: 4px;
+	line-height: 1.2;
+}
+
+/* 生日信息行：阳历/阴历顶部对齐（内容可能多行），过生日类型居中对齐 */
+.birthday-field .el-form-item {
+	align-items: flex-start;
+}
+
+.birthday-field .el-form-item__label {
+	white-space: nowrap;
+}
+
+/* 阴历生日：月日并排不换行 */
+.yinlsr-selects {
+	display: flex;
+	flex-wrap: nowrap;
+	gap: 8px;
+	width: 100%;
+}
+
+.yinlsr-selects .el-select {
+	flex: 1;
+	min-width: 0;
 }
 
 .el-input-group__append {
@@ -527,13 +719,23 @@ export default {
 	color: #606266;
 }
 
+/* 底部按钮区：现代化间距与过渡 */
 .dialog-footer {
 	text-align: right;
-	padding: 20px 0;
+	padding: 16px 0 0;
 }
 
 .dialog-footer .el-button {
 	margin-left: 10px;
+	transition: all 0.2s ease;
+}
+
+.dialog-footer .el-button--primary {
+	box-shadow: 0 2px 6px rgba(64, 158, 255, 0.3);
+}
+
+.dialog-footer .el-button--primary:hover {
+	box-shadow: 0 4px 12px rgba(64, 158, 255, 0.4);
 }
 
 /* 必填字段标识 */
@@ -542,11 +744,12 @@ export default {
 	color: #f56c6c;
 	margin-right: 4px;
 }
+
 .el-col {
 	margin-bottom: 10px;
 }
 
-/* 响应式布局 */
+/* 响应式 */
 @media (max-width: 768px) {
 	.el-col {
 		margin-bottom: 10px;
diff --git a/antis-ncc-admin/src/views/lqKhxx/detail-dialog.vue b/antis-ncc-admin/src/views/lqKhxx/detail-dialog.vue
index d98aa3d..15b71ed 100644
--- a/antis-ncc-admin/src/views/lqKhxx/detail-dialog.vue
+++ b/antis-ncc-admin/src/views/lqKhxx/detail-dialog.vue
@@ -5,7 +5,7 @@
 		width="1400px"
 		:close-on-click-modal="false"
 		@close="handleClose"
-		class="detail-dialog"
+		class="detail-dialog customer-detail-dialog"
 	>
 		<div v-loading="loading" class="detail-content">
 			<div v-if="detailData" class="detail-wrapper">
@@ -251,7 +251,11 @@
 							</div>
 							<div class="info-item">
 								<span class="label">阴历生日：</span>
-								<span class="value">{{ formatDate(detailData.yinlsr) || '无' }}</span>
+								<span class="value">{{ formatYinlsr(detailData.yinlsr) || '无' }}</span>
+							</div>
+							<div class="info-item">
+								<span class="label">过生日类型：</span>
+								<span class="value">{{ detailData.birthdayType === 1 ? '农历生日' : '阳历生日' }}</span>
 							</div>
 						</div>
 					</div>
@@ -325,6 +329,11 @@ export default {
 				day: '2-digit'
 			})
 		},
+		formatYinlsr(val) {
+			if (!val) return null
+			if (typeof val === 'string' && !/^\d{4}-\d|^\d+$/.test(val)) return val
+			return this.formatDate(val)
+		},
 		formatMoney(amount) {
 			if (!amount && amount !== 0) return '¥0.00'
 			const num = parseFloat(amount)
@@ -361,11 +370,31 @@ export default {
 </script>
 
 <style lang="scss" scoped>
-.detail-dialog {
+/* 现代化弹窗：与编辑表单风格统一 */
+.customer-detail-dialog {
+	::v-deep .el-dialog {
+		border-radius: 12px;
+		box-shadow: 0 12px 48px rgba(0, 0, 0, 0.12);
+		overflow: hidden;
+	}
+
+	::v-deep .el-dialog__header {
+		padding: 18px 20px;
+		border-bottom: 1px solid #f0f2f5;
+		background: #fafbfc;
+	}
+
 	::v-deep .el-dialog__body {
-		padding: 20px;
+		padding: 20px 24px;
 		max-height: 70vh;
 		overflow-y: auto;
+		background: #fff;
+	}
+
+	::v-deep .el-dialog__footer {
+		padding: 16px 24px;
+		border-top: 1px solid #f0f2f5;
+		background: #fafbfc;
 	}
 }
 
@@ -379,17 +408,20 @@ export default {
 		background: #fff;
 		border-radius: 8px;
 		overflow: hidden;
-		border: 1px solid #EBEEF5;
+		border: 1px solid #ebeef5;
+		box-shadow: 0 1px 4px rgba(0, 0, 0, 0.04);
 
 		.section-title {
-			background: linear-gradient(135deg, #667eea 0%, #764ba2 100%);
+			background: linear-gradient(135deg, #409eff 0%, #66b1ff 100%);
 			color: #fff;
 			padding: 12px 20px;
-			font-size: 16px;
+			font-size: 15px;
 			font-weight: 600;
+			letter-spacing: 0.3px;
 			display: flex;
 			align-items: center;
 			gap: 8px;
+			box-shadow: 0 2px 8px rgba(64, 158, 255, 0.25);
 
 			i {
 				font-size: 18px;
diff --git a/netcore/ExportFiles/合作成本表 (202601).xlsx b/netcore/ExportFiles/合作成本表 (202601).xlsx
new file mode 100644
index 0000000..765566d
Binary files /dev/null and b/netcore/ExportFiles/合作成本表 (202601).xlsx differ
diff --git a/netcore/src/Modularity/Extend/NCC.Extend.Entitys/Dto/LqKhxx/LqKhxxBirthdayOutput.cs b/netcore/src/Modularity/Extend/NCC.Extend.Entitys/Dto/LqKhxx/LqKhxxBirthdayOutput.cs
index 6e03212..a08e7a8 100644
--- a/netcore/src/Modularity/Extend/NCC.Extend.Entitys/Dto/LqKhxx/LqKhxxBirthdayOutput.cs
+++ b/netcore/src/Modularity/Extend/NCC.Extend.Entitys/Dto/LqKhxx/LqKhxxBirthdayOutput.cs
@@ -50,7 +50,12 @@ namespace NCC.Extend.Entitys.Dto.LqKhxx
         /// <summary>
         /// 阴历生日
         /// </summary>
-        public DateTime? yinlsr { get; set; }
+        public string yinlsr { get; set; }
+
+        /// <summary>
+        /// 生日类型（0-阳历生日，1-农历生日）
+        /// </summary>
+        public int birthdayType { get; set; }
 
         /// <summary>
         /// 生日日期(用于日历显示,格式:MM-DD)
diff --git a/netcore/src/Modularity/Extend/NCC.Extend.Entitys/Dto/LqKhxx/LqKhxxCrInput.cs b/netcore/src/Modularity/Extend/NCC.Extend.Entitys/Dto/LqKhxx/LqKhxxCrInput.cs
index ea95600..ca19cdb 100644
--- a/netcore/src/Modularity/Extend/NCC.Extend.Entitys/Dto/LqKhxx/LqKhxxCrInput.cs
+++ b/netcore/src/Modularity/Extend/NCC.Extend.Entitys/Dto/LqKhxx/LqKhxxCrInput.cs
@@ -1,4 +1,4 @@
-using System;
+using System;
 using System.Collections.Generic;
 using Newtonsoft.Json;
 
@@ -86,10 +86,14 @@ namespace NCC.Extend.Entitys.Dto.LqKhxx
         public DateTime? yanglsr { get; set; }
 
         /// <summary>
-        /// 阴历生日
+        /// 阴历生日（格式：腊月十九、四月廿一等）
         /// </summary>
-        public DateTime? yinlsr { get; set; }
+        public string yinlsr { get; set; }
 
+        /// <summary>
+        /// 生日类型（0-阳历生日，1-农历生日）
+        /// </summary>
+        public int birthdayType { get; set; } = 0;
 
         /// <summary>
         /// 拓客人员
diff --git a/netcore/src/Modularity/Extend/NCC.Extend.Entitys/Dto/LqKhxx/LqKhxxInfoOutput.cs b/netcore/src/Modularity/Extend/NCC.Extend.Entitys/Dto/LqKhxx/LqKhxxInfoOutput.cs
index a1fb44e..41a2ffc 100644
--- a/netcore/src/Modularity/Extend/NCC.Extend.Entitys/Dto/LqKhxx/LqKhxxInfoOutput.cs
+++ b/netcore/src/Modularity/Extend/NCC.Extend.Entitys/Dto/LqKhxx/LqKhxxInfoOutput.cs
@@ -1,4 +1,4 @@
-using System;
+using System;
 using System.Collections.Generic;
 
 namespace NCC.Extend.Entitys.Dto.LqKhxx
@@ -103,7 +103,12 @@ namespace NCC.Extend.Entitys.Dto.LqKhxx
         /// <summary>
         /// 阴历生日
         /// </summary>
-        public DateTime? yinlsr { get; set; }
+        public string yinlsr { get; set; }
+
+        /// <summary>
+        /// 生日类型（0-阳历生日，1-农历生日）
+        /// </summary>
+        public int birthdayType { get; set; }
 
         /// <summary>
         /// 添加时间
diff --git a/netcore/src/Modularity/Extend/NCC.Extend.Entitys/Dto/LqKhxx/LqKhxxListOutput.cs b/netcore/src/Modularity/Extend/NCC.Extend.Entitys/Dto/LqKhxx/LqKhxxListOutput.cs
index 62ca416..3e34fea 100644
--- a/netcore/src/Modularity/Extend/NCC.Extend.Entitys/Dto/LqKhxx/LqKhxxListOutput.cs
+++ b/netcore/src/Modularity/Extend/NCC.Extend.Entitys/Dto/LqKhxx/LqKhxxListOutput.cs
@@ -1,4 +1,4 @@
-using System;
+using System;
 using System.Collections.Generic;
 using NCC.Code;
 using NCC.Extend.Entitys.Enum;
@@ -121,7 +121,12 @@ namespace NCC.Extend.Entitys.Dto.LqKhxx
         /// <summary>
         /// 阴历生日
         /// </summary>
-        public DateTime? yinlsr { get; set; }
+        public string yinlsr { get; set; }
+
+        /// <summary>
+        /// 生日类型（0-阳历生日，1-农历生日）
+        /// </summary>
+        public int birthdayType { get; set; }
 
         /// <summary>
         /// 年龄
diff --git a/netcore/src/Modularity/Extend/NCC.Extend.Entitys/Dto/LqXhHyhk/LqXhHyhkNoFeedbackListQueryInput.cs b/netcore/src/Modularity/Extend/NCC.Extend.Entitys/Dto/LqXhHyhk/LqXhHyhkNoFeedbackListQueryInput.cs
new file mode 100644
index 0000000..a539bc6
--- /dev/null
+++ b/netcore/src/Modularity/Extend/NCC.Extend.Entitys/Dto/LqXhHyhk/LqXhHyhkNoFeedbackListQueryInput.cs
@@ -0,0 +1,30 @@
+using NCC.Common.Filter;
+
+namespace NCC.Extend.Entitys.Dto.LqXhHyhk
+{
+    /// <summary>
+    /// 无耗卡日志的耗卡记录列表查询输入
+    /// </summary>
+    public class LqXhHyhkNoFeedbackListQueryInput : PageInputBase
+    {
+        /// <summary>
+        /// 耗卡日期范围（格式：开始时间,结束时间，如：2025-01-01,2025-01-31）
+        /// </summary>
+        public string hksj { get; set; }
+
+        /// <summary>
+        /// 会员姓名（模糊匹配）
+        /// </summary>
+        public string hymc { get; set; }
+
+        /// <summary>
+        /// 会员电话（模糊匹配）
+        /// </summary>
+        public string memberPhone { get; set; }
+
+        /// <summary>
+        /// 门店ID（可选）
+        /// </summary>
+        public string md { get; set; }
+    }
+}
diff --git a/netcore/src/Modularity/Extend/NCC.Extend.Entitys/Entity/lq_khxx/LqKhxxEntity.cs b/netcore/src/Modularity/Extend/NCC.Extend.Entitys/Entity/lq_khxx/LqKhxxEntity.cs
index bb078a7..148d7ee 100644
--- a/netcore/src/Modularity/Extend/NCC.Extend.Entitys/Entity/lq_khxx/LqKhxxEntity.cs
+++ b/netcore/src/Modularity/Extend/NCC.Extend.Entitys/Entity/lq_khxx/LqKhxxEntity.cs
@@ -1,4 +1,4 @@
-using System;
+using System;
 using NCC.Common.Const;
 using NCC.Extend.Entitys.Enum;
 using SqlSugar;
@@ -110,10 +110,16 @@ namespace NCC.Extend.Entitys.lq_khxx
         public DateTime? Yanglsr { get; set; }
 
         /// <summary>
-        /// 阴历生日
+        /// 阴历生日（格式：腊月十九、四月廿一等，便于直接阅读）
         /// </summary>
         [SugarColumn(ColumnName = "yinlsr")]
-        public DateTime? Yinlsr { get; set; }
+        public string Yinlsr { get; set; }
+
+        /// <summary>
+        /// 生日类型（0-阳历生日，1-农历生日）
+        /// </summary>
+        [SugarColumn(ColumnName = "F_BirthdayType")]
+        public int BirthdayType { get; set; } = 0;
 
         /// <summary>
         /// 添加时间
diff --git a/netcore/src/Modularity/Extend/NCC.Extend.Entitys/Enum/BirthdayTypeEnum.cs b/netcore/src/Modularity/Extend/NCC.Extend.Entitys/Enum/BirthdayTypeEnum.cs
new file mode 100644
index 0000000..cc284a3
--- /dev/null
+++ b/netcore/src/Modularity/Extend/NCC.Extend.Entitys/Enum/BirthdayTypeEnum.cs
@@ -0,0 +1,22 @@
+using System.ComponentModel;
+
+namespace NCC.Extend.Entitys.Enum
+{
+    /// <summary>
+    /// 生日类型（会员过阳历生日还是农历生日）
+    /// </summary>
+    public enum BirthdayTypeEnum
+    {
+        /// <summary>
+        /// 阳历生日
+        /// </summary>
+        [Description("阳历生日")]
+        阳历 = 0,
+
+        /// <summary>
+        /// 农历生日
+        /// </summary>
+        [Description("农历生日")]
+        农历 = 1
+    }
+}
diff --git a/netcore/src/Modularity/Extend/NCC.Extend/LqCooperationCostService.cs b/netcore/src/Modularity/Extend/NCC.Extend/LqCooperationCostService.cs
index d4c88ab..74e9817 100644
--- a/netcore/src/Modularity/Extend/NCC.Extend/LqCooperationCostService.cs
+++ b/netcore/src/Modularity/Extend/NCC.Extend/LqCooperationCostService.cs
@@ -448,13 +448,13 @@ namespace NCC.Extend.LqCooperationCost
                     // 使用ExcelImportHelper读取Excel文件（第一行为标题行）
                     var dataTable = ExcelImportHelper.ToDataTable(tempFilePath, 0, 0);
 
-                    if (dataTable.Rows.Count <= 1)
+                    if (dataTable.Rows.Count == 0)
                     {
                         throw NCCException.Oh("Excel文件中没有数据行（至少需要标题行和一行数据）");
                     }
 
-                    // 从第1行开始读取数据（跳过标题行）
-                    for (int i = 1; i < dataTable.Rows.Count; i++)
+                    // ExcelImportHelper 已跳过标题行，从第0行开始即为第一行数据
+                    for (int i = 0; i < dataTable.Rows.Count; i++)
                     {
                         try
                         {
diff --git a/netcore/src/Modularity/Extend/NCC.Extend/LqKhxxService.cs b/netcore/src/Modularity/Extend/NCC.Extend/LqKhxxService.cs
index 6d43f0f..078be49 100644
--- a/netcore/src/Modularity/Extend/NCC.Extend/LqKhxxService.cs
+++ b/netcore/src/Modularity/Extend/NCC.Extend/LqKhxxService.cs
@@ -1,5 +1,6 @@
 using System;
 using System.Collections.Generic;
+using System.Globalization;
 using System.IO;
 using System.Linq;
 using System.Text;
@@ -72,6 +73,21 @@ namespace NCC.Extend.LqKhxx
 
         #region 客户资料
         /// <summary>
+        /// 阳历转农历（用于前端选择阳历后自动填入农历生日）
+        /// </summary>
+        /// <param name="date">阳历日期，格式 yyyy-MM-dd</param>
+        /// <returns>农历字符串，如 腊月十九</returns>
+        [HttpGet("solar-to-lunar")]
+        [AllowAnonymous]
+        public object SolarToLunar([FromQuery] string date)
+        {
+            if (string.IsNullOrEmpty(date) || !DateTime.TryParse(date, out var solarDate))
+                return new { code = 400, msg = "日期格式错误，请使用 yyyy-MM-dd" };
+            var yinlsr = SolarToLunarString(solarDate);
+            return new { code = 200, msg = "成功", data = new { yinlsr } };
+        }
+
+        /// <summary>
         /// 获取客户资料
         /// </summary>
         /// <param name="id">参数</param>
@@ -200,6 +216,7 @@ namespace NCC.Extend.LqKhxx
                     bz = it.Bz,
                     yanglsr = it.Yanglsr,
                     yinlsr = it.Yinlsr,
+                    birthdayType = it.BirthdayType,
                     createTime = it.CreateTime,
                     expandUser = it.ExpandUser,
                     mainHealthUser = it.MainHealthUser,
@@ -256,6 +273,11 @@ namespace NCC.Extend.LqKhxx
             entity.Id = YitIdHelper.NextId().ToString();
             entity.Dah = "LQ" + DateTime.Now.ToString("yyyyMMddHHmmssfff");
             entity.Zcsj = DateTime.Now;
+            // 阳历生日转农历：若填写了 yanglsr，自动转换并保存到 yinlsr（格式：腊月十九、四月廿一等，便于直接阅读）
+            if (input.yanglsr.HasValue)
+            {
+                entity.Yinlsr = SolarToLunarString(input.yanglsr.Value);
+            }
             // 处理客户消费字段：将数组转换为逗号分隔的字符串
             if (input.khxf != null && input.khxf.Count > 0)
             {
@@ -284,10 +306,6 @@ namespace NCC.Extend.LqKhxx
             List<string> queryYanglsr = input.yanglsr != null ? input.yanglsr.Split(',').ToObeject<List<string>>() : null;
             DateTime? startYanglsr = queryYanglsr != null ? Ext.GetDateTime(queryYanglsr.First()) : null;
             DateTime? endYanglsr = queryYanglsr != null ? Ext.GetDateTime(queryYanglsr.Last()) : null;
-            List<string> queryYinlsr = input.yinlsr != null ? input.yinlsr.Split(',').ToObeject<List<string>>() : null;
-            DateTime? startYinlsr = queryYinlsr != null ? Ext.GetDateTime(queryYinlsr.First()) : null;
-            DateTime? endYinlsr = queryYinlsr != null ? Ext.GetDateTime(queryYinlsr.Last()) : null;
-            
             // 处理沉睡天数范围
             List<string> querySleepDaysRange = input.SleepDaysRange != null ? input.SleepDaysRange.Split(',').ToObeject<List<string>>() : null;
             int? minSleepDays = null;
@@ -338,8 +356,7 @@ namespace NCC.Extend.LqKhxx
                 .WhereIF(maxRemainingRights.HasValue, p => p.RemainingRightsAmount <= maxRemainingRights.Value)
                 .WhereIF(queryYanglsr != null, p => p.Yanglsr >= new DateTime(startYanglsr.ToDate().Year, startYanglsr.ToDate().Month, startYanglsr.ToDate().Day, 0, 0, 0))
                 .WhereIF(queryYanglsr != null, p => p.Yanglsr <= new DateTime(endYanglsr.ToDate().Year, endYanglsr.ToDate().Month, endYanglsr.ToDate().Day, 23, 59, 59))
-                .WhereIF(queryYinlsr != null, p => p.Yinlsr >= new DateTime(startYinlsr.ToDate().Year, startYinlsr.ToDate().Month, startYinlsr.ToDate().Day, 0, 0, 0))
-                .WhereIF(queryYinlsr != null, p => p.Yinlsr <= new DateTime(endYinlsr.ToDate().Year, endYinlsr.ToDate().Month, endYinlsr.ToDate().Day, 23, 59, 59))
+                .WhereIF(!string.IsNullOrEmpty(input.yinlsr), p => p.Yinlsr != null && p.Yinlsr.Contains(input.yinlsr))
                 .Select(it => new LqKhxxListOutput
                 {
                     id = it.Id,
@@ -360,6 +377,7 @@ namespace NCC.Extend.LqKhxx
                     bz = it.Bz,
                     yanglsr = it.Yanglsr,
                     yinlsr = it.Yinlsr,
+                    birthdayType = it.BirthdayType,
                     createTime = it.CreateTime,
                     expandUser = it.ExpandUser,
                     mainHealthUser = it.MainHealthUser,
@@ -412,10 +430,6 @@ namespace NCC.Extend.LqKhxx
             List<string> queryYanglsr = input.yanglsr != null ? input.yanglsr.Split(',').ToObeject<List<string>>() : null;
             DateTime? startYanglsr = queryYanglsr != null ? Ext.GetDateTime(queryYanglsr.First()) : null;
             DateTime? endYanglsr = queryYanglsr != null ? Ext.GetDateTime(queryYanglsr.Last()) : null;
-            List<string> queryYinlsr = input.yinlsr != null ? input.yinlsr.Split(',').ToObeject<List<string>>() : null;
-            DateTime? startYinlsr = queryYinlsr != null ? Ext.GetDateTime(queryYinlsr.First()) : null;
-            DateTime? endYinlsr = queryYinlsr != null ? Ext.GetDateTime(queryYinlsr.Last()) : null;
-
             var data = await _db.Queryable<LqKhxxEntity>()
                 .Where(p => p.Khlx == "线索") // 固定查询线索池客户
                 .WhereIF(!string.IsNullOrEmpty(input.id), p => p.Id.Contains(input.id))
@@ -436,8 +450,7 @@ namespace NCC.Extend.LqKhxx
                 .WhereIF(!string.IsNullOrEmpty(input.bz), p => p.Bz.Contains(input.bz))
                 .WhereIF(queryYanglsr != null, p => p.Yanglsr >= new DateTime(startYanglsr.ToDate().Year, startYanglsr.ToDate().Month, startYanglsr.ToDate().Day, 0, 0, 0))
                 .WhereIF(queryYanglsr != null, p => p.Yanglsr <= new DateTime(endYanglsr.ToDate().Year, endYanglsr.ToDate().Month, endYanglsr.ToDate().Day, 23, 59, 59))
-                .WhereIF(queryYinlsr != null, p => p.Yinlsr >= new DateTime(startYinlsr.ToDate().Year, startYinlsr.ToDate().Month, startYinlsr.ToDate().Day, 0, 0, 0))
-                .WhereIF(queryYinlsr != null, p => p.Yinlsr <= new DateTime(endYinlsr.ToDate().Year, endYinlsr.ToDate().Month, endYinlsr.ToDate().Day, 23, 59, 59))
+                .WhereIF(!string.IsNullOrEmpty(input.yinlsr), p => p.Yinlsr != null && p.Yinlsr.Contains(input.yinlsr))
                 .Select(it => new LqKhxxListOutput
                 {
                     id = it.Id,
@@ -458,6 +471,7 @@ namespace NCC.Extend.LqKhxx
                     bz = it.Bz,
                     yanglsr = it.Yanglsr,
                     yinlsr = it.Yinlsr,
+                    birthdayType = it.BirthdayType,
                     createTime = it.CreateTime,
                     expandUser = it.ExpandUser,
                     mainHealthUser = it.MainHealthUser,
@@ -1119,7 +1133,11 @@ namespace NCC.Extend.LqKhxx
         public async Task Update(string id, [FromBody] LqKhxxUpInput input)
         {
             var entity = input.Adapt<LqKhxxEntity>();
-
+            // 阳历生日转农历：若填写了 yanglsr，自动转换并保存到 yinlsr（格式：腊月十九、四月廿一等，便于直接阅读）
+            if (input.yanglsr.HasValue)
+            {
+                entity.Yinlsr = SolarToLunarString(input.yanglsr.Value);
+            }
             // 处理客户消费字段：将数组转换为逗号分隔的字符串
             if (input.khxf != null && input.khxf.Count > 0)
             {
@@ -3235,7 +3253,9 @@ WHERE kh.F_IsEffective = 1";
         /// 获取门店未来30天过生日的会员列表
         /// </summary>
         /// <remarks>
-        /// 根据门店ID获取未来30天内过生日的会员信息，支持按阳历生日查询
+        /// 根据门店ID获取未来30天内过生日的会员信息，支持阳历生日和农历生日
+        /// - 阳历生日：直接按公历月日计算今年/明年生日
+        /// - 农历生日：将今年/明年农历月日转为公历日期后判断是否在未来30天内（便于按公历日期查询提醒）
         /// 
         /// 会员等级说明：0=D，1=C，2=B，3=A，4=A+，5=A++
         /// 
@@ -3258,11 +3278,12 @@ WHERE kh.F_IsEffective = 1";
             {
                 var now = DateTime.Now;
                 var endDate = now.AddDays(30);
-                
-                // 构建查询
+                var cal = new ChineseLunisolarCalendar();
+
+                // 构建查询：阳历或农历生日任一有值即可
                 var query = _db.Queryable<LqKhxxEntity>()
                     .Where(x => x.IsEffective == StatusEnum.有效.GetHashCode())
-                    .Where(x => x.Yanglsr != null); // 必须有阳历生日
+                    .Where(x => x.Yanglsr != null || !string.IsNullOrEmpty(x.Yinlsr));
 
                 // 门店过滤
                 if (!string.IsNullOrEmpty(storeId))
@@ -3275,36 +3296,61 @@ WHERE kh.F_IsEffective = 1";
 
                 // 在内存中筛选未来30天过生日的会员
                 var upcomingBirthdays = new List<LqKhxxBirthdayOutput>();
-                
+
                 foreach (var member in members)
                 {
-                    if (!member.Yanglsr.HasValue) continue;
-
-                    var birthday = member.Yanglsr.Value;
-                    
-                    // 计算今年和明年的生日
-                    var thisYearBirthday = new DateTime(now.Year, birthday.Month, birthday.Day);
-                    var nextYearBirthday = new DateTime(now.Year + 1, birthday.Month, birthday.Day);
+                    DateTime? upcomingBirthday = null;
+                    string birthdayDateStr;
+                    int age;
+                    DateTime? birthDateForAge = null;
 
-                    DateTime upcomingBirthday;
-                    
-                    // 判断生日是今年还是明年
-                    if (thisYearBirthday >= now.Date && thisYearBirthday <= endDate.Date)
+                    // 优先使用阳历生日
+                    if (member.Yanglsr.HasValue)
                     {
-                        upcomingBirthday = thisYearBirthday;
+                        var birthday = member.Yanglsr.Value;
+                        birthDateForAge = birthday;
+                        var thisYearBirthday = new DateTime(now.Year, birthday.Month, birthday.Day);
+                        var nextYearBirthday = new DateTime(now.Year + 1, birthday.Month, birthday.Day);
+
+                        if (thisYearBirthday >= now.Date && thisYearBirthday <= endDate.Date)
+                            upcomingBirthday = thisYearBirthday;
+                        else if (nextYearBirthday >= now.Date && nextYearBirthday <= endDate.Date)
+                            upcomingBirthday = nextYearBirthday;
+
+                        birthdayDateStr = birthday.ToString("MM-dd");
                     }
-                    else if (nextYearBirthday >= now.Date && nextYearBirthday <= endDate.Date)
+                    // 无阳历有农历：将今年/明年农历生日转为公历后判断
+                    else if (!string.IsNullOrEmpty(member.Yinlsr))
                     {
-                        upcomingBirthday = nextYearBirthday;
+                        int currentLunarYear = cal.GetYear(now);
+                        int nextLunarYear = currentLunarYear + 1;
+                        var (lunarMonth, lunarDay) = LunarStringToMonthDay(member.Yinlsr, cal, currentLunarYear);
+                        if (!lunarMonth.HasValue || !lunarDay.HasValue)
+                        {
+                            continue;
+                        }
+
+                        DateTime? thisYearSolar = LunarToSolar(cal, currentLunarYear, lunarMonth.Value, lunarDay.Value);
+                        DateTime? nextYearSolar = LunarToSolar(cal, nextLunarYear, lunarMonth.Value, lunarDay.Value);
+
+                        if (thisYearSolar.HasValue && thisYearSolar.Value >= now.Date && thisYearSolar.Value <= endDate.Date)
+                            upcomingBirthday = thisYearSolar;
+                        else if (nextYearSolar.HasValue && nextYearSolar.Value >= now.Date && nextYearSolar.Value <= endDate.Date)
+                            upcomingBirthday = nextYearSolar;
+
+                        birthdayDateStr = member.Yinlsr;
                     }
                     else
                     {
-                        continue; // 不在未来30天内
+                        continue;
                     }
 
-                    // 计算年龄
-                    var age = now.Year - birthday.Year;
-                    if (now.Month < birthday.Month || (now.Month == birthday.Month && now.Day < birthday.Day))
+                    if (!upcomingBirthday.HasValue) continue;
+
+                    // 计算年龄（有阳历用阳历，否则用农历年近似）
+                    age = birthDateForAge.HasValue ? now.Year - birthDateForAge.Value.Year : 0;
+                    if (age > 0 && birthDateForAge.HasValue &&
+                        (now.Month < birthDateForAge.Value.Month || (now.Month == birthDateForAge.Value.Month && now.Day < birthDateForAge.Value.Day)))
                     {
                         age--;
                     }
@@ -3319,8 +3365,9 @@ WHERE kh.F_IsEffective = 1";
                         gsmd = member.Gsmd,
                         yanglsr = member.Yanglsr,
                         yinlsr = member.Yinlsr,
-                        birthdayDate = birthday.ToString("MM-dd"),
-                        birthdayFullDate = upcomingBirthday,
+                        birthdayType = member.BirthdayType,
+                        birthdayDate = birthdayDateStr,
+                        birthdayFullDate = upcomingBirthday.Value,
                         consumeLevel = member.ConsumeLevel,
                         consumeLevelName = GetConsumeLevelName(member.ConsumeLevel),
                         remainingRightsAmount = member.RemainingRightsAmount,
@@ -3387,5 +3434,124 @@ WHERE kh.F_IsEffective = 1";
 
         #endregion
 
+        #region 阳历转农历
+        private static readonly string[] LunarMonthNames = { "正月", "二月", "三月", "四月", "五月", "六月", "七月", "八月", "九月", "十月", "冬月", "腊月" };
+        private static readonly string[] LunarDayNames = { "初一", "初二", "初三", "初四", "初五", "初六", "初七", "初八", "初九", "初十", "十一", "十二", "十三", "十四", "十五", "十六", "十七", "十八", "十九", "二十", "廿一", "廿二", "廿三", "廿四", "廿五", "廿六", "廿七", "廿八", "廿九", "三十" };
+
+        /// <summary>
+        /// 将阳历日期转换为农历字符串（格式：腊月十九、四月廿一等），便于直接阅读
+        /// </summary>
+        /// <param name="solarDate">阳历日期</param>
+        /// <returns>农历字符串，若转换失败返回 null</returns>
+        private static string SolarToLunarString(DateTime solarDate)
+        {
+            try
+            {
+                var cal = new ChineseLunisolarCalendar();
+                int year = cal.GetYear(solarDate);
+                int month = cal.GetMonth(solarDate);
+                int day = cal.GetDayOfMonth(solarDate);
+                int leapMonth = cal.GetLeapMonth(year);
+
+                string monthStr;
+                if (leapMonth > 0 && month == leapMonth + 1)
+                {
+                    monthStr = "闰" + LunarMonthNames[leapMonth - 1];
+                }
+                else if (leapMonth > 0 && month > leapMonth + 1)
+                {
+                    monthStr = LunarMonthNames[month - 2];
+                }
+                else
+                {
+                    monthStr = LunarMonthNames[month - 1];
+                }
+
+                string dayStr = day >= 1 && day <= 30 ? LunarDayNames[day - 1] : day.ToString();
+                return monthStr + dayStr;
+            }
+            catch (ArgumentOutOfRangeException)
+            {
+                return null;
+            }
+        }
+
+        /// <summary>
+        /// 将农历字符串（腊月十九、四月廿一等）解析为日历月、日数字（闰月需结合年份转换为日历月份）
+        /// </summary>
+        /// <param name="lunarStr">农历字符串</param>
+        /// <param name="cal">农历日历</param>
+        /// <param name="lunarYear">农历年（用于闰月转换）</param>
+        /// <returns>(日历月, 日)，解析失败返回 (null, null)</returns>
+        private static (int? month, int? day) LunarStringToMonthDay(string lunarStr, ChineseLunisolarCalendar cal, int lunarYear)
+        {
+            if (string.IsNullOrEmpty(lunarStr)) return (null, null);
+
+            if (DateTime.TryParse(lunarStr, out var dt))
+            {
+                return (dt.Month, dt.Day);
+            }
+
+            bool isLeap = lunarStr.StartsWith("闰");
+            int startIdx = isLeap ? 1 : 0;
+
+            int baseMonth = 0;
+            for (int i = 0; i < LunarMonthNames.Length; i++)
+            {
+                if (lunarStr.IndexOf(LunarMonthNames[i], startIdx, StringComparison.Ordinal) == startIdx)
+                {
+                    baseMonth = i + 1;
+                    startIdx += LunarMonthNames[i].Length;
+                    break;
+                }
+            }
+            if (baseMonth == 0) return (null, null);
+
+            string dayPart = lunarStr.Substring(startIdx);
+            int day = 0;
+            for (int i = 0; i < LunarDayNames.Length; i++)
+            {
+                if (dayPart == LunarDayNames[i] || dayPart.StartsWith(LunarDayNames[i]))
+                {
+                    day = i + 1;
+                    break;
+                }
+            }
+            if (day == 0) return (null, null);
+
+            int leapMonth = cal.GetLeapMonth(lunarYear);
+            int calendarMonth;
+            if (isLeap)
+            {
+                calendarMonth = baseMonth + 1;
+            }
+            else if (leapMonth > 0 && baseMonth > leapMonth)
+            {
+                calendarMonth = baseMonth + 1;
+            }
+            else
+            {
+                calendarMonth = baseMonth;
+            }
+
+            return (calendarMonth, day);
+        }
+
+        /// <summary>
+        /// 将农历日期转换为公历日期，用于生日提醒时按公历日期查询
+        /// </summary>
+        private static DateTime? LunarToSolar(ChineseLunisolarCalendar cal, int lunarYear, int lunarMonth, int lunarDay)
+        {
+            try
+            {
+                return cal.ToDateTime(lunarYear, lunarMonth, lunarDay, 0, 0, 0, 0);
+            }
+            catch (ArgumentOutOfRangeException)
+            {
+                return null;
+            }
+        }
+        #endregion
+
     }
 }
diff --git a/netcore/src/Modularity/Extend/NCC.Extend/LqTestService.cs b/netcore/src/Modularity/Extend/NCC.Extend/LqTestService.cs
new file mode 100644
index 0000000..2011b90
--- /dev/null
+++ b/netcore/src/Modularity/Extend/NCC.Extend/LqTestService.cs
@@ -0,0 +1,131 @@
+using System;
+using System.Threading.Tasks;
+using Microsoft.AspNetCore.Authorization;
+using Microsoft.AspNetCore.Mvc;
+using NCC.Common.Core.Manager;
+using NCC.Dependency;
+using NCC.DynamicApiController;
+
+namespace NCC.Extend.LqTest
+{
+    /// <summary>
+    /// 测试服务（用于验证接口可用性及自动委派流程）
+    /// </summary>
+    [ApiDescriptionSettings(Tag = "绿纤测试服务", Name = "LqTest", Order = 200)]
+    [Route("api/Extend/[controller]")]
+    public class LqTestService : IDynamicApiController, ITransient
+    {
+        private readonly IUserManager _userManager;
+
+        /// <summary>
+        /// 初始化一个<see cref="LqTestService"/>类型的新实例
+        /// </summary>
+        public LqTestService(IUserManager userManager)
+        {
+            _userManager = userManager;
+        }
+
+        /// <summary>
+        /// 健康检查 / 连通性测试
+        /// </summary>
+        /// <remarks>
+        /// 用于验证 API 服务是否正常运行，无需登录即可调用（若需鉴权可移除 AllowAnonymous）
+        ///
+        /// 示例请求：
+        /// ```http
+        /// GET /api/Extend/LqTest/Ping
+        /// ```
+        ///
+        /// 参数说明：无
+        /// </remarks>
+        /// <returns>服务状态信息</returns>
+        /// <response code="200">成功返回服务状态</response>
+        /// <response code="500">服务器错误</response>
+        [HttpGet("Ping")]
+        [AllowAnonymous]
+        public Task<object> Ping()
+        {
+            var result = new
+            {
+                success = true,
+                message = "绿纤 ERP 测试接口正常",
+                timestamp = DateTime.Now.ToString("yyyy-MM-dd HH:mm:ss"),
+                service = "LqTestService"
+            };
+            return Task.FromResult<object>(result);
+        }
+
+        /// <summary>
+        /// Hello World 测试接口
+        /// </summary>
+        /// <remarks>
+        /// 直接返回 hello world 字符串，用于简单连通性测试
+        /// </remarks>
+        /// <returns>hello world</returns>
+        /// <response code="200">成功返回</response>
+        [HttpGet("HelloWorld")]
+        [AllowAnonymous]
+        public Task<object> HelloWorld()
+        {
+            return Task.FromResult<object>(new { message = "hello world" });
+        }
+
+        /// <summary>
+        /// Echo 回显测试接口
+        /// </summary>
+        /// <remarks>
+        /// 返回服务器时间与随机数，用于验证接口连通性
+        ///
+        /// 示例请求：
+        /// ```http
+        /// GET /api/Extend/LqTest/Echo
+        /// ```
+        /// </remarks>
+        /// <returns>服务器时间与随机数</returns>
+        /// <response code="200">成功返回</response>
+        [HttpGet("Echo")]
+        [AllowAnonymous]
+        public Task<object> Echo()
+        {
+            var random = new Random();
+            var result = new
+            {
+                message = "echo ok",
+                serverTime = DateTime.Now.ToString("yyyy-MM-dd HH:mm:ss"),
+                randomValue = random.Next(1, 10000)
+            };
+            return Task.FromResult<object>(result);
+        }
+
+        /// <summary>
+        /// 带鉴权的测试接口（需登录）
+        /// </summary>
+        /// <remarks>
+        /// 验证当前用户登录态，返回用户相关信息
+        ///
+        /// 示例请求：
+        /// ```http
+        /// GET /api/Extend/LqTest/WhoAmI
+        /// Authorization: Bearer {token}
+        /// ```
+        /// </remarks>
+        /// <returns>当前用户信息</returns>
+        /// <response code="200">成功返回用户信息</response>
+        /// <response code="401">未登录或 token 无效</response>
+        [HttpGet("WhoAmI")]
+        public async Task<object> WhoAmI()
+        {
+            var userId = _userManager.UserId;
+            var userInfo = await _userManager.GetUserInfo();
+            var result = new
+            {
+                success = true,
+                userId,
+                userName = userInfo?.userName ?? "未知",
+                account = userInfo?.userAccount ?? "未知",
+                timestamp = DateTime.Now.ToString("yyyy-MM-dd HH:mm:ss")
+            };
+            return result;
+        }
+    }
+}
diff --git a/netcore/src/Modularity/Extend/NCC.Extend/LqXhHyhkService.cs b/netcore/src/Modularity/Extend/NCC.Extend/LqXhHyhkService.cs
index 3cdf754..d17b4ce 100644
--- a/netcore/src/Modularity/Extend/NCC.Extend/LqXhHyhkService.cs
+++ b/netcore/src/Modularity/Extend/NCC.Extend/LqXhHyhkService.cs
@@ -28,6 +28,7 @@ using NCC.Extend.Entitys.lq_kd_kdjlb;
 using NCC.Extend.Entitys.lq_kd_pxmx;
 using NCC.Extend.Entitys.lq_khxx;
 using NCC.Extend.Entitys.lq_person_times_record;
+using NCC.Extend.Entitys.lq_xh_feedback;
 using NCC.Extend.Entitys.lq_xh_hyhk;
 using NCC.Extend.Entitys.lq_xh_jksyj;
 using NCC.Extend.Entitys.lq_xh_kjbsyj;
@@ -521,6 +522,220 @@ namespace NCC.Extend.LqXhHyhk
 
             return PageResult<LqXhHyhkListOutput>.SqlSugarPageResult(data);
         }
+
+        /// <summary>
+        /// 获取无耗卡日志的耗卡记录列表
+        /// </summary>
+        /// <remarks>
+        /// 查询已发生耗卡但尚未填写耗卡日志（服务日志）的记录，支持按耗卡日期、会员姓名、电话等条件筛选
+        ///
+        /// 示例请求：
+        /// GET /api/Extend/LqXhHyhk/Actions/GetNoFeedbackList?currentPage=1&amp;pageSize=10&amp;hksj=2025-01-01,2025-01-31&amp;hymc=张三&amp;memberPhone=138
+        ///
+        /// 参数说明：
+        /// - hksj: 耗卡日期范围（格式：开始时间,结束时间，如：2025-01-01,2025-01-31）
+        /// - hymc: 会员姓名（模糊匹配）
+        /// - memberPhone: 会员电话（模糊匹配）
+        /// - keyword: 关键字（可选，搜索会员名称、账号、手机号）
+        /// - md: 门店ID（可选）
+        /// - currentPage: 当前页码
+        /// - pageSize: 每页数量
+        /// - sidx: 排序字段（默认hksj）
+        /// - sort: 排序方式（asc/desc，默认desc）
+        ///
+        /// 返回说明：
+        /// - 返回格式与GetList接口相同，包含耗卡基本信息、耗卡明细、健康师业绩、科技部老师业绩
+        /// </remarks>
+        /// <param name="input">查询参数</param>
+        /// <returns>无耗卡日志的耗卡记录列表（分页）</returns>
+        /// <response code="200">查询成功</response>
+        /// <response code="400">参数错误</response>
+        /// <response code="500">服务器内部错误</response>
+        [HttpGet("Actions/GetNoFeedbackList")]
+        public async Task<dynamic> GetNoFeedbackList([FromQuery] LqXhHyhkNoFeedbackListQueryInput input)
+        {
+            var sidx = input.sidx == null ? "hksj" : input.sidx;
+            var sort = string.IsNullOrEmpty(input.sort) ? "DESC" : input.sort;
+            DateTime? startHksj = null;
+            DateTime? endHksj = null;
+            if (!string.IsNullOrEmpty(input.hksj))
+            {
+                var parts = input.hksj.Split(',');
+                if (parts.Length >= 1 && DateTime.TryParse(parts[0].Trim(), out var start))
+                    startHksj = start;
+                if (parts.Length >= 2 && DateTime.TryParse(parts[1].Trim(), out var end))
+                    endHksj = end;
+            }
+            var queryHksj = startHksj != null || endHksj != null;
+
+            // 耗卡表 LEFT JOIN 耗卡反馈表，筛选 feedback.Id 为 NULL 的记录（即无耗卡日志）
+            var query = _db.Queryable<LqXhHyhkEntity, LqXhFeedbackEntity>((hyhk, feedback) => new JoinQueryInfos(
+                    JoinType.Left, hyhk.Id == feedback.ConsumeId))
+                .Where((hyhk, feedback) => feedback.Id == null)
+                .Where((hyhk, feedback) => hyhk.IsEffective == StatusEnum.有效.GetHashCode())
+                .WhereIF(!string.IsNullOrEmpty(input.keyword), (hyhk, feedback) => hyhk.Hymc.Contains(input.keyword) || hyhk.Hyzh.Contains(input.keyword) || hyhk.MemberPhone.Contains(input.keyword))
+                .WhereIF(!string.IsNullOrEmpty(input.md), (hyhk, feedback) => hyhk.Md == input.md)
+                .WhereIF(!string.IsNullOrEmpty(input.hymc), (hyhk, feedback) => hyhk.Hymc.Contains(input.hymc))
+                .WhereIF(!string.IsNullOrEmpty(input.memberPhone), (hyhk, feedback) => hyhk.MemberPhone.Contains(input.memberPhone))
+                .WhereIF(queryHksj && startHksj.HasValue, (hyhk, feedback) => hyhk.Hksj >= new DateTime(startHksj.Value.Year, startHksj.Value.Month, startHksj.Value.Day, 0, 0, 0))
+                .WhereIF(queryHksj && endHksj.HasValue, (hyhk, feedback) => hyhk.Hksj <= new DateTime(endHksj.Value.Year, endHksj.Value.Month, endHksj.Value.Day, 23, 59, 59))
+                .Select((hyhk, feedback) => new LqXhHyhkListOutput
+                {
+                    id = hyhk.Id,
+                    md = hyhk.Md,
+                    mdbh = hyhk.Mdbh,
+                    mdmc = hyhk.Mdmc,
+                    hy = hyhk.Hy,
+                    hyzh = hyhk.Hyzh,
+                    hymc = SqlFunc.Subqueryable<LqKhxxEntity>().Where(w => w.Id == hyhk.Hy).Select(w => w.Khmc),
+                    gklx = hyhk.Gklx,
+                    xfje = SqlFunc.ToString(hyhk.Xfje),
+                    sgfy = SqlFunc.ToString(hyhk.Sgfy),
+                    sfykjb = hyhk.Sfykjb,
+                    hksj = hyhk.Hksj,
+                    czry = hyhk.Czry,
+                    memberPhone = SqlFunc.Subqueryable<LqKhxxEntity>().Where(w => w.Id == hyhk.Hy).Select(w => w.Sjh),
+                    isEffective = hyhk.IsEffective,
+                    signatureFile = hyhk.SignatureFile,
+                    remark = hyhk.Remark,
+                    overtimeCoefficient = hyhk.OvertimeCoefficient,
+                    originalSgfy = hyhk.OriginalSgfy,
+                    overtimeSgfy = hyhk.OvertimeSgfy,
+                    appointmentId = hyhk.AppointmentId,
+                })
+                .MergeTable()
+                .OrderBy($"{sidx} {sort}")
+                .ToPagedListAsync(input.currentPage, input.pageSize);
+
+            var data = await query;
+
+            // 获取当前页的耗卡记录ID列表
+            var consumeIds = data.list.Select(x => x.id).ToList();
+
+            // 批量查询耗卡明细、健康师业绩、科技部老师业绩、人次记录
+            var consumeDetails = new List<LqXhPxmxInfoOutput>();
+            var jksyjList = new List<LqXhJksyjInfoOutput>();
+            var kjbsyjList = new List<LqXhKjbsyjInfoOutput>();
+            var personTimesRecordList = new List<LqPersonTimesRecordListOutput>();
+
+            if (consumeIds.Any())
+            {
+                consumeDetails = await _db.Queryable<LqXhPxmxEntity>()
+                    .Where(x => consumeIds.Contains(x.ConsumeInfoId) && x.IsEffective == StatusEnum.有效.GetHashCode())
+                    .Select(x => new LqXhPxmxInfoOutput
+                    {
+                        id = x.Id,
+                        consumeInfoId = x.ConsumeInfoId,
+                        billingItemId = x.BillingItemId,
+                        px = x.Px,
+                        pxmc = x.Pxmc,
+                        pxjg = x.Pxjg,
+                        memberId = x.MemberId,
+                        createTime = x.CreateTIme,
+                        projectNumber = x.ProjectNumber,
+                        originalProjectNumber = x.OriginalProjectNumber,
+                        overtimeProjectNumber = x.OvertimeProjectNumber,
+                        sourceType = x.SourceType,
+                        totalPrice = x.TotalPrice,
+                        isEffective = x.IsEffective,
+                    })
+                    .ToListAsync();
+
+                jksyjList = await _db.Queryable<LqXhJksyjEntity>()
+                    .Where(x => consumeIds.Contains(x.Glkdbh) && x.IsEffective == StatusEnum.有效.GetHashCode())
+                    .Select(x => new LqXhJksyjInfoOutput
+                    {
+                        id = x.Id,
+                        glkdbh = x.Glkdbh,
+                        jks = x.Jks,
+                        jkszh = x.Jkszh,
+                        jksxm = x.Jksxm,
+                        jksyj = SqlFunc.ToString(x.Jksyj),
+                        yjsj = x.Yjsj,
+                        jsjId = x.JsjId,
+                        kdpxid = x.Kdpxid,
+                        laborCost = x.LaborCost,
+                        kdpxNumber = x.KdpxNumber,
+                        originalKdpxNumber = x.OriginalKdpxNumber,
+                        overtimeKdpxNumber = x.OvertimeKdpxNumber,
+                        originalLaborCost = x.OriginalLaborCost,
+                        overtimeLaborCost = x.OvertimeLaborCost,
+                        isAccompanied = x.IsAccompanied,
+                        accompaniedProjectNumber = x.AccompaniedProjectNumber,
+                    })
+                    .ToListAsync();
+
+                kjbsyjList = await _db.Queryable<LqXhKjbsyjEntity>()
+                    .Where(x => consumeIds.Contains(x.Glkdbh) && x.IsEffective == StatusEnum.有效.GetHashCode())
+                    .Select(x => new LqXhKjbsyjInfoOutput
+                    {
+                        id = x.Id,
+                        glkdbh = x.Glkdbh,
+                        kjbls = x.Kjbls,
+                        kjblszh = x.Kjblszh,
+                        kjblsxm = x.Kjblsxm,
+                        kjblsyj = SqlFunc.ToString(x.Kjblsyj),
+                        yjsj = x.Yjsj,
+                        hkpxid = x.Hkpxid,
+                        laborCost = x.LaborCost,
+                        hdpxNumber = x.HdpxNumber,
+                        originalHdpxNumber = x.OriginalHdpxNumber,
+                        overtimeHdpxNumber = x.OvertimeHdpxNumber,
+                        originalLaborCost = x.OriginalLaborCost,
+                        overtimeLaborCost = x.OvertimeLaborCost,
+                    })
+                    .ToListAsync();
+
+                personTimesRecordList = await _db.Queryable<LqPersonTimesRecordEntity>()
+                    .Where(x => consumeIds.Contains(x.BusinessId) && x.IsEffective == StatusEnum.有效.GetHashCode())
+                    .Select(x => new LqPersonTimesRecordListOutput
+                    {
+                        id = x.Id,
+                        businessId = x.BusinessId,
+                        businessType = x.BusinessType,
+                        hasBilling = x.HasBilling,
+                        personType = x.PersonType,
+                        personId = x.PersonId,
+                        personName = x.PersonName,
+                        memberId = x.MemberId,
+                        memberName = x.MemberName,
+                        workDate = x.WorkDate,
+                        workMonth = x.WorkMonth,
+                        quantity = x.Quantity,
+                        createTime = x.CreateTime,
+                        isEffective = x.IsEffective,
+                    })
+                    .ToListAsync();
+            }
+
+            // 按耗卡记录ID分组
+            var consumeDetailsGrouped = consumeDetails.GroupBy(x => x.consumeInfoId)
+                .ToDictionary(g => g.Key, g => g.ToList());
+            var jksyjGrouped = jksyjList.GroupBy(x => x.glkdbh)
+                .ToDictionary(g => g.Key, g => g.ToList());
+            var kjbsyjGrouped = kjbsyjList.GroupBy(x => x.glkdbh)
+                .ToDictionary(g => g.Key, g => g.ToList());
+            var personTimesRecordGrouped = personTimesRecordList.GroupBy(x => x.businessId)
+                .ToDictionary(g => g.Key, g => g.ToList());
+
+            foreach (var item in data.list)
+            {
+                item.ConsumeDetails = consumeDetailsGrouped.ContainsKey(item.id)
+                    ? consumeDetailsGrouped[item.id]
+                    : new List<LqXhPxmxInfoOutput>();
+                item.lqXhJksyjList = jksyjGrouped.ContainsKey(item.id)
+                    ? jksyjGrouped[item.id]
+                    : new List<LqXhJksyjInfoOutput>();
+                item.lqXhKjbsyjList = kjbsyjGrouped.ContainsKey(item.id)
+                    ? kjbsyjGrouped[item.id]
+                    : new List<LqXhKjbsyjInfoOutput>();
+                item.personTimesRecordList = personTimesRecordGrouped.ContainsKey(item.id)
+                    ? personTimesRecordGrouped[item.id]
+                    : new List<LqPersonTimesRecordListOutput>();
+            }
+
+            return PageResult<LqXhHyhkListOutput>.SqlSugarPageResult(data);
+        }
         #endregion
 
         #region 根据健康师ID获取耗卡列表
diff --git a/sql/添加会员生日类型字段.sql b/sql/添加会员生日类型字段.sql
new file mode 100644
index 0000000..23a9e0f
--- /dev/null
+++ b/sql/添加会员生日类型字段.sql
@@ -0,0 +1,7 @@
+-- 为会员信息表(lq_khxx)添加生日类型字段
+-- 用于标识会员过阳历生日还是农历生日
+-- 执行时间：2026-02-05
+-- 字段命名规范：F_ 开头，使用标准英文命名，不用拼音
+
+ALTER TABLE `lq_khxx`
+ADD COLUMN `F_BirthdayType` INT(11) DEFAULT 0 COMMENT '生日类型(0-阳历生日,1-农历生日)' AFTER `yinlsr`;
--
libgit2 0.21.4