123

“wangming”
1 parent a52c7842
Showing 8 changed files with 95 additions and 12 deletions
netcore/src/Modularity/Extend/NCC.Extend.Entitys/Dto/LqDailyReport/StorePerformanceCompletionOutput.cs
netcore/src/Modularity/Extend/NCC.Extend.Entitys/Dto/LqXhFeedback/LqXhFeedbackCrInput.cs
netcore/src/Modularity/Extend/NCC.Extend.Entitys/Dto/LqXhFeedback/LqXhFeedbackInfoOutput.cs
netcore/src/Modularity/Extend/NCC.Extend.Entitys/Dto/LqXhFeedback/LqXhFeedbackListOutput.cs
netcore/src/Modularity/Extend/NCC.Extend.Entitys/Entity/lq_xh_feedback/LqXhFeedbackEntity.cs
netcore/src/Modularity/Extend/NCC.Extend/LqDailyReportService.cs
netcore/src/Modularity/Extend/NCC.Extend/LqTkjlbService.cs
netcore/src/Modularity/Extend/NCC.Extend/LqXhFeedbackService.cs
@@ -24,7 +24,22 @@ namespace NCC.Extend.Entitys.Dto.LqDailyReport
         public decimal TargetPerformance { get; set; }
         /// <summary>
-        /// 完成业绩（开单业绩）
+        /// 开单业绩
+        /// </summary>
+        public decimal BillingPerformance { get; set; }
+
+        /// <summary>
+        /// 退款业绩（退卡业绩）
+        /// </summary>
+        public decimal RefundPerformance { get; set; }
+
+        /// <summary>
+        /// 实际业绩（开单业绩 - 退款业绩）
+        /// </summary>
+        public decimal ActualPerformance { get; set; }
+
+        /// <summary>
+        /// 完成业绩（实际业绩，用于兼容旧版本）
         /// </summary>
         public decimal CompletedPerformance { get; set; }
@@ -32,5 +32,11 @@ namespace NCC.Extend.Entitys.Dto.LqXhFeedback
         /// </summary>
         [Display(Name = "备注", Description = "反馈备注信息")]
         public string Remark { get; set; }
+
+        /// <summary>
+        /// 科技部备注
+        /// </summary>
+        [Display(Name = "科技部备注", Description = "科技部备注信息")]
+        public string KjbRemark { get; set; }
     }
 }
@@ -18,6 +18,11 @@ namespace NCC.Extend.Entitys.Dto.LqXhFeedback
         public string consumeId { get; set; }
         /// <summary>
+        /// 会员ID
+        /// </summary>
+        public string memberId { get; set; }
+
+        /// <summary>
         /// 前图片
         /// </summary>
         public string beforeImage { get; set; }
@@ -33,6 +38,11 @@ namespace NCC.Extend.Entitys.Dto.LqXhFeedback
         public string remark { get; set; }
         /// <summary>
+        /// 科技部备注
+        /// </summary>
+        public string kjbRemark { get; set; }
+
+        /// <summary>
         /// 添加人ID
         /// </summary>
         public string createUser { get; set; }
@@ -18,6 +18,11 @@ namespace NCC.Extend.Entitys.Dto.LqXhFeedback
         public string consumeId { get; set; }
         /// <summary>
+        /// 会员ID
+        /// </summary>
+        public string memberId { get; set; }
+
+        /// <summary>
         /// 前图片
         /// </summary>
         public string beforeImage { get; set; }
@@ -33,6 +38,11 @@ namespace NCC.Extend.Entitys.Dto.LqXhFeedback
         public string remark { get; set; }
         /// <summary>
+        /// 科技部备注
+        /// </summary>
+        public string kjbRemark { get; set; }
+
+        /// <summary>
         /// 添加人ID
         /// </summary>
         public string createUser { get; set; }
@@ -24,6 +24,12 @@ namespace NCC.Extend.Entitys.lq_xh_feedback
         public string ConsumeId { get; set; }
         /// <summary>
+        /// 会员ID
+        /// </summary>
+        [SugarColumn(ColumnName = "F_MemberId")]
+        public string MemberId { get; set; }
+
+        /// <summary>
         /// 前图片
         /// </summary>
         [SugarColumn(ColumnName = "F_BeforeImage")]
