feat: 删除LqXhmxb相关代码并优化LqXhHyhkService

- 删除LqXhmxb相关的所有后端代码（Service、Entity、DTO、Interface、Mapper） - 删除LqXhmxb相关的前端Vue组件文件 - 删除LqKdQkbj（欠款补缴）相关代码 - 优化LqXhHyhkService.GetMemberCardUsageRecord方法，支持分页和性能优化 - 修复LqXhHyhkService.GetJksyjList方法，添加分页和时间过滤 - 更新LqKdKdjlbService.GetDebtRecordByStoreId方法，支持分页和已缴欠款逻辑 - 完善LqHytkHytkService.VoidRefundCardInfo方法，添加事务处理 - 修复LqKdKdjlbStringGenerator中健康师名称显示问题 - 更新多个Entity文件以匹配数据库结构 - 添加新的DTO类支持分页查询功能

feat: 删除LqXhmxb相关代码并优化LqXhHyhkService
- 删除LqXhmxb相关的所有后端代码（Service、Entity、DTO、Interface、Mapper） - 删除LqXhmxb相关的前端Vue组件文件 - 删除LqKdQkbj（欠款补缴）相关代码 - 优化LqXhHyhkService.GetMemberCardUsageRecord方法，支持分页和性能优化 - 修复LqXhHyhkService.GetJksyjList方法，添加分页和时间过滤 - 更新LqKdKdjlbService.GetDebtRecordByStoreId方法，支持分页和已缴欠款逻辑 - 完善LqHytkHytkService.VoidRefundCardInfo方法，添加事务处理 - 修复LqKdKdjlbStringGenerator中健康师名称显示问题 - 更新多个Entity文件以匹配数据库结构 - 添加新的DTO类支持分页查询功能
“wangming”
1 parent ada64779
Showing 45 changed files with 621 additions and 2071 deletions
antis-ncc-admin/src/views/lqXhmxb/ExportBox.vue
antis-ncc-admin/src/views/lqXhmxb/Form.vue
antis-ncc-admin/src/views/lqXhmxb/index.vue
netcore/src/Modularity/Extend/NCC.Extend.Entitys/Dto/LqKdDeductinfo/LqKdDeductinfoInfoOutput.cs
netcore/src/Modularity/Extend/NCC.Extend.Entitys/Dto/LqKdKdjlb/DebtPaymentRecordOutput.cs
netcore/src/Modularity/Extend/NCC.Extend.Entitys/Dto/LqKdQkbj/LqKdQkbjUpInput.cs → netcore/src/Modularity/Extend/NCC.Extend.Entitys/Dto/LqKdKdjlb/DebtRecordQueryInput.cs
netcore/src/Modularity/Extend/NCC.Extend.Entitys/Dto/LqKdKdjlb/LqKdKdjlbCrInput.cs
netcore/src/Modularity/Extend/NCC.Extend.Entitys/Dto/LqKdKdjlb/LqKdKdjlbInfoOutput.cs
netcore/src/Modularity/Extend/NCC.Extend.Entitys/Dto/LqKdKdjlb/LqKdKdjlbListOutput.cs
netcore/src/Modularity/Extend/NCC.Extend.Entitys/Dto/LqKdKdjlb/PayDebtInput.cs
netcore/src/Modularity/Extend/NCC.Extend.Entitys/Dto/LqKdPxmx/LqKdPxmxInfoOutput.cs
netcore/src/Modularity/Extend/NCC.Extend.Entitys/Dto/LqKdQkbj/LqKdQkbjCrInput.cs
netcore/src/Modularity/Extend/NCC.Extend.Entitys/Dto/LqKdQkbj/LqKdQkbjInfoOutput.cs
netcore/src/Modularity/Extend/NCC.Extend.Entitys/Dto/LqKdQkbj/LqKdQkbjListOutput.cs
netcore/src/Modularity/Extend/NCC.Extend.Entitys/Dto/LqKdQkbj/LqKdQkbjListQueryInput.cs
netcore/src/Modularity/Extend/NCC.Extend.Entitys/Dto/LqTkjlb/LqTkjlbInfoOutput.cs
netcore/src/Modularity/Extend/NCC.Extend.Entitys/Dto/LqTkjlb/LqTkjlbListOutput.cs
netcore/src/Modularity/Extend/NCC.Extend.Entitys/Dto/LqXhHyhk/LqXhHyhkMemberCardUsageOutput.cs
netcore/src/Modularity/Extend/NCC.Extend.Entitys/Dto/LqXhHyhk/LqXhHyhkMemberCardUsageQueryInput.cs
netcore/src/Modularity/Extend/NCC.Extend.Entitys/Dto/LqKdKdjlb/DebtPaymentQueryInput.cs → netcore/src/Modularity/Extend/NCC.Extend.Entitys/Dto/LqXhHyhk/LqXhJksyjQueryInput.cs
-<template>
-  <el-dialog title="导出数据" :close-on-click-modal="false" :visible.sync="visible"
-    class="NCC-dialog NCC-dialog_center" lock-scroll width="600px">
-    <el-form label-position="top" label-width="80px">
-      <el-form-item label="数据选择">
-        <el-radio-group v-model="type">
-          <el-radio :label="0">当前页面数据</el-radio>
-          <el-radio :label="1">全部页面数据</el-radio>
-        </el-radio-group>
-      </el-form-item>
-      <el-form-item label="导出字段">
-        <el-checkbox :indeterminate="isIndeterminate" v-model="checkAll"
-          @change="handleCheckAllChange">全选</el-checkbox>
-        <el-checkbox-group v-model="columns" @change="handleCheckedChange">
-          <el-checkbox v-for="item in columnList" :label="item.prop" :key="item.prop">
-            {{item.label}}
-          </el-checkbox>
-        </el-checkbox-group>
-      </el-form-item>
-    </el-form>
-    <span slot="footer" class="dialog-footer">
-      <el-button @click="visible=false">取 消</el-button>
-      <el-button type="primary" @click="downLoad">导 出</el-button>
-    </span>
-  </el-dialog>
-</template>
-
-<script>
-export default {
-  data() {
-    return {
-      visible: false,
-      btnLoading: false,
-      type: 0,
-      columns: [],
-      checkAll: true,
-      isIndeterminate: false,
-      columnList: []
-    }
-  },
-  methods: {
-    init(columnList) {
-      this.visible = true
-      this.columnList = columnList
-      this.columns = columnList.map(o => o.prop)
-    },
-    handleCheckAllChange(val) {
-      this.columns = val ? this.columnList.map(o => o.prop) : [];
-      this.isIndeterminate = false;
-    },
-    handleCheckedChange(value) {
-      let checkedCount = value.length;
-      this.checkAll = checkedCount === this.columnList.length;
-      this.isIndeterminate = checkedCount > 0 && checkedCount < this.columnList.length;
-    },
-    downLoad() {
-      this.$emit('download', { dataType: this.type, selectKey: this.columns.join(',') })
-    }
-  }
-}
-</script>
-<style lang="scss" scoped>
->>> .el-dialog__body {
-  padding: 20px !important;
-}
-</style>
 \ No newline at end of file
