提交代码

Mall.Model/Entity/User/RB_MiniProgram.cs

@@ -365,5 +365,11 @@ namespace Mall.Model.Entity.User
         /// </summary>
         public string JumpAppId { get; set; }
         #endregion
+
+        /// <summary>
+        ///小程序直播组件 0-否，1-是
+        /// </summary>
+        public int LivePlayerPlugin { get; set; }
+
     }
 }

Mall.Repository/User/RB_Member_CouponRepository.cs

@@ -97,7 +97,7 @@ namespace Mall.Repository.User
                 }
                 if (query.PlatformType > 0)
                 {
-                    builder.Append($" AND b.{nameof(RB_Member_User.Source)}={query.PlatformType}");
+                    builder.Append($" AND a.{nameof(RB_Member_DiscountCoupon_Extend.PlatformType)}={query.PlatformType}");
                 }
                 if (query.UserId > 0)
                 {
@@ -112,7 +112,7 @@ namespace Mall.Repository.User
                     builder.Append($" AND DATE_FORMAT(c.{nameof(RB_DiscountCoupon.CreateDate)},'%Y-%m-%d' )<= DATE_FORMAT('{query.EndDate}','%Y-%m-%d' )");
                 }
             }
-            string sql = @$" select * fromFROM
+            string sql = @$" select * FROM
 	{TableName} AS a
 LEFT JOIN {MemberTableName} AS b ON a.UserId = b.Id
 LEFT JOIN {DiscountCouponTableName} as c on c.ID=a.CouponId   where 1=1 {builder.ToString()} ";
@@ -143,7 +143,7 @@ LEFT JOIN {DiscountCouponTableName} as c on c.ID=a.CouponId   where 1=1 {builder
                 }
                 if (query.PlatformType > 0)
                 {
-                    builder.Append($" AND b.{nameof(RB_Member_User.Source)}={query.PlatformType}");
+                    builder.Append($" AND a.{nameof(RB_Member_DiscountCoupon_Extend.PlatformType)}={query.PlatformType}");
                 }
                 if (!string.IsNullOrWhiteSpace(query.StartDate))
                 {
@@ -209,7 +209,7 @@ LEFT JOIN {DiscountCouponTableName} as c on c.ID=a.CouponId   where a.EndDate<NO
                 }
                 if (query.PlatformType > 0)
                 {
-                    builder.Append($" AND b.{nameof(RB_Member_User.Source)}={query.PlatformType}");
+                    builder.Append($" AND a.{nameof(RB_Member_DiscountCoupon_Extend.PlatformType)}={query.PlatformType}");
                 }
                 if (!string.IsNullOrWhiteSpace(query.StartDate))
                 {

Mall.WebApi/Mall.WebApi.csproj

@@ -4,6 +4,10 @@
     <TargetFramework>netcoreapp3.0</TargetFramework>
   </PropertyGroup>
 
+  <ItemGroup>
+    <Content Remove="web.config" />
+  </ItemGroup>
+
   <ItemGroup>
     <PackageReference Include="JWT" Version="5.3.1" />
     <PackageReference Include="Microsoft.VisualStudio.Web.CodeGeneration.Design" Version="3.0.0" />