收费

src/Shentun.Peis.Application/RegisterCheckAsbitems/RegisterCheckAsbitemAppService.cs

@@ -563,8 +563,16 @@ namespace Shentun.Peis.RegisterAsbitems
         [HttpPost("api/app/registerasbitem/registerasbitemcharge")]
         public async Task<RegisterCheckAsbitemChargeDto> RegisterAsbitemChargeAsync(RegisterCheckAsbitemCheckChargeRequestDto input)
         {
-            if (input != null && input.Asbitems.Any() && input.ChargePays.Any())
+            if (!input.Asbitems.Any())
             {
+                throw new UserFriendlyException("收费项目不能为空");
+            }
+
+            if (!input.ChargePays.Any())
+            {
+                throw new UserFriendlyException("收费方式不能为空");
+            }
+
             #region 验证是否多张同样的卡
 
             var cardList = input.ChargePays.Where(m => m.PayModeId == "05").ToList();
@@ -702,11 +710,7 @@ namespace Shentun.Peis.RegisterAsbitems
             #endregion
 
             return new RegisterCheckAsbitemChargeDto { code = 1, msg = "收费成功", ChargeId = charge_new.Id };
-            }
-            else
-            {
-                throw new UserFriendlyException("参数有误");
-            }
+
         }
 
         #endregion

src/Shentun.Peis.Domain/ChargeBackPays/ChargeBackPay.cs

@@ -11,7 +11,7 @@ namespace Shentun.Peis.Models
     /// 退费支付方式
     /// </summary>
     [Table("charge_back_pay")]