-<template>
-	<el-dialog :title="!dataForm.id ? '新建' :  isDetail ? '详情':'编辑'" :close-on-click-modal="false" :visible.sync="visible" class="NCC-dialog NCC-dialog_center" lock-scroll width="600px">
-		<el-row :gutter="15" class="" >
-				<el-form ref="elForm" :model="dataForm" size="small" label-width="100px" label-position="right" :disabled="!!isDetail" :rules="rules">
-					<el-col :span="24" v-if="false" >
-						<el-form-item label="消耗编号" prop="id">
-							<el-input v-model="dataForm.id" placeholder="请输入" clearable :style='{"width":"100%"}' >
-							</el-input>
-						</el-form-item>
-					</el-col>
-					<el-col :span="24">
-						<el-form-item label="门店编号" prop="mdbh">
-							<el-input v-model="dataForm.mdbh" placeholder="请输入" clearable :style='{"width":"100%"}' >
-							</el-input>
-						</el-form-item>
-					</el-col>
-					<el-col :span="24">
-						<el-form-item label="门店名称" prop="mdmc">
-							<el-input v-model="dataForm.mdmc" placeholder="请输入" clearable :style='{"width":"100%"}' >
-							</el-input>
-						</el-form-item>
-					</el-col>
-					<el-col :span="24">
-						<el-form-item label="部门编号" prop="bmbh">
-							<el-input v-model="dataForm.bmbh" placeholder="请输入" clearable :style='{"width":"100%"}' >
-							</el-input>
-						</el-form-item>
-					</el-col>
-					<el-col :span="24">
-						<el-form-item label="部门名称" prop="bmmc">
-							<el-input v-model="dataForm.bmmc" placeholder="请输入" clearable :style='{"width":"100%"}' >
-							</el-input>
-						</el-form-item>
-					</el-col>
-					<el-col :span="24">
-						<el-form-item label="员工编号" prop="ygbh">
-							<el-input v-model="dataForm.ygbh" placeholder="请输入" clearable :style='{"width":"100%"}' >
-							</el-input>
-						</el-form-item>
-					</el-col>
-					<el-col :span="24">
-						<el-form-item label="员工名称" prop="ygmc">
-							<el-input v-model="dataForm.ygmc" placeholder="请输入" clearable :style='{"width":"100%"}' >
-							</el-input>
-						</el-form-item>
-					</el-col>
-					<el-col :span="24">
-						<el-form-item label="项目数" prop="xms">
-							<el-input v-model="dataForm.xms" placeholder="请输入" clearable :style='{"width":"100%"}' >
-							</el-input>
-						</el-form-item>
-					</el-col>
-					<el-col :span="24">
-						<el-form-item label="消耗" prop="xh">
-							<el-input v-model="dataForm.xh" placeholder="请输入" clearable :style='{"width":"100%"}' >
-							</el-input>
-						</el-form-item>
-					</el-col>
-					<el-col :span="24">
-						<el-form-item label="手工" prop="sg">
-							<el-input v-model="dataForm.sg" placeholder="请输入" clearable :style='{"width":"100%"}' >
-							</el-input>
-						</el-form-item>
-					</el-col>
-					<el-col :span="24">
-						<el-form-item label="其它手工1" prop="qtsg1">
-							<el-input v-model="dataForm.qtsg1" placeholder="请输入" clearable :style='{"width":"100%"}' >
-							</el-input>
-						</el-form-item>
-					</el-col>
-					<el-col :span="24">
-						<el-form-item label="其它手工2" prop="qtsg2">
-							<el-input v-model="dataForm.qtsg2" placeholder="请输入" clearable :style='{"width":"100%"}' >
-							</el-input>
-						</el-form-item>
-					</el-col>
-					<el-col :span="24">
-						<el-form-item label="其它手工3" prop="qtsg3">
-							<el-input v-model="dataForm.qtsg3" placeholder="请输入" clearable :style='{"width":"100%"}' >
-							</el-input>
-						</el-form-item>
-					</el-col>
-					<el-col :span="24">
-						<el-form-item label="手工合计" prop="sghj">
-							<el-input v-model="dataForm.sghj" placeholder="请输入" clearable :style='{"width":"100%"}' >
-							</el-input>
-						</el-form-item>
-					</el-col>
-				</el-form>
-		</el-row>
-		<span slot="footer" class="dialog-footer">
-			<el-button @click="visible = false">取 消</el-button>
-			<el-button type="primary" @click="dataFormSubmit()" v-if="!isDetail">确 定</el-button>
-		</span>
-	</el-dialog>
-</template>
-<script>
-	import request from '@/utils/request'
-	import { getDictionaryDataSelector } from '@/api/systemData/dictionary'
-	import { previewDataInterface } from '@/api/systemData/dataInterface'
-	export default {
-		components: {},
-		props: [],
-		data() {
-			return {
-				loading: false,
-				visible: false,
-				isDetail: false,
-				dataForm: {
-					id:'',
-					id:undefined,
-					mdbh:undefined,
-					mdmc:undefined,
-					bmbh:undefined,
-					bmmc:undefined,
-					ygbh:undefined,
-					ygmc:undefined,
-					xms:undefined,
-					xh:undefined,
-					sg:undefined,
-					qtsg1:undefined,
-					qtsg2:undefined,
-					qtsg3:undefined,
-					sghj:undefined,
-				},
-				rules: {
-				},
-			}
-		},
-		computed: {},
-        watch: {},
-        created() {
-		},
-		mounted() {
-        },
-		methods: {
-			goBack() {
-                this.$emit('refresh')
-            },
-			init(id, isDetail) {
-				this.dataForm.id = id || 0;
-                this.visible = true;
-                this.isDetail = isDetail || false;
-				this.$nextTick(() => {
-					this.$refs['elForm'].resetFields();
-					if (this.dataForm.id) {
-						request({
-							url: '/api/Extend/LqXhmxb/' + this.dataForm.id,
-							method: 'get'
-						}).then(res =>{
-							this.dataForm = res.data;
-						})
-					}
-				})
-			},
-			dataFormSubmit() {
-				this.$refs['elForm'].validate((valid) => {
-                    if (valid) {
-                        if (!this.dataForm.id) {
-                            request({
-                                url: `/api/Extend/LqXhmxb`,
-                                method: 'post',
-                                data: this.dataForm,
-                            }).then((res) => {
-                                this.$message({
-                                    message: res.msg,
-                                    type: 'success',
-                                    duration: 1000,
-                                    onClose: () => {
-                                        this.visible = false,
-                                            this.$emit('refresh', true)
-                                    }
-                                })
-                            })
-                        } else {
-                            request({
-                                url: '/api/Extend/LqXhmxb/' + this.dataForm.id,
-                                method: 'PUT',
-                                data: this.dataForm
-                            }).then((res) => {
-                                this.$message({
-                                    message: res.msg,
-                                    type: 'success',
-                                    duration: 1000,
-                                    onClose: () => {
-                                        this.visible = false
-                                        this.$emit('refresh', true)
-                                    }
-                                })
-                            })
-                        }
-                    }
-                })
-			},
-		}
-	}
-</script>
-<template>
-	<div class="NCC-common-layout">
-		<div class="NCC-common-layout-center">
-			<el-row class="NCC-common-search-box" :gutter="16">
-				<el-form @submit.native.prevent>
-					<el-col :span="6">
-						<el-form-item label="消耗编号">
-							<el-input v-model="query.id" placeholder="消耗编号" clearable />	
-						</el-form-item>
-					</el-col>
-					<el-col :span="6">
-						<el-form-item label="门店编号">
-							<el-input v-model="query.mdbh" placeholder="门店编号" clearable />	
-						</el-form-item>
-					</el-col>
-					<el-col :span="6">
-						<el-form-item label="门店名称">
-							<el-input v-model="query.mdmc" placeholder="门店名称" clearable />	
-						</el-form-item>
-					</el-col>
-					<template v-if="showAll">
-					<el-col :span="6">
-						<el-form-item label="部门编号">
-							<el-input v-model="query.bmbh" placeholder="部门编号" clearable />	
-						</el-form-item>
-					</el-col>
-					<el-col :span="6">
-						<el-form-item label="部门名称">
-							<el-input v-model="query.bmmc" placeholder="部门名称" clearable />	
-						</el-form-item>
-					</el-col>
-					<el-col :span="6">
-						<el-form-item label="员工编号">
-							<el-input v-model="query.ygbh" placeholder="员工编号" clearable />	
-						</el-form-item>
-					</el-col>
-					<el-col :span="6">
-						<el-form-item label="员工名称">
-							<el-input v-model="query.ygmc" placeholder="员工名称" clearable />	
-						</el-form-item>
-					</el-col>
-					<el-col :span="6">
-						<el-form-item label="项目数">
-							<el-input v-model="query.xms" placeholder="项目数" clearable />	
-						</el-form-item>
-					</el-col>
-					<el-col :span="6">
-						<el-form-item label="消耗">
-							<el-input v-model="query.xh" placeholder="消耗" clearable />	
-						</el-form-item>
-					</el-col>
-					<el-col :span="6">
-						<el-form-item label="手工">
-							<el-input v-model="query.sg" placeholder="手工" clearable />	
-						</el-form-item>
-					</el-col>
-					<el-col :span="6">
-						<el-form-item label="其它手工1">
-							<el-input v-model="query.qtsg1" placeholder="其它手工1" clearable />	
-						</el-form-item>
-					</el-col>
-					<el-col :span="6">
-						<el-form-item label="其它手工2">
-							<el-input v-model="query.qtsg2" placeholder="其它手工2" clearable />	
-						</el-form-item>
-					</el-col>
-					<el-col :span="6">
-						<el-form-item label="其它手工3">
-							<el-input v-model="query.qtsg3" placeholder="其它手工3" clearable />	
-						</el-form-item>
-					</el-col>
-					<el-col :span="6">
-						<el-form-item label="手工合计">
-							<el-input v-model="query.sghj" placeholder="手工合计" clearable />	
-						</el-form-item>
-					</el-col>
-					</template>
-					<el-col :span="6">
-						<el-form-item>
-							<el-button type="primary" icon="el-icon-search" @click="search()">查询</el-button>
-							<el-button icon="el-icon-refresh-right" @click="reset()">重置</el-button>
-							<el-button type="text" icon="el-icon-arrow-down" @click="showAll=true" v-if="!showAll">展开</el-button>
-							<el-button type="text" icon="el-icon-arrow-up" @click="showAll=false" v-else>收起</el-button>
-						</el-form-item>
-					</el-col>
-				</el-form>
-			</el-row>
-			<div class="NCC-common-layout-main NCC-flex-main">
-				<div class="NCC-common-head">
-					<div>
-						<el-button type="primary" icon="el-icon-plus" @click="addOrUpdateHandle()">新增</el-button>
-						<el-button type="text" icon="el-icon-download" @click="exportData()">导出</el-button>
-						<el-button type="text" icon="el-icon-delete" @click="handleBatchRemoveDel()">批量删除</el-button>
-					</div>
-					<div class="NCC-common-head-right">
-						<el-tooltip effect="dark" content="刷新" placement="top">
-							<el-link icon="icon-ym icon-ym-Refresh NCC-common-head-icon" :underline="false" @click="reset()" />
-						</el-tooltip>
-						<screenfull isContainer />
-					</div>
-				</div>
-                <NCC-table v-loading="listLoading" :data="list" has-c @selection-change="handleSelectionChange">
-					<el-table-column prop="id" label="消耗编号" align="left" />
-					<el-table-column prop="mdbh" label="门店编号" align="left" />
-					<el-table-column prop="mdmc" label="门店名称" align="left" />
-					<el-table-column prop="bmbh" label="部门编号" align="left" />
-					<el-table-column prop="bmmc" label="部门名称" align="left" />
-					<el-table-column prop="ygbh" label="员工编号" align="left" />
-					<el-table-column prop="ygmc" label="员工名称" align="left" />
-					<el-table-column prop="xms" label="项目数" align="left" />
-					<el-table-column prop="xh" label="消耗" align="left" />
-					<el-table-column prop="sg" label="手工" align="left" />
-					<el-table-column prop="qtsg1" label="其它手工1" align="left" />
-					<el-table-column prop="qtsg2" label="其它手工2" align="left" />
-					<el-table-column prop="qtsg3" label="其它手工3" align="left" />
-					<el-table-column prop="sghj" label="手工合计" align="left" />
-					<el-table-column label="操作" fixed="right" width="100">
-							<template slot-scope="scope">
-							<el-button type="text" @click="addOrUpdateHandle(scope.row.id)" >编辑</el-button>
-							<el-button type="text" @click="handleDel(scope.row.id)" class="NCC-table-delBtn" >删除</el-button>
-						</template>
-					</el-table-column>
-				</NCC-table>
-                <pagination :total="total" :page.sync="listQuery.currentPage" :limit.sync="listQuery.pageSize" @pagination="initData" />
-            </div>
-        </div>
-		<NCC-Form v-if="formVisible" ref="NCCForm" @refresh="refresh" />
-		<ExportBox v-if="exportBoxVisible" ref="ExportBox" @download="download" />
-	</div>
-</template>
-<script>
-    import request from '@/utils/request'
-    import { getDictionaryDataSelector } from '@/api/systemData/dictionary'
-    import NCCForm from './Form'
-    import ExportBox from './ExportBox'
-    import { previewDataInterface } from '@/api/systemData/dataInterface'
-	export default {
-        components: { NCCForm, ExportBox },
-        data() {
-            return {
-                showAll: false,
-				query: {
-                    id:undefined,
-                    mdbh:undefined,
-                    mdmc:undefined,
-                    bmbh:undefined,
-                    bmmc:undefined,
-                    ygbh:undefined,
-                    ygmc:undefined,
-                    xms:undefined,
-                    xh:undefined,
-                    sg:undefined,
-                    qtsg1:undefined,
-                    qtsg2:undefined,
-                    qtsg3:undefined,
-                    sghj:undefined,
-				},
-                list: [],
-                listLoading: true,
-                multipleSelection: [], total: 0,
-                listQuery: {
-                    currentPage: 1,
-                    pageSize: 20,
-					sort: "desc",
-                    sidx: "",
-                },
-                formVisible: false,
-                exportBoxVisible: false,
-                columnList: [
-                    { prop: 'id', label: '消耗编号' },
-                    { prop: 'mdbh', label: '门店编号' },
-                    { prop: 'mdmc', label: '门店名称' },
-                    { prop: 'bmbh', label: '部门编号' },
-                    { prop: 'bmmc', label: '部门名称' },
-                    { prop: 'ygbh', label: '员工编号' },
-                    { prop: 'ygmc', label: '员工名称' },
-                    { prop: 'xms', label: '项目数' },
-                    { prop: 'xh', label: '消耗' },
-                    { prop: 'sg', label: '手工' },
-                    { prop: 'qtsg1', label: '其它手工1' },
-                    { prop: 'qtsg2', label: '其它手工2' },
-                    { prop: 'qtsg3', label: '其它手工3' },
-                    { prop: 'sghj', label: '手工合计' },
-				],
-			}
-        },
-		computed: {},
-		created() {
-			this.initData()
-		},
-		methods: {
-			initData() {
-                this.listLoading = true;
-                let _query = {
-                    ...this.listQuery,
-                    ...this.query
-                };
-                let query = {}
-                for (let key in _query) {
-                    if (Array.isArray(_query[key])) {
-                        query[key] = _query[key].join()
-                    } else {
-                        query[key] = _query[key]
-                    }
-                }
-                request({
-                    url: `/api/Extend/LqXhmxb`,
-                    method: 'GET',
-                    data: query
-                }).then(res => {
-                    this.list = res.data.list
-                    this.total = res.data.pagination.total
-                    this.listLoading = false
-                })
-            },
-			handleDel(id) {
-                this.$confirm('此操作将永久删除该数据, 是否继续?', '提示', {
-                    type: 'warning'
-                }).then(() => {
-                    request({
-                        url: `/api/Extend/LqXhmxb/${id}`,
-                        method: 'DELETE'
-                    }).then(res => {
-                        this.$message({
-                            type: 'success',
-                            message: res.msg,
-                            onClose: () => {
-                                this.initData()
-                            }
-                        });
-                    })
-                }).catch(() => {
-                });
-            },
-			handleSelectionChange(val) {
-                const res = val.map(item => item.id)
-                this.multipleSelection = res
-            },
-            handleBatchRemoveDel() {
-                if (!this.multipleSelection.length) {
-                    this.$message({
-                        type: 'error',
-                        message: '请选择一条数据',
-                        duration: 1500,
-                    })
-                    return
-                }
-                const ids = this.multipleSelection
-                this.$confirm('您确定要删除这些数据吗, 是否继续？', '提示', {
-                    type: 'warning'
-                }).then(() => {
-                    request({
-                        url: `/api/Extend/LqXhmxb/batchRemove`,
-                        method: 'POST',
-                        data: ids ,
-                    }).then(res => {
-                        this.$message({
-                            type: 'success',
-                            message: res.msg,
-                            onClose: () => {
-                                this.initData()
-                            }
-                        });
-                    })
-                }).catch(() => { })
-            },
-			addOrUpdateHandle(id, isDetail) {
-                this.formVisible = true
-                this.$nextTick(() => {
-                    this.$refs.NCCForm.init(id, isDetail)
-                })
-            },
-			exportData() {
-                this.exportBoxVisible = true
-                this.$nextTick(() => {
-                    this.$refs.ExportBox.init(this.columnList)
-                })
-            },
-            download(data) {
-                let query = { ...data, ...this.listQuery, ...this.query }
-                request({
-                    url: `/api/Extend/LqXhmxb/Actions/Export`,
-                    method: 'GET',
-                    data: query
-                }).then(res => {
-                    if (!res.data.url) return
-                    window.location.href = this.define.comUrl + res.data.url
-                    this.$refs.ExportBox.visible = false
-                    this.exportBoxVisible = false
-                })
-            },
-			search() {
-                this.listQuery = {
-                    currentPage: 1,
-                    pageSize: 20,
-                    sort: "desc",
-                    sidx: "",
-                }
-                this.initData()
-            },
-            refresh(isrRefresh) {
-                this.formVisible = false
-                if (isrRefresh) this.reset()
-            },
-            reset() {
-                for (let key in this.query) {
-                    this.query[key] = undefined
-                }
-                this.listQuery = {
-                    currentPage: 1,
-                    pageSize: 20,
-                    sort: "desc",
-                    sidx: "",
-                }
-                this.initData()
-            }
-		}
-    }
-</script>
 \ No newline at end of file
@@ -10,57 +10,62 @@ namespace NCC.Extend.Entitys.Dto.LqKdDeductinfo
         /// <summary>
         /// 主键
         /// </summary>
-        public string Id { get; set; }
+        public string id { get; set; }
         /// <summary>
         /// 扣减类型
         /// </summary>
-        public string DeductType { get; set; }
+        public string deductType { get; set; }
         /// <summary>
         /// 扣减类型名称
         /// </summary>
-        public string DeductTypeName { get; set; }
+        public string deductTypeName { get; set; }
         /// <summary>
         /// 扣减关联ID
         /// </summary>
-        public string DeductId { get; set; }
+        public string deductId { get; set; }
         /// <summary>
         /// 开单id
         /// </summary>
-        public string BillingId { get; set; }
+        public string billingId { get; set; }
         /// <summary>
         /// 合计金额
         /// </summary>
-        public decimal? Amount { get; set; }
+        public decimal? amount { get; set; }
         /// <summary>
         /// 是否有效
         /// </summary>
-        public int? IsEffective { get; set; }
+        public int? isEffective { get; set; }
         /// <summary>
         /// 单价
         /// </summary>
-        public decimal? UnitPrice { get; set; }
+        public decimal? unitPrice { get; set; }
         /// <summary>
         /// 品项名称
         /// </summary>
-        public string ItemName { get; set; }
+        public string itemName { get; set; }
         /// <summary>
         /// 品项id
         /// </summary>
-        public string ItemId { get; set; }
+        public string itemId { get; set; }
+
+        /// <summary>
+        /// 项目数量
+        /// </summary>
+        public decimal? projectNumber { get; set; }
         /// <summary>
         /// 创建时间
         /// </summary>
-        public DateTime? CreateTime { get; set; }
+        public DateTime? createTime { get; set; }
     }
 }
-using System;
-using System.ComponentModel.DataAnnotations;
-
-namespace NCC.Extend.Entitys.Dto.LqKdKdjlb
-{
-    /// <summary>
-    /// 补缴欠款记录输出
-    /// </summary>
-    public class DebtPaymentRecordOutput
-    {
-        /// <summary>
-        /// 补缴记录ID
-        /// </summary>
-        [Display(Name = "补缴记录ID", Description = "补缴欠款记录的唯一标识")]
-        public string Id { get; set; }
-
-        /// <summary>
-        /// 开单记录ID
-        /// </summary>
-        [Display(Name = "开单记录ID", Description = "关联的开单记录ID")]
-        public string BillingId { get; set; }
-
-        /// <summary>
-        /// 补缴金额
-        /// </summary>
-        [Display(Name = "补缴金额", Description = "客户补缴的欠款金额")]
-        public decimal PaymentAmount { get; set; }
-
-        /// <summary>
-        /// 付款方式
-        /// </summary>
-        [Display(Name = "付款方式", Description = "客户付款的方式")]
-        public string PaymentMethod { get; set; }
-
-        /// <summary>
-        /// 付款日期
-        /// </summary>
-        [Display(Name = "付款日期", Description = "客户实际付款的日期")]
-        public DateTime PaymentDate { get; set; }
-
-        /// <summary>
-        /// 收款人员
-        /// </summary>
-        [Display(Name = "收款人员", Description = "负责收款的工作人员")]
-        public string PaymentUser { get; set; }
-
-        /// <summary>
-        /// 备注
-        /// </summary>
-        [Display(Name = "备注", Description = "补缴欠款的备注信息")]
-        public string Remarks { get; set; }
-
-        /// <summary>
-        /// 创建时间
-        /// </summary>
-        [Display(Name = "创建时间", Description = "补缴记录的创建时间")]
-        public DateTime CreateTime { get; set; }
-    }
-}
-using System;
 using System.ComponentModel.DataAnnotations;
+using NCC.Common.Filter;
-namespace NCC.Extend.Entitys.Dto.LqKdQkbj
+namespace NCC.Extend.Entitys.Dto.LqKdKdjlb
 {
     /// <summary>
-    /// 开单欠款补缴记录更新输入
+    /// 门店欠款记录查询输入
     /// </summary>
-    public class LqKdQkbjUpInput : LqKdQkbjCrInput
+    public class DebtRecordQueryInput : PageInputBase
     {
         /// <summary>
-        /// 主键
+        /// 门店ID
         /// </summary>
-        [Required(ErrorMessage = "主键不能为空")]
-        public string Id { get; set; }
+        [Required(ErrorMessage = "门店ID不能为空")]
+        [Display(Name = "门店ID", Description = "查询欠款记录的门店ID")]
+        public string StoreId { get; set; }
     }
 }
@@ -161,6 +161,16 @@ namespace NCC.Extend.Entitys.Dto.LqKdKdjlb
         public string cancelRefRemarks { get; set; }
         /// <summary>
+        /// 补缴开单ID
+        /// </summary>
+        public string supplementBillingId { get; set; }
+
+        /// <summary>
+        /// 补缴金额
+        /// </summary>
+        public decimal supplementAmount { get; set; }
+
+        /// <summary>
         /// 扣款信息
         /// </summary>
         public List<LqKdDeductinfoCrInput> lqKdKdjlbDeductList { get; set; }
@@ -157,6 +157,27 @@ namespace NCC.Extend.Entitys.Dto.LqKdKdjlb
         public int IsEffective { get; set; }
         /// <summary>
