Merge branch 'master' of http://140.143.162.39:3000/shentun/peis

src/Shentun.Peis.Application.Contracts/CardBills/CardBillDto.cs

@@ -21,7 +21,7 @@ namespace Shentun.Peis.CardBills
         /// </summary>
         public decimal BillMoney { get; set; }
         /// <summary>
-        /// 记账标志 0、扣费   1、退费  2、充值
+        /// 记账标志 0、充值  1、扣费   2、退费  
         /// </summary>
         public char? BillFlag { get; set; }
 

src/Shentun.Peis.Application.Contracts/CardBills/CardBillInChargeDto.cs

@@ -20,7 +20,7 @@ namespace Shentun.Peis.CardBills
         /// </summary>
         public decimal BillMoney { get; set; }
         /// <summary>
-        /// 记账标志 0、扣费   1、退费  2、充值
+        ///记账标志 0、充值  1、扣费   2、退费  
         /// </summary>
         public char? BillFlag { get; set; }
 

src/Shentun.Peis.Application.Contracts/CardBills/GetCardBillListDto.cs

@@ -32,7 +32,7 @@ namespace Shentun.Peis.CardBills
         //public string? MobileTelephone { get; set; }
 
         /// <summary>
-        /// 记账标志 0、扣费   1、退费  2、充值
+        /// 记账标志 0、充值  1、扣费   2、退费  
         /// </summary>
         public char? BillFlag { get; set; }
 

src/Shentun.Peis.Application.Contracts/CardRegisters/CreateCardBillDto.cs

@@ -19,7 +19,7 @@ namespace Shentun.Peis.CardRegisters
         /// </summary>
         public decimal BillMoney { get; set; }
         /// <summary>
-        /// 记账标志 0、扣费   1、退费  2、充值
+        /// 记账标志 0、充值  1、扣费   2、退费 
         /// </summary>
         public char BillFlag { get; set; }
     }

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

src/Shentun.Peis.Application/CardRegisters/CardRegisterAppService.cs

@@ -277,7 +277,7 @@ namespace Shentun.Peis.CardRegisters
        */
 
         /// <summary>
-        /// 会员卡充值
+        /// 会员卡充值、退费
         /// </summary>
         /// <returns></returns>
         [HttpPost("api/app/cardregister/addcardbill")]

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
                         };

src/Shentun.Peis.Domain.Shared/Enums/CardBillFlag.cs

@@ -7,13 +7,21 @@ namespace Shentun.Peis.Enums
 {
     public static class CardBillFlag
     {
-        
+        /// <summary>
+        /// 充值
+        /// </summary>
         [Description("充值")]
         public const char Charge = '0';
-      
+
+        /// <summary>
+        /// 扣费
+        /// </summary>
         [Description("扣费")]
         public const char Deduction = '1';
 
+        /// <summary>
+        /// 退费
+        /// </summary>
         [Description("退费")]
         public const char Refund = '2';
     }

src/Shentun.Peis.Domain/CardBills/CardBill.cs

@@ -34,7 +34,7 @@ namespace Shentun.Peis.Models
         [Precision(10, 2)]
         public decimal BillMoney { get; set; }
         /// <summary>
-        /// 记账标志 0、扣费   1、退费  2、充值
+        /// 记账标志 0、充值  1、扣费   2、退费 
         /// </summary>
         [Column("bill_flag")]
         [MaxLength(1)]