Skip to content
Projects
Groups
Snippets
Help
Loading...
Help
Submit feedback
Contribute to GitLab
Sign in
Toggle navigation
M
mall.oytour.com
Project
Project
Details
Activity
Releases
Cycle Analytics
Repository
Repository
Files
Commits
Branches
Tags
Contributors
Graph
Compare
Charts
Issues
0
Issues
0
List
Board
Labels
Milestones
Merge Requests
0
Merge Requests
0
CI / CD
CI / CD
Pipelines
Jobs
Schedules
Charts
Wiki
Wiki
Snippets
Snippets
Members
Members
Collapse sidebar
Close sidebar
Activity
Graph
Charts
Create a new issue
Jobs
Commits
Issue Boards
Open sidebar
黄奎
mall.oytour.com
Commits
50e58cf2
Commit
50e58cf2
authored
Sep 22, 2021
by
吴春
Browse files
Options
Browse Files
Download
Email Patches
Plain Diff
提交首店已否已成都落地
parent
294c3bb1
Hide whitespace changes
Inline
Side-by-side
Showing
7 changed files
with
45 additions
and
13 deletions
+45
-13
RB_Brand.cs
Mall.Model/Entity/TradePavilion/RB_Brand.cs
+4
-0
RB_BrandApplyFor.cs
Mall.Model/Entity/TradePavilion/RB_BrandApplyFor.cs
+5
-0
CarrierModule.cs
Mall.Module.TradePavilion/CarrierModule.cs
+13
-9
CompanyModule.cs
Mall.Module.TradePavilion/CompanyModule.cs
+1
-0
RB_BrandRepository.cs
Mall.Repository/TradePavilion/RB_BrandRepository.cs
+7
-4
AppletTradeController.cs
...WebApi/Controllers/TradePavilion/AppletTradeController.cs
+7
-0
TradeController.cs
Mall.WebApi/Controllers/TradePavilion/TradeController.cs
+8
-0
No files found.
Mall.Model/Entity/TradePavilion/RB_Brand.cs
View file @
50e58cf2
...
...
@@ -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
View file @
50e58cf2
...
...
@@ -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
View file @
50e58cf2
...
...
@@ -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
View file @
50e58cf2
...
...
@@ -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
View file @
50e58cf2
...
...
@@ -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
View file @
50e58cf2
...
...
@@ -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
View file @
50e58cf2
...
...
@@ -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
);
...
...
Write
Preview
Markdown
is supported
0%
Try again
or
attach a new file
Attach a file
Cancel
You are about to add
0
people
to the discussion. Proceed with caution.
Finish editing this message first!
Cancel
Please
register
or
sign in
to comment