+        /// 补缴开单ID
+        /// </summary>
+        public string SupplementBillingId { get; set; }
+
+        /// <summary>
+        /// 补缴金额
+        /// </summary>
+        public decimal SupplementAmount { get; set; }
+
+        /// <summary>
+        /// 已缴欠款
+        /// </summary>
+        public decimal PaidDebt { get; set; }
+
+
+        /// <summary>
+        /// 作废关联备注
+        /// </summary>
+        public string CancelRefRemarks { get; set; }
+
+        /// <summary>
         /// 健康师业绩
         /// </summary>
         public List<LqKdJksyjInfoOutput> lqKdJksyjList { get; set; }
@@ -53,6 +53,11 @@ namespace NCC.Extend.Entitys.Dto.LqKdKdjlb
         public decimal qk { get; set; }
         /// <summary>
+        /// 已缴欠款
+        /// </summary>
+        public decimal PaidDebt { get; set; }
+
+        /// <summary>
         /// 储扣方式
         /// </summary>
         public string ckfs { get; set; }
-using System;
-using System.ComponentModel.DataAnnotations;
-
-namespace NCC.Extend.Entitys.Dto.LqKdKdjlb
-{
-    /// <summary>
-    /// 补缴欠款输入
-    /// </summary>
-    public class PayDebtInput
-    {
-        /// <summary>
-        /// 开单记录ID
-        /// </summary>
-        [Required(ErrorMessage = "开单记录ID不能为空")]
-        [Display(Name = "开单记录ID", Description = "需要补缴欠款的开单记录ID")]
-        public string BillingId { get; set; }
-
-        /// <summary>
-        /// 补缴金额
-        /// </summary>
-        [Required(ErrorMessage = "补缴金额不能为空")]
-        [Range(0.01, double.MaxValue, ErrorMessage = "补缴金额必须大于0")]
-        [Display(Name = "补缴金额", Description = "客户补缴的欠款金额")]
-        public decimal PaymentAmount { get; set; }
-
-        /// <summary>
-        /// 付款方式
-        /// </summary>
-        [Display(Name = "付款方式", Description = "客户付款的方式（现金、刷卡、转账等）")]
-        public string PaymentMethod { get; set; }
-
-        /// <summary>
-        /// 付款日期
-        /// </summary>
-        [Display(Name = "付款日期", Description = "客户实际付款的日期")]
-        public DateTime? PaymentDate { get; set; }
-
-        /// <summary>
-        /// 收款人员
-        /// </summary>
-        [Display(Name = "收款人员", Description = "负责收款的工作人员")]
-        public string PaymentUser { get; set; }
-
-        /// <summary>
-        /// 备注
-        /// </summary>
-        [Display(Name = "备注", Description = "补缴欠款的备注信息")]
-        public string Remarks { get; set; }
-    }
-}
@@ -78,7 +78,7 @@ namespace NCC.Extend.Entitys.Dto.LqKdKdjlb
         /// <summary>
         /// 是否有效
         /// </summary>
-        public int IsEffective { get; set; }
+        public int isEffective { get; set; }
         /// <summary>
         /// 健康师业绩列表
-using System;
-using System.ComponentModel.DataAnnotations;
-
-namespace NCC.Extend.Entitys.Dto.LqKdQkbj
-{
-    /// <summary>
-    /// 开单欠款补缴记录创建输入
-    /// </summary>
-    public class LqKdQkbjCrInput
-    {
-        /// <summary>
-        /// 开单ID
-        /// </summary>
-        [Required(ErrorMessage = "开单ID不能为空")]
-        public string BillingId { get; set; }
-
-        /// <summary>
-        /// 补缴金额
-        /// </summary>
-        [Required(ErrorMessage = "补缴金额不能为空")]
-        [Range(0.01, 999999.99, ErrorMessage = "补缴金额必须在0.01到999999.99之间")]
-        public decimal PaymentAmount { get; set; }
-
-        /// <summary>
-        /// 补缴方式
-        /// </summary>
-        [Required(ErrorMessage = "补缴方式不能为空")]
-        public string PaymentMethod { get; set; }
-
-        /// <summary>
-        /// 补缴时间
-        /// </summary>
-        [Required(ErrorMessage = "补缴时间不能为空")]
-        public DateTime PaymentTime { get; set; }
-
-        /// <summary>
-        /// 补缴操作人
-        /// </summary>
-        public string PaymentUser { get; set; }
-
-        /// <summary>
-        /// 补缴账户
-        /// </summary>
-        public string PaymentAccount { get; set; }
-
-        /// <summary>
-        /// 补缴凭证号
-        /// </summary>
-        public string PaymentReference { get; set; }
-
-        /// <summary>
-        /// 补缴备注
-        /// </summary>
-        [StringLength(500, ErrorMessage = "补缴备注不能超过500个字符")]
-        public string Remark { get; set; }
-    }
-}
-using System;
-
-namespace NCC.Extend.Entitys.Dto.LqKdQkbj
-{
-    /// <summary>
-    /// 开单欠款补缴记录详情输出
-    /// </summary>
-    public class LqKdQkbjInfoOutput
-    {
-        /// <summary>
-        /// 主键
-        /// </summary>
-        public string Id { get; set; }
-
-        /// <summary>
-        /// 开单ID
-        /// </summary>
-        public string BillingId { get; set; }
-
-        /// <summary>
-        /// 补缴金额
-        /// </summary>
-        public decimal PaymentAmount { get; set; }
-
-        /// <summary>
-        /// 补缴方式
-        /// </summary>
-        public string PaymentMethod { get; set; }
-
-        /// <summary>
-        /// 补缴方式名称
-        /// </summary>
-        public string PaymentMethodName { get; set; }
-
-        /// <summary>
-        /// 补缴时间
-        /// </summary>
-        public DateTime PaymentTime { get; set; }
-
-        /// <summary>
-        /// 补缴操作人
-        /// </summary>
-        public string PaymentUser { get; set; }
-
-        /// <summary>
-        /// 补缴操作人姓名
-        /// </summary>
-        public string PaymentUserName { get; set; }
-
-        /// <summary>
-        /// 补缴账户
-        /// </summary>
-        public string PaymentAccount { get; set; }
-
-        /// <summary>
-        /// 补缴凭证号
-        /// </summary>
-        public string PaymentReference { get; set; }
-
-        /// <summary>
-        /// 补缴备注
-        /// </summary>
-        public string Remark { get; set; }
-
-        /// <summary>
-        /// 创建时间
-        /// </summary>
-        public DateTime CreateTime { get; set; }
-
-        /// <summary>
-        /// 更新时间
-        /// </summary>
-        public DateTime UpdateTime { get; set; }
-
-        /// <summary>
-        /// 是否有效
-        /// </summary>
-        public int IsEffective { get; set; }
-    }
-}
-using System;
-
-namespace NCC.Extend.Entitys.Dto.LqKdQkbj
-{
-    /// <summary>
-    /// 开单欠款补缴记录列表输出
-    /// </summary>
-    public class LqKdQkbjListOutput
-    {
-        /// <summary>
-        /// 主键
-        /// </summary>
-        public string Id { get; set; }
-
-        /// <summary>
-        /// 开单ID
-        /// </summary>
-        public string BillingId { get; set; }
-
-        /// <summary>
-        /// 补缴金额
-        /// </summary>
-        public decimal PaymentAmount { get; set; }
-
-        /// <summary>
-        /// 补缴方式
-        /// </summary>
-        public string PaymentMethod { get; set; }
-
-        /// <summary>
-        /// 补缴方式名称
-        /// </summary>
-        public string PaymentMethodName { get; set; }
-
-        /// <summary>
-        /// 补缴时间
-        /// </summary>
-        public DateTime PaymentTime { get; set; }
-
-        /// <summary>
-        /// 补缴操作人
-        /// </summary>
-        public string PaymentUser { get; set; }
-
-        /// <summary>
-        /// 补缴操作人姓名
-        /// </summary>
-        public string PaymentUserName { get; set; }
-
-        /// <summary>
-        /// 补缴账户
-        /// </summary>
-        public string PaymentAccount { get; set; }
-
-        /// <summary>
-        /// 补缴凭证号
-        /// </summary>
-        public string PaymentReference { get; set; }
-
-        /// <summary>
-        /// 补缴备注
-        /// </summary>
-        public string Remark { get; set; }
-
-        /// <summary>
-        /// 创建时间
-        /// </summary>
-        public DateTime CreateTime { get; set; }
-
-        /// <summary>
-        /// 是否有效
-        /// </summary>
-        public int IsEffective { get; set; }
-    }
-}
-using System;
-
-namespace NCC.Extend.Entitys.Dto.LqKdQkbj
-{
-    /// <summary>
-    /// 开单欠款补缴记录列表查询输入
-    /// </summary>
-    public class LqKdQkbjListQueryInput
-    {
-        /// <summary>
-        /// 开单ID
-        /// </summary>
-        public string BillingId { get; set; }
-
-        /// <summary>
-        /// 补缴方式
-        /// </summary>
-        public string PaymentMethod { get; set; }
-
-        /// <summary>
-        /// 补缴操作人
-        /// </summary>
-        public string PaymentUser { get; set; }
-
-        /// <summary>
-        /// 最小补缴金额
-        /// </summary>
-        public decimal? MinPaymentAmount { get; set; }
-
-        /// <summary>
-        /// 最大补缴金额
-        /// </summary>
-        public decimal? MaxPaymentAmount { get; set; }
-
-        /// <summary>
-        /// 开始补缴时间
-        /// </summary>
-        public DateTime? StartPaymentTime { get; set; }
-
-        /// <summary>
-        /// 结束补缴时间
-        /// </summary>
-        public DateTime? EndPaymentTime { get; set; }
-
-        /// <summary>
-        /// 是否有效
-        /// </summary>
-        public int? IsEffective { get; set; }
-
-        /// <summary>
-        /// 补缴凭证号
-        /// </summary>
-        public string PaymentReference { get; set; }
-    }
-}
@@ -82,5 +82,10 @@ namespace NCC.Extend.Entitys.Dto.LqTkjlb
         /// 拓客活动名称
         /// </summary>
         public string eventName { get; set; }
+
+        /// <summary>
+        /// 是否有效
+        /// </summary>
+        public int isEffective { get; set; }
     }
 }
@@ -92,5 +92,10 @@ namespace NCC.Extend.Entitys.Dto.LqTkjlb
         /// 拓客活动名称
         /// </summary>
         public string eventName { get; set; }
+
+        /// <summary>
+        /// 是否有效
+        /// </summary>
+        public int isEffective { get; set; }
     }
 }
+using System;
+using System.Collections.Generic;
+
+namespace NCC.Extend.Entitys.Dto.LqXhHyhk
+{
+    /// <summary>
+    /// 会员耗卡记录输出
+    /// </summary>
+    public class LqXhHyhkMemberCardUsageOutput
+    {
+        /// <summary>
+        /// 耗卡记录ID
+        /// </summary>
+        public string Id { get; set; }
+
+        /// <summary>
+        /// 会员ID
+        /// </summary>
+        public string MemberId { get; set; }
+
+        /// <summary>
+        /// 会员姓名
+        /// </summary>
+        public string MemberName { get; set; }
+
+        /// <summary>
+        /// 门店ID
+        /// </summary>
+        public string StoreId { get; set; }
+
+        /// <summary>
+        /// 门店名称
+        /// </summary>
+        public string StoreName { get; set; }
+
+        /// <summary>
+        /// 耗卡时间
+        /// </summary>
+        public DateTime? UsageDate { get; set; }
+
+        /// <summary>
+        /// 消费金额
+        /// </summary>
+        public decimal? TotalAmount { get; set; }
+
+        /// <summary>
+        /// 备注
+        /// </summary>
+        public string Remarks { get; set; }
+
+        /// <summary>
+        /// 创建时间
+        /// </summary>
+        public DateTime? CreateTime { get; set; }
+
+        /// <summary>
+        /// 品项明细列表
+        /// </summary>
+        public List<LqXhHyhkMemberCardUsageItemDetail> ItemDetails { get; set; } = new List<LqXhHyhkMemberCardUsageItemDetail>();
+    }
+
+    /// <summary>
+    /// 会员耗卡记录品项明细
+    /// </summary>
+    public class LqXhHyhkMemberCardUsageItemDetail
+    {
+        /// <summary>
+        /// 明细ID
+        /// </summary>
+        public string Id { get; set; }
+
+        /// <summary>
+        /// 品项ID
+        /// </summary>
+        public string ItemId { get; set; }
+
+        /// <summary>
+        /// 品项名称
+        /// </summary>
+        public string ItemName { get; set; }
+
+        /// <summary>
+        /// 单价
+        /// </summary>
+        public decimal? UnitPrice { get; set; }
+
+        /// <summary>
+        /// 项目次数
+        /// </summary>
+        public int? ProjectNumber { get; set; }
+
+        /// <summary>
+        /// 合计金额
+        /// </summary>
+        public decimal? TotalPrice { get; set; }
+
+        /// <summary>
+        /// 来源类型
+        /// </summary>
+        public string SourceType { get; set; }
+
+        /// <summary>
+        /// 创建时间
+        /// </summary>
+        public DateTime? CreateTime { get; set; }
+    }
+}
+using NCC.Common.Filter;
+using System.ComponentModel.DataAnnotations;
+
+namespace NCC.Extend.Entitys.Dto.LqXhHyhk
+{
+    /// <summary>
+    /// 会员耗卡记录查询输入
+    /// </summary>
+    public class LqXhHyhkMemberCardUsageQueryInput : PageInputBase
+    {
+        /// <summary>
+        /// 会员ID
+        /// </summary>
+        [Required(ErrorMessage = "会员ID不能为空")]
+        public string MemberId { get; set; }
+
+        /// <summary>
+        /// 门店ID
+        /// </summary>
+        public string StoreId { get; set; }
+
+        /// <summary>
+        /// 开始时间
+        /// </summary>
+        public System.DateTime? StartTime { get; set; }
+
+        /// <summary>
+        /// 结束时间
+        /// </summary>
+        public System.DateTime? EndTime { get; set; }
+    }
+}
@@ -2,35 +2,35 @@ using System;
 using System.ComponentModel.DataAnnotations;
 using NCC.Common.Filter;
-namespace NCC.Extend.Entitys.Dto.LqKdKdjlb
+namespace NCC.Extend.Entitys.Dto.LqXhHyhk
 {
     /// <summary>
-    /// 补缴欠款记录查询输入
+    /// 健康师业绩查询输入
     /// </summary>
-    public class DebtPaymentQueryInput : PageInputBase
+    public class LqXhJksyjQueryInput : PageInputBase
     {
         /// <summary>
         /// 开单记录ID
         /// </summary>
-        [Display(Name = "开单记录ID", Description = "开单记录ID")]
-        public string BillingId { get; set; }
+        [Display(Name = "开单记录ID", Description = "关联的开单记录ID")]
+        public string Glkdbh { get; set; }
         /// <summary>
-        /// 付款日期开始
+        /// 健康师ID
         /// </summary>
-        [Display(Name = "付款日期开始", Description = "付款日期范围开始")]
-        public DateTime? PaymentDateStart { get; set; }
+        [Display(Name = "健康师ID", Description = "健康师用户ID，可选")]
+        public string JksId { get; set; }
         /// <summary>
-        /// 付款日期结束
+        /// 开始时间
         /// </summary>
-        [Display(Name = "付款日期结束", Description = "付款日期范围结束")]
-        public DateTime? PaymentDateEnd { get; set; }
+        [Display(Name = "开始时间", Description = "查询开始时间")]
+        public DateTime? StartTime { get; set; }
         /// <summary>
-        /// 收款人员
+        /// 结束时间
         /// </summary>
-        [Display(Name = "收款人员", Description = "收款人员")]
-        public string PaymentUser { get; set; }
+        [Display(Name = "结束时间", Description = "查询结束时间")]
+        public DateTime? EndTime { get; set; }
     }
 }