@@ -42,6 +48,12 @@ namespace NCC.Extend.Entitys.lq_xh_feedback
         public string Remark { get; set; }
         /// <summary>
+        /// 科技部备注
+        /// </summary>
+        [SugarColumn(ColumnName = "F_KjbRemark")]
+        public string KjbRemark { get; set; }
+
+        /// <summary>
         /// 添加人ID
         /// </summary>
         [SugarColumn(ColumnName = "F_CreateUser")]
@@ -192,8 +192,11 @@ namespace NCC.Extend
         /// - StoreId: 门店ID
         /// - StoreName: 门店名称
         /// - TargetPerformance: 目标业绩（生命线，来自门店信息表）
-        /// - CompletedPerformance: 完成业绩（当月1号至统计日期的开单业绩总和）
-        /// - CompletionRate: 完成率（百分比，CompletedPerformance / TargetPerformance * 100）
+        /// - BillingPerformance: 开单业绩（开单业绩总和）
+        /// - RefundPerformance: 退款业绩（退卡业绩总和）
+        /// - ActualPerformance: 实际业绩（开单业绩 - 退款业绩）
+        /// - CompletedPerformance: 完成业绩（实际业绩，用于兼容旧版本）
+        /// - CompletionRate: 完成率（百分比，ActualPerformance / TargetPerformance * 100）
         /// </remarks>
         /// <param name="input">查询参数</param>
         /// <returns>门店业绩完成情况列表</returns>
@@ -222,7 +225,7 @@ namespace NCC.Extend
                     store.dm as StoreName,
                     -- 目标业绩（生命线）
                     COALESCE(store.xsyj, 0) as TargetPerformance,
-                    -- 完成业绩（开单业绩总和）
+                    -- 开单业绩总和
                     COALESCE((
                         SELECT SUM(billing.sfyj)
                         FROM lq_kd_kdjlb billing
@@ -230,25 +233,39 @@ namespace NCC.Extend
                             AND billing.F_IsEffective = 1
                             AND DATE(billing.kdrq) >= '{startDate:yyyy-MM-dd}'
                             AND DATE(billing.kdrq) <= '{endDate:yyyy-MM-dd}'
-                    ), 0) as CompletedPerformance
+                    ), 0) as BillingPerformance,
+                    -- 退款业绩总和（退卡业绩）
+                    COALESCE((
+                        SELECT SUM(refund.tkje)
+                        FROM lq_hytk_hytk refund
+                        WHERE refund.md = store.F_Id
+                            AND refund.F_IsEffective = 1
+                            AND DATE(refund.tksj) >= '{startDate:yyyy-MM-dd}'
+                            AND DATE(refund.tksj) <= '{endDate:yyyy-MM-dd}'
+                    ), 0) as RefundPerformance
                 FROM lq_mdxx store
                 WHERE 1=1 {storeFilter}
-                ORDER BY CompletedPerformance DESC";
+                ORDER BY (BillingPerformance - RefundPerformance) DESC";
             var result = await _db.Ado.SqlQueryAsync<dynamic>(sql);
             var outputList = result.Select(item =>
             {
                 var targetPerformance = Convert.ToDecimal(item.TargetPerformance);
-                var completedPerformance = Convert.ToDecimal(item.CompletedPerformance);
-                var completionRate = targetPerformance > 0 ? (completedPerformance / targetPerformance * 100m) : 0m;
+                var billingPerformance = Convert.ToDecimal(item.BillingPerformance);
+                var refundPerformance = Convert.ToDecimal(item.RefundPerformance);
+                var actualPerformance = billingPerformance - refundPerformance;
+                var completionRate = targetPerformance > 0 ? (actualPerformance / targetPerformance * 100m) : 0m;
                 return new StorePerformanceCompletionOutput
                 {
                     StoreId = item.StoreId,
                     StoreName = item.StoreName,
                     TargetPerformance = targetPerformance,
-                    CompletedPerformance = completedPerformance,
+                    BillingPerformance = billingPerformance,
+                    RefundPerformance = refundPerformance,
+                    ActualPerformance = actualPerformance,
+                    CompletedPerformance = actualPerformance, // 保持兼容性
                     CompletionRate = decimal.Round(completionRate, 2)
                 };
             }).ToList();
