Merge branch 'sdzq' of http://gitlab.oytour.com/Kui2/mall.oytour.com

Mall.Repository/Reserve/RB_Reserve_CouponRepository.cs

@@ -95,7 +95,7 @@ namespace Mall.Repository.Reserve
                 {
                     builder.Append($" AND  ( FIND_IN_SET('{query.StoreId}', {nameof(RB_Reserve_Coupon_Extend.StoreIds)}) or  FIND_IN_SET('0',  {nameof(RB_Reserve_Coupon_Extend.StoreIds)} )) ");
                 }
-                else if (query.StoreId != -1)
+                else 
                 {
                     builder.Append($" AND FIND_IN_SET('0',  {nameof(RB_Reserve_Coupon_Extend.StoreIds)})");
                 }

Mall.WebApi/Controllers/Reserve/ReserveController.cs

@@ -460,7 +460,6 @@ namespace Mall.WebApi.Controllers.Reserve
             var query = JsonConvert.DeserializeObject<RB_Reserve_Coupon_Extend>(RequestParm.msg.ToString());
             query.TenantId = UserInfo.TenantId;
             query.MallBaseId = parms.MallBaseId;
-            query.StoreId = -1;
             var oldLogisticsModel = reserveModule.GetDiscountCouponList(query).FirstOrDefault();
             if (oldLogisticsModel == null)
             {