@@ -11,27 +11,27 @@ namespace NCC.Extend.Entitys.Dto.LqXhJksyj
         /// 业绩编号
         /// </summary>
         public string id { get; set; }
-        
+
         /// <summary>
         /// 关联开单编号
         /// </summary>
         public string glkdbh { get; set; }
-        
+
         /// <summary>
         /// 健康师
         /// </summary>
         public string jks { get; set; }
-        
+
         /// <summary>
         /// 健康师姓名
         /// </summary>
         public string jksxm { get; set; }
-        
+
         /// <summary>
         /// 健康师账号
         /// </summary>
         public string jkszh { get; set; }
-        
+
         /// <summary>
         /// 健康师业绩
         /// </summary>
@@ -43,6 +43,11 @@ namespace NCC.Extend.Entitys.Dto.LqXhJksyj
         public DateTime? yjsj { get; set; }
         /// <summary>
+        /// 门店
+        /// </summary>
+        public string storeName { get; set; }
+
+        /// <summary>
         /// 金三角id
         /// </summary>
         public string jsjId { get; set; }
@@ -61,5 +66,16 @@ namespace NCC.Extend.Entitys.Dto.LqXhJksyj
         /// 耗卡品项次数
         /// </summary>
         public decimal? kdpxNumber { get; set; }
+
+        /// <summary>
+        /// 会员id
+        /// </summary>
+        public string memberId { get; set; }
+
+
+        /// <summary>
+        /// 会员名称
+        /// </summary>
+        public string memberName { get; set; }
     }
 }
 \ No newline at end of file
-using System;
-using System.Collections.Generic;
-
-namespace NCC.Extend.Entitys.Dto.LqXhmxb
-{
-    /// <summary>
-    /// 消耗明细表修改输入参数
-    /// </summary>
-    public class LqXhmxbCrInput
-    {
-        /// <summary>
-        /// 消耗编号
-        /// </summary>
-        public string id { get; set; }
-        
-        /// <summary>
-        /// 门店编号
-        /// </summary>
-        public string mdbh { get; set; }
-        
-        /// <summary>
-        /// 门店名称
-        /// </summary>
-        public string mdmc { get; set; }
-        
-        /// <summary>
-        /// 部门编号
-        /// </summary>
-        public string bmbh { get; set; }
-        
-        /// <summary>
-        /// 部门名称
-        /// </summary>
-        public string bmmc { get; set; }
-        
-        /// <summary>
-        /// 员工编号
-        /// </summary>
-        public string ygbh { get; set; }
-        
-        /// <summary>
-        /// 员工名称
-        /// </summary>
-        public string ygmc { get; set; }
-        
-        /// <summary>
-        /// 项目数
-        /// </summary>
-        public string xms { get; set; }
-        
-        /// <summary>
-        /// 消耗
-        /// </summary>
-        public string xh { get; set; }
-        
-        /// <summary>
-        /// 手工
-        /// </summary>
-        public string sg { get; set; }
-        
-        /// <summary>
-        /// 其它手工1
-        /// </summary>
-        public string qtsg1 { get; set; }
-        
-        /// <summary>
-        /// 其它手工2
-        /// </summary>
-        public string qtsg2 { get; set; }
-        
-        /// <summary>
-        /// 其它手工3
-        /// </summary>
-        public string qtsg3 { get; set; }
-        
-        /// <summary>
-        /// 手工合计
-        /// </summary>
-        public string sghj { get; set; }
-        
-    }
-}
-using System;
-using System.Collections.Generic;
-
-namespace NCC.Extend.Entitys.Dto.LqXhmxb
-{
-    /// <summary>
-    /// 消耗明细表输出参数
-    /// </summary>
-    public class LqXhmxbInfoOutput
-    {
-        /// <summary>
-        /// 消耗编号
-        /// </summary>
-        public string id { get; set; }
-        
-        /// <summary>
-        /// 门店编号
-        /// </summary>
-        public string mdbh { get; set; }
-        
-        /// <summary>
-        /// 门店名称
-        /// </summary>
-        public string mdmc { get; set; }
-        
-        /// <summary>
-        /// 部门编号
-        /// </summary>
-        public string bmbh { get; set; }
-        
-        /// <summary>
-        /// 部门名称
-        /// </summary>
-        public string bmmc { get; set; }
-        
-        /// <summary>
-        /// 员工编号
-        /// </summary>
-        public string ygbh { get; set; }
-        
-        /// <summary>
-        /// 员工名称
-        /// </summary>
-        public string ygmc { get; set; }
-        
-        /// <summary>
-        /// 项目数
-        /// </summary>
-        public string xms { get; set; }
-        
-        /// <summary>
-        /// 消耗
-        /// </summary>
-        public string xh { get; set; }
-        
-        /// <summary>
-        /// 手工
-        /// </summary>
-        public string sg { get; set; }
-        
-        /// <summary>
-        /// 其它手工1
-        /// </summary>
-        public string qtsg1 { get; set; }
-        
-        /// <summary>
-        /// 其它手工2
-        /// </summary>
-        public string qtsg2 { get; set; }
-        
-        /// <summary>
-        /// 其它手工3
-        /// </summary>
-        public string qtsg3 { get; set; }
-        
-        /// <summary>
-        /// 手工合计
-        /// </summary>
-        public string sghj { get; set; }
-        
-    }
-}
-using System;
-
-namespace NCC.Extend.Entitys.Dto.LqXhmxb
-{
-    /// <summary>
-    /// 消耗明细表输入参数
-    /// </summary>
-    public class LqXhmxbListOutput
-    {
-        /// <summary>
-        /// 消耗编号
-        /// </summary>
-        public string id { get; set; }
-        
-        /// <summary>
-        /// 门店编号
-        /// </summary>
-        public string mdbh { get; set; }
-        
-        /// <summary>
-        /// 门店名称
-        /// </summary>
-        public string mdmc { get; set; }
-        
-        /// <summary>
-        /// 部门编号
-        /// </summary>
-        public string bmbh { get; set; }
-        
-        /// <summary>
-        /// 部门名称
-        /// </summary>
-        public string bmmc { get; set; }
-        
-        /// <summary>
-        /// 员工编号
-        /// </summary>
-        public string ygbh { get; set; }
-        
-        /// <summary>
-        /// 员工名称
-        /// </summary>
-        public string ygmc { get; set; }
-        
-        /// <summary>
-        /// 项目数
-        /// </summary>
-        public string xms { get; set; }
-        
-        /// <summary>
-        /// 消耗
-        /// </summary>
-        public string xh { get; set; }
-        
-        /// <summary>
-        /// 手工
-        /// </summary>
-        public string sg { get; set; }
-        
-        /// <summary>
-        /// 其它手工1
-        /// </summary>
-        public string qtsg1 { get; set; }
-        
-        /// <summary>
-        /// 其它手工2
-        /// </summary>
-        public string qtsg2 { get; set; }
-        
-        /// <summary>
-        /// 其它手工3
-        /// </summary>
-        public string qtsg3 { get; set; }
-        
-        /// <summary>
-        /// 手工合计
-        /// </summary>
-        public string sghj { get; set; }
-        
-    }
-}
-using NCC.Common.Filter;
-using System.Collections.Generic;
-
-namespace NCC.Extend.Entitys.Dto.LqXhmxb
-{
-    /// <summary>
-    /// 消耗明细表列表查询输入
-    /// </summary>
-    public class LqXhmxbListQueryInput : PageInputBase
-    {
-        /// <summary>
-        /// 选择导出数据key
-        /// </summary>
-        public string selectKey { get; set; }
-
-        /// <summary>
-        /// 
-        /// </summary>
-        public int dataType { get; set; }
-
-
-        /// <summary>
-        /// 消耗编号
-        /// </summary>
-        public string id { get; set; }
-        
-        /// <summary>
-        /// 门店编号
-        /// </summary>
-        public string mdbh { get; set; }
-        
-        /// <summary>
-        /// 门店名称
-        /// </summary>
-        public string mdmc { get; set; }
-        
-        /// <summary>
-        /// 部门编号
-        /// </summary>
-        public string bmbh { get; set; }
-        
-        /// <summary>
-        /// 部门名称
-        /// </summary>
-        public string bmmc { get; set; }
-        
-        /// <summary>
-        /// 员工编号
-        /// </summary>
-        public string ygbh { get; set; }
-        
-        /// <summary>
-        /// 员工名称
-        /// </summary>
-        public string ygmc { get; set; }
-        
-        /// <summary>
-        /// 项目数
-        /// </summary>
-        public string xms { get; set; }
-        
-        /// <summary>
-        /// 消耗
-        /// </summary>
-        public string xh { get; set; }
-        
-        /// <summary>
-        /// 手工
-        /// </summary>
-        public string sg { get; set; }
-        
-        /// <summary>
-        /// 其它手工1
-        /// </summary>
-        public string qtsg1 { get; set; }
-        
-        /// <summary>
-        /// 其它手工2
-        /// </summary>
-        public string qtsg2 { get; set; }
-        
-        /// <summary>
-        /// 其它手工3
-        /// </summary>
-        public string qtsg3 { get; set; }
-        
-        /// <summary>
-        /// 手工合计
-        /// </summary>
-        public string sghj { get; set; }
-        
-    }
-}
-using System;
-using System.Collections.Generic;
-
-namespace NCC.Extend.Entitys.Dto.LqXhmxb
-{
-    /// <summary>
-    /// 消耗明细表更新输入参数
-    /// </summary>
-    public class LqXhmxbUpInput : LqXhmxbCrInput
-    {
-        /// <summary>
-        /// 消耗编号
-        /// </summary>
-        public string id { get; set; }
-        
-    }
-}
@@ -102,7 +102,6 @@ namespace NCC.Extend.Entitys.lq_hytk_hytk
         [SugarColumn(ColumnName = "tkyy")]
         public string Tkyy { get; set; }
-
         /// <summary>
         /// 退卡附件
         /// </summary>
@@ -134,16 +133,9 @@ namespace NCC.Extend.Entitys.lq_hytk_hytk
         public string F_ModifyUser { get; set; }
         /// <summary>
-        /// 删除标记
-        /// </summary>
-        [SugarColumn(ColumnName = "F_DeleteMark")]
-        public int? F_DeleteMark { get; set; }
-
-        /// <summary>
         /// 是否有效
         /// </summary>
         [SugarColumn(ColumnName = "F_IsEffective")]
         public int IsEffective { get; set; } = StatusEnum.有效.GetHashCode();
-
     }
 }
 \ No newline at end of file
@@ -103,13 +103,7 @@ namespace NCC.Extend.Entitys.lq_hytk_jksyj
         public string F_ModifyUser { get; set; }
         /// <summary>
-        /// 删除标记
-        /// </summary>
-        [SugarColumn(ColumnName = "F_DeleteMark")]
-        public int? F_DeleteMark { get; set; }
-
-        /// <summary>
-        /// 退卡品项明细id
+        /// 退卡品相表id
         /// </summary>
         [SugarColumn(ColumnName = "F_CardReturn")]
         public string CardReturn { get; set; }
@@ -96,14 +96,9 @@ namespace NCC.Extend.Entitys.lq_hytk_kjbsyj
         [SugarColumn(ColumnName = "F_ModifyUser")]
         public string F_ModifyUser { get; set; }
-        /// <summary>
-        /// 删除标记
-        /// </summary>
-        [SugarColumn(ColumnName = "F_DeleteMark")]
-        public int? F_DeleteMark { get; set; }
         /// <summary>
-        /// 退卡品项明细id
+        /// 退卡品项明细ID
         /// </summary>
         [SugarColumn(ColumnName = "F_CardReturn")]
         public string CardReturn { get; set; }
@@ -25,7 +25,7 @@ namespace NCC.Extend.Entitys.lq_hytk_mx
         public string RefundInfoId { get; set; }
         /// <summary>
-        /// 退卡记录Id
+        /// 开单品项明细表id
         /// </summary>
         [SugarColumn(ColumnName = "F_BillingItemId")]
         public string BillingItemId { get; set; }
@@ -68,12 +68,6 @@ namespace NCC.Extend.Entitys.lq_hytk_mx
         public int ProjectNumber { get; set; }
         /// <summary>
-        /// 是否有效
-        /// </summary>
-        [SugarColumn(ColumnName = "F_IsEnabled")]
-        public int IsEnabled { get; set; } = StatusEnum.有效.GetHashCode();
-
-        /// <summary>
         /// 来源类型
         /// </summary>
         [SugarColumn(ColumnName = "F_SourceType")]
@@ -110,12 +104,6 @@ namespace NCC.Extend.Entitys.lq_hytk_mx
         public string ModifyUser { get; set; }
         /// <summary>
-        /// 删除标记
-        /// </summary>
-        [SugarColumn(ColumnName = "F_DeleteMark")]
-        public int? DeleteMark { get; set; }
-
-        /// <summary>
         /// 是否有效
         /// </summary>
         [SugarColumn(ColumnName = "F_IsEffective")]
@@ -229,5 +229,17 @@ namespace NCC.Extend.Entitys.lq_kd_kdjlb
         /// </summary>
         [SugarColumn(ColumnName = "F_PaidDebt")]
         public decimal PaidDebt { get; set; }
+
+        /// <summary>
+        /// 补缴开单ID
+        /// </summary>
+        [SugarColumn(ColumnName = "F_SupplementBillingId")]
+        public string SupplementBillingId { get; set; }
+
+        /// <summary>
+        /// 补缴金额
+        /// </summary>
+        [SugarColumn(ColumnName = "F_SupplementAmount")]
+        public decimal SupplementAmount { get; set; }
     }
 }
-using NCC.Common.Const;
-using SqlSugar;
-using System;
-
-namespace NCC.Extend.Entitys.lq_kd_qkbj
-{
-    /// <summary>
-    /// 开单欠款补缴记录表
-    /// </summary>
-    [SugarTable("lq_kd_qkbj")]
-    [Tenant(ClaimConst.TENANT_ID)]
-    public class LqKdQkbjEntity
-    {
-        /// <summary>
-        /// 补缴记录ID
-        /// </summary>
-        [SugarColumn(ColumnName = "F_Id", IsPrimaryKey = true)]
-        public string Id { get; set; }
-
-        /// <summary>
-        /// 开单记录ID
-        /// </summary>
-        [SugarColumn(ColumnName = "F_BillingId")]
-        public string BillingId { get; set; }
-
-        /// <summary>
-        /// 补缴金额
-        /// </summary>
-        [SugarColumn(ColumnName = "F_PaymentAmount")]
-        public decimal PaymentAmount { get; set; }
-
-        /// <summary>
-        /// 付款方式
-        /// </summary>
-        [SugarColumn(ColumnName = "F_PaymentMethod")]
-        public string PaymentMethod { get; set; }
-
-        /// <summary>
-        /// 付款日期
-        /// </summary>
-        [SugarColumn(ColumnName = "F_PaymentDate")]
-        public DateTime PaymentDate { get; set; }
-
-        /// <summary>
-        /// 收款人员
-        /// </summary>
-        [SugarColumn(ColumnName = "F_PaymentUser")]
-        public string PaymentUser { get; set; }
-
-        /// <summary>
-        /// 备注
-        /// </summary>
-        [SugarColumn(ColumnName = "F_Remarks")]
-        public string Remarks { get; set; }
-
-        /// <summary>
-        /// 创建时间
-        /// </summary>
-        [SugarColumn(ColumnName = "F_CreateTime")]
-        public DateTime CreateTime { get; set; }
-
-        /// <summary>
-        /// 更新时间
-        /// </summary>
-        [SugarColumn(ColumnName = "F_UpdateTime")]
-        public DateTime UpdateTime { get; set; }
-
-        /// <summary>
-        /// 是否有效
-        /// </summary>
-        [SugarColumn(ColumnName = "F_IsEffective")]
-        public int IsEffective { get; set; } = 1;
-    }
-}
 \ No newline at end of file
 using System;
 using NCC.Common.Const;