@@ -238,7 +238,7 @@ namespace NCC.Extend.LqTkjlb
                     Pxjg = 0,
                     Yjsj = DateTime.Now,
                     MemberId = MemberId,
-                    ProjectNumber = 0,
+                    ProjectNumber = 1,
                     IsEnabled = StatusEnum.有效.GetHashCode(),
                     SourceType = "体验",
                     TotalPrice = 0,
@@ -92,17 +92,21 @@ namespace NCC.Extend
         /// ```json
         /// {
         ///   "consumeId": "耗卡记录ID",
+        ///   "memberId": "会员ID",
         ///   "beforeImage": "前图片路径或Base64",
         ///   "afterImage": "后图片路径或Base64",
-        ///   "remark": "反馈备注"
+        ///   "remark": "反馈备注",
+        ///   "kjbRemark": "科技部备注"
         /// }
         /// ```
         /// 
         /// 参数说明：
         /// - consumeId: 耗卡记录ID（必填）
+        /// - memberId: 会员ID（可选）
         /// - beforeImage: 前图片（可选）
         /// - afterImage: 后图片（可选）
         /// - remark: 反馈备注（可选）
+        /// - kjbRemark: 科技部备注（可选）
         /// </remarks>
         /// <param name="input">创建参数</param>
         /// <returns>创建的耗卡反馈记录</returns>
@@ -125,6 +129,7 @@ namespace NCC.Extend
                 entity.CreateUser = _userManager.UserId;
                 entity.CreateTime = DateTime.Now;
                 entity.UpdateTime = DateTime.Now;
+                entity.MemberId = consumeRecord.Hy;
                 await _db.Insertable(entity).ExecuteCommandAsync();
                 return entity.Adapt<LqXhFeedbackInfoOutput>();
             }
@@ -147,18 +152,22 @@ namespace NCC.Extend
         /// {
         ///   "id": "反馈记录ID",
         ///   "consumeId": "耗卡记录ID",
+        ///   "memberId": "会员ID",
         ///   "beforeImage": "前图片路径或Base64",
         ///   "afterImage": "后图片路径或Base64",
-        ///   "remark": "反馈备注"
+        ///   "remark": "反馈备注",
+        ///   "kjbRemark": "科技部备注"
         /// }
         /// ```
         /// 
         /// 参数说明：
         /// - id: 反馈记录ID（必填）
         /// - consumeId: 耗卡记录ID（必填）
+        /// - memberId: 会员ID（可选）
         /// - beforeImage: 前图片（可选）
         /// - afterImage: 后图片（可选）
         /// - remark: 反馈备注（可选）
+        /// - kjbRemark: 科技部备注（可选）
         /// </remarks>
         /// <param name="input">更新参数</param>
         /// <returns>更新后的耗卡反馈记录</returns>
@@ -187,7 +196,9 @@ namespace NCC.Extend
                 entity.BeforeImage = input.BeforeImage;
                 entity.AfterImage = input.AfterImage;
                 entity.Remark = input.Remark;
+                entity.KjbRemark = input.KjbRemark;
                 entity.UpdateTime = DateTime.Now;
+                entity.MemberId = consumeRecord.Hy;
                 await _db.Updateable(entity).ExecuteCommandAsync();
                 return entity.Adapt<LqXhFeedbackInfoOutput>();
             }
@@ -272,9 +283,11 @@ namespace NCC.Extend
                     {
                         id = it.Id,
                         consumeId = it.ConsumeId,
+                        memberId = it.MemberId,
                         beforeImage = it.BeforeImage,
                         afterImage = it.AfterImage,
                         remark = it.Remark,
+                        kjbRemark = it.KjbRemark,
                         createUser = it.CreateUser,
                         createUserName = SqlFunc.Subqueryable<UserEntity>().Where(x => x.Id == it.CreateUser).Select(x => x.RealName),
                         createTime = it.CreateTime,