From b33289ba9348ee2c0f64c9113827b760850e2ac8 Mon Sep 17 00:00:00 2001 From: wxd <123@qq.com> Date: Thu, 21 Mar 2024 15:27:11 +0800 Subject: [PATCH] =?UTF-8?q?=E4=BC=9A=E5=91=98=E5=8D=A1=E6=9E=9A=E4=B8=BE?= =?UTF-8?q?=E4=BF=AE=E6=94=B9=E8=B7=9F=E5=A4=87=E6=B3=A8?= MIME-Version: 1.0 Content-Type: text/plain; charset=UTF-8 Content-Transfer-Encoding: 8bit --- .../CardBills/CardBillDto.cs | 2 +- .../CardBills/CardBillInChargeDto.cs | 2 +- .../CardBills/GetCardBillListDto.cs | 2 +- .../CardRegisters/CreateCardBillDto.cs | 2 +- .../CardBills/CardBillAppService.cs | 7 ++++--- .../CardRegisters/CardRegisterAppService.cs | 2 +- .../RegisterAsbitems/RegisterAsbitemAppService.cs | 4 ++-- src/Shentun.Peis.Domain.Shared/Enums/CardBillFlag.cs | 12 ++++++++++-- src/Shentun.Peis.Domain/CardBills/CardBill.cs | 2 +- 9 files changed, 22 insertions(+), 13 deletions(-) diff --git a/src/Shentun.Peis.Application.Contracts/CardBills/CardBillDto.cs b/src/Shentun.Peis.Application.Contracts/CardBills/CardBillDto.cs index cd5466d..f193e28 100644 --- a/src/Shentun.Peis.Application.Contracts/CardBills/CardBillDto.cs +++ b/src/Shentun.Peis.Application.Contracts/CardBills/CardBillDto.cs @@ -21,7 +21,7 @@ namespace Shentun.Peis.CardBills /// public decimal BillMoney { get; set; } /// - /// 记账标志 0、扣费 1、退费 2、充值 + /// 记账标志 0、充值 1、扣费 2、退费 /// public char? BillFlag { get; set; } diff --git a/src/Shentun.Peis.Application.Contracts/CardBills/CardBillInChargeDto.cs b/src/Shentun.Peis.Application.Contracts/CardBills/CardBillInChargeDto.cs index 5db3612..ba58fa7 100644 --- a/src/Shentun.Peis.Application.Contracts/CardBills/CardBillInChargeDto.cs +++ b/src/Shentun.Peis.Application.Contracts/CardBills/CardBillInChargeDto.cs @@ -20,7 +20,7 @@ namespace Shentun.Peis.CardBills /// public decimal BillMoney { get; set; } /// - /// 记账标志 0、扣费 1、退费 2、充值 + ///记账标志 0、充值 1、扣费 2、退费 /// public char? BillFlag { get; set; } diff --git a/src/Shentun.Peis.Application.Contracts/CardBills/GetCardBillListDto.cs b/src/Shentun.Peis.Application.Contracts/CardBills/GetCardBillListDto.cs index 14553dc..046f16e 100644 --- a/src/Shentun.Peis.Application.Contracts/CardBills/GetCardBillListDto.cs +++ b/src/Shentun.Peis.Application.Contracts/CardBills/GetCardBillListDto.cs @@ -32,7 +32,7 @@ namespace Shentun.Peis.CardBills //public string? MobileTelephone { get; set; } /// - /// 记账标志 0、扣费 1、退费 2、充值 + /// 记账标志 0、充值 1、扣费 2、退费 /// public char? BillFlag { get; set; } diff --git a/src/Shentun.Peis.Application.Contracts/CardRegisters/CreateCardBillDto.cs b/src/Shentun.Peis.Application.Contracts/CardRegisters/CreateCardBillDto.cs index 691d85d..0eaf9e1 100644 --- a/src/Shentun.Peis.Application.Contracts/CardRegisters/CreateCardBillDto.cs +++ b/src/Shentun.Peis.Application.Contracts/CardRegisters/CreateCardBillDto.cs @@ -19,7 +19,7 @@ namespace Shentun.Peis.CardRegisters /// public decimal BillMoney { get; set; } /// - /// 记账标志 0、扣费 1、退费 2、充值 + /// 记账标志 0、充值 1、扣费 2、退费 /// public char BillFlag { get; set; } } diff --git a/src/Shentun.Peis.Application/CardBills/CardBillAppService.cs b/src/Shentun.Peis.Application/CardBills/CardBillAppService.cs index a9353cb..e1121d1 100644 --- a/src/Shentun.Peis.Application/CardBills/CardBillAppService.cs +++ b/src/Shentun.Peis.Application/CardBills/CardBillAppService.cs @@ -2,6 +2,7 @@ using Microsoft.AspNetCore.Mvc; using Microsoft.AspNetCore.Mvc.ModelBinding.Validation; using Microsoft.EntityFrameworkCore; +using Shentun.Peis.Enums; using Shentun.Peis.Models; using System; using System.Collections.Generic; @@ -153,7 +154,7 @@ namespace Shentun.Peis.CardBills var chargeBackPayQueryable = await _chargeBackPayRepository.GetQueryableAsync(); var userQueryable = await _userRepository.GetQueryableAsync(); - var queryCharge = from a in cardBillQueryable.Where(m => m.CardRegisterId == CardRegisterId && m.BillFlag == '0') + var queryCharge = from a in cardBillQueryable.Where(m => m.CardRegisterId == CardRegisterId && m.BillFlag ==CardBillFlag.Deduction) join b in chargePayQueryable on a.Id equals b.CardBillId into bb from ab in bb.DefaultIfEmpty() join c in chargeQueryable on ab.ChargeId equals c.Id into cc @@ -176,7 +177,7 @@ namespace Shentun.Peis.CardBills LastModifierName = ae != null ? ae.UserName : string.Empty }; - var queryChargeBack = from a in cardBillQueryable.Where(m => m.CardRegisterId == CardRegisterId && m.BillFlag == '1') + var queryChargeBack = from a in cardBillQueryable.Where(m => m.CardRegisterId == CardRegisterId && m.BillFlag == CardBillFlag.Refund) join b in chargeBackPayQueryable on a.Id equals b.CardBillId into bb from ab in bb.DefaultIfEmpty() join c in chargeBackQueryable on ab.ChargeBackId equals c.Id into cc @@ -201,7 +202,7 @@ namespace Shentun.Peis.CardBills LastModifierName = af != null ? af.UserName : string.Empty }; - var queryReCharge = from a in cardBillQueryable.Where(m => m.CardRegisterId == CardRegisterId && m.BillFlag == '2') + var queryReCharge = from a in cardBillQueryable.Where(m => m.CardRegisterId == CardRegisterId && m.BillFlag == CardBillFlag.Charge) join d in userQueryable on a.CreatorId equals d.Id into dd from ad in dd.DefaultIfEmpty() join e in userQueryable on a.LastModifierId equals e.Id into ee diff --git a/src/Shentun.Peis.Application/CardRegisters/CardRegisterAppService.cs b/src/Shentun.Peis.Application/CardRegisters/CardRegisterAppService.cs index 61cc877..0954dbd 100644 --- a/src/Shentun.Peis.Application/CardRegisters/CardRegisterAppService.cs +++ b/src/Shentun.Peis.Application/CardRegisters/CardRegisterAppService.cs @@ -277,7 +277,7 @@ namespace Shentun.Peis.CardRegisters */ /// - /// 会员卡充值 + /// 会员卡充值、退费 /// /// [HttpPost("api/app/cardregister/addcardbill")] diff --git a/src/Shentun.Peis.Application/RegisterAsbitems/RegisterAsbitemAppService.cs b/src/Shentun.Peis.Application/RegisterAsbitems/RegisterAsbitemAppService.cs index ade61c4..4f0cafa 100644 --- a/src/Shentun.Peis.Application/RegisterAsbitems/RegisterAsbitemAppService.cs +++ b/src/Shentun.Peis.Application/RegisterAsbitems/RegisterAsbitemAppService.cs @@ -473,7 +473,7 @@ namespace Shentun.Peis.RegisterAsbitems CardBill cardBill = new CardBill(GuidGenerator.Create()) { PayModeId = item.PayModeId, - BillFlag = '0', + BillFlag = CardBillFlag.Deduction, BillMoney = item.ChargeMoney, CardRegisterId = item.CardRegisterId.Value }; @@ -593,7 +593,7 @@ namespace Shentun.Peis.RegisterAsbitems CardBill cardBill = new CardBill(GuidGenerator.Create()) { PayModeId = item.PayModeId, - BillFlag = '1', + BillFlag = CardBillFlag.Refund, BillMoney = item.BackMoeny, CardRegisterId = item.CardRegisterId.Value }; diff --git a/src/Shentun.Peis.Domain.Shared/Enums/CardBillFlag.cs b/src/Shentun.Peis.Domain.Shared/Enums/CardBillFlag.cs index faeb157..64e8648 100644 --- a/src/Shentun.Peis.Domain.Shared/Enums/CardBillFlag.cs +++ b/src/Shentun.Peis.Domain.Shared/Enums/CardBillFlag.cs @@ -7,13 +7,21 @@ namespace Shentun.Peis.Enums { public static class CardBillFlag { - + /// + /// 充值 + /// [Description("充值")] public const char Charge = '0'; - + + /// + /// 扣费 + /// [Description("扣费")] public const char Deduction = '1'; + /// + /// 退费 + /// [Description("退费")] public const char Refund = '2'; } diff --git a/src/Shentun.Peis.Domain/CardBills/CardBill.cs b/src/Shentun.Peis.Domain/CardBills/CardBill.cs index 00f4350..8051531 100644 --- a/src/Shentun.Peis.Domain/CardBills/CardBill.cs +++ b/src/Shentun.Peis.Domain/CardBills/CardBill.cs @@ -34,7 +34,7 @@ namespace Shentun.Peis.Models [Precision(10, 2)] public decimal BillMoney { get; set; } /// - /// 记账标志 0、扣费 1、退费 2、充值 + /// 记账标志 0、充值 1、扣费 2、退费 /// [Column("bill_flag")] [MaxLength(1)]