-    [Index(nameof(ChargeBackId), nameof(PayModeId), Name = "IX_charge_back_pay_pay_mode_id", IsUnique = true)]
+    [Index(nameof(ChargeBackId), nameof(PayModeId), Name = "IX_charge_back_pay_pay_mode_id")]
     public  class ChargeBackPay : Entity<Guid>, IHasConcurrencyStamp
     {
 

src/Shentun.Peis.EntityFrameworkCore/DbMapping/ChargeBackPays/ChargeBackPayDbMapping.cs

@@ -14,8 +14,8 @@ namespace Shentun.Peis.DbMapping
     {
         public void Configure(EntityTypeBuilder<ChargeBackPay> entity)
         {
-            entity.HasKey(e => new { e.ChargeBackId, e.PayModeId })
-              .HasName("pk_department_charge_back_pay");
+            //entity.HasKey(e => new { e.ChargeBackId, e.PayModeId })
+            //  .HasName("pk_department_charge_back_pay");
 
             entity.HasComment("退费支付方式");
             entity.Property(t => t.PayModeId).HasComment("支付方式ID").IsRequired();

src/Shentun.Peis.EntityFrameworkCore/DbMapping/ChargePays/ChargePayDbMapping.cs

@@ -14,8 +14,8 @@ namespace Shentun.Peis.DbMapping
     {
         public void Configure(EntityTypeBuilder<ChargePay> entity)
         {
-            entity.HasKey(e => new { e.ChargeId, e.PayModeId })
-              .HasName("pk_department_charge_pay");
+            //entity.HasKey(e => new { e.ChargeId, e.PayModeId })
+            //  .HasName("pk_department_charge_pay");
 
             entity.HasComment("收费支付方式");
 

src/Shentun.Peis.EntityFrameworkCore/Migrations/PeisDbContextModelSnapshot.cs

@@ -19,7 +19,7 @@ namespace Shentun.Peis.Migrations
 #pragma warning disable 612, 618
             modelBuilder
                 .HasAnnotation("_Abp_DatabaseProvider", EfCoreDatabaseProvider.PostgreSql)
-                .HasAnnotation("ProductVersion", "6.0.5")
+                .HasAnnotation("ProductVersion", "6.0.19")
                 .HasAnnotation("Relational:MaxIdentifierLength", 63);
 
             NpgsqlModelBuilderExtensions.UseIdentityByDefaultColumns(modelBuilder);
@@ -1685,15 +1685,9 @@ namespace Shentun.Peis.Migrations
 
             modelBuilder.Entity("Shentun.Peis.Models.ChargeBackPay", b =>
                 {
-                    b.Property<Guid>("ChargeBackId")
+                    b.Property<Guid>("Id")
                         .HasColumnType("uuid")
-                        .HasColumnName("charge_back_id");
-
-                    b.Property<string>("PayModeId")
-                        .HasMaxLength(4)
-                        .HasColumnType("character varying(4)")
-                        .HasColumnName("pay_mode_id")
-                        .HasComment("支付方式ID");
+                        .HasColumnName("id");
 
                     b.Property<decimal>("BackMoeny")
                         .HasPrecision(10, 2)
@@ -1706,23 +1700,28 @@ namespace Shentun.Peis.Migrations
                         .HasColumnName("card_bill_id")
                         .HasComment("会员卡ID");
 
+                    b.Property<Guid>("ChargeBackId")
+                        .HasColumnType("uuid")
+                        .HasColumnName("charge_back_id");
+
                     b.Property<string>("ConcurrencyStamp")
                         .IsConcurrencyToken()
                         .HasMaxLength(40)
                         .HasColumnType("character varying(40)")
                         .HasColumnName("concurrency_stamp");
 
-                    b.Property<Guid>("Id")
-                        .HasColumnType("uuid")
-                        .HasColumnName("id");
+                    b.Property<string>("PayModeId")
+                        .IsRequired()
+                        .HasMaxLength(4)
+                        .HasColumnType("character varying(4)")
+                        .HasColumnName("pay_mode_id")
+                        .HasComment("支付方式ID");
 
-                    b.HasKey("ChargeBackId", "PayModeId")
-                        .HasName("pk_department_charge_back_pay");
+                    b.HasKey("Id");
 
                     b.HasIndex("PayModeId");
 
                     b.HasIndex(new[] { "ChargeBackId", "PayModeId" }, "IX_charge_back_pay_pay_mode_id")
-                        .IsUnique()
                         .HasDatabaseName("IX_charge_back_pay_pay_mode_id1");
 
                     b.ToTable("charge_back_pay");
@@ -1732,22 +1731,20 @@ namespace Shentun.Peis.Migrations
 
             modelBuilder.Entity("Shentun.Peis.Models.ChargePay", b =>
                 {
-                    b.Property<Guid>("ChargeId")
+                    b.Property<Guid>("Id")
                         .HasColumnType("uuid")
-                        .HasColumnName("charge_id")
-                        .HasComment("收据号");
-
-                    b.Property<string>("PayModeId")
-                        .HasMaxLength(4)
-                        .HasColumnType("character varying(4)")
-                        .HasColumnName("pay_mode_id")
-                        .HasComment("支付方式");
+                        .HasColumnName("id");
 
                     b.Property<Guid?>("CardBillId")
                         .HasColumnType("uuid")
                         .HasColumnName("card_bill_id")
                         .HasComment("会员卡ID");
 
+                    b.Property<Guid>("ChargeId")
+                        .HasColumnType("uuid")
+                        .HasColumnName("charge_id")
+                        .HasComment("收据号");
+
                     b.Property<decimal>("ChargeMoney")
                         .HasPrecision(10, 2)
                         .HasColumnType("numeric(10,2)")
@@ -1760,12 +1757,14 @@ namespace Shentun.Peis.Migrations
                         .HasColumnType("character varying(40)")
                         .HasColumnName("concurrency_stamp");
 
-                    b.Property<Guid>("Id")
-                        .HasColumnType("uuid")
-                        .HasColumnName("id");
+                    b.Property<string>("PayModeId")
+                        .IsRequired()
+                        .HasMaxLength(4)
+                        .HasColumnType("character varying(4)")
+                        .HasColumnName("pay_mode_id")
+                        .HasComment("支付方式");
 
-                    b.HasKey("ChargeId", "PayModeId")
-                        .HasName("pk_department_charge_pay");
+                    b.HasKey("Id");
 
                     b.HasIndex("PayModeId");
 
@@ -13033,7 +13032,7 @@ namespace Shentun.Peis.Migrations
                         .HasColumnName("method_name");
 
                     b.Property<string>("Parameters")
-                        .HasMaxLength(2000)
+                        .HasMaxLength(50000)
                         .HasColumnType("text")
                         .HasColumnName("parameters");