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
ff96e55b
Commit
ff96e55b
authored
Dec 11, 2024
by
吴春
Browse files
Options
Browse Files
Download
Plain Diff
Merge branch 'master' of
http://gitlab.oytour.com/Kui2/mall.oytour.com
parents
9a7280ab
75d5bc33
Hide whitespace changes
Inline
Side-by-side
Showing
9 changed files
with
26 additions
and
26 deletions
+26
-26
RB_Building.cs
Mall.Model/Entity/TradePavilion/RB_Building.cs
+2
-2
RB_EnterpriseServices.cs
Mall.Model/Entity/TradePavilion/RB_EnterpriseServices.cs
+2
-2
BuildingCarrierModule_V2.cs
Mall.Module.TradePavilion/BuildingCarrierModule_V2.cs
+4
-5
RB_CompanyEnterpriseRepository.cs
...epository/TradePavilion/RB_CompanyEnterpriseRepository.cs
+1
-1
MallHelper.cs
Mall.WebApi/Controllers/Mall/MallHelper.cs
+1
-1
AppletTradeController.cs
...WebApi/Controllers/TradePavilion/AppletTradeController.cs
+1
-1
TradeController.cs
Mall.WebApi/Controllers/TradePavilion/TradeController.cs
+1
-1
YBTradeController.cs
Mall.WebApi/Controllers/TradePavilion/YBTradeController.cs
+8
-8
TenantController.cs
Mall.WebApi/Controllers/User/TenantController.cs
+6
-5
No files found.
Mall.Model/Entity/TradePavilion/RB_Building.cs
View file @
ff96e55b
...
@@ -59,12 +59,12 @@ namespace Mall.Model.Entity.TradePavilion
...
@@ -59,12 +59,12 @@ namespace Mall.Model.Entity.TradePavilion
/// <summary>
/// <summary>
/// 楼层数
/// 楼层数
/// </summary>
/// </summary>
public
int
FloorNum
{
get
;
set
;
}
public
string
FloorNum
{
get
;
set
;
}
/// <summary>
/// <summary>
/// 电梯数
/// 电梯数
/// </summary>
/// </summary>
public
int
ElevatorNum
{
get
;
set
;
}
public
string
ElevatorNum
{
get
;
set
;
}
/// <summary>
/// <summary>
/// 层高
/// 层高
...
...
Mall.Model/Entity/TradePavilion/RB_EnterpriseServices.cs
View file @
ff96e55b
...
@@ -74,12 +74,12 @@ namespace Mall.Model.Entity.TradePavilion
...
@@ -74,12 +74,12 @@ namespace Mall.Model.Entity.TradePavilion
/// <summary>
/// <summary>
/// 意向楼层
/// 意向楼层
/// </summary>
/// </summary>
public
int
IntentionalFloor
{
get
;
set
;
}
public
string
IntentionalFloor
{
get
;
set
;
}
/// <summary>
/// <summary>
/// 电梯数
/// 电梯数
/// </summary>
/// </summary>
public
int
ElevatorNum
{
get
;
set
;
}
public
string
ElevatorNum
{
get
;
set
;
}
/// <summary>
/// <summary>
/// 物业费(元/㎡)
/// 物业费(元/㎡)
...
...
Mall.Module.TradePavilion/BuildingCarrierModule_V2.cs
View file @
ff96e55b
...
@@ -1103,9 +1103,9 @@ namespace Mall.Module.TradePavilion
...
@@ -1103,9 +1103,9 @@ namespace Mall.Module.TradePavilion
/// <param name="rowsCount"></param>
/// <param name="rowsCount"></param>
/// <param name="query"></param>
/// <param name="query"></param>
/// <returns></returns>
/// <returns></returns>
public
List
<
RB_CompanyEnterprise_Extend
>
GetCompanyEnterprisePage
List
Module
(
int
pageIndex
,
int
pageSize
,
out
long
rowsCount
,
RB_CompanyEnterprise_Extend
query
)
public
List
<
RB_CompanyEnterprise_Extend
>
GetCompanyEnterprisePageModule
(
int
pageIndex
,
int
pageSize
,
out
long
rowsCount
,
RB_CompanyEnterprise_Extend
query
)
{
{
var
list
=
companyEnterpriseRepository
.
GetCompany
PageList
Repository
(
pageIndex
,
pageSize
,
out
rowsCount
,
query
);
var
list
=
companyEnterpriseRepository
.
GetCompany
EnterprisePage
Repository
(
pageIndex
,
pageSize
,
out
rowsCount
,
query
);
if
(
list
!=
null
&&
list
.
Any
())
if
(
list
!=
null
&&
list
.
Any
())
{
{
//查询用户列表
//查询用户列表
...
@@ -1114,11 +1114,10 @@ namespace Mall.Module.TradePavilion
...
@@ -1114,11 +1114,10 @@ namespace Mall.Module.TradePavilion
foreach
(
var
item
in
list
)
foreach
(
var
item
in
list
)
{
{
var
umodel
=
ulist
.
Where
(
x
=>
x
.
Id
==
item
.
CreateBy
).
FirstOrDefault
();
var
umodel
=
ulist
.
Where
(
x
=>
x
.
Id
==
item
.
CreateBy
).
FirstOrDefault
();
item
.
UserName
=
umodel
.
Name
;
item
.
UserName
=
umodel
?.
Name
??
""
;
item
.
UserIcon
=
umodel
.
Photo
;
item
.
UserIcon
=
umodel
?.
Photo
??
""
;
}
}
}
}
return
list
;
return
list
;
}
}
...
...
Mall.Repository/TradePavilion/RB_CompanyEnterpriseRepository.cs
View file @
ff96e55b
...
@@ -22,7 +22,7 @@ namespace Mall.Repository.TradePavilion
...
@@ -22,7 +22,7 @@ namespace Mall.Repository.TradePavilion
/// <param name="rowsCount"></param>
/// <param name="rowsCount"></param>
/// <param name="query"></param>
/// <param name="query"></param>
/// <returns></returns>
/// <returns></returns>
public
List
<
RB_CompanyEnterprise_Extend
>
GetCompany
PageList
Repository
(
int
pageIndex
,
int
pageSize
,
out
long
rowsCount
,
RB_CompanyEnterprise_Extend
query
)
public
List
<
RB_CompanyEnterprise_Extend
>
GetCompany
EnterprisePage
Repository
(
int
pageIndex
,
int
pageSize
,
out
long
rowsCount
,
RB_CompanyEnterprise_Extend
query
)
{
{
rowsCount
=
0
;
rowsCount
=
0
;
DynamicParameters
parameters
=
new
DynamicParameters
();
DynamicParameters
parameters
=
new
DynamicParameters
();
...
...
Mall.WebApi/Controllers/Mall/MallHelper.cs
View file @
ff96e55b
...
@@ -3361,7 +3361,7 @@ namespace Mall.WebApi.Controllers
...
@@ -3361,7 +3361,7 @@ namespace Mall.WebApi.Controllers
//宜宾商再通特色颜色处理
//宜宾商再通特色颜色处理
if
((
miniProgram
.
TenantId
??
0
)
==
30
)
if
((
miniProgram
.
TenantId
??
0
)
==
30
)
{
{
resultMallShopStyle
=
new
ResultMallShopStyle
()
{
main
=
"#017edf"
,
secondary
=
"#ea850"
,
IsEducation
=
0
};
resultMallShopStyle
=
new
ResultMallShopStyle
()
{
main
=
"#017edf"
,
secondary
=
"#ea850
5
"
,
IsEducation
=
0
};
}
}
break
;
break
;
case
MallShopStyleEnum
.
PureBlack
:
case
MallShopStyleEnum
.
PureBlack
:
...
...
Mall.WebApi/Controllers/TradePavilion/AppletTradeController.cs
View file @
ff96e55b
...
@@ -3911,7 +3911,7 @@ namespace Mall.WebApi.Controllers.TradePavilion
...
@@ -3911,7 +3911,7 @@ namespace Mall.WebApi.Controllers.TradePavilion
};
};
query
.
MallBaseId
=
userInfo
.
MallBaseId
;
query
.
MallBaseId
=
userInfo
.
MallBaseId
;
query
.
TenantId
=
userInfo
.
TenantId
;
query
.
TenantId
=
userInfo
.
TenantId
;
var
list
=
buildingCarrierModule
.
GetCompanyEnterprisePage
List
Module
(
pageModel
.
pageIndex
,
pageModel
.
pageSize
,
out
long
rowsCount
,
query
);
var
list
=
buildingCarrierModule
.
GetCompanyEnterprisePageModule
(
pageModel
.
pageIndex
,
pageModel
.
pageSize
,
out
long
rowsCount
,
query
);
pageModel
.
count
=
Convert
.
ToInt32
(
rowsCount
);
pageModel
.
count
=
Convert
.
ToInt32
(
rowsCount
);
pageModel
.
pageData
=
list
;
pageModel
.
pageData
=
list
;
return
ApiResult
.
Success
(
data
:
pageModel
);
return
ApiResult
.
Success
(
data
:
pageModel
);
...
...
Mall.WebApi/Controllers/TradePavilion/TradeController.cs
View file @
ff96e55b
...
@@ -4490,7 +4490,7 @@ namespace Mall.WebApi.Controllers.TradePavilion
...
@@ -4490,7 +4490,7 @@ namespace Mall.WebApi.Controllers.TradePavilion
};
};
query
.
MallBaseId
=
RequestParm
.
MallBaseId
;
query
.
MallBaseId
=
RequestParm
.
MallBaseId
;
query
.
TenantId
=
RequestParm
.
TenantId
;
query
.
TenantId
=
RequestParm
.
TenantId
;
var
list
=
buildingCarrierModule
.
GetCompanyEnterprisePage
List
Module
(
pageModel
.
pageIndex
,
pageModel
.
pageSize
,
out
long
rowsCount
,
query
);
var
list
=
buildingCarrierModule
.
GetCompanyEnterprisePageModule
(
pageModel
.
pageIndex
,
pageModel
.
pageSize
,
out
long
rowsCount
,
query
);
pageModel
.
count
=
Convert
.
ToInt32
(
rowsCount
);
pageModel
.
count
=
Convert
.
ToInt32
(
rowsCount
);
pageModel
.
pageData
=
list
;
pageModel
.
pageData
=
list
;
return
ApiResult
.
Success
(
data
:
pageModel
);
return
ApiResult
.
Success
(
data
:
pageModel
);
...
...
Mall.WebApi/Controllers/TradePavilion/YBTradeController.cs
View file @
ff96e55b
...
@@ -116,8 +116,8 @@ namespace Mall.WebApi.Controllers.TradePavilion
...
@@ -116,8 +116,8 @@ namespace Mall.WebApi.Controllers.TradePavilion
CategoryId
=
parms
.
GetInt
(
"CategoryId"
),
CategoryId
=
parms
.
GetInt
(
"CategoryId"
),
Areas
=
parms
.
GetStringValue
(
"Areas"
),
Areas
=
parms
.
GetStringValue
(
"Areas"
),
BuildingNum
=
parms
.
GetStringValue
(
"BuildingNum"
),
BuildingNum
=
parms
.
GetStringValue
(
"BuildingNum"
),
FloorNum
=
parms
.
Get
Int
(
"FloorNum"
),
FloorNum
=
parms
.
Get
StringValue
(
"FloorNum"
),
ElevatorNum
=
parms
.
Get
Int
(
"ElevatorNum"
),
ElevatorNum
=
parms
.
Get
StringValue
(
"ElevatorNum"
),
FloorHeight
=
parms
.
GetDecimal
(
"FloorHeight"
),
FloorHeight
=
parms
.
GetDecimal
(
"FloorHeight"
),
Developers
=
parms
.
GetStringValue
(
"Developers"
),
Developers
=
parms
.
GetStringValue
(
"Developers"
),
PropertyComp
=
parms
.
GetStringValue
(
"PropertyComp"
),
PropertyComp
=
parms
.
GetStringValue
(
"PropertyComp"
),
...
@@ -202,8 +202,8 @@ namespace Mall.WebApi.Controllers.TradePavilion
...
@@ -202,8 +202,8 @@ namespace Mall.WebApi.Controllers.TradePavilion
CategoryName
=
extModel
?.
CategoryName
??
""
,
CategoryName
=
extModel
?.
CategoryName
??
""
,
Areas
=
extModel
?.
Areas
??
""
,
Areas
=
extModel
?.
Areas
??
""
,
BuildingNum
=
extModel
?.
BuildingNum
??
""
,
BuildingNum
=
extModel
?.
BuildingNum
??
""
,
FloorNum
=
extModel
?.
FloorNum
??
0
,
FloorNum
=
extModel
?.
FloorNum
??
""
,
ElevatorNum
=
extModel
?.
ElevatorNum
??
0
,
ElevatorNum
=
extModel
?.
ElevatorNum
??
""
,
FloorHeight
=
extModel
?.
FloorHeight
??
0
,
FloorHeight
=
extModel
?.
FloorHeight
??
0
,
Developers
=
extModel
?.
Developers
??
""
,
Developers
=
extModel
?.
Developers
??
""
,
PropertyComp
=
extModel
?.
PropertyComp
??
""
,
PropertyComp
=
extModel
?.
PropertyComp
??
""
,
...
@@ -539,8 +539,8 @@ namespace Mall.WebApi.Controllers.TradePavilion
...
@@ -539,8 +539,8 @@ namespace Mall.WebApi.Controllers.TradePavilion
Renovation
=
parms
.
GetStringValue
(
"Renovation"
),
Renovation
=
parms
.
GetStringValue
(
"Renovation"
),
Payment
=
parms
.
GetStringValue
(
"Payment"
),
Payment
=
parms
.
GetStringValue
(
"Payment"
),
HandoverDate
=
parms
.
GetStringValue
(
"HandoverDate"
),
HandoverDate
=
parms
.
GetStringValue
(
"HandoverDate"
),
IntentionalFloor
=
parms
.
Get
Int
(
"IntentionalFloor"
),
IntentionalFloor
=
parms
.
Get
StringValue
(
"IntentionalFloor"
),
ElevatorNum
=
parms
.
Get
Int
(
"ElevatorNum"
),
ElevatorNum
=
parms
.
Get
StringValue
(
"ElevatorNum"
),
PropertyFee
=
parms
.
GetDecimal
(
"PropertyFee"
),
PropertyFee
=
parms
.
GetDecimal
(
"PropertyFee"
),
RentFee
=
parms
.
GetDecimal
(
"RentFee"
),
RentFee
=
parms
.
GetDecimal
(
"RentFee"
),
ContactName
=
parms
.
GetStringValue
(
"ContactName"
),
ContactName
=
parms
.
GetStringValue
(
"ContactName"
),
...
@@ -616,8 +616,8 @@ namespace Mall.WebApi.Controllers.TradePavilion
...
@@ -616,8 +616,8 @@ namespace Mall.WebApi.Controllers.TradePavilion
Renovation
=
extModel
?.
Renovation
??
""
,
Renovation
=
extModel
?.
Renovation
??
""
,
Payment
=
extModel
?.
Payment
??
""
,
Payment
=
extModel
?.
Payment
??
""
,
HandoverDate
=
extModel
?.
HandoverDate
??
""
,
HandoverDate
=
extModel
?.
HandoverDate
??
""
,
IntentionalFloor
=
extModel
?.
IntentionalFloor
??
0
,
IntentionalFloor
=
extModel
?.
IntentionalFloor
??
""
,
ElevatorNum
=
extModel
?.
ElevatorNum
??
0
,
ElevatorNum
=
extModel
?.
ElevatorNum
??
""
,
PropertyFee
=
extModel
?.
PropertyFee
??
0
,
PropertyFee
=
extModel
?.
PropertyFee
??
0
,
RentFee
=
extModel
?.
RentFee
??
0
,
RentFee
=
extModel
?.
RentFee
??
0
,
ContactName
=
extModel
?.
ContactName
??
""
,
ContactName
=
extModel
?.
ContactName
??
""
,
...
...
Mall.WebApi/Controllers/User/TenantController.cs
View file @
ff96e55b
...
@@ -2205,11 +2205,12 @@ namespace Mall.WebApi.Controllers.User
...
@@ -2205,11 +2205,12 @@ namespace Mall.WebApi.Controllers.User
/// <returns></returns>
/// <returns></returns>
public
ApiResult
TestYBBrandImport
()
public
ApiResult
TestYBBrandImport
()
{
{
string
rootPath
=
Path
.
Combine
(
Directory
.
GetCurrentDirectory
(),
"upfile"
);
//string rootPath = Path.Combine(Directory.GetCurrentDirectory(), "upfile");
string
filePath
=
rootPath
+
@"\宜宾模板文件.xlsx"
;
//string filePath = rootPath+ @"\宜宾模板文件.xlsx";
string
tempPath
=
rootPath
+
@"\TempImg"
;
//string tempPath = rootPath + @"\TempImg";
var
list
=
BrandHelper
.
ImportYBBrandData
(
filePath
,
tempPath
);
//var list = BrandHelper.ImportYBBrandData(filePath, tempPath);
return
ApiResult
.
Success
(
data
:
Common
.
Plugin
.
JsonHelper
.
Serialize
(
list
));
//return ApiResult.Success(data: Common.Plugin.JsonHelper.Serialize(list));
return
ApiResult
.
Success
();
}
}
}
}
}
}
\ No newline at end of file
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