+using NCC.Extend.Entitys.Enum;
 using SqlSugar;
 namespace NCC.Extend.Entitys.lq_khxx
@@ -140,5 +141,11 @@ namespace NCC.Extend.Entitys.lq_khxx
         [SugarColumn(ColumnName = "F_SubHealthUser")]
         public string SubHealthUser { get; set; }
+        /// <summary>
+        /// 是否有效
+        /// </summary>
+        [SugarColumn(ColumnName = "F_IsEffective")]
+        public int IsEffective { get; set; } = StatusEnum.有效.GetHashCode();
+
     }
 }
 using System;
+using NCC.Common.Enum;
+using NCC.Extend.Entitys.Enum;
 using SqlSugar;
 namespace NCC.Extend.Entitys.lq_tkjlb
@@ -92,5 +94,6 @@ namespace NCC.Extend.Entitys.lq_tkjlb
         /// </summary>
         [SugarColumn(ColumnName = "F_CreateTime")]
         public DateTime CreateTime { get; set; } = DateTime.Now;
+
     }
 }
 using System;
 using NCC.Common.Const;
+using NCC.Extend.Entitys.Enum;
 using SqlSugar;
 namespace NCC.Extend.Entitys.lq_xh_hyhk
@@ -118,6 +119,6 @@ namespace NCC.Extend.Entitys.lq_xh_hyhk
         /// 是否有效
         /// </summary>
         [SugarColumn(ColumnName = "F_IsEffective")]
-        public int? IsEffective { get; set; } = 1;
+        public int IsEffective { get; set; } = StatusEnum.有效.GetHashCode();
     }
 }
-using NCC.Common.Const;
-using SqlSugar;
-using System;
-
-namespace NCC.Extend.Entitys.lq_xhmxb
-{
-    /// <summary>
-    /// 消耗明细表
-    /// </summary>
-    [SugarTable("lq_xhmxb")]
-    [Tenant(ClaimConst.TENANT_ID)]
-    public class LqXhmxbEntity
-    {
-        /// <summary>
-        /// 消耗编号
-        /// </summary>
-        [SugarColumn(ColumnName = "F_Id", IsPrimaryKey = true)]
-        public string Id { get; set; }
-        
-        /// <summary>
-        /// 门店编号
-        /// </summary>
-        [SugarColumn(ColumnName = "mdbh")]        
-        public string Mdbh { get; set; }
-        
-        /// <summary>
-        /// 门店名称
-        /// </summary>
-        [SugarColumn(ColumnName = "mdmc")]        
-        public string Mdmc { get; set; }
-        
-        /// <summary>
-        /// 部门编号
-        /// </summary>
-        [SugarColumn(ColumnName = "bmbh")]        
-        public string Bmbh { get; set; }
-        
-        /// <summary>
-        /// 部门名称
-        /// </summary>
-        [SugarColumn(ColumnName = "bmmc")]        
-        public string Bmmc { get; set; }
-        
-        /// <summary>
-        /// 员工编号
-        /// </summary>
-        [SugarColumn(ColumnName = "ygbh")]        
-        public string Ygbh { get; set; }
-        
-        /// <summary>
-        /// 员工名称
-        /// </summary>
-        [SugarColumn(ColumnName = "ygmc")]        
-        public string Ygmc { get; set; }
-        
-        /// <summary>
-        /// 项目数
-        /// </summary>
-        [SugarColumn(ColumnName = "xms")]        
-        public string Xms { get; set; }
-        
-        /// <summary>
-        /// 消耗
-        /// </summary>
-        [SugarColumn(ColumnName = "xh")]        
-        public string Xh { get; set; }
-        
-        /// <summary>
-        /// 手工
-        /// </summary>
-        [SugarColumn(ColumnName = "sg")]        
-        public string Sg { get; set; }
-        
-        /// <summary>
-        /// 其它手工1
-        /// </summary>
-        [SugarColumn(ColumnName = "qtsg1")]        
-        public string Qtsg1 { get; set; }
-        
-        /// <summary>
-        /// 其它手工2
-        /// </summary>
-        [SugarColumn(ColumnName = "qtsg2")]        
-        public string Qtsg2 { get; set; }
-        
-        /// <summary>
-        /// 其它手工3
-        /// </summary>
-        [SugarColumn(ColumnName = "qtsg3")]        
-        public string Qtsg3 { get; set; }
-        
-        /// <summary>
-        /// 手工合计
-        /// </summary>
-        [SugarColumn(ColumnName = "sghj")]        
-        public string Sghj { get; set; }
-        
-    }
-}
 \ No newline at end of file
-using NCC.Common.Helper;
-using NCC.Extend.Entitys.Dto.LqXhmxb;
-using Mapster;
-using System.Collections.Generic;
-
-namespace NCC.Extend.Entitys.Mapper.LqXhmxb
-{
-	public class Mapper : IRegister
-	{
-		public void Register(TypeAdapterConfig config)
-		{
-		}
-	}
-}
-namespace NCC.Extend.Interfaces.LqXhmxb
-{
-    public interface ILqXhmxbService
-    {
-    }
-}
 \ No newline at end of file
@@ -200,7 +200,6 @@ namespace NCC.Extend.LqHytkHytk
             entity.Id = YitIdHelper.NextId().ToString();
             entity.F_CreateTime = DateTime.Now;
             entity.F_CreateUser = userInfo.userId;
-            entity.F_DeleteMark = 0;
             entity.IsEffective = StatusEnum.有效.GetHashCode();
             entity.Czry = userInfo.userId;
@@ -230,13 +229,11 @@ namespace NCC.Extend.LqHytkHytk
                             BillingItemId = item.billingItemId,
                             CreateTime = DateTime.Now,
                             CreateUser = userInfo.userId,
-                            DeleteMark = 0,
                             Px = item.px,
                             Pxmc = item.pxmc,
                             Pxjg = item.pxjg,
                             Tkje = item.tkje,
                             ProjectNumber = item.F_ProjectNumber ?? 1,
-                            IsEnabled = item.F_IsEnabled ?? 1,
                             SourceType = item.F_SourceType,
                             TotalPrice = item.F_TotalPrice ?? (item.pxjg * (item.F_ProjectNumber ?? 1)),
                             IsEffective = StatusEnum.有效.GetHashCode(),
@@ -263,7 +260,6 @@ namespace NCC.Extend.LqHytkHytk
                                     F_tkpxNumber = ijks_tem.F_tkpxNumber,
                                     F_CreateTime = DateTime.Now,
                                     F_CreateUser = userInfo.userId,
-                                    F_DeleteMark = 0,
                                     CardReturn = lqHytkMxEntity.Id,
                                     IsEffective = StatusEnum.有效.GetHashCode(),
                                 }
@@ -291,7 +287,6 @@ namespace NCC.Extend.LqHytkHytk
                                         F_tkpxNumber = ikjbs_tem.F_tkpxNumber,
                                         F_CreateTime = DateTime.Now,
                                         F_CreateUser = userInfo.userId,
-                                        F_DeleteMark = 0,
                                         CardReturn = lqHytkMxEntity.Id,
                                         IsEffective = StatusEnum.有效.GetHashCode(),
                                     }
@@ -385,13 +380,11 @@ namespace NCC.Extend.LqHytkHytk
                             CreateTime = DateTime.Now,
                             CreateUser = userInfo.userId,
                             Tksj = input.tksj,
-                            DeleteMark = 0,
                             Px = item.px,
                             Pxmc = item.pxmc,
                             Pxjg = item.pxjg,
                             Tkje = item.tkje,
                             ProjectNumber = item.F_ProjectNumber ?? 1,
-                            IsEnabled = item.F_IsEnabled ?? 1,
                             SourceType = item.F_SourceType,
                             TotalPrice = item.F_TotalPrice ?? (item.pxjg * (item.F_ProjectNumber ?? 1)),
                         };
@@ -418,7 +411,6 @@ namespace NCC.Extend.LqHytkHytk
                                         F_tkpxNumber = ijks_tem.F_tkpxNumber,
                                         F_CreateTime = DateTime.Now,
                                         F_CreateUser = userInfo.userId,
-                                        F_DeleteMark = 0,
                                     }
                                 );
                             }
@@ -444,7 +436,6 @@ namespace NCC.Extend.LqHytkHytk
                                         F_tkpxNumber = ikjbs_tem.F_tkpxNumber,
                                         F_CreateTime = DateTime.Now,
                                         F_CreateUser = userInfo.userId,
-                                        F_DeleteMark = 0,
                                     }
                                 );
                             }
@@ -479,23 +470,42 @@ namespace NCC.Extend.LqHytkHytk
         }
         #endregion
-        #region 标记退卡信息为无效
+        #region 作废退卡信息
         /// <summary>
-        /// 删除退卡信息（逻辑删除）
+        /// 作废退卡信息
         /// </summary>
         /// <param name="id">主键</param>
         /// <returns></returns>
-        [HttpDelete("{id}")]
-        public async Task Delete(string id)
+        [HttpPut("VoidRefundCardInfo/{id}")]
+        public async Task<dynamic> VoidRefundCardInfo(string id)
         {
-            var entity = await _db.Queryable<LqHytkHytkEntity>().FirstAsync(p => p.Id == id);
-            if (entity != null)
+            try
             {
+                var entity = await _db.Queryable<LqHytkHytkEntity>().FirstAsync(p => p.Id == id && p.IsEffective == StatusEnum.有效.GetHashCode());
+                if (entity == null)
+                {
+                    throw NCCException.Oh("退卡信息不存在或已被作废");
+                }
+                // 开启事务
+                _db.BeginTran();
+                // 更新主表
                 entity.IsEffective = StatusEnum.无效.GetHashCode();
-                await _lqHytkHytkRepository.UpdateAsync(entity);
+                entity.F_ModifyTime = DateTime.Now;
+                await _db.Updateable(entity).ExecuteCommandAsync();
+                // 更新明细表
                 await _db.Updateable<LqHytkMxEntity>().SetColumns(it => new LqHytkMxEntity { IsEffective = StatusEnum.无效.GetHashCode() }).Where(w => w.RefundInfoId == id).ExecuteCommandAsync();
+                // 更新健康师业绩表
                 await _db.Updateable<LqHytkJksyjEntity>().SetColumns(it => new LqHytkJksyjEntity { IsEffective = StatusEnum.无效.GetHashCode() }).Where(w => w.Gltkbh == id).ExecuteCommandAsync();
+                // 更新科技部业绩表
                 await _db.Updateable<LqHytkKjbsyjEntity>().SetColumns(it => new LqHytkKjbsyjEntity { IsEffective = StatusEnum.无效.GetHashCode() }).Where(w => w.Gltkbh == id).ExecuteCommandAsync();
+                // 提交事务
+                _db.CommitTran();
+                return entity;
+            }
+            catch (Exception ex)
+            {
+                _db.RollbackTran();
+                throw NCCException.Oh($"删除退卡信息失败: {ex.Message}");
             }
         }
         #endregion
@@ -598,10 +608,10 @@ namespace NCC.Extend.LqHytkHytk
             try
             {
                 // 1. 查询主表信息
-                var entity = await _db.Queryable<LqHytkHytkEntity>().FirstAsync(p => p.Id == id);
+                var entity = await _db.Queryable<LqHytkHytkEntity>().Where(p => p.Id == id && p.IsEffective == StatusEnum.有效.GetHashCode()).FirstAsync();
                 if (entity == null)
                 {
-                    throw NCCException.Oh(ErrorCode.COM1005, "退卡记录不存在");
+                    throw NCCException.Oh(ErrorCode.COM1005, "退卡记录不存在或已作废");
                 }
                 var output = entity.Adapt<LqHytkHytkInfoOutput>();
@@ -629,7 +639,6 @@ namespace NCC.Extend.LqHytkHytk
                         pxjg = mx.Pxjg,
                         tkje = mx.Tkje,
                         projectNumber = mx.ProjectNumber,
-                        isEnabled = mx.IsEnabled,
                         sourceType = mx.SourceType,
                         totalPrice = mx.TotalPrice,
                     };
@@ -27,7 +27,6 @@ using NCC.Extend.Entitys.lq_kd_jksyj;
 using NCC.Extend.Entitys.lq_kd_kdjlb;
 using NCC.Extend.Entitys.lq_kd_kjbsyj;
 using NCC.Extend.Entitys.lq_kd_pxmx;
-using NCC.Extend.Entitys.lq_kd_qkbj;
 using NCC.Extend.Entitys.lq_khxx;
 using NCC.Extend.Entitys.lq_xh_pxmx;
 using NCC.Extend.Entitys.lq_xmzl;
@@ -144,7 +143,7 @@ namespace NCC.Extend.LqKdKdjlb
                         totalPrice = pxmx.TotalPrice,
                         actualPrice = pxmx.ActualPrice,
                         remark = pxmx.Remark,
-                        IsEffective = pxmx.IsEffective,
+                        isEffective = pxmx.IsEffective,
                     };
                     // 关联该品项的健康师业绩
@@ -309,6 +308,22 @@ namespace NCC.Extend.LqKdKdjlb
                 //     await _db.Updateable<LqKdDeductinfoEntity>().Where(p => p.BillingId == input.cancelRefId).UpdateColumns(p => new LqKdDeductinfoEntity { IsEffective = StatusEnum.无效.GetHashCode() }).ExecuteCommandAsync();
                 // }
+                //判断是否有补缴开单ID
+                if (!string.IsNullOrEmpty(input.supplementBillingId))
+                {
+                    //查询补缴开单ID
+                    var supplementBillingEntity = await _db.Queryable<LqKdKdjlbEntity>().FirstAsync(p => p.Id == input.supplementBillingId);
+                    if (supplementBillingEntity == null || supplementBillingEntity.IsEffective == StatusEnum.无效.GetHashCode())
+                    {
+                        throw NCCException.Oh("补缴开单记录不存在或已作废");
+                    }
+                    //然后对之前的开单表的补缴金额进行累加
+                    //需要判断补缴金额是否超过欠款金额，只记录应缴金额
+                    var supplementAmount = supplementBillingEntity.Qk - supplementBillingEntity.PaidDebt;
+                    entity.PaidDebt += input.supplementAmount > supplementAmount ? supplementAmount : input.supplementAmount;
+                    await _db.Updateable(entity).ExecuteCommandAsync();
+                }
+
                 //新增开单记录表记录
                 entity.CreateUser = userInfo.userId;
                 entity.DeductAmount = input.lqKdKdjlbDeductList.Sum(x => x.Amount ?? 0);//计算储扣总金额
@@ -1548,158 +1563,96 @@ namespace NCC.Extend.LqKdKdjlb
         }
         #endregion
-        #region 补缴欠款
+        #region 根据门店获取该门店的欠款记录
         /// <summary>
-        /// 补缴欠款
+        /// 根据门店获取该门店的欠款记录
         /// </summary>
