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
4fc88d0d
Commit
4fc88d0d
authored
Dec 12, 2024
by
吴春
Browse files
Options
Browse Files
Download
Email Patches
Plain Diff
1
parent
a8503b2a
Hide whitespace changes
Inline
Side-by-side
Showing
4 changed files
with
48 additions
and
5 deletions
+48
-5
RB_BrandEnterpriseApplyFor_Extend.cs
...Extend/TradePavilion/RB_BrandEnterpriseApplyFor_Extend.cs
+5
-0
RB_Brand_Enterprise_Extend.cs
....Model/Extend/TradePavilion/RB_Brand_Enterprise_Extend.cs
+5
-0
BuildingCarrierModule_V2.cs
Mall.Module.TradePavilion/BuildingCarrierModule_V2.cs
+30
-5
AppletTradeController.cs
...WebApi/Controllers/TradePavilion/AppletTradeController.cs
+8
-0
No files found.
Mall.Model/Extend/TradePavilion/RB_BrandEnterpriseApplyFor_Extend.cs
View file @
4fc88d0d
...
@@ -43,5 +43,10 @@ namespace Mall.Model.Extend.TradePavilion
...
@@ -43,5 +43,10 @@ namespace Mall.Model.Extend.TradePavilion
/// 结束时间
/// 结束时间
/// </summary>
/// </summary>
public
string
EndTime
{
get
;
set
;
}
public
string
EndTime
{
get
;
set
;
}
/// <summary>
/// 物业需求
/// </summary>
public
List
<
string
>
PropertyDemandList
{
get
;
set
;
}
}
}
}
}
Mall.Model/Extend/TradePavilion/RB_Brand_Enterprise_Extend.cs
View file @
4fc88d0d
...
@@ -35,5 +35,10 @@ namespace Mall.Model.Extend.TradePavilion
...
@@ -35,5 +35,10 @@ namespace Mall.Model.Extend.TradePavilion
/// 收藏id
/// 收藏id
/// </summary>
/// </summary>
public
int
CollectId
{
get
;
set
;
}
public
int
CollectId
{
get
;
set
;
}
/// <summary>
/// 物业服务
/// </summary>
public
List
<
string
>
PropertyDemandList
{
get
;
set
;
}
}
}
}
}
Mall.Module.TradePavilion/BuildingCarrierModule_V2.cs
View file @
4fc88d0d
...
@@ -306,7 +306,7 @@ namespace Mall.Module.TradePavilion
...
@@ -306,7 +306,7 @@ namespace Mall.Module.TradePavilion
{
nameof
(
RB_EnterpriseServicesApply_Extend
.
UpdateBy
),
model
.
UpdateBy
},
{
nameof
(
RB_EnterpriseServicesApply_Extend
.
UpdateBy
),
model
.
UpdateBy
},
{
nameof
(
RB_EnterpriseServicesApply_Extend
.
UpdateDate
),
model
.
UpdateDate
},
{
nameof
(
RB_EnterpriseServicesApply_Extend
.
UpdateDate
),
model
.
UpdateDate
},
{
nameof
(
RB_EnterpriseServicesApply_Extend
.
EType
),
model
.
EType
},
{
nameof
(
RB_EnterpriseServicesApply_Extend
.
EType
),
model
.
EType
},
};
};
flag
=
enterpriseServicesApplyRepository
.
Update
(
fileds
,
new
WhereHelper
(
nameof
(
RB_EnterpriseServicesApply_Extend
.
ID
),
model
.
ID
));
flag
=
enterpriseServicesApplyRepository
.
Update
(
fileds
,
new
WhereHelper
(
nameof
(
RB_EnterpriseServicesApply_Extend
.
ID
),
model
.
ID
));
}
}
...
@@ -352,7 +352,7 @@ namespace Mall.Module.TradePavilion
...
@@ -352,7 +352,7 @@ namespace Mall.Module.TradePavilion
{
nameof
(
RB_EnterpriseServices
.
UpdateBy
),
BrandModel
.
UpdateBy
},
{
nameof
(
RB_EnterpriseServices
.
UpdateBy
),
BrandModel
.
UpdateBy
},
{
nameof
(
RB_EnterpriseServices
.
UpdateDate
),
BrandModel
.
UpdateDate
},
{
nameof
(
RB_EnterpriseServices
.
UpdateDate
),
BrandModel
.
UpdateDate
},
{
nameof
(
RB_EnterpriseServices
.
EType
),
BrandModel
.
EType
},
{
nameof
(
RB_EnterpriseServices
.
EType
),
BrandModel
.
EType
},
};
};
enterpriseServicesRepository
.
Update
(
filedsBrand
,
new
WhereHelper
(
nameof
(
RB_EnterpriseServices
.
ServiceId
),
BrandModel
.
ExistServiceId
));
enterpriseServicesRepository
.
Update
(
filedsBrand
,
new
WhereHelper
(
nameof
(
RB_EnterpriseServices
.
ServiceId
),
BrandModel
.
ExistServiceId
));
}
}
...
@@ -812,13 +812,22 @@ namespace Mall.Module.TradePavilion
...
@@ -812,13 +812,22 @@ namespace Mall.Module.TradePavilion
{
{
model
.
BrandModel
.
BannerList
=
new
List
<
string
>();
model
.
BrandModel
.
BannerList
=
new
List
<
string
>();
}
}
if
(!
string
.
IsNullOrWhiteSpace
(
model
.
BrandModel
.
PropertyDemand
))
{
model
.
BrandModel
.
PropertyDemandList
=
JsonConvert
.
DeserializeObject
<
List
<
string
>>(
model
.
BrandModel
.
PropertyDemand
);
}
else
{
model
.
BrandModel
.
PropertyDemandList
=
new
List
<
string
>();
}
}
}
else
else
{
{
model
.
BrandModel
=
new
RB_BrandEnterpriseApplyFor_Extend
model
.
BrandModel
=
new
RB_BrandEnterpriseApplyFor_Extend
{
{
BannerList
=
new
List
<
string
>(),
BannerList
=
new
List
<
string
>(),
CustomerTypeInfo
=
new
List
<
string
>()
CustomerTypeInfo
=
new
List
<
string
>(),
PropertyDemandList
=
new
List
<
string
>()
};
};
}
}
}
}
...
@@ -921,13 +930,22 @@ namespace Mall.Module.TradePavilion
...
@@ -921,13 +930,22 @@ namespace Mall.Module.TradePavilion
{
{
model
.
BrandModel
.
BannerList
=
new
List
<
string
>();
model
.
BrandModel
.
BannerList
=
new
List
<
string
>();
}
}
if
(!
string
.
IsNullOrWhiteSpace
(
model
.
BrandModel
.
PropertyDemand
))
{
model
.
BrandModel
.
PropertyDemandList
=
JsonConvert
.
DeserializeObject
<
List
<
string
>>(
model
.
BrandModel
.
PropertyDemand
);
}
else
{
model
.
BrandModel
.
PropertyDemandList
=
new
List
<
string
>();
}
}
}
else
else
{
{
model
.
BrandModel
=
new
RB_BrandEnterpriseApplyFor_Extend
model
.
BrandModel
=
new
RB_BrandEnterpriseApplyFor_Extend
{
{
BannerList
=
new
List
<
string
>(),
BannerList
=
new
List
<
string
>(),
CustomerTypeInfo
=
new
List
<
string
>()
CustomerTypeInfo
=
new
List
<
string
>(),
PropertyDemandList
=
new
List
<
string
>(),
};
};
}
}
}
}
...
@@ -1171,7 +1189,14 @@ namespace Mall.Module.TradePavilion
...
@@ -1171,7 +1189,14 @@ namespace Mall.Module.TradePavilion
{
{
model
.
BrandModel
.
BannerList
=
new
List
<
string
>();
model
.
BrandModel
.
BannerList
=
new
List
<
string
>();
}
}
if
(!
string
.
IsNullOrWhiteSpace
(
model
.
BrandModel
.
PropertyDemand
))
{
model
.
BrandModel
.
PropertyDemandList
=
JsonConvert
.
DeserializeObject
<
List
<
string
>>(
model
.
BrandModel
.
PropertyDemand
);
}
else
{
model
.
BrandModel
.
PropertyDemandList
=
new
List
<
string
>();
}
model
.
BrandModel
.
ProjectName
=
model
.
BrandModel
.
ProjectType
.
GetEnumName
();
model
.
BrandModel
.
ProjectName
=
model
.
BrandModel
.
ProjectType
.
GetEnumName
();
}
}
}
}
...
...
Mall.WebApi/Controllers/TradePavilion/AppletTradeController.cs
View file @
4fc88d0d
...
@@ -3550,6 +3550,14 @@ namespace Mall.WebApi.Controllers.TradePavilion
...
@@ -3550,6 +3550,14 @@ namespace Mall.WebApi.Controllers.TradePavilion
query
.
CreateDate
=
System
.
DateTime
.
Now
;
query
.
CreateDate
=
System
.
DateTime
.
Now
;
query
.
CreateBy
=
userInfo
.
UserId
;
query
.
CreateBy
=
userInfo
.
UserId
;
}
}
if
(
query
.
PropertyDemandList
!=
null
&&
query
.
PropertyDemandList
.
Any
())
{
query
.
PropertyDemand
=
string
.
Join
(
","
,
query
.
PropertyDemandList
.
Select
(
x
=>
x
));
}
else
{
query
.
PropertyDemand
=
""
;
}
query
.
MallBaseId
=
userInfo
.
MallBaseId
;
query
.
MallBaseId
=
userInfo
.
MallBaseId
;
query
.
TenantId
=
userInfo
.
TenantId
;
query
.
TenantId
=
userInfo
.
TenantId
;
query
.
Status
=
0
;
query
.
Status
=
0
;
...
...
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