提交首店已否已成都落地

Mall.Model/Entity/TradePavilion/RB_Brand.cs

@@ -220,6 +220,10 @@ namespace Mall.Model.Entity.TradePavilion
 
 
 
+        /// <summary>
+        /// 是否已在成都落地 0-否，1-是，-1未填写
+        /// </summary>
+        public int? IsInChengdu { get; set; }
         /// <summary>
         /// 奖项来源ids
         /// </summary>

Mall.Model/Entity/TradePavilion/RB_BrandApplyFor.cs

@@ -223,5 +223,10 @@ namespace Mall.Model.Entity.TradePavilion
         /// 现有品牌id
         /// </summary>
         public int ExistBrandId { get; set; }
+
+        /// <summary>
+        /// 是否已在成都落地 0-否，1-是，-1未填写
+        /// </summary>
+        public int? IsInChengdu { get; set; }
     }
 }

Mall.Module.TradePavilion/CarrierModule.cs

@@ -412,7 +412,7 @@ namespace Mall.Module.TradePavilion
                     {
                         {nameof(RB_Company_Extend.CompanyStatus),1 },
                     };
-                   
+
                     List<WhereHelper> wheres = new List<WhereHelper>() {
                      new WhereHelper(){
                          FiledName=nameof(RB_Company_Extend.CompanyId),
@@ -420,7 +420,7 @@ namespace Mall.Module.TradePavilion
                            OperatorEnum=OperatorEnum.Equal
                      }
                 };
-                   companyRepository.Update(fileds, wheres);
+                    companyRepository.Update(fileds, wheres);
                     //载体
                     var carrierList = carrierApplyForRepository.GetCarrierList(new RB_CarrierApplyFor_Extend() { MallBaseId = cmodel.MallBaseId, CompanyId = cmodel.CompanyId });
                     if (carrierList != null && carrierList.Any())
@@ -497,7 +497,7 @@ namespace Mall.Module.TradePavilion
                         }
                         else
                         {
-                           
+
                             #region 新增载体
                             var inserCModel = CarrierModel.RefMapperTo<RB_Carrier_Extend>();
                             inserCModel.ID = 0;
@@ -531,7 +531,7 @@ namespace Mall.Module.TradePavilion
                         }
                     }
                 }
-                }
+            }
             return flag;
         }
 
@@ -616,7 +616,7 @@ namespace Mall.Module.TradePavilion
                     {nameof(RB_CompanyBrand_Extend.StoreExpansion),model.StoreExpansion },
                     {nameof(RB_CompanyBrand_Extend.ProjectType),(int)model.ProjectType },
                     {nameof(RB_CompanyBrand_Extend.AreaRequirement),model.AreaRequirement },
-                    {nameof(RB_CompanyBrand_Extend.EndAreaRequirement),model.EndAreaRequirement }
+                    {nameof(RB_CompanyBrand_Extend.EndAreaRequirement),model.EndAreaRequirement },
                 };
                 return companyBrandRepository.Update(fileds, new WhereHelper(nameof(RB_CompanyBrand_Extend.ID), model.ID));
             }
@@ -809,6 +809,7 @@ namespace Mall.Module.TradePavilion
                     {nameof(RB_Brand_Extend. PaiYanBZ),model. PaiYanBZ },
                     {nameof(RB_Brand_Extend.IsShopSize),model.IsShopSize },
                     {nameof(RB_Brand_Extend.OpenShopWish),model.OpenShopWish },
+                     {nameof(RB_Brand_Extend.IsInChengdu),model.IsInChengdu }
                 };
                 return brandRepository.Update(fileds, new WhereHelper(nameof(RB_Brand_Extend.ID), model.ID));
             }
@@ -860,6 +861,7 @@ namespace Mall.Module.TradePavilion
                     {nameof(RB_BrandApplyFor_Extend.PaiYanBZ),model. PaiYanBZ },
                     {nameof(RB_BrandApplyFor_Extend.IsShopSize),model.IsShopSize },
                     {nameof(RB_BrandApplyFor_Extend.OpenShopWish),model.OpenShopWish },
+                      {nameof(RB_BrandApplyFor_Extend.IsInChengdu),model.IsInChengdu },
                     {nameof(RB_BrandApplyFor_Extend.ExistBrandId),model.ExistBrandId },
                 };
                 bool flag = brandApplyForRepository.Update(fileds, new WhereHelper(nameof(RB_BrandApplyFor_Extend.ID), model.ID));
@@ -946,6 +948,7 @@ namespace Mall.Module.TradePavilion
                                         {nameof(RB_Brand_Extend.PaiYanBZ),BrandModel.PaiYanBZ },
                                         {nameof(RB_Brand_Extend.IsShopSize),BrandModel.IsShopSize },
                                         {nameof(RB_Brand_Extend.OpenShopWish),BrandModel.OpenShopWish },
+                                           {nameof(RB_Brand_Extend.IsInChengdu),BrandModel.IsInChengdu },
                                         {nameof(RB_Brand_Extend.UserId),cmodel.CreateBy },
                                     };
                                     brandRepository.Update(filedsBrand, new WhereHelper(nameof(RB_Brand_Extend.ID), BrandModel.ExistBrandId));