-        /// <param name="input">补缴欠款输入</param>
-        /// <returns>补缴记录ID</returns>
+        /// <param name="input">查询参数</param>
+        /// <returns>分页的欠款记录</returns>
         /// <remarks>
-        /// 为客户补缴欠款，记录补缴信息并更新开单记录的已缴欠款金额
+        /// 获取指定门店的欠款记录，考虑已缴欠款情况，支持分页
         /// 
         /// 示例请求：
         /// ```json
         /// {
-        ///   "billingId": "123456789",
-        ///   "paymentAmount": 1000.00,
-        ///   "paymentMethod": "现金",
-        ///   "paymentDate": "2025-01-15T10:30:00",
-        ///   "paymentUser": "收款员",
-        ///   "remarks": "客户补缴欠款"
+        ///   "storeId": "门店ID",
+        ///   "currentPage": 1,
+        ///   "pageSize": 10,
+        ///   "sidx": "Kdrq",
+        ///   "sort": "desc"
         /// }
         /// ```
         /// 
         /// 参数说明：
-        /// - billingId: 开单记录ID（必填）
-        /// - paymentAmount: 补缴金额（必填）
-        /// - paymentMethod: 付款方式
-        /// - paymentDate: 付款日期
-        /// - paymentUser: 收款人员
-        /// - remarks: 备注信息
+        /// - storeId: 门店ID，必填
+        /// - currentPage: 当前页码
+        /// - pageSize: 每页大小
+        /// - sidx: 排序字段，默认按开单日期
+        /// - sort: 排序方式，默认降序
+        /// 
+        /// 返回说明：
+        /// - 只返回仍有欠款的记录（总欠款 > 已缴欠款）
+        /// - 包含开单编号、客户信息、欠款金额、已缴金额等
         /// </remarks>
-        /// <response code="200">补缴成功，返回补缴记录ID</response>
-        /// <response code="400">请求参数错误</response>
-        /// <response code="404">开单记录不存在</response>
-        /// <response code="500">服务器内部错误</response>
-        [HttpPost("PayDebtAsync")]
-        public async Task<dynamic> PayDebtAsync(PayDebtInput input)
+        /// <response code="200">成功返回分页的欠款记录列表</response>
+        /// <response code="400">门店ID不能为空</response>
+        /// <response code="500">服务器错误</response>
+        [HttpGet("GetDebtRecordByStoreId")]
+        public async Task<dynamic> GetDebtRecordByStoreId([FromQuery] DebtRecordQueryInput input)
         {
             try
             {
-                // 验证补缴金额
-                if (input.PaymentAmount <= 0)
-                {
-                    throw NCCException.Oh("补缴金额必须大于0");
-                }
-
-                // 检查开单记录是否存在
-                var billingRecord = await _db.Queryable<LqKdKdjlbEntity>().Where(w => w.Id == input.BillingId).FirstAsync();
-                if (billingRecord == null || billingRecord.IsEffective == StatusEnum.无效.GetHashCode())
-                {
-                    throw NCCException.Oh("开单记录不存在或已作废");
-                }
-                // 检查补缴金额是否超过欠款金额
-                var remainingDebt = billingRecord.Qk - billingRecord.PaidDebt;
-                if (input.PaymentAmount > remainingDebt)
-                {
-                    throw NCCException.Oh($"补缴金额({input.PaymentAmount})不能超过剩余欠款金额({remainingDebt})");
-                }
-                // 开始事务
-                _db.BeginTran();
-                try
-                {
-                    // 创建补缴记录
-                    var paymentRecord = new LqKdQkbjEntity
-                    {
-                        Id = YitIdHelper.NextId().ToString(),
-                        BillingId = input.BillingId,
-                        PaymentAmount = input.PaymentAmount,
-                        PaymentMethod = input.PaymentMethod,
-                        PaymentDate = input.PaymentDate ?? DateTime.Now,
-                        PaymentUser = input.PaymentUser ?? _userManager.UserId,
-                        Remarks = input.Remarks,
-                        CreateTime = DateTime.Now,
-                        UpdateTime = DateTime.Now,
-                        IsEffective = StatusEnum.有效.GetHashCode()
-                    };
-                    // 保存补缴记录
-                    await _db.Insertable(paymentRecord).ExecuteCommandAsync();
-
-                    // 更新开单记录的已缴欠款金额
-                    await _db.Updateable<LqKdKdjlbEntity>()
-                        .SetColumns(it => new LqKdKdjlbEntity
-                        {
-                            PaidDebt = it.PaidDebt + input.PaymentAmount,
-                            UpdateTime = DateTime.Now
-                        })
-                        .Where(w => w.Id == input.BillingId)
-                        .ExecuteCommandAsync();
-
-                    // 提交事务
-                    _db.CommitTran();
-                    return new
-                    {
-                        success = true,
-                        message = "补缴成功",
-                        data = paymentRecord.Id
-                    };
-                }
-                catch
+                if (string.IsNullOrEmpty(input.StoreId))
                 {
-                    // 回滚事务
-                    _db.RollbackTran();
-                    throw;
+                    throw NCCException.Oh("门店ID不能为空");
                 }
-            }
-            catch (Exception ex)
-            {
-                throw NCCException.Oh($"补缴欠款失败: {ex.Message}");
-            }
-        }
-
-
-        #endregion
-
-        #region 补缴欠款查询
-        /// <summary>
-        /// 获取补缴欠款记录列表
-        /// </summary>
-        /// <param name="input">查询输入</param>
-        /// <returns>补缴记录列表</returns>
-        /// <remarks>
-        /// 获取指定开单记录的补缴欠款历史记录
-        /// </remarks>
-        /// <response code="200">成功获取补缴记录列表</response>
-        /// <response code="400">请求参数错误</response>
-        /// <response code="500">服务器内部错误</response>
-        [HttpGet("GetDebtPaymentRecordsAsync")]
-        public async Task<dynamic> GetDebtPaymentRecordsAsync([FromQuery] DebtPaymentQueryInput input)
-        {
-            try
-            {
-                var sidx = input.sidx == null ? "PaymentDate" : input.sidx;
-                var data = await _db.Queryable<LqKdQkbjEntity>()
-                    .WhereIF(!string.IsNullOrEmpty(input.BillingId), w => w.BillingId == input.BillingId)
-                    .WhereIF(input.PaymentDateStart.HasValue, w => w.PaymentDate >= input.PaymentDateStart.Value)
-                    .WhereIF(input.PaymentDateEnd.HasValue, w => w.PaymentDate <= input.PaymentDateEnd.Value)
-                    .WhereIF(!string.IsNullOrEmpty(input.PaymentUser), w => w.PaymentUser.Contains(input.PaymentUser))
-                    .Select(it => new DebtPaymentRecordOutput
+                var sidx = string.IsNullOrEmpty(input.sidx) ? "Kdrq" : input.sidx;
+                var sort = string.IsNullOrEmpty(input.sort) ? "desc" : input.sort;
+                // 获取该门店的欠款记录，考虑已缴欠款情况
+                // 只返回仍有欠款的记录：总欠款 > 已缴欠款
+                var debtRecords = await _db.Queryable<LqKdKdjlbEntity>()
+                    .Where(p => p.Djmd == input.StoreId && p.Qk > p.PaidDebt && p.IsEffective == StatusEnum.有效.GetHashCode())
+                    .Select(it => new LqKdKdjlbListOutput
                     {
-                        Id = it.Id,
-                        BillingId = it.BillingId,
-                        PaymentAmount = it.PaymentAmount,
-                        PaymentMethod = it.PaymentMethod,
-                        PaymentDate = it.PaymentDate,
-                        PaymentUser = it.PaymentUser,
-                        Remarks = it.Remarks,
-                        CreateTime = it.CreateTime
-                    }).MergeTable().OrderBy(sidx + " " + input.sort).ToPagedListAsync(input.currentPage, input.pageSize);
-
-                return PageResult<DebtPaymentRecordOutput>.SqlSugarPageResult(data);
+                        id = it.Id,
+                        djmd = it.Djmd,
+                        jsj = it.Jsj,
+                        kdrq = it.Kdrq,
+                        gjlx = it.Gjlx,
+                        hgjg = it.Hgjg,
+                        zdyj = it.Zdyj,
+                        sfyj = it.Sfyj,
+                        qk = it.Qk,
+                        ckfs = it.Ckfs,
+                        PaidDebt = it.PaidDebt,
+                        fkfs = it.Fkfs,
+                        fkyy = it.Fkyy,
+                        fkpd = it.Fkpd,
+                        khly = it.Khly,
+                        tjr = it.Tjr,
+                        deductAmount = it.DeductAmount,
+                        sfskdd = it.Sfskdd,
+                        jj = it.Jj,
+                        bz = it.Bz,
+                        kdhy = it.Kdhy,
+                        kdhyc = it.Kdhyc,
+                        kdhysjh = it.Kdhysjh,
+                        jksyj = it.Jksyj,
+                        kjblsyj = it.Kjblsyj,
+                        pxxx = it.Pxxx,
+                        IsEffective = it.IsEffective,
+                        CreateUser = it.CreateUser,
+                        CreateUserName = SqlFunc.Subqueryable<UserEntity>().Where(x => x.Id == it.CreateUser).Select(x => x.RealName),
+                    })
+                    .MergeTable()
+                    .OrderBy(sidx + " " + sort)
+                    .ToPagedListAsync(input.currentPage, input.pageSize);
+
+                return PageResult<LqKdKdjlbListOutput>.SqlSugarPageResult(debtRecords);
             }
             catch (Exception ex)
             {
-                throw NCCException.Oh($"获取补缴记录失败: {ex.Message}");
+                throw NCCException.Oh($"获取门店欠款记录失败: {ex.Message}");
             }
         }
         #endregion
@@ -1725,14 +1678,14 @@ namespace NCC.Extend.LqKdKdjlb
                 {
                     return (false, "该开单记录已经作废");
                 }
-                // 查询开单记录下的品项明细ID列表
-                var pxmxIdList = await _db.Queryable<LqKdPxmxEntity>().Where(p => p.Glkdbh == billingId).Select(p => p.Id).Distinct().ToListAsync();
-                //判断是否有对应的补缴记录
-                var qkbjList = await _db.Queryable<LqKdQkbjEntity>().Where(p => p.BillingId == billingId).ToListAsync();
+                // 判断是否有对应的补缴记录
+                var qkbjList = await _db.Queryable<LqKdKdjlbEntity>().Where(p => p.SupplementBillingId == billingId).ToListAsync();
                 if (qkbjList.Any())
                 {
                     return (false, "该开单记录有对应的补缴记录，不能进行操作");
                 }
+                // 查询开单记录下的品项明细ID列表
+                var pxmxIdList = await _db.Queryable<LqKdPxmxEntity>().Where(p => p.Glkdbh == billingId).Select(p => p.Id).Distinct().ToListAsync();
                 // 判断是否有对应的消耗记录
                 var xhPxmxList = await _db.Queryable<LqXhPxmxEntity>().Where(p => pxmxIdList.Contains(p.BillingItemId)).ToListAsync();
                 if (xhPxmxList.Any())
@@ -352,7 +352,7 @@ namespace NCC.Extend.LqKhxx
                 throw NCCException.Oh("客户不存在");
             }
             // 查询开单记录数量
-            var orderCount = await _db.Queryable<LqKdKdjlbEntity>().Where(o => o.Kdhy == customerId && o.IsEffective == StatusEnum.有效.GetHashCode()).CountAsync();
+            var orderCount = await _db.Queryable<LqKdKdjlbEntity>().Where(o => o.Kdhy == customerId && o.IsEffective == StatusEnum.有效.GetHashCode() && o.Sfyj > 0).CountAsync();
             var hasOrderRecord = orderCount > 0;
             var orderType = hasOrderRecord ? "repeat_order" : "first_order";
             return new LqKhxxOrderTypeOutput
@@ -569,7 +569,7 @@ namespace NCC.Extend.LqKhxx
                 // 查询退卡数据
                 var refundedData = await _db.Queryable<LqHytkMxEntity>()
                     .Where(x => baseItems.Select(b => b.Id).Contains(x.BillingItemId))
-                    // .Where(x => x.IsEffective == StatusEnum.有效.GetHashCode())
+                    .Where(x => x.IsEffective == StatusEnum.有效.GetHashCode())
                     .GroupBy(x => x.BillingItemId)
                     .Select(x => new
                     {
@@ -609,6 +609,8 @@ namespace NCC.Extend.LqKhxx
                 {
                     item.RemainingCount = item.TotalPurchased - item.ConsumedCount - item.RefundedCount - item.DeductCount;
                 }
+                //过滤剩余数量为0的品项,先暂时为不等于 0 ，因为现在有问题，会出现负数，后面再修改
+                remainingItems = remainingItems.Where(item => item.RemainingCount != 0).ToList();
                 return new MemberRemainingItemsOutput
                 {
                     MemberId = memberId,
@@ -19,6 +19,7 @@ using NCC.Extend.Entitys.Dto.LqTkjlb;
 using NCC.Extend.Entitys.Enum;
 using NCC.Extend.Entitys.lq_event;
 using NCC.Extend.Entitys.lq_eventuser;
+using NCC.Extend.Entitys.lq_kd_kdjlb;
 using NCC.Extend.Entitys.lq_khxx;
 using NCC.Extend.Entitys.lq_mdxx;
 using NCC.Extend.Entitys.lq_tkjlb;
@@ -80,7 +81,7 @@ namespace NCC.Extend.LqTkjlb
                     teamName = p.TeamName,
                     eventId = p.EventId,
                     eventName = SqlFunc.Subqueryable<LqEventEntity>().Where(e => e.Id == p.EventId).Select(e => e.EventName),
-                    storeName = SqlFunc.Subqueryable<LqMdxxEntity>().Where(u => u.Id == p.StoreId).Select(u => u.Dm),
+                    storeName = SqlFunc.Subqueryable<LqMdxxEntity>().Where(u => u.Id == p.StoreId).Select(u => u.Dm)
                 })
                 .FirstAsync();
@@ -187,6 +188,7 @@ namespace NCC.Extend.LqTkjlb
                 MemberInfo.Khlx = MemberTypeEnum.线索.GetHashCode().ToString();
                 MemberInfo.Dah = "GK" + DateTime.Now.ToString("yyyyMMddHHmmssfff");
                 MemberInfo.Jdqd = "19.9卡";
+
                 //找到input.expansionUserId的用户信息
                 var userInfo = await _db.Queryable<UserEntity>().Where(u => u.Id == input.expansionUserId).FirstAsync();
                 //判断 岗位是否为健康师，如果是健康师，则设置拓客人员是健康师
@@ -523,5 +525,7 @@ namespace NCC.Extend.LqTkjlb
             return result.OrderByDescending(t => t.totalCount).ToList();
         }
         #endregion
+
+
     }
 }
@@ -20,6 +20,7 @@ using NCC.Extend.Entitys.Dto.LqXhHyhk;
 using NCC.Extend.Entitys.Dto.LqXhJksyj;
 using NCC.Extend.Entitys.Dto.LqXhKjbsyj;
 using NCC.Extend.Entitys.Dto.LqXhPxmx;
+using NCC.Extend.Entitys.Enum;
 using NCC.Extend.Entitys.lq_kd_kdjlb;
 using NCC.Extend.Entitys.lq_kd_pxmx;
 using NCC.Extend.Entitys.lq_khxx;
