Commit d5374a535918c8cf35319a49aa48d75c19ccbfa1
1 parent
0c866930
feat: 在营销活动统计中新增欠款金额统计
- 在GetActivityStatistics方法中新增欠款金额统计 - 欠款金额来自lq_kd_kdjlb表的qk字段 - 支持门店ID过滤 - 更新输出DTO和相关接口文档
Showing
2 changed files
with
13 additions
and
3 deletions
netcore/src/Modularity/Extend/NCC.Extend.Entitys/Dto/LqPackageInfo/ActivityStatisticsOutput.cs
| @@ -51,5 +51,10 @@ namespace NCC.Extend.Entitys.Dto.LqPackageInfo | @@ -51,5 +51,10 @@ namespace NCC.Extend.Entitys.Dto.LqPackageInfo | ||
| 51 | /// 退卡率(退卡数量 / 开单数量) | 51 | /// 退卡率(退卡数量 / 开单数量) |
| 52 | /// </summary> | 52 | /// </summary> |
| 53 | public decimal RefundRate { get; set; } | 53 | public decimal RefundRate { get; set; } |
| 54 | + | ||
| 55 | + /// <summary> | ||
| 56 | + /// 欠款金额(所有开单的欠款总和) | ||
| 57 | + /// </summary> | ||
| 58 | + public decimal DebtAmount { get; set; } | ||
| 54 | } | 59 | } |
| 55 | } | 60 | } |
netcore/src/Modularity/Extend/NCC.Extend/LqPackageInfoService.cs
| @@ -586,6 +586,7 @@ namespace NCC.Extend.LqPackageInfo | @@ -586,6 +586,7 @@ namespace NCC.Extend.LqPackageInfo | ||
| 586 | /// - NetBillingCount: 净开单数量(开单数量 - 退卡数量) | 586 | /// - NetBillingCount: 净开单数量(开单数量 - 退卡数量) |
| 587 | /// - NetBillingAmount: 净开单金额(开单金额 - 退卡金额) | 587 | /// - NetBillingAmount: 净开单金额(开单金额 - 退卡金额) |
| 588 | /// - RefundRate: 退卡率(退卡数量 / 开单数量) | 588 | /// - RefundRate: 退卡率(退卡数量 / 开单数量) |
| 589 | + /// - DebtAmount: 欠款金额(所有开单的欠款总和) | ||
| 589 | /// </remarks> | 590 | /// </remarks> |
| 590 | /// <param name="input">查询参数</param> | 591 | /// <param name="input">查询参数</param> |
| 591 | /// <returns>营销活动统计数据</returns> | 592 | /// <returns>营销活动统计数据</returns> |
| @@ -629,7 +630,8 @@ namespace NCC.Extend.LqPackageInfo | @@ -629,7 +630,8 @@ namespace NCC.Extend.LqPackageInfo | ||
| 629 | RefundAmount = 0, | 630 | RefundAmount = 0, |
| 630 | NetBillingCount = 0, | 631 | NetBillingCount = 0, |
| 631 | NetBillingAmount = 0, | 632 | NetBillingAmount = 0, |
| 632 | - RefundRate = 0 | 633 | + RefundRate = 0, |
| 634 | + DebtAmount = 0 | ||
| 633 | }; | 635 | }; |
| 634 | } | 636 | } |
| 635 | 637 | ||
| @@ -653,7 +655,8 @@ namespace NCC.Extend.LqPackageInfo | @@ -653,7 +655,8 @@ namespace NCC.Extend.LqPackageInfo | ||
| 653 | var billingSql = $@" | 655 | var billingSql = $@" |
| 654 | SELECT | 656 | SELECT |
| 655 | COUNT(DISTINCT kd.F_Id) as billing_count, | 657 | COUNT(DISTINCT kd.F_Id) as billing_count, |
| 656 | - SUM(CAST(px.F_ActualPrice AS DECIMAL(18,2))) as billing_amount | 658 | + SUM(CAST(px.F_ActualPrice AS DECIMAL(18,2))) as billing_amount, |
| 659 | + SUM(CAST(kd.qk AS DECIMAL(18,2))) as debt_amount | ||
| 657 | FROM lq_kd_pxmx px | 660 | FROM lq_kd_pxmx px |
| 658 | LEFT JOIN lq_kd_kdjlb kd ON px.glkdbh = kd.F_Id | 661 | LEFT JOIN lq_kd_kdjlb kd ON px.glkdbh = kd.F_Id |
| 659 | WHERE px.F_IsEffective = 1 | 662 | WHERE px.F_IsEffective = 1 |
| @@ -665,6 +668,7 @@ namespace NCC.Extend.LqPackageInfo | @@ -665,6 +668,7 @@ namespace NCC.Extend.LqPackageInfo | ||
| 665 | var billingData = await _db.Ado.SqlQueryAsync<dynamic>(billingSql); | 668 | var billingData = await _db.Ado.SqlQueryAsync<dynamic>(billingSql); |
| 666 | var billingCount = Convert.ToInt32(billingData.FirstOrDefault()?.billing_count ?? 0); | 669 | var billingCount = Convert.ToInt32(billingData.FirstOrDefault()?.billing_count ?? 0); |
| 667 | var billingAmount = Convert.ToDecimal(billingData.FirstOrDefault()?.billing_amount ?? 0); | 670 | var billingAmount = Convert.ToDecimal(billingData.FirstOrDefault()?.billing_amount ?? 0); |
| 671 | + var debtAmount = Convert.ToDecimal(billingData.FirstOrDefault()?.debt_amount ?? 0); | ||
| 668 | 672 | ||
| 669 | // 7. 退卡统计 | 673 | // 7. 退卡统计 |
| 670 | var refundSql = $@" | 674 | var refundSql = $@" |
| @@ -699,7 +703,8 @@ namespace NCC.Extend.LqPackageInfo | @@ -699,7 +703,8 @@ namespace NCC.Extend.LqPackageInfo | ||
| 699 | RefundAmount = refundAmount, | 703 | RefundAmount = refundAmount, |
| 700 | NetBillingCount = netBillingCount, | 704 | NetBillingCount = netBillingCount, |
| 701 | NetBillingAmount = netBillingAmount, | 705 | NetBillingAmount = netBillingAmount, |
| 702 | - RefundRate = refundRate | 706 | + RefundRate = refundRate, |
| 707 | + DebtAmount = debtAmount | ||
| 703 | }; | 708 | }; |
| 704 | } | 709 | } |
| 705 | catch (Exception ex) | 710 | catch (Exception ex) |