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
473b3454
Commit
473b3454
authored
Feb 21, 2021
by
liudong1993
Browse files
Options
Browse Files
Download
Plain Diff
Merge branch 'master' of
http://gitlab.oytour.com/Kui2/mall.oytour.com
into sdzq-ld
parents
0879f88c
aa5d2a0b
Hide whitespace changes
Inline
Side-by-side
Showing
14 changed files
with
352 additions
and
54 deletions
+352
-54
RB_Commerce_ActivityType.cs
Mall.Model/Entity/TradePavilion/RB_Commerce_ActivityType.cs
+5
-0
RB_Company.cs
Mall.Model/Entity/TradePavilion/RB_Company.cs
+1
-1
RB_Commerce_Activity_Extend.cs
...Model/Extend/TradePavilion/RB_Commerce_Activity_Extend.cs
+18
-1
MiniprogramTemplateModule.cs
Mall.Module.MarketingCenter/MiniprogramTemplateModule.cs
+3
-2
CommerceActivityModule.cs
Mall.Module.TradePavilion/CommerceActivityModule.cs
+12
-1
CompanyModule.cs
Mall.Module.TradePavilion/CompanyModule.cs
+10
-0
ContractModule.cs
Mall.Module.TradePavilion/ContractModule.cs
+10
-0
RB_Commerce_ActivityRepository.cs
...epository/TradePavilion/RB_Commerce_ActivityRepository.cs
+6
-6
RB_Commerce_ActivityTypeRepository.cs
...itory/TradePavilion/RB_Commerce_ActivityTypeRepository.cs
+38
-0
RB_CompanyRepository.cs
Mall.Repository/TradePavilion/RB_CompanyRepository.cs
+42
-0
RB_ContractRepository.cs
Mall.Repository/TradePavilion/RB_ContractRepository.cs
+38
-0
MallHelper.cs
Mall.WebApi/Controllers/Mall/MallHelper.cs
+8
-0
AppletTradeController.cs
...WebApi/Controllers/TradePavilion/AppletTradeController.cs
+105
-0
TradeController.cs
Mall.WebApi/Controllers/TradePavilion/TradeController.cs
+56
-43
No files found.
Mall.Model/Entity/TradePavilion/RB_Commerce_ActivityType.cs
View file @
473b3454
...
...
@@ -23,6 +23,11 @@ namespace Mall.Model.Entity.TradePavilion
/// </summary>
public
string
TypeName
{
get
;
set
;
}
/// <summary>
/// 封面图
/// </summary>
public
string
CoverImage
{
get
;
set
;
}
/// <summary>
/// 商户号id
/// </summary>
...
...
Mall.Model/Entity/TradePavilion/RB_Company.cs
View file @
473b3454
...
...
@@ -107,7 +107,7 @@ namespace Mall.Model.Entity.TradePavilion
public
string
ImportCountry
{
get
;
set
;
}
/// <summary>
///
主要进口类
目
///
进口品
目
/// </summary>
public
string
ImportCategory
{
get
;
set
;
}
...
...
Mall.Model/Extend/TradePavilion/RB_Commerce_Activity_Extend.cs
View file @
473b3454
...
...
@@ -8,8 +8,25 @@ namespace Mall.Model.Extend.TradePavilion
/// <summary>
/// 商会活动表扩展实体类
/// </summary>
public
class
RB_Commerce_Activity_Extend
:
RB_Commerce_Activity
public
class
RB_Commerce_Activity_Extend
:
RB_Commerce_Activity
{
/// <summary>
/// 活动名称
/// </summary>
public
string
ActivityTypeName
{
get
;
set
;
}
/// <summary>
/// 开始时间字符串
/// </summary>
public
string
StartTimeStr
{
get
{
return
Common
.
ConvertHelper
.
FormatDate
(
this
.
StartTime
);
}
}
/// <summary>
/// 结束时间字符串
/// </summary>
public
string
EndTimeStr
{
get
{
return
Common
.
ConvertHelper
.
FormatDate
(
this
.
EndTime
);
}
}
/// <summary>
/// 商会活动详情列表
/// </summary>
...
...
Mall.Module.MarketingCenter/MiniprogramTemplateModule.cs
View file @
473b3454
...
...
@@ -111,7 +111,7 @@ namespace Mall.Module.MarketingCenter
}
if
(
extModel
.
TemplateData
!=
null
&&
!
string
.
IsNullOrEmpty
(
extModel
.
TemplateData
))
{
extModel
.
ComponentDataList
=
JsonHelper
.
DeserializeObject
<
List
<
ComponentItem
>>(
Common
.
ConvertHelper
.
JsonReplaceSign
(
extModel
.
TemplateData
)
);
extModel
.
ComponentDataList
=
JsonHelper
.
DeserializeObject
<
List
<
ComponentItem
>>(
extModel
.
TemplateData
);
if
(
extModel
.
ComponentDataList
!=
null
&&
extModel
.
ComponentDataList
.
Count
>
0
)
{
foreach
(
var
item
in
extModel
.
ComponentDataList
)
...
...
@@ -621,7 +621,8 @@ namespace Mall.Module.MarketingCenter
}
item
.
data
=
storeModel
;
break
;
//导航-页面
case
"nav-page"
:
item
.
data
=
JsonHelper
.
DeserializeObject
<
navItem
>(
item
.
data
.
ToString
());
break
;
}
}
...
...
Mall.Module.TradePavilion/CommerceActivityModule.cs
View file @
473b3454
...
...
@@ -58,7 +58,7 @@ namespace Mall.Module.TradePavilion
{
nameof
(
RB_Commerce_Activity_Extend
.
EndTime
),
model
.
EndTime
},
{
nameof
(
RB_Commerce_Activity_Extend
.
CoverImg
),
model
.
CoverImg
},
{
nameof
(
RB_Commerce_Activity_Extend
.
ActivityType
),
model
.
ActivityType
},
{
nameof
(
RB_Commerce_Activity_Extend
.
ActivityInfo
),
model
.
Activity
Type
},
{
nameof
(
RB_Commerce_Activity_Extend
.
ActivityInfo
),
model
.
Activity
Info
},
{
nameof
(
RB_Commerce_Activity_Extend
.
UpdateBy
),
model
.
UpdateBy
},
{
nameof
(
RB_Commerce_Activity_Extend
.
UpdateDate
),
model
.
UpdateDate
},
};
...
...
@@ -161,6 +161,16 @@ namespace Mall.Module.TradePavilion
return
activityTypeRepository
.
GetCommerceActivityTypePageListRepository
(
pageIndex
,
pageSize
,
out
rowsCount
,
query
);
}
/// <summary>
/// 获取商会活动类型列表
/// </summary>
/// <param name="query"></param>
/// <returns></returns>
public
List
<
RB_Commerce_ActivityType_Extend
>
GetCommerceActivityTypeListModule
(
RB_Commerce_ActivityType_Extend
query
)
{
return
activityTypeRepository
.
GetCommerceActivityTypeListRepository
(
query
);
}
/// <summary>
/// 新增修改商会活动类型
/// </summary>
...
...
@@ -174,6 +184,7 @@ namespace Mall.Module.TradePavilion
Dictionary
<
string
,
object
>
fileds
=
new
Dictionary
<
string
,
object
>()
{
{
nameof
(
RB_Commerce_ActivityType_Extend
.
TypeName
),
model
.
TypeName
},
{
nameof
(
RB_Commerce_ActivityType_Extend
.
CoverImage
),
model
.
CoverImage
},
{
nameof
(
RB_Commerce_ActivityType_Extend
.
UpdateBy
),
model
.
UpdateBy
},
{
nameof
(
RB_Commerce_ActivityType_Extend
.
UpdateDate
),
model
.
UpdateDate
}
};
...
...
Mall.Module.TradePavilion/CompanyModule.cs
View file @
473b3454
...
...
@@ -35,6 +35,16 @@ namespace Mall.Module.TradePavilion
return
companyRepository
.
GetEntity
<
RB_Company_Extend
>(
CompanyId
);
}
/// <summary>
/// 获取公司信息实体
/// </summary>
/// <param name="CompanyId"></param>
/// <returns></returns>
public
RB_Company_Extend
GetCompanyByUserIdModule
(
int
userId
)
{
return
companyRepository
.
GetCompanyRepository
(
new
RB_Company_Extend
()
{
CreateBy
=
userId
});
}
/// <summary>
/// 新增修改公司信息
/// </summary>
...
...
Mall.Module.TradePavilion/ContractModule.cs
View file @
473b3454
...
...
@@ -30,6 +30,16 @@ namespace Mall.Module.TradePavilion
return
contractRepository
.
GetContractPageListRepository
(
pageIndex
,
pageSize
,
out
rowsCount
,
query
);
}
/// <summary>
/// 获取联系列表
/// </summary>
/// <param name="query"></param>
/// <returns></returns>
public
List
<
RB_Contract_Extend
>
GetContractListModule
(
RB_Contract_Extend
query
)
{
return
contractRepository
.
GetContractListRepository
(
query
);
}
/// <summary>
/// 获取联系人实体
/// </summary>
...
...
Mall.Repository/TradePavilion/RB_Commerce_ActivityRepository.cs
View file @
473b3454
...
...
@@ -28,11 +28,11 @@ namespace Mall.Repository.TradePavilion
DynamicParameters
parameters
=
new
DynamicParameters
();
StringBuilder
builder
=
new
StringBuilder
();
builder
.
AppendFormat
(
@"
SELECT
*
FROM
RB_Commerce_Activity
SELECT
A.*,IFNULL(B.TypeName,'') AS ActivityTypeName
FROM
rb_commerce_activity AS A LEFT JOIN rb_commerce_activitytype AS B ON A.ActivityType=B.Id
WHERE 1=1
"
);
builder
.
AppendFormat
(
" AND {0}={1} "
,
nameof
(
RB_Commerce_Activity_Extend
.
Status
),
(
int
)
DateStateEnum
.
Normal
);
builder
.
AppendFormat
(
" AND
A.
{0}={1} "
,
nameof
(
RB_Commerce_Activity_Extend
.
Status
),
(
int
)
DateStateEnum
.
Normal
);
if
(
query
==
null
)
{
return
new
List
<
RB_Commerce_Activity_Extend
>();
...
...
@@ -41,15 +41,15 @@ WHERE 1=1
{
if
(
query
.
TenantId
>
0
)
{
builder
.
AppendFormat
(
" AND {0}={1} "
,
nameof
(
RB_Commerce_Activity_Extend
.
TenantId
),
query
.
TenantId
);
builder
.
AppendFormat
(
" AND
A.
{0}={1} "
,
nameof
(
RB_Commerce_Activity_Extend
.
TenantId
),
query
.
TenantId
);
}
if
(
query
.
MallBaseId
>
0
)
{
builder
.
AppendFormat
(
" AND {0}={1} "
,
nameof
(
RB_Commerce_Activity_Extend
.
MallBaseId
),
query
.
MallBaseId
);
builder
.
AppendFormat
(
" AND
A.
{0}={1} "
,
nameof
(
RB_Commerce_Activity_Extend
.
MallBaseId
),
query
.
MallBaseId
);
}
if
(!
string
.
IsNullOrEmpty
(
query
.
ActivityName
))
{
builder
.
AppendFormat
(
" AND {0} LIKE @Name "
,
nameof
(
RB_Commerce_Activity_Extend
.
ActivityName
));
builder
.
AppendFormat
(
" AND
A.
{0} LIKE @Name "
,
nameof
(
RB_Commerce_Activity_Extend
.
ActivityName
));
parameters
.
Add
(
"Name"
,
"%"
+
query
.
ActivityName
.
Trim
()
+
"%"
);
}
}
...
...
Mall.Repository/TradePavilion/RB_Commerce_ActivityTypeRepository.cs
View file @
473b3454
...
...
@@ -55,5 +55,43 @@ WHERE 1=1
}
return
GetPage
<
RB_Commerce_ActivityType_Extend
>(
pageIndex
,
pageSize
,
out
rowsCount
,
builder
.
ToString
(),
parameters
).
ToList
();
}
/// <summary>
/// 获取商会活动类型列表
/// </summary>
/// <param name="query"></param>
/// <returns></returns>
public
List
<
RB_Commerce_ActivityType_Extend
>
GetCommerceActivityTypeListRepository
(
RB_Commerce_ActivityType_Extend
query
)
{
DynamicParameters
parameters
=
new
DynamicParameters
();
StringBuilder
builder
=
new
StringBuilder
();
builder
.
AppendFormat
(
@"
SELECT *
FROM RB_Commerce_ActivityType
WHERE 1=1
"
);
builder
.
AppendFormat
(
" AND {0}={1} "
,
nameof
(
RB_Commerce_ActivityType_Extend
.
Status
),
(
int
)
DateStateEnum
.
Normal
);
if
(
query
==
null
)
{
return
new
List
<
RB_Commerce_ActivityType_Extend
>();
}
else
{
if
(
query
.
TenantId
>
0
)
{
builder
.
AppendFormat
(
" AND {0}={1} "
,
nameof
(
RB_Commerce_ActivityType_Extend
.
TenantId
),
query
.
TenantId
);
}
if
(
query
.
MallBaseId
>
0
)
{
builder
.
AppendFormat
(
" AND {0}={1} "
,
nameof
(
RB_Commerce_ActivityType_Extend
.
MallBaseId
),
query
.
MallBaseId
);
}
if
(!
string
.
IsNullOrEmpty
(
query
.
TypeName
))
{
builder
.
AppendFormat
(
" AND {0} LIKE @Name "
,
nameof
(
RB_Commerce_ActivityType_Extend
.
TypeName
));
parameters
.
Add
(
"Name"
,
"%"
+
query
.
TypeName
.
Trim
()
+
"%"
);
}
}
return
Get
<
RB_Commerce_ActivityType_Extend
>(
builder
.
ToString
(),
parameters
).
ToList
();
}
}
}
Mall.Repository/TradePavilion/RB_CompanyRepository.cs
View file @
473b3454
...
...
@@ -55,5 +55,47 @@ WHERE 1=1
}
return
GetPage
<
RB_Company_Extend
>(
pageIndex
,
pageSize
,
out
rowsCount
,
builder
.
ToString
(),
parameters
).
ToList
();
}
/// <summary>
/// 根据查询条件获取公司信息实体
/// </summary>
/// <param name="query"></param>
/// <returns></returns>
public
RB_Company_Extend
GetCompanyRepository
(
RB_Company_Extend
query
)
{
DynamicParameters
parameters
=
new
DynamicParameters
();
StringBuilder
builder
=
new
StringBuilder
();
builder
.
AppendFormat
(
@"
SELECT *
FROM RB_Company
WHERE 1=1
"
);
builder
.
AppendFormat
(
" AND {0}={1} "
,
nameof
(
RB_Company_Extend
.
Status
),
(
int
)
DateStateEnum
.
Normal
);
if
(
query
==
null
)
{
return
new
RB_Company_Extend
();
}
else
{
if
(
query
.
TenantId
>
0
)
{
builder
.
AppendFormat
(
" AND {0}={1} "
,
nameof
(
RB_Company_Extend
.
TenantId
),
query
.
TenantId
);
}
if
(
query
.
MallBaseId
>
0
)
{
builder
.
AppendFormat
(
" AND {0}={1} "
,
nameof
(
RB_Company_Extend
.
MallBaseId
),
query
.
MallBaseId
);
}
if
(!
string
.
IsNullOrEmpty
(
query
.
CompanyName
))
{
builder
.
AppendFormat
(
" AND {0} LIKE @Name "
,
nameof
(
RB_Company_Extend
.
CompanyName
));
parameters
.
Add
(
"Name"
,
"%"
+
query
.
CompanyName
.
Trim
()
+
"%"
);
}
if
(
query
.
CreateBy
>
0
)
{
builder
.
AppendFormat
(
" AND {0}={1} "
,
nameof
(
RB_Company_Extend
.
CreateBy
),
query
.
CreateBy
);
}
}
return
Get
<
RB_Company_Extend
>(
builder
.
ToString
(),
parameters
).
FirstOrDefault
();
}
}
}
Mall.Repository/TradePavilion/RB_ContractRepository.cs
View file @
473b3454
...
...
@@ -55,5 +55,43 @@ WHERE 1=1
}
return
GetPage
<
RB_Contract_Extend
>(
pageIndex
,
pageSize
,
out
rowsCount
,
builder
.
ToString
(),
parameters
).
ToList
();
}
/// <summary>
/// 获取联系列表
/// </summary>
/// <param name="query"></param>
/// <returns></returns>
public
List
<
RB_Contract_Extend
>
GetContractListRepository
(
RB_Contract_Extend
query
)
{
DynamicParameters
parameters
=
new
DynamicParameters
();
StringBuilder
builder
=
new
StringBuilder
();
builder
.
AppendFormat
(
@"
SELECT *
FROM RB_Contract
WHERE 1=1
"
);
builder
.
AppendFormat
(
" AND {0}={1} "
,
nameof
(
RB_Contract_Extend
.
Status
),
(
int
)
DateStateEnum
.
Normal
);
if
(
query
==
null
)
{
return
new
List
<
RB_Contract_Extend
>();
}
else
{
if
(
query
.
TenantId
>
0
)
{
builder
.
AppendFormat
(
" AND {0}={1} "
,
nameof
(
RB_Contract_Extend
.
TenantId
),
query
.
TenantId
);
}
if
(
query
.
MallBaseId
>
0
)
{
builder
.
AppendFormat
(
" AND {0}={1} "
,
nameof
(
RB_Contract_Extend
.
MallBaseId
),
query
.
MallBaseId
);
}
if
(!
string
.
IsNullOrEmpty
(
query
.
Name
))
{
builder
.
AppendFormat
(
" AND {0} LIKE @Name "
,
nameof
(
RB_Contract_Extend
.
Name
));
parameters
.
Add
(
"Name"
,
"%"
+
query
.
Name
.
Trim
()
+
"%"
);
}
}
return
Get
<
RB_Contract_Extend
>(
builder
.
ToString
(),
parameters
).
ToList
();
}
}
}
\ No newline at end of file
Mall.WebApi/Controllers/Mall/MallHelper.cs
View file @
473b3454
...
...
@@ -130,6 +130,14 @@ namespace Mall.WebApi.Controllers
data
=
navData
};
break
;
case
"nav-page"
:
var
navPageData
=
subItem
.
data
as
navItem
;
obj
=
new
{
id
=
subItem
.
Id
,
data
=
navPageData
};
break
;
//轮播广告插件
case
"banner"
:
var
bannerData
=
subItem
.
data
as
bannerItem
;
...
...
Mall.WebApi/Controllers/TradePavilion/AppletTradeController.cs
0 → 100644
View file @
473b3454
using
System
;
using
System.Collections.Generic
;
using
System.Linq
;
using
System.Threading.Tasks
;
using
Mall.Common.API
;
using
Mall.Common.Plugin
;
using
Mall.Model.Extend.TradePavilion
;
using
Mall.Module.TradePavilion
;
using
Mall.WebApi.Filter
;
using
Microsoft.AspNetCore.Authorization
;
using
Microsoft.AspNetCore.Cors
;
using
Microsoft.AspNetCore.Http
;
using
Microsoft.AspNetCore.Mvc
;
using
Newtonsoft.Json.Linq
;
namespace
Mall.WebApi.Controllers.TradePavilion
{
[
Route
(
"api/[controller]/[action]"
)]
[
ApiExceptionFilter
]
[
ApiController
]
[
EnableCors
(
"AllowCors"
)]
public
class
AppletTradeController
:
BaseController
{
/// <summary>
/// 联系人处理类对象
/// </summary>
private
readonly
ContractModule
module
=
new
ContractModule
();
/// <summary>
/// 投资采购处理类对象
/// </summary>
private
readonly
InvestmentProcurementModule
procurementModule
=
new
InvestmentProcurementModule
();
/// <summary>
/// 公司信息处理类对象
/// </summary>
private
readonly
CompanyModule
companyModule
=
new
CompanyModule
();
/// <summary>
/// 商会活动处理类对象
/// </summary>
private
readonly
CommerceActivityModule
activityModule
=
new
CommerceActivityModule
();
/// <summary>
/// 商会活动报名处理类对象
/// </summary>
private
readonly
CommerceConsultModule
consultModule
=
new
CommerceConsultModule
();
/// <summary>
/// 新增修改公司信息
/// </summary>
/// <returns></returns>
public
ApiResult
SetCompany
()
{
JObject
parms
=
JObject
.
Parse
(
RequestParm
.
msg
.
ToString
());
var
extModel
=
new
RB_Company_Extend
()
{
CompanyId
=
parms
.
GetInt
(
"CompanyId"
),
CompanyName
=
parms
.
GetStringValue
(
"CompanyName"
),
CompanyEnName
=
parms
.
GetStringValue
(
"CompanyEnName"
),
Principal
=
parms
.
GetStringValue
(
"Principal"
),
Mobile
=
parms
.
GetStringValue
(
"Mobile"
),
EMail
=
parms
.
GetStringValue
(
"EMail"
),
LegalPerson
=
parms
.
GetStringValue
(
"LegalPerson"
),
WechatNo
=
parms
.
GetStringValue
(
"WechatNo"
),
CompanyIntro
=
parms
.
GetStringValue
(
"CompanyIntro"
),
DomainUrl
=
parms
.
GetStringValue
(
"DomainUrl"
),
FoundingTime
=
parms
.
GetDateTime
(
"FoundingTime"
),
EmployeeNum
=
parms
.
GetInt
(
"EmployeeNum"
),
AnnualSales
=
parms
.
GetDecimal
(
"AnnualSales"
),
AnnualImport
=
parms
.
GetDecimal
(
"AnnualImport"
),
Address
=
parms
.
GetStringValue
(
"Address"
),
EnAddress
=
parms
.
GetStringValue
(
"EnAddress"
),
Industry
=
parms
.
GetStringValue
(
"Industry"
),
ExportCountry
=
parms
.
GetStringValue
(
"ExportCountry"
),
ImportCountry
=
parms
.
GetStringValue
(
"ImportCountry"
),
ImportCategory
=
parms
.
GetStringValue
(
"ImportCategory"
),
OtherInfo
=
parms
.
GetStringValue
(
"OtherInfo"
),
};
var
userInfo
=
AppletUserInfo
;
extModel
.
Status
=
Common
.
Enum
.
DateStateEnum
.
Normal
;
extModel
.
MallBaseId
=
userInfo
.
MallBaseId
;
extModel
.
TenantId
=
userInfo
.
TenantId
;
Int32
.
TryParse
(
userInfo
.
UserId
.
ToString
(),
out
int
Uid
);
extModel
.
CreateBy
=
Uid
;
extModel
.
CreateDate
=
DateTime
.
Now
;
extModel
.
UpdateBy
=
Uid
;
extModel
.
UpdateDate
=
DateTime
.
Now
;
var
flag
=
companyModule
.
SetCompanyModule
(
extModel
);
return
flag
?
ApiResult
.
Success
()
:
ApiResult
.
Failed
();
}
/// <summary>
/// 获取当前用户的公司信息实体
/// </summary>
/// <returns></returns>
public
ApiResult
GetUserCompany
()
{
var
userInfo
=
AppletUserInfo
;
var
model
=
companyModule
.
GetCompanyByUserIdModule
(
userInfo
.
UserId
);
return
ApiResult
.
Success
(
data
:
model
);
}
}
}
Mall.WebApi/Controllers/TradePavilion/TradeController.cs
View file @
473b3454
...
...
@@ -6,6 +6,7 @@ using Mall.Common.Plugin;
using
Mall.Model.Extend.TradePavilion
;
using
Mall.Module.TradePavilion
;
using
Mall.WebApi.Filter
;
using
Microsoft.AspNetCore.Authorization
;
using
Microsoft.AspNetCore.Cors
;
using
Microsoft.AspNetCore.Mvc
;
using
Newtonsoft.Json
;
...
...
@@ -51,6 +52,9 @@ namespace Mall.WebApi.Controllers.TradePavilion
/// 获取联系人分页列表
/// </summary>
/// <returns></returns>
[
HttpGet
]
[
HttpPost
]
[
AllowAnonymous
]
public
ApiResult
GetContractPageList
()
{
ResultPageModel
pageModel
=
JsonConvert
.
DeserializeObject
<
ResultPageModel
>(
RequestParm
.
msg
.
ToString
());
...
...
@@ -77,6 +81,33 @@ namespace Mall.WebApi.Controllers.TradePavilion
return
ApiResult
.
Success
(
data
:
pageModel
);
}
/// <summary>
/// 获取联系人列表
/// </summary>
/// <returns></returns>
public
ApiResult
GetContractList
()
{
JObject
parms
=
JObject
.
Parse
(
RequestParm
.
msg
.
ToString
());
var
query
=
new
RB_Contract_Extend
()
{
Name
=
parms
.
GetStringValue
(
"Name"
)
};
query
.
MallBaseId
=
RequestParm
.
MallBaseId
;
query
.
TenantId
=
RequestParm
.
TenantId
;
var
list
=
module
.
GetContractListModule
(
query
);
if
(
list
!=
null
&&
list
.
Count
>
0
)
{
foreach
(
var
item
in
list
)
{
if
(
item
.
CreateBy
>
0
)
{
item
.
CreateByName
=
UserReidsCache
.
GetUserLoginInfo
(
item
.
CreateBy
)?.
Account
??
""
;
}
}
}
return
ApiResult
.
Success
(
data
:
list
);
}
/// <summary>
/// 新增修改联系人
/// </summary>
...
...
@@ -100,6 +131,8 @@ namespace Mall.WebApi.Controllers.TradePavilion
Int32
.
TryParse
(
RequestParm
.
uid
,
out
int
Uid
);
extModel
.
CreateBy
=
Uid
;
extModel
.
CreateDate
=
DateTime
.
Now
;
extModel
.
UpdateBy
=
Uid
;
extModel
.
UpdateDate
=
DateTime
.
Now
;
var
flag
=
module
.
SetContractModule
(
extModel
);
return
flag
?
ApiResult
.
Success
()
:
ApiResult
.
Failed
();
}
...
...
@@ -108,6 +141,9 @@ namespace Mall.WebApi.Controllers.TradePavilion
/// 获取角色实体
/// </summary>
/// <returns></returns>
[
HttpGet
]
[
HttpPost
]
[
AllowAnonymous
]
public
ApiResult
GetContract
()
{
JObject
parms
=
JObject
.
Parse
(
RequestParm
.
msg
.
ToString
());
...
...
@@ -249,48 +285,6 @@ namespace Mall.WebApi.Controllers.TradePavilion
return
ApiResult
.
Success
(
data
:
pageModel
);
}
/// <summary>
/// 新增修改公司信息
/// </summary>
/// <returns></returns>
public
ApiResult
SetCompany
()
{
JObject
parms
=
JObject
.
Parse
(
RequestParm
.
msg
.
ToString
());
var
extModel
=
new
RB_Company_Extend
()
{
CompanyId
=
parms
.
GetInt
(
"CompanyId"
),
CompanyName
=
parms
.
GetStringValue
(
"CompanyName"
),
CompanyEnName
=
parms
.
GetStringValue
(
"CompanyEnName"
),
Principal
=
parms
.
GetStringValue
(
"Principal"
),
Mobile
=
parms
.
GetStringValue
(
"Mobile"
),
EMail
=
parms
.
GetStringValue
(
"EMail"
),
LegalPerson
=
parms
.
GetStringValue
(
"LegalPerson"
),
WechatNo
=
parms
.
GetStringValue
(
"WechatNo"
),
CompanyIntro
=
parms
.
GetStringValue
(
"CompanyIntro"
),
DomainUrl
=
parms
.
GetStringValue
(
"DomainUrl"
),
FoundingTime
=
parms
.
GetDateTime
(
"FoundingTime"
),
EmployeeNum
=
parms
.
GetInt
(
"EmployeeNum"
),
AnnualSales
=
parms
.
GetDecimal
(
"AnnualSales"
),
AnnualImport
=
parms
.
GetDecimal
(
"AnnualImport"
),
Address
=
parms
.
GetStringValue
(
"Address"
),
EnAddress
=
parms
.
GetStringValue
(
"EnAddress"
),
Industry
=
parms
.
GetStringValue
(
"Industry"
),
ExportCountry
=
parms
.
GetStringValue
(
"ExportCountry"
),
ImportCountry
=
parms
.
GetStringValue
(
"ImportCountry"
),
ImportCategory
=
parms
.
GetStringValue
(
"ImportCategory"
),
OtherInfo
=
parms
.
GetStringValue
(
"OtherInfo"
),
};
extModel
.
Status
=
Common
.
Enum
.
DateStateEnum
.
Normal
;
extModel
.
MallBaseId
=
RequestParm
.
MallBaseId
;
extModel
.
TenantId
=
RequestParm
.
TenantId
;
Int32
.
TryParse
(
RequestParm
.
uid
,
out
int
Uid
);
extModel
.
CreateBy
=
Uid
;
extModel
.
CreateDate
=
DateTime
.
Now
;
extModel
.
UpdateBy
=
Uid
;
extModel
.
UpdateDate
=
DateTime
.
Now
;
var
flag
=
companyModule
.
SetCompanyModule
(
extModel
);
return
flag
?
ApiResult
.
Success
()
:
ApiResult
.
Failed
();
}
/// <summary>
/// 获取公司信息详情
...
...
@@ -422,6 +416,24 @@ namespace Mall.WebApi.Controllers.TradePavilion
return
ApiResult
.
Success
(
data
:
pageModel
);
}
/// <summary>
/// 获取商会活动类型列表
/// </summary>
/// <returns></returns>
public
ApiResult
GetCommerceActivityTypeList
()
{
JObject
jObj
=
JObject
.
Parse
(
RequestParm
.
msg
.
ToString
());
var
query
=
new
RB_Commerce_ActivityType_Extend
()
{
TypeName
=
jObj
.
GetStringValue
(
"TypeName"
)
};
query
.
MallBaseId
=
RequestParm
.
MallBaseId
;
query
.
TenantId
=
RequestParm
.
TenantId
;
var
list
=
activityModule
.
GetCommerceActivityTypeListModule
(
query
);
return
ApiResult
.
Success
(
data
:
list
);
}
/// <summary>
/// 新增修改商会活动类型
/// </summary>
...
...
@@ -432,7 +444,8 @@ namespace Mall.WebApi.Controllers.TradePavilion
var
extModel
=
new
RB_Commerce_ActivityType_Extend
()
{
Id
=
jObj
.
GetInt
(
"Id"
),
TypeName
=
jObj
.
GetStringValue
(
"TypeName"
)
TypeName
=
jObj
.
GetStringValue
(
"TypeName"
),
CoverImage
=
jObj
.
GetStringValue
(
"CoverImage"
)
};
extModel
.
Status
=
Common
.
Enum
.
DateStateEnum
.
Normal
;
extModel
.
MallBaseId
=
RequestParm
.
MallBaseId
;
...
...
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