@@ -521,6 +522,12 @@ namespace NCC.Extend.LqXhHyhk
             {
                 //开启事务
                 _db.BeginTran();
+                //查询记录
+                var LqXhHyhkInfo = await _db.Queryable<LqXhHyhkEntity>().Where(p => p.Id == id && p.IsEffective == StatusEnum.有效.GetHashCode()).FirstAsync();
+                if (LqXhHyhkInfo == null)
+                {
+                    throw NCCException.Oh(ErrorCode.COM1005, "耗卡记录不存在或已作废");
+                }
                 entity.UpdateTime = DateTime.Now;
                 //更新会员耗卡记录
                 await _db.Updateable(entity).IgnoreColumns(ignoreAllNullColumns: true).ExecuteCommandAsync();
@@ -528,57 +535,31 @@ namespace NCC.Extend.LqXhHyhk
                 //清空原有数据
                 await _db.Deleteable<LqXhJksyjEntity>().Where(u => u.Glkdbh == id).ExecuteCommandAsync();
                 await _db.Deleteable<LqXhKjbsyjEntity>().Where(u => u.Glkdbh == id).ExecuteCommandAsync();
-
-                // 注意：品项明细表不做删除操作，只更新或新增
-                // await _db.Deleteable<LqXhPxmxEntity>().Where(u => u.ConsumeInfoId == id).ExecuteCommandAsync();
-
+                await _db.Deleteable<LqXhPxmxEntity>().Where(u => u.ConsumeInfoId == id).ExecuteCommandAsync();
                 // 收集所有需要插入的实体，然后批量插入
                 var allPxmxEntities = new List<LqXhPxmxEntity>();
                 var allJksyjEntities = new List<LqXhJksyjEntity>();
                 var allKjbsyjEntities = new List<LqXhKjbsyjEntity>();
-
                 // 处理品项明细列表
                 if (input.lqXhPxmxList != null && input.lqXhPxmxList.Any())
                 {
                     foreach (var item in input.lqXhPxmxList)
                     {
-                        // 检查品项明细是否已存在
-                        var existingPxmx = await _db.Queryable<LqXhPxmxEntity>()
-                            .Where(p => p.Id == item.id)
-                            .FirstAsync();
-
-                        LqXhPxmxEntity lqXhPxmxEntity;
-                        if (existingPxmx != null)
-                        {
-                            // 更新现有记录
-                            lqXhPxmxEntity = existingPxmx;
-                            // 注意：LqXhPxmxEntity 没有 UpdateTime 字段
-                            lqXhPxmxEntity.MemberId = entity.Hy;
-                            lqXhPxmxEntity.ProjectNumber = item.projectNumber ?? 1;
-                            lqXhPxmxEntity.TotalPrice = (decimal)(item.pxjg * (item.projectNumber ?? 1));
-                            lqXhPxmxEntity.Px = item.px;
-                            lqXhPxmxEntity.Pxmc = item.pxmc;
-                            lqXhPxmxEntity.Pxjg = item.pxjg;
-                            lqXhPxmxEntity.SourceType = item.sourceType;
-                        }
-                        else
+                        // 创建品项明细实体
+                        var lqXhPxmxEntity = new LqXhPxmxEntity
                         {
-                            // 创建新记录
-                            lqXhPxmxEntity = new LqXhPxmxEntity
-                            {
-                                Id = YitIdHelper.NextId().ToString(),
-                                ConsumeInfoId = entity.Id,
-                                BillingItemId = item.billingItemId,
-                                CreateTIme = DateTime.Now,
-                                MemberId = entity.Hy,
-                                ProjectNumber = item.projectNumber ?? 1,
-                                TotalPrice = (decimal)(item.pxjg * (item.projectNumber ?? 1)),
-                                Px = item.px,
-                                Pxmc = item.pxmc,
-                                Pxjg = item.pxjg,
-                                SourceType = item.sourceType,
-                            };
-                        }
+                            Id = YitIdHelper.NextId().ToString(),
+                            ConsumeInfoId = input.id,
+                            BillingItemId = item.billingItemId,
+                            CreateTIme = DateTime.Now,
+                            MemberId = entity.Hy,
+                            ProjectNumber = item.projectNumber ?? 1,
+                            TotalPrice = (decimal)(item.pxjg * (item.projectNumber ?? 1)),
+                            Px = item.px,
+                            Pxmc = item.pxmc,
+                            Pxjg = item.pxjg,
+                            SourceType = item.sourceType,
+                        };
                         allPxmxEntities.Add(lqXhPxmxEntity);
                         // 收集该品项关联的健康师业绩
@@ -590,7 +571,7 @@ namespace NCC.Extend.LqXhHyhk
                                     new LqXhJksyjEntity
                                     {
                                         Id = YitIdHelper.NextId().ToString(),
-                                        Glkdbh = entity.Id,
+                                        Glkdbh = input.id,
                                         Jks = ijks_tem.jks,
                                         Jksxm = ijks_tem.jksxm,
                                         Jkszh = ijks_tem.jkszh,
@@ -614,7 +595,7 @@ namespace NCC.Extend.LqXhHyhk
                                     new LqXhKjbsyjEntity
                                     {
                                         Id = YitIdHelper.NextId().ToString(),
-                                        Glkdbh = entity.Id,
+                                        Glkdbh = input.id,
                                         Kjbls = ikjbs_tem.kjbls,
                                         Kjblsxm = ikjbs_tem.kjblsxm,
                                         Kjblszh = ikjbs_tem.kjblszh,
@@ -629,22 +610,10 @@ namespace NCC.Extend.LqXhHyhk
                         }
                     }
                 }
-
                 // 批量插入品项明细
                 if (allPxmxEntities.Any())
                 {
-                    // 分别处理插入和更新
-                    var existingEntities = allPxmxEntities.Where(e => !string.IsNullOrEmpty(e.Id)).ToList();
-                    var newEntities = allPxmxEntities.Where(e => string.IsNullOrEmpty(e.Id)).ToList();
-
-                    if (existingEntities.Any())
-                    {
-                        await _db.Updateable(existingEntities).ExecuteCommandAsync();
-                    }
-                    if (newEntities.Any())
-                    {
-                        await _db.Insertable(newEntities).ExecuteCommandAsync();
-                    }
+                    await _db.Insertable(allPxmxEntities).ExecuteCommandAsync();
                 }
                 // 批量插入健康师业绩
                 if (allJksyjEntities.Any())
@@ -656,8 +625,7 @@ namespace NCC.Extend.LqXhHyhk
                 {
                     await _db.Insertable(allKjbsyjEntities).ExecuteCommandAsync();
                 }
-
-                //关闭事务
+                // 提交事务
                 _db.CommitTran();
             }
             catch (Exception)
@@ -707,5 +675,198 @@ namespace NCC.Extend.LqXhHyhk
             }
         }
         #endregion
+
+        #region 查询健康师消耗业绩列表
+        /// <summary>
+        /// 查询健康师业绩列表
+        /// </summary>
+        /// <param name="input">查询参数</param>
+        /// <returns>分页的健康师业绩列表</returns>
+        /// <remarks>
+        /// 查询健康师业绩记录，支持分页和时间筛选
+        /// 
+        /// 示例请求：
+        /// ```json
+        /// {
+        ///   "glkdbh": "123456789",
+        ///   "jksId": "健康师ID",
+        ///   "startTime": "2025-01-01T00:00:00",
+        ///   "endTime": "2025-01-31T23:59:59",
+        ///   "currentPage": 1,
+        ///   "pageSize": 10,
+        ///   "sidx": "yjsj",
+        ///   "sort": "desc"
+        /// }
+        /// ```
+        /// 
+        /// 参数说明：
+        /// - glkdbh: 开单记录ID（可选）
+        /// - jksId: 健康师ID（可选）
+        /// - startTime: 查询开始时间（可选）
+        /// - endTime: 查询结束时间（可选）
+        /// - currentPage: 当前页码
+        /// - pageSize: 每页大小
+        /// </remarks>
+        /// <response code="200">成功获取健康师业绩列表</response>
+        /// <response code="400">请求参数错误</response>
+        /// <response code="500">服务器内部错误</response>
+        [HttpGet("GetJksyjList")]
+        public async Task<dynamic> GetJksyjList([FromQuery] LqXhJksyjQueryInput input)
+        {
+            try
+            {
+                var sidx = string.IsNullOrEmpty(input.sidx) ? "yjsj" : input.sidx;
+                var sort = string.IsNullOrEmpty(input.sort) ? "desc" : input.sort;
+                var data = await _db.Queryable<LqXhJksyjEntity>()
+                    .WhereIF(!string.IsNullOrEmpty(input.Glkdbh), w => w.Glkdbh == input.Glkdbh)
+                    .WhereIF(!string.IsNullOrEmpty(input.JksId), w => w.Jks == input.JksId)
+                    .WhereIF(input.StartTime.HasValue, w => w.Yjsj >= input.StartTime.Value)
+                    .WhereIF(input.EndTime.HasValue, w => w.Yjsj <= input.EndTime.Value)
+                    .Where(w => w.IsEffective == StatusEnum.有效.GetHashCode())
+                    .Select(it => new LqXhJksyjInfoOutput
+                    {
+                        id = it.Id,
+                        glkdbh = it.Glkdbh,
+                        jks = it.Jks,
+                        jksxm = it.Jksxm,
+                        jkszh = it.Jkszh,
+                        jksyj = it.Jksyj.ToString(),
+                        yjsj = it.Yjsj,
+                        jsjId = it.JsjId,
+                        kdpxid = it.Kdpxid,
+                        laborCost = it.LaborCost,
+                        kdpxNumber = it.KdpxNumber,
+                        storeName = SqlFunc.Subqueryable<LqXhHyhkEntity>().Where(w => w.Id == it.Glkdbh).Select(w => w.Mdmc),
+                        memberId = SqlFunc.Subqueryable<LqXhHyhkEntity>().Where(w => w.Id == it.Glkdbh).Select(w => w.Hy),
+                        memberName = SqlFunc.Subqueryable<LqXhHyhkEntity>().Where(w => w.Id == it.Glkdbh).Select(w => w.Hymc),
+                    })
+                    .MergeTable()
+                    .OrderBy(sidx + " " + sort)
+                    .ToPagedListAsync(input.currentPage, input.pageSize);
+
+                return PageResult<LqXhJksyjInfoOutput>.SqlSugarPageResult(data);
+            }
+            catch (Exception ex)
+            {
+                throw NCCException.Oh($"获取健康师业绩列表失败: {ex.Message}");
+            }
+        }
+        #endregion
+
+        #region 耗卡记录作废
+        /// <summary>
+        /// 耗卡记录作废
+        /// </summary>
+        /// <param name="id">耗卡记录ID</param>
+        /// <returns></returns>
+        [HttpPut("CancelCardUsageRecord/{id}")]
+        public async Task<dynamic> CancelCardUsageRecord(string id)
+        {
+            try
+            {
+                //开启事务
+                _db.BeginTran();
+                //查询消耗记录表信息
+                var LqhyhkInfo = await _db.Queryable<LqXhHyhkEntity>().Where(p => p.Id == id && p.IsEffective == StatusEnum.有效.GetHashCode()).FirstAsync();
+                if (LqhyhkInfo == null)
+                {
+                    throw NCCException.Oh(ErrorCode.COM1005, "耗卡记录不存在或已作废");
+                }
+                //更新耗卡记录状态
+                LqhyhkInfo.IsEffective = StatusEnum.无效.GetHashCode();
+                await _db.Updateable(LqhyhkInfo).ExecuteCommandAsync();
+                //更新品项明细表状态
+                await _db.Updateable<LqXhPxmxEntity>().SetColumns(it => new LqXhPxmxEntity { IsEffective = StatusEnum.无效.GetHashCode() }).Where(w => w.ConsumeInfoId == id).ExecuteCommandAsync();
+                //更新健康师业绩表状态
+                await _db.Updateable<LqXhJksyjEntity>().SetColumns(it => new LqXhJksyjEntity { IsEffective = StatusEnum.无效.GetHashCode() }).Where(w => w.Glkdbh == id).ExecuteCommandAsync();
+                //更新科技部老师业绩表状态
+                await _db.Updateable<LqXhKjbsyjEntity>().SetColumns(it => new LqXhKjbsyjEntity { IsEffective = StatusEnum.无效.GetHashCode() }).Where(w => w.Glkdbh == id).ExecuteCommandAsync();
+                //关闭事务
+                _db.CommitTran();
+                return LqhyhkInfo;
+            }
+            catch (Exception)
+            {
+                //回滚事务
+                _db.RollbackTran();
+                throw NCCException.Oh(ErrorCode.COM1001);
+            }
+        }
+        #endregion
+
+        #region 获取某个会员的耗卡记录
+        /// <summary>
+        /// 获取某个会员的耗卡记录（分页）
+        /// </summary>
+        /// <param name="input">查询参数</param>
+        /// <returns></returns>
+        [HttpGet("GetMemberCardUsageRecord")]
+        public async Task<dynamic> GetMemberCardUsageRecord([FromQuery] LqXhHyhkMemberCardUsageQueryInput input)
+        {
+            try
+            {
+                // 参数验证
+                if (string.IsNullOrEmpty(input.MemberId))
+                {
+                    throw NCCException.Oh("会员ID不能为空");
+                }
+                // 分页查询会员耗卡记录
+                var data = await _db.Queryable<LqXhHyhkEntity>()
+                    .Where(p => p.Hy == input.MemberId && p.IsEffective == StatusEnum.有效.GetHashCode())
+                    .WhereIF(!string.IsNullOrEmpty(input.StoreId), p => p.Md == input.StoreId)
+                    .WhereIF(input.StartTime.HasValue, p => p.Hksj >= input.StartTime.Value)
+                    .WhereIF(input.EndTime.HasValue, p => p.Hksj <= input.EndTime.Value)
+                    .Select(it => new LqXhHyhkMemberCardUsageOutput
+                    {
+                        Id = it.Id,
+                        MemberId = it.Hy,
+                        MemberName = it.Hymc,
+                        StoreId = it.Md,
+                        StoreName = it.Mdmc,
+                        UsageDate = it.Hksj,
+                        TotalAmount = it.Xfje,
+                        Remarks = it.SignatureFile,
+                        CreateTime = it.CreateTime
+                    })
+                    .MergeTable()
+                    .OrderBy((input.sidx == null ? "UsageDate" : input.sidx) + " " + (input.sort ?? "desc"))
+                    .ToPagedListAsync(input.currentPage, input.pageSize);
+
+                // 获取当前页耗卡记录ID，直接查询对应的品项明细
+                if (data.list.Any())
+                {
+                    var recordIds = data.list.Select(r => r.Id).ToList();
+                    // 批量查询当前页记录的所有品项明细
+                    var itemDetails = await _db.Queryable<LqXhPxmxEntity>().Where(w => recordIds.Contains(w.ConsumeInfoId) && w.IsEffective == StatusEnum.有效.GetHashCode()).ToListAsync();
+                    // 按耗卡记录ID分组明细
+                    var detailsGrouped = itemDetails.GroupBy(d => d.ConsumeInfoId).ToDictionary(g => g.Key, g => g.ToList());
+                    // 为每个记录添加品项明细
+                    foreach (var record in data.list)
+                    {
+                        if (detailsGrouped.ContainsKey(record.Id))
+                        {
+                            record.ItemDetails = detailsGrouped[record.Id].Select(detail => new LqXhHyhkMemberCardUsageItemDetail
+                            {
+                                Id = detail.Id,
+                                ItemId = detail.Px,
+                                ItemName = detail.Pxmc,
+                                UnitPrice = detail.Pxjg,
+                                ProjectNumber = detail.ProjectNumber,
+                                TotalPrice = detail.TotalPrice,
+                                SourceType = detail.SourceType,
+                                CreateTime = detail.CreateTIme
+                            }).ToList();
+                        }
+                    }
+                }
+                return PageResult<LqXhHyhkMemberCardUsageOutput>.SqlSugarPageResult(data);
+            }
+            catch (Exception ex)
+            {
+                throw NCCException.Oh($"获取会员耗卡记录失败: {ex.Message}");
+            }
+        }
+        #endregion
+
     }
 }