@@ -964,11 +967,12 @@ namespace Mall.Module.TradePavilion
                         catch (Exception ex)
                         {
 
-                           
+
                         }
-                        
+
                     }
-                    else {
+                    else
+                    {
                         //更新认证表  资料状态为完成
                         Dictionary<string, object> keyValues = new Dictionary<string, object>() {
                         { nameof(RB_Company_Extend.IsComplete),1}
@@ -982,7 +986,7 @@ namespace Mall.Module.TradePavilion
                     };
                         companyRepository.Update(keyValues, wheres);
                     }
-                   
+
                 }
                 return flag;
             }

Mall.Module.TradePavilion/CompanyModule.cs

@@ -587,6 +587,7 @@ namespace Mall.Module.TradePavilion
                                         {nameof(RB_Brand_Extend.PaiYanBZ),BrandModel.PaiYanBZ },
                                         {nameof(RB_Brand_Extend.IsShopSize),BrandModel.IsShopSize },
                                         {nameof(RB_Brand_Extend.OpenShopWish),BrandModel.OpenShopWish },
+                                        {nameof(RB_Brand_Extend.IsInChengdu),BrandModel.IsInChengdu },
                                         {nameof(RB_Brand_Extend.UserId),cmodel.CreateBy },
                                     };
                                     brand2Repository.Update(filedsBrand, new WhereHelper(nameof(RB_Brand_Extend.ID), BrandModel.ExistBrandId), trans);

Mall.Repository/TradePavilion/RB_BrandRepository.cs

@@ -48,7 +48,10 @@ WHERE 1=1
                 {
                     builder.AppendFormat(" AND a.{0}={1} ", nameof(RB_Brand_Extend.UserId), query.UserId);
                 }
-               
+                if (query.IsInChengdu.HasValue && query.IsInChengdu.Value >= 0)
+                {
+                    builder.AppendFormat(" AND a.{0}={1} ", nameof(RB_Brand_Extend.IsInChengdu), query.IsInChengdu);
+                }
                 if (!string.IsNullOrEmpty(query.BrandName))
                 {
                     builder.AppendFormat(" AND a.{0} LIKE @Name ", nameof(RB_Brand_Extend.BrandName));
@@ -199,7 +202,7 @@ WHERE 1=1
                     builder.AppendFormat(" AND a.{0}={1} ", nameof(RB_Brand_Extend.UserId), query.UserId);
                 }
 
-               
+
                 if (!string.IsNullOrWhiteSpace(query.QBrandIds))
                 {
                     builder.AppendFormat(" AND a.{0} in ({1}) ", nameof(RB_Brand_Extend.ID), query.QBrandIds);
@@ -292,7 +295,7 @@ WHERE 1=1
                 {
                     builder.AppendFormat(" AND a.{0}={1} ", nameof(RB_Brand_Extend.UserId), query.UserId);
                 }
-               
+
                 if (query.UserId == -1)
                 {
                     builder.AppendFormat(" AND a.{0} =0 ", nameof(RB_Brand_Extend.UserId));//查询未绑定用户的
@@ -301,7 +304,7 @@ WHERE 1=1
                 {
                     builder.AppendFormat(" AND a.{0}={1} ", nameof(RB_Brand_Extend.ProjectType), (int)query.ProjectType);
                 }
-               
+
 
             }
             if (query.QOrderBy == 2)

Mall.WebApi/Controllers/TradePavilion/AppletTradeController.cs

@@ -1925,6 +1925,13 @@ namespace Mall.WebApi.Controllers.TradePavilion
                 DianLiang = parms.GetStringValue("DianLiang"),
                 PrizeId = parms.GetInt("PrizeId", 0),
             };
+            if (!string.IsNullOrWhiteSpace(parms.GetStringValue("IsInChengdu")))
+            {
+                query.IsInChengdu = Convert.ToInt32(parms.GetStringValue("IsInChengdu"));
+            }
+            else {
+                query.IsInChengdu = -1;
+            }
             query.MallBaseId = userInfo.MallBaseId;
             query.TenantId = userInfo.TenantId;
             var list = carrierModule.GetBrandPageList(pageModel.pageIndex, pageModel.pageSize, out long rowsCount, query);

Mall.WebApi/Controllers/TradePavilion/TradeController.cs

@@ -1897,6 +1897,14 @@ namespace Mall.WebApi.Controllers.TradePavilion
                 UserId = parms.GetInt("UserId", 0),
                 PrizeId = parms.GetInt("PrizeId", -1),
             };
+            if (!string.IsNullOrWhiteSpace(parms.GetStringValue("IsInChengdu")))
+            {
+                query.IsInChengdu = Convert.ToInt32(parms.GetStringValue("IsInChengdu"));
+            }
+            else
+            {
+                query.IsInChengdu = -1;
+            }
             query.MallBaseId = RequestParm.MallBaseId;
             query.TenantId = RequestParm.TenantId;
             var list = carrierModule.GetBrandPageList(pageModel.pageIndex, pageModel.pageSize, out long rowsCount, query, true);