-using System;
-using System.Collections.Generic;
-using System.Linq;
-using System.Threading.Tasks;
-using Mapster;
-using Microsoft.AspNetCore.Mvc;
-using NCC.ClayObject;
-using NCC.Common.Configuration;
-using NCC.Common.Core.Manager;
-using NCC.Common.Enum;
-using NCC.Common.Extension;
-using NCC.Common.Filter;
-using NCC.Common.Helper;
-using NCC.Common.Model.NPOI;
-using NCC.DataEncryption;
-using NCC.Dependency;
-using NCC.DynamicApiController;
-using NCC.Extend.Entitys.Dto.LqXhmxb;
-using NCC.Extend.Entitys.lq_xhmxb;
-using NCC.Extend.Interfaces.LqXhmxb;
-using NCC.FriendlyException;
-using NCC.JsonSerialization;
-using SqlSugar;
-using Yitter.IdGenerator;
-
-namespace NCC.Extend.LqXhmxb
-{
-    /// <summary>
-    /// 消耗明细表服务
-    /// </summary>
-    [ApiDescriptionSettings(Tag = "Extend", Name = "LqXhmxb", Order = 200)]
-    [Route("api/Extend/[controller]")]
-    public class LqXhmxbService : ILqXhmxbService, IDynamicApiController, ITransient
-    {
-        private readonly ISqlSugarRepository<LqXhmxbEntity> _lqXhmxbRepository;
-        private readonly SqlSugarScope _db;
-        private readonly IUserManager _userManager;
-
-        /// <summary>
-        /// 初始化一个<see cref="LqXhmxbService"/>类型的新实例
-        /// </summary>
-        public LqXhmxbService(ISqlSugarRepository<LqXhmxbEntity> lqXhmxbRepository, IUserManager userManager)
-        {
-            _lqXhmxbRepository = lqXhmxbRepository;
-            _db = _lqXhmxbRepository.Context;
-            _userManager = userManager;
-        }
-
-        /// <summary>
-        /// 获取消耗明细表
-        /// </summary>
-        /// <param name="id">参数</param>
-        /// <returns></returns>
-        [HttpGet("{id}")]
-        public async Task<dynamic> GetInfo(string id)
-        {
-            var entity = await _db.Queryable<LqXhmxbEntity>().FirstAsync(p => p.Id == id);
-            var output = entity.Adapt<LqXhmxbInfoOutput>();
-            return output;
-        }
-
-        /// <summary>
-        /// 获取消耗明细表列表
-        /// </summary>
-        /// <param name="input">请求参数</param>
-        /// <returns></returns>
-        [HttpGet("")]
-        public async Task<dynamic> GetList([FromQuery] LqXhmxbListQueryInput input)
-        {
-            var sidx = input.sidx == null ? "id" : input.sidx;
-            var data = await _db.Queryable<LqXhmxbEntity>()
-                .WhereIF(!string.IsNullOrEmpty(input.id), p => p.Id.Contains(input.id))
-                .WhereIF(!string.IsNullOrEmpty(input.mdbh), p => p.Mdbh.Contains(input.mdbh))
-                .WhereIF(!string.IsNullOrEmpty(input.mdmc), p => p.Mdmc.Contains(input.mdmc))
-                .WhereIF(!string.IsNullOrEmpty(input.bmbh), p => p.Bmbh.Contains(input.bmbh))
-                .WhereIF(!string.IsNullOrEmpty(input.bmmc), p => p.Bmmc.Contains(input.bmmc))
-                .WhereIF(!string.IsNullOrEmpty(input.ygbh), p => p.Ygbh.Contains(input.ygbh))
-                .WhereIF(!string.IsNullOrEmpty(input.ygmc), p => p.Ygmc.Contains(input.ygmc))
-                .WhereIF(!string.IsNullOrEmpty(input.xms), p => p.Xms.Contains(input.xms))
-                .WhereIF(!string.IsNullOrEmpty(input.xh), p => p.Xh.Contains(input.xh))
-                .WhereIF(!string.IsNullOrEmpty(input.sg), p => p.Sg.Contains(input.sg))
-                .WhereIF(!string.IsNullOrEmpty(input.qtsg1), p => p.Qtsg1.Contains(input.qtsg1))
-                .WhereIF(!string.IsNullOrEmpty(input.qtsg2), p => p.Qtsg2.Contains(input.qtsg2))
-                .WhereIF(!string.IsNullOrEmpty(input.qtsg3), p => p.Qtsg3.Contains(input.qtsg3))
-                .WhereIF(!string.IsNullOrEmpty(input.sghj), p => p.Sghj.Contains(input.sghj))
-                .Select(it => new LqXhmxbListOutput
-                {
-                    id = it.Id,
-                    mdbh = it.Mdbh,
-                    mdmc = it.Mdmc,
-                    bmbh = it.Bmbh,
-                    bmmc = it.Bmmc,
-                    ygbh = it.Ygbh,
-                    ygmc = it.Ygmc,
-                    xms = it.Xms,
-                    xh = it.Xh,
-                    sg = it.Sg,
-                    qtsg1 = it.Qtsg1,
-                    qtsg2 = it.Qtsg2,
-                    qtsg3 = it.Qtsg3,
-                    sghj = it.Sghj,
-                })
-                .MergeTable()
-                .OrderBy(sidx + " " + input.sort)
-                .ToPagedListAsync(input.currentPage, input.pageSize);
-            return PageResult<LqXhmxbListOutput>.SqlSugarPageResult(data);
-        }
-
-        /// <summary>
-        /// 新建消耗明细表
-        /// </summary>
-        /// <param name="input">参数</param>
-        /// <returns></returns>
-        [HttpPost("")]
-        public async Task Create([FromBody] LqXhmxbCrInput input)
-        {
-            var userInfo = await _userManager.GetUserInfo();
-            var entity = input.Adapt<LqXhmxbEntity>();
-            entity.Id = YitIdHelper.NextId().ToString();
-            var isOk = await _db.Insertable(entity).IgnoreColumns(ignoreNullColumn: true).ExecuteCommandAsync();
-            if (!(isOk > 0))
-                throw NCCException.Oh(ErrorCode.COM1000);
-        }
-
-        /// <summary>
-        /// 获取消耗明细表无分页列表
-        /// </summary>
-        /// <param name="input">请求参数</param>
-        /// <returns></returns>
-        [NonAction]
-        public async Task<dynamic> GetNoPagingList([FromQuery] LqXhmxbListQueryInput input)
-        {
-            var sidx = input.sidx == null ? "id" : input.sidx;
-            var data = await _db.Queryable<LqXhmxbEntity>()
-                .WhereIF(!string.IsNullOrEmpty(input.id), p => p.Id.Contains(input.id))
-                .WhereIF(!string.IsNullOrEmpty(input.mdbh), p => p.Mdbh.Contains(input.mdbh))
-                .WhereIF(!string.IsNullOrEmpty(input.mdmc), p => p.Mdmc.Contains(input.mdmc))
-                .WhereIF(!string.IsNullOrEmpty(input.bmbh), p => p.Bmbh.Contains(input.bmbh))
-                .WhereIF(!string.IsNullOrEmpty(input.bmmc), p => p.Bmmc.Contains(input.bmmc))
-                .WhereIF(!string.IsNullOrEmpty(input.ygbh), p => p.Ygbh.Contains(input.ygbh))
-                .WhereIF(!string.IsNullOrEmpty(input.ygmc), p => p.Ygmc.Contains(input.ygmc))
-                .WhereIF(!string.IsNullOrEmpty(input.xms), p => p.Xms.Contains(input.xms))
-                .WhereIF(!string.IsNullOrEmpty(input.xh), p => p.Xh.Contains(input.xh))
-                .WhereIF(!string.IsNullOrEmpty(input.sg), p => p.Sg.Contains(input.sg))
-                .WhereIF(!string.IsNullOrEmpty(input.qtsg1), p => p.Qtsg1.Contains(input.qtsg1))
-                .WhereIF(!string.IsNullOrEmpty(input.qtsg2), p => p.Qtsg2.Contains(input.qtsg2))
-                .WhereIF(!string.IsNullOrEmpty(input.qtsg3), p => p.Qtsg3.Contains(input.qtsg3))
-                .WhereIF(!string.IsNullOrEmpty(input.sghj), p => p.Sghj.Contains(input.sghj))
-                .Select(it => new LqXhmxbListOutput
-                {
-                    id = it.Id,
-                    mdbh = it.Mdbh,
-                    mdmc = it.Mdmc,
-                    bmbh = it.Bmbh,
-                    bmmc = it.Bmmc,
-                    ygbh = it.Ygbh,
-                    ygmc = it.Ygmc,
-                    xms = it.Xms,
-                    xh = it.Xh,
-                    sg = it.Sg,
-                    qtsg1 = it.Qtsg1,
-                    qtsg2 = it.Qtsg2,
-                    qtsg3 = it.Qtsg3,
-                    sghj = it.Sghj,
-                })
-                .MergeTable()
-                .OrderBy(sidx + " " + input.sort)
-                .ToListAsync();
-            return data;
-        }
-
-        /// <summary>
-        /// 导出消耗明细表
-        /// </summary>
-        /// <param name="input">请求参数</param>
-        /// <returns></returns>
-        [HttpGet("Actions/Export")]
-        public async Task<dynamic> Export([FromQuery] LqXhmxbListQueryInput input)
-        {
-            var userInfo = await _userManager.GetUserInfo();
-            var exportData = new List<LqXhmxbListOutput>();
-            if (input.dataType == 0)
-            {
-                var data = Clay.Object(await this.GetList(input));
-                exportData = data.Solidify<PageResult<LqXhmxbListOutput>>().list;
-            }
-            else
-            {
-                exportData = await this.GetNoPagingList(input);
-            }
-            List<ParamsModel> paramList =
-                "[{\"value\":\"消耗编号\",\"field\":\"id\"},{\"value\":\"门店编号\",\"field\":\"mdbh\"},{\"value\":\"门店名称\",\"field\":\"mdmc\"},{\"value\":\"部门编号\",\"field\":\"bmbh\"},{\"value\":\"部门名称\",\"field\":\"bmmc\"},{\"value\":\"员工编号\",\"field\":\"ygbh\"},{\"value\":\"员工名称\",\"field\":\"ygmc\"},{\"value\":\"项目数\",\"field\":\"xms\"},{\"value\":\"消耗\",\"field\":\"xh\"},{\"value\":\"手工\",\"field\":\"sg\"},{\"value\":\"其它手工1\",\"field\":\"qtsg1\"},{\"value\":\"其它手工2\",\"field\":\"qtsg2\"},{\"value\":\"其它手工3\",\"field\":\"qtsg3\"},{\"value\":\"手工合计\",\"field\":\"sghj\"},]".ToList<ParamsModel>();
-            ExcelConfig excelconfig = new ExcelConfig();
-            excelconfig.FileName = "消耗明细表.xls";
-            excelconfig.HeadFont = "微软雅黑";
-            excelconfig.HeadPoint = 10;
-            excelconfig.IsAllSizeColumn = true;
-            excelconfig.ColumnModel = new List<ExcelColumnModel>();
-            List<string> selectKeyList = input.selectKey.Split(',').ToList();
-            foreach (var item in selectKeyList)
-            {
-                var isExist = paramList.Find(p => p.field == item);
-                if (isExist != null)
-                {
-                    excelconfig.ColumnModel.Add(new ExcelColumnModel() { Column = isExist.field, ExcelColumn = isExist.value });
-                }
-            }
-            var addPath = FileVariable.TemporaryFilePath + excelconfig.FileName;
-            ExcelExportHelper<LqXhmxbListOutput>.Export(exportData, excelconfig, addPath);
-            var fileName = _userManager.UserId + "|" + addPath + "|xls";
-            var output = new { name = excelconfig.FileName, url = "/api/File/Download?encryption=" + DESCEncryption.Encrypt(fileName, "NCC") };
-            return output;
-        }
-
-        /// <summary>
-        /// 批量删除消耗明细表
-        /// </summary>
-        /// <param name="ids">主键数组</param>
-        /// <returns></returns>
-        [HttpPost("batchRemove")]
-        public async Task BatchRemove([FromBody] List<string> ids)
-        {
-            var entitys = await _db.Queryable<LqXhmxbEntity>().In(it => it.Id, ids).ToListAsync();
-            if (entitys.Count > 0)
-            {
-                try
-                {
-                    //开启事务
-                    _db.BeginTran();
-                    //批量删除消耗明细表
-                    await _db.Deleteable<LqXhmxbEntity>().In(d => d.Id, ids).ExecuteCommandAsync();
-                    //关闭事务
-                    _db.CommitTran();
-                }
-                catch (Exception)
-                {
-                    //回滚事务
-                    _db.RollbackTran();
-                    throw NCCException.Oh(ErrorCode.COM1002);
-                }
-            }
-        }
-
-        /// <summary>
-        /// 更新消耗明细表
-        /// </summary>
-        /// <param name="id">主键</param>
-        /// <param name="input">参数</param>
-        /// <returns></returns>
-        [HttpPut("{id}")]
-        public async Task Update(string id, [FromBody] LqXhmxbUpInput input)
-        {
-            var entity = input.Adapt<LqXhmxbEntity>();
-            var isOk = await _db.Updateable(entity).IgnoreColumns(ignoreAllNullColumns: true).ExecuteCommandAsync();
-            if (!(isOk > 0))
-                throw NCCException.Oh(ErrorCode.COM1001);
-        }
-
-        /// <summary>
-        /// 删除消耗明细表
-        /// </summary>
-        /// <returns></returns>
-        [HttpDelete("{id}")]
-        public async Task Delete(string id)
-        {
-            var entity = await _db.Queryable<LqXhmxbEntity>().FirstAsync(p => p.Id == id);
-            _ = entity ?? throw NCCException.Oh(ErrorCode.COM1005);
-            var isOk = await _db.Deleteable<LqXhmxbEntity>().Where(d => d.Id == id).ExecuteCommandAsync();
-            if (!(isOk > 0))
-                throw NCCException.Oh(ErrorCode.COM1002);
-        }
-    }
-}
@@ -46,8 +46,9 @@ namespace NCC.Extend.Utils
             var customerName = GetCustomerName(entity.kdhy);
             sb.AppendLine($"⏩顾客姓名：{customerName}");
             // 健康师：王维
-            var healthTeachers = HealthInstructorNames.TrimEnd(',');
-            sb.AppendLine($"⏩健康师：{healthTeachers}");
+            //这里需要把HealthInstructorNames去重，HealthInstructorNames格式为张三、李四、张三、
+            var healthTeachers = HealthInstructorNames.Split(',', StringSplitOptions.RemoveEmptyEntries).Distinct().ToArray();
+            sb.AppendLine($"⏩健康师：{string.Join("、", healthTeachers)}");
             // 活动方案：532工程
             sb.AppendLine($"⏩活动方案：{entity.pxxx ?? "无"}");