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
22dcedbd
Commit
22dcedbd
authored
Apr 28, 2020
by
liudong1993
Browse files
Options
Browse Files
Download
Plain Diff
Merge branch 'master' of
http://gitlab.oytour.com/Kui2/mall.oytour.com
parents
3163f6eb
a90a895a
Expand all
Hide whitespace changes
Inline
Side-by-side
Showing
28 changed files
with
1270 additions
and
135 deletions
+1270
-135
ChargeModeEnum.cs
Mall.Common/Enum/MallBase/ChargeModeEnum.cs
+21
-0
PlatformTypeEnum.cs
Mall.Common/Enum/MarketingCenter/PlatformTypeEnum.cs
+31
-0
RecordTypeEnum.cs
Mall.Common/Enum/MarketingCenter/RecordTypeEnum.cs
+21
-0
RB_Logistics_Rules.cs
Mall.Model/Entity/BaseSetUp/RB_Logistics_Rules.cs
+1
-1
RB_Integral_Settings.cs
Mall.Model/Entity/MarketingCenter/RB_Integral_Settings.cs
+43
-0
RB_Recharge_Settings.cs
Mall.Model/Entity/MarketingCenter/RB_Recharge_Settings.cs
+70
-0
RB_Member_Balance.cs
Mall.Model/Entity/User/RB_Member_Balance.cs
+7
-1
RB_Member_Integral.cs
Mall.Model/Entity/User/RB_Member_Integral.cs
+13
-1
RB_Miniprogram_Bottomnav.cs
Mall.Model/Entity/User/RB_Miniprogram_Bottomnav.cs
+5
-0
RB_Member_Balance_Extend.cs
Mall.Model/Extend/User/RB_Member_Balance_Extend.cs
+13
-0
RB_Member_Integral_Extend.cs
Mall.Model/Extend/User/RB_Member_Integral_Extend.cs
+14
-1
RB_Miniprogram_Bottomnav_Extend.cs
Mall.Model/Extend/User/RB_Miniprogram_Bottomnav_Extend.cs
+4
-1
Integral_Query.cs
Mall.Model/Query/Integral_Query.cs
+34
-0
IntegralModule.cs
Mall.Module.MarketingCenter/IntegralModule.cs
+93
-0
Mall.Module.MarketingCenter.csproj
...Module.MarketingCenter/Mall.Module.MarketingCenter.csproj
+1
-2
RechargeModule.cs
Mall.Module.MarketingCenter/RechargeModule.cs
+93
-2
MiniProgramModule.cs
Mall.Module.User/MiniProgramModule.cs
+13
-3
UserModule.cs
Mall.Module.User/UserModule.cs
+79
-43
RB_Integral_SettingsRepository.cs
...ository/MarketingCenter/RB_Integral_SettingsRepository.cs
+47
-0
RB_Recharge_SettingsRepository.cs
...ository/MarketingCenter/RB_Recharge_SettingsRepository.cs
+47
-0
RB_Member_BalanceRepository.cs
Mall.Repository/User/RB_Member_BalanceRepository.cs
+48
-1
RB_Member_IntegralRepository.cs
Mall.Repository/User/RB_Member_IntegralRepository.cs
+104
-6
RB_Miniprogram_BottomnavRepository.cs
Mall.Repository/User/RB_Miniprogram_BottomnavRepository.cs
+2
-31
IntegralController.cs
....WebApi/Controllers/MarketingCenter/IntegralController.cs
+162
-0
RechargeController.cs
....WebApi/Controllers/MarketingCenter/RechargeController.cs
+232
-0
TenantController.cs
Mall.WebApi/Controllers/User/TenantController.cs
+3
-3
UserController.cs
Mall.WebApi/Controllers/User/UserController.cs
+68
-39
Mall.WebApi.csproj
Mall.WebApi/Mall.WebApi.csproj
+1
-0
No files found.
Mall.Common/Enum/MallBase/ChargeModeEnum.cs
0 → 100644
View file @
22dcedbd
using
Mall.Common.Plugin
;
using
System
;
using
System.Collections.Generic
;
using
System.Text
;
namespace
Mall.Common.Enum.MallBase
{
public
enum
ChargeModeEnum
{
/// <summary>
/// 按重计费
/// </summary>
[
EnumField
(
"按重计费"
)]
Weight
=
1
,
/// <summary>
/// 按件计费
/// </summary>
[
EnumField
(
"按件计费"
)]
Num
=
2
}
}
Mall.Common/Enum/MarketingCenter/PlatformTypeEnum.cs
0 → 100644
View file @
22dcedbd
using
Mall.Common.Plugin
;
using
System
;
using
System.Collections.Generic
;
using
System.Text
;
namespace
Mall.Common.Enum.MarketingCenter
{
public
enum
PlatformTypeEnum
{
/// <summary>
/// 微信
/// </summary>
[
EnumField
(
"微信"
)]
WeChat
=
1
,
/// <summary>
/// 支付宝
/// </summary>
[
EnumField
(
"支付宝"
)]
Alipay
=
2
,
/// <summary>
/// 抖音/头条
/// </summary>
[
EnumField
(
"抖音/头条"
)]
TrillOrHeadline
=
3
,
/// <summary>
/// 百度
/// </summary>
[
EnumField
(
"百度"
)]
Baidu
=
2
,
}
}
Mall.Common/Enum/MarketingCenter/RecordTypeEnum.cs
0 → 100644
View file @
22dcedbd
using
Mall.Common.Plugin
;
using
System
;
using
System.Collections.Generic
;
using
System.Text
;
namespace
Mall.Common.Enum.MarketingCenter
{
public
enum
RecordTypeEnum
{
/// <summary>
/// 收入
/// </summary>
[
EnumField
(
"+"
)]
Income
=
1
,
/// <summary>
/// 支出
/// </summary>
[
EnumField
(
"-"
)]
Expend
=
2
,
}
}
Mall.Model/Entity/BaseSetUp/RB_Logistics_Rules.cs
View file @
22dcedbd
...
...
@@ -38,7 +38,7 @@ namespace Mall.Model.Entity.BaseSetUp
/// <summary>
/// 计费方式
/// </summary>
public
int
ChargeMode
{
get
;
set
;
}
public
ChargeModeEnum
ChargeMode
{
get
;
set
;
}
public
int
Status
{
get
;
set
;
}
...
...
Mall.Model/Entity/MarketingCenter/RB_Integral_Settings.cs
0 → 100644
View file @
22dcedbd
using
Mall.Common.AOP
;
using
System
;
using
System.Collections.Generic
;
using
System.Text
;
namespace
Mall.Model.Entity.MarketingCenter
{
/// <summary>
/// 积分设置
/// </summary>
[
Serializable
]
[
DB
(
ConnectionName
=
"DefaultConnection"
)]
public
class
RB_Integral_Settings
{
public
int
ID
{
get
;
set
;
}
/// <summary>
/// 商户id
/// </summary>
public
int
TenantId
{
get
;
set
;
}
/// <summary>
/// 小程序id
/// </summary>
public
int
MallBaseId
{
get
;
set
;
}
public
int
Status
{
get
;
set
;
}
public
DateTime
CreateDate
{
get
;
set
;
}
public
DateTime
UpdateDate
{
get
;
set
;
}
/// <summary>
/// 用户积分使用规则
/// </summary>
public
string
Explain
{
get
;
set
;
}
/// <summary>
/// 用户积分
/// </summary>
public
int
IntegralNum
{
get
;
set
;
}
}
}
Mall.Model/Entity/MarketingCenter/RB_Recharge_Settings.cs
0 → 100644
View file @
22dcedbd
using
Mall.Common.AOP
;
using
System
;
using
System.Collections.Generic
;
using
System.Text
;
namespace
Mall.Model.Entity.MarketingCenter
{
/// <summary>
/// 充值设置
/// </summary>
[
Serializable
]
[
DB
(
ConnectionName
=
"DefaultConnection"
)]
public
class
RB_Recharge_Settings
{
public
int
ID
{
get
;
set
;
}
/// <summary>
/// 商户id
/// </summary>
public
int
TenantId
{
get
;
set
;
}
/// <summary>
/// 小程序id
/// </summary>
public
int
MallBaseId
{
get
;
set
;
}
public
int
Status
{
get
;
set
;
}
public
DateTime
CreateDate
{
get
;
set
;
}
public
DateTime
UpdateDate
{
get
;
set
;
}
/// <summary>
/// 开启余额功能0-否,1-是
/// </summary>
public
int
IsOpenBalance
{
get
;
set
;
}
/// <summary>
/// 是否开放自定义金额,0-否,1-是
/// </summary>
public
int
IsExploitMoney
{
get
;
set
;
}
/// <summary>
/// 背景图片
/// </summary>
public
string
BackImg
{
get
;
set
;
}
/// <summary>
/// 广告图片
/// </summary>
public
string
AdvertisingImg
{
get
;
set
;
}
/// <summary>
/// 广告图片跳转链接
/// </summary>
public
string
AdvertisingLink
{
get
;
set
;
}
/// <summary>
/// 充值说明图标
/// </summary>
public
string
ExplainIco
{
get
;
set
;
}
/// <summary>
/// 充值说明
/// </summary>
public
string
Explain
{
get
;
set
;
}
}
}
Mall.Model/Entity/User/RB_Member_Balance.cs
View file @
22dcedbd
using
Mall.Common.AOP
;
using
Mall.Common.Enum.MarketingCenter
;
using
Mall.Common.Enum.User
;
using
System
;
using
System.Collections.Generic
;
...
...
@@ -29,7 +30,7 @@ namespace Mall.Model.Entity.User
/// <summary>
/// 类型 1增加 2减少
/// </summary>
public
int
?
Type
public
RecordTypeEnum
?
Type
{
get
;
set
;
...
...
@@ -82,5 +83,10 @@ namespace Mall.Model.Entity.User
get
;
set
;
}
/// <summary>
/// 备注
/// </summary>
public
string
Remarks
{
get
;
set
;
}
}
}
Mall.Model/Entity/User/RB_Member_Integral.cs
View file @
22dcedbd
using
Mall.Common.AOP
;
using
Mall.Common.Enum.MarketingCenter
;
using
Mall.Common.Enum.User
;
using
System
;
using
System.Collections.Generic
;
...
...
@@ -29,11 +30,18 @@ namespace Mall.Model.Entity.User
/// <summary>
/// 类型 1增加 2减少
/// </summary>
public
int
?
Type
public
RecordTypeEnum
?
Type
{
get
;
set
;
}
/// <summary>
/// 平台类型
/// </summary>
public
PlatformTypeEnum
?
PlatformType
{
get
;
set
;
}
/// <summary>
/// 积分
/// </summary>
...
...
@@ -82,5 +90,9 @@ namespace Mall.Model.Entity.User
get
;
set
;
}
/// <summary>
/// 备注
/// </summary>
public
string
Remarks
{
get
;
set
;
}
}
}
Mall.Model/Entity/User/RB_Miniprogram_Bottomnav.cs
View file @
22dcedbd
...
...
@@ -101,5 +101,10 @@ namespace Mall.Model.Entity.User
get
;
set
;
}
/// <summary>
/// 排序
/// </summary>
public
int
TagSort
{
get
;
set
;
}
}
}
Mall.Model/Extend/User/RB_Member_Balance_Extend.cs
View file @
22dcedbd
...
...
@@ -13,6 +13,19 @@ namespace Mall.Model.Extend.User
[
DB
(
ConnectionName
=
"DefaultConnection"
)]
public
class
RB_Member_Balance_Extend
:
RB_Member_Balance
{
/// <summary>
/// 会员名称
/// </summary>
public
string
MemberName
{
get
;
set
;
}
/// <summary>
/// 开始时间【查询使用】
/// </summary>
public
string
StartDate
{
get
;
set
;
}
/// <summary>
/// 结束时间【查询使用】
/// </summary>
public
string
EndDate
{
get
;
set
;
}
}
}
Mall.Model/Extend/User/RB_Member_Integral_Extend.cs
View file @
22dcedbd
...
...
@@ -13,6 +13,19 @@ namespace Mall.Model.Extend.User
[
DB
(
ConnectionName
=
"DefaultConnection"
)]
public
class
RB_Member_Integral_Extend
:
RB_Member_Integral
{
/// <summary>
/// 会员名称
/// </summary>
public
string
MemberName
{
get
;
set
;
}
/// <summary>
/// 开始时间【查询使用】
/// </summary>
public
string
StartDate
{
get
;
set
;
}
/// <summary>
/// 结束时间【查询使用】
/// </summary>
public
string
EndDate
{
get
;
set
;
}
}
}
Mall.Model/Extend/User/RB_Miniprogram_Bottomnav_Extend.cs
View file @
22dcedbd
...
...
@@ -12,6 +12,9 @@ namespace Mall.Model.Extend.User
[
DB
(
ConnectionName
=
"DefaultConnection"
)]
public
class
RB_Miniprogram_Bottomnav_Extend
:
Model
.
Entity
.
User
.
RB_Miniprogram_Bottomnav
{
/// <summary>
/// 标签是否激活状态【前端使用】
/// </summary>
public
bool
IsActive
{
get
;
set
;
}
}
}
Mall.Model/Query/Integral_Query.cs
0 → 100644
View file @
22dcedbd
using
Mall.Common.AOP
;
using
System
;
using
System.Collections.Generic
;
using
System.Text
;
namespace
Mall.Model.Query
{
[
Serializable
]
[
DB
(
ConnectionName
=
"DefaultConnection"
)]
public
class
Integral_Query
{
public
int
TenantId
{
get
;
set
;
}
public
int
MallBaseId
{
get
;
set
;
}
public
int
PlatformType
{
get
;
set
;
}
public
string
CreateDate
{
get
;
set
;
}
public
string
Income
{
get
;
set
;
}
public
string
Expend
{
get
;
set
;
}
/// <summary>
/// 开始时间【查询使用】
/// </summary>
public
string
StartDate
{
get
;
set
;
}
/// <summary>
/// 结束时间【查询使用】
/// </summary>
public
string
EndDate
{
get
;
set
;
}
}
}
Mall.Module.MarketingCenter/IntegralModule.cs
0 → 100644
View file @
22dcedbd
using
Mall.Model.Entity.MarketingCenter
;
using
Mall.Model.Extend.MarketingCenter
;
using
Mall.Model.Extend.User
;
using
Mall.Model.Query
;
using
Mall.Repository.MarketingCenter
;
using
Mall.Repository.User
;
using
System
;
using
System.Collections.Generic
;
using
System.Text
;
namespace
Mall.Module.MarketingCenter
{
public
class
IntegralModule
{
private
RB_Integral_SettingsRepository
settingsRepository
=
new
RB_Integral_SettingsRepository
();
private
RB_Member_IntegralRepository
recordRepository
=
new
RB_Member_IntegralRepository
();
#
region
积分设置
/// <summary>
/// 积分设置列表
/// </summary>
/// <param name="query">查询条件</param>
/// <returns></returns>
public
List
<
RB_Integral_Settings
>
GetIntegralSettingsList
(
RB_Integral_Settings
query
)
{
return
settingsRepository
.
GetIntegralSettingsList
(
query
);
}
/// <summary>
/// 新增修改积分
/// </summary>
/// <param name="model"></param>
/// <returns></returns>
public
bool
AddOrUpdateIntegralSettings
(
RB_Integral_Settings
model
)
{
if
(
model
.
ID
==
0
)
{
return
settingsRepository
.
Insert
(
model
)
>
0
;
}
else
{
return
settingsRepository
.
Update
(
model
);
}
}
#
endregion
#
region
积分记录
/// <summary>
/// 积分记录列表
/// </summary>
/// <param name="pageIndex">页码</param>
/// <param name="pageSize">每页显示条数</param>
/// <param name="rowCount">总条数</param>
/// <param name="query">查询条件</param>
/// <returns></returns>
public
List
<
RB_Member_Integral_Extend
>
GetRechargeRecordPageList
(
int
pageIndex
,
int
pageSize
,
out
long
rowCount
,
RB_Member_Integral_Extend
query
)
{
return
recordRepository
.
GetRechargeRecordPageList
(
pageIndex
,
pageSize
,
out
rowCount
,
query
);
}
/// <summary>
/// 数据统计-积分收支
/// </summary>
/// <param name="pageIndex">页码</param>
/// <param name="pageSize">每页显示条数</param>
/// <param name="rowCount">总条数</param>
/// <param name="query">查询条件</param>
/// <returns></returns>
public
List
<
Integral_Query
>
GetIntegraStatisticslList
(
int
pageIndex
,
int
pageSize
,
out
long
rowCount
,
Integral_Query
query
)
{
return
recordRepository
.
GetIntegraStatisticslList
(
pageIndex
,
pageSize
,
out
rowCount
,
query
);
}
/// <summary>
/// 获取列表
/// </summary>
/// <param name="dmodel"></param>
/// <returns></returns>
public
List
<
RB_Member_Integral_Extend
>
GetTotalIntegral
(
RB_Member_Integral_Extend
dmodel
)
{
return
recordRepository
.
GetList
(
dmodel
);
}
#
endregion
}
}
Mall.Module.MarketingCenter/Mall.Module.MarketingCenter.csproj
View file @
22dcedbd
<Project Sdk="Microsoft.NET.Sdk">
<PropertyGroup>
<TargetFramework>netcoreapp3.
1
</TargetFramework>
<TargetFramework>netcoreapp3.
0
</TargetFramework>
</PropertyGroup>
<ItemGroup>
<ProjectReference Include="..\Mall.Common\Mall.Common.csproj" />
<ProjectReference Include="..\Mall.Model\Mall.Model.csproj" />
<ProjectReference Include="..\Mall.Repository\Mall.Repository.csproj" />
</ItemGroup>
...
...
Mall.Module.MarketingCenter/RechargeModule.cs
View file @
22dcedbd
using
Mall.Model.Extend.MarketingCenter
;
using
Mall.Common.Plugin
;
using
Mall.Model.Entity.MarketingCenter
;
using
Mall.Model.Extend.MarketingCenter
;
using
Mall.Model.Extend.User
;
using
Mall.Repository
;
using
Mall.Repository.MarketingCenter
;
using
Mall.Repository.User
;
using
System
;
using
System.Collections.Generic
;
using
System.Text
;
...
...
@@ -11,7 +16,9 @@ namespace Mall.Module.MarketingCenter
private
RB_Recharge_RulesRepository
rulesRepository
=
new
RB_Recharge_RulesRepository
();
#
region
充值信息
private
RB_Member_BalanceRepository
balanceRepository
=
new
RB_Member_BalanceRepository
();
private
RB_Recharge_SettingsRepository
settingsRepository
=
new
RB_Recharge_SettingsRepository
();
#
region
充值规则信息
/// <summary>
/// 充值信息列表
/// </summary>
...
...
@@ -49,7 +56,91 @@ namespace Mall.Module.MarketingCenter
}
}
/// <summary>
/// 删除充值方案
/// </summary>
/// <param name="gradeId"></param>
/// <param name="uid"></param>
/// <returns></returns>
public
bool
DelRechargeRules
(
int
id
,
int
uid
,
int
mallBaseId
)
{
try
{
Dictionary
<
string
,
object
>
cols
=
new
Dictionary
<
string
,
object
>()
{
{
nameof
(
RB_Recharge_Rules
.
Status
),
1
},
{
nameof
(
RB_Recharge_Rules
.
UpdateDate
),
DateTime
.
Now
},
};
List
<
WhereHelper
>
wheres1
=
new
List
<
WhereHelper
>()
{
new
WhereHelper
(){
FiledName
=
nameof
(
RB_Recharge_Rules
.
ID
),
FiledValue
=
id
,
OperatorEnum
=
OperatorEnum
.
Equal
},
new
WhereHelper
(){
FiledName
=
nameof
(
RB_Recharge_Rules
.
TenantId
),
FiledValue
=
Convert
.
ToInt32
(
uid
),
OperatorEnum
=
OperatorEnum
.
Equal
},
new
WhereHelper
(){
FiledName
=
nameof
(
RB_Recharge_Rules
.
MallBaseId
),
FiledValue
=
Convert
.
ToInt32
(
mallBaseId
),
OperatorEnum
=
OperatorEnum
.
Equal
}
};
return
rulesRepository
.
Update
(
cols
,
wheres1
);
}
catch
(
Exception
ex
)
{
LogHelper
.
Write
(
ex
,
"DelRechargeRules"
);
return
false
;
}
}
#
endregion
#
region
充值设置
/// <summary>
/// 充值设置列表
/// </summary>
/// <param name="query">查询条件</param>
/// <returns></returns>
public
List
<
RB_Recharge_Settings
>
GetRechargeSettingsList
(
RB_Recharge_Settings
query
)
{
return
settingsRepository
.
GetRechargeSettingsList
(
query
);
}
public
bool
AddOrUpdateRechargeSettings
(
RB_Recharge_Settings
model
)
{
if
(
model
.
ID
==
0
)
{
return
settingsRepository
.
Insert
(
model
)
>
0
;
}
else
{
return
settingsRepository
.
Update
(
model
);
}
}
#
endregion
#
region
余额收支
/// <summary>
/// 营销中心-余额收支
/// </summary>
/// <param name="pageIndex">页码</param>
/// <param name="pageSize">每页显示条数</param>
/// <param name="rowCount">总条数</param>
/// <param name="query">查询条件</param>
/// <returns></returns>
public
List
<
RB_Member_Balance_Extend
>
GetMemberBalancePageList
(
int
pageIndex
,
int
pageSize
,
out
long
rowCount
,
RB_Member_Balance_Extend
query
)
{
return
balanceRepository
.
GetMemberBalancePageList
(
pageIndex
,
pageSize
,
out
rowCount
,
query
);
}
#
endregion
}
}
Mall.Module.User/MiniProgramModule.cs
View file @
22dcedbd
...
...
@@ -3,6 +3,7 @@ using System.Collections.Generic;
using
System.Text
;
using
Mall.Model.Extend.User
;
using
Mall.Repository
;
using
System.Linq
;
namespace
Mall.Module.User
{
...
...
@@ -187,14 +188,23 @@ namespace Mall.Module.User
/// 根据编号获取小程序信息
/// </summary>
/// <param name="MallBaseId">小程序Id</param>
/// <param name="isGetNav">是否获取顶部底部配置+底部标签导航(0-不获取,1-获取)</param>
/// <returns></returns>
public
RB_MiniProgram_Extend
GetMiniProgramModule
(
object
MallBaseId
)
public
RB_MiniProgram_Extend
GetMiniProgramModule
(
object
MallBaseId
,
int
isGetNav
=
0
)
{
RB_MiniProgram_Extend
extModel
=
programRepository
.
GetEntity
<
RB_MiniProgram_Extend
>(
MallBaseId
);
if
(
extModel
==
null
)
{
extModel
=
new
RB_MiniProgram_Extend
();
}
if
(
isGetNav
==
1
)
{
extModel
.
BottomTagList
=
bottomnavRepository
.
GetListRepository
(
new
RB_Miniprogram_Bottomnav_Extend
()
{
MallBaseId
=
extModel
.
MallBaseId
});
if
(
extModel
.
BottomTagList
!=
null
&&
extModel
.
BottomTagList
.
Count
>
0
)
{
extModel
.
BottomTagList
.
FirstOrDefault
().
IsActive
=
true
;
}
}
return
extModel
;
}
...
...
@@ -234,7 +244,7 @@ namespace Mall.Module.User
return
flag
;
}
/// <summary>
/// 删除小程序底部导航
...
...
@@ -248,7 +258,7 @@ namespace Mall.Module.User
{
{
nameof
(
RB_Miniprogram_Bottomnav_Extend
.
Status
),
1
},
};
flag
=
program
Repository
.
Update
(
fileds
,
new
WhereHelper
(
nameof
(
RB_Miniprogram_Bottomnav_Extend
.
TagId
),
TagId
));
flag
=
bottomnav
Repository
.
Update
(
fileds
,
new
WhereHelper
(
nameof
(
RB_Miniprogram_Bottomnav_Extend
.
TagId
),
TagId
));
return
flag
;
}
}
...
...
Mall.Module.User/UserModule.cs
View file @
22dcedbd
This diff is collapsed.
Click to expand it.
Mall.Repository/MarketingCenter/RB_Integral_SettingsRepository.cs
0 → 100644
View file @
22dcedbd
using
Mall.Model.Entity.MarketingCenter
;
using
System
;
using
System.Collections.Generic
;
using
System.Linq
;
using
System.Text
;
namespace
Mall.Repository.MarketingCenter
{
/// <summary>
/// 积分设置
/// </summary>
public
class
RB_Integral_SettingsRepository
:
RepositoryBase
<
RB_Integral_Settings
>
{
/// <summary>
/// 表名称
/// </summary>
public
string
TableName
{
get
{
return
nameof
(
RB_Integral_Settings
);
}
}
/// <summary>
/// 积分设置列表
/// </summary>
/// <param name="query">查询条件</param>
/// <returns></returns>
public
List
<
RB_Integral_Settings
>
GetIntegralSettingsList
(
RB_Integral_Settings
query
)
{
StringBuilder
builder
=
new
StringBuilder
();
builder
.
Append
(
$" SELECT * FROM
{
TableName
}
WHERE
{
nameof
(
RB_Integral_Settings
.
Status
)}
=0 "
);
if
(
query
!=
null
)
{
if
(
query
.
ID
>
0
)
{
builder
.
Append
(
$" AND
{
nameof
(
RB_Integral_Settings
.
ID
)}
=
{
query
.
ID
}
"
);
}
if
(
query
.
TenantId
>
0
)
{
builder
.
Append
(
$" AND
{
nameof
(
RB_Integral_Settings
.
TenantId
)}
=
{
query
.
TenantId
}
"
);
}
if
(
query
.
TenantId
>
0
)
{
builder
.
Append
(
$" AND
{
nameof
(
RB_Integral_Settings
.
MallBaseId
)}
=
{
query
.
MallBaseId
}
"
);
}
}
return
Get
<
RB_Integral_Settings
>(
builder
.
ToString
()).
ToList
();
}
}
}
Mall.Repository/MarketingCenter/RB_Recharge_SettingsRepository.cs
0 → 100644
View file @
22dcedbd
using
Mall.Model.Entity.MarketingCenter
;
using
System
;
using
System.Collections.Generic
;
using
System.Linq
;
using
System.Text
;
namespace
Mall.Repository.MarketingCenter
{
/// <summary>
/// 充值设置仓储层
/// </summary>
public
class
RB_Recharge_SettingsRepository
:
RepositoryBase
<
RB_Recharge_Settings
>
{
/// <summary>
/// 表名称
/// </summary>
public
string
TableName
{
get
{
return
nameof
(
RB_Recharge_Settings
);
}
}
/// <summary>
/// 充值设置列表
/// </summary>
/// <param name="query">查询条件</param>
/// <returns></returns>
public
List
<
RB_Recharge_Settings
>
GetRechargeSettingsList
(
RB_Recharge_Settings
query
)
{
StringBuilder
builder
=
new
StringBuilder
();
builder
.
Append
(
$" SELECT * FROM
{
TableName
}
WHERE
{
nameof
(
RB_Recharge_Settings
.
Status
)}
=0 "
);
if
(
query
!=
null
)
{
if
(
query
.
ID
>
0
)
{
builder
.
Append
(
$" AND
{
nameof
(
RB_Recharge_Settings
.
ID
)}
=
{
query
.
ID
}
"
);
}
if
(
query
.
TenantId
>
0
)
{
builder
.
Append
(
$" AND
{
nameof
(
RB_Recharge_Settings
.
TenantId
)}
=
{
query
.
TenantId
}
"
);
}
if
(
query
.
TenantId
>
0
)
{
builder
.
Append
(
$" AND
{
nameof
(
RB_Recharge_Settings
.
MallBaseId
)}
=
{
query
.
MallBaseId
}
"
);
}
}
return
Get
<
RB_Recharge_Settings
>(
builder
.
ToString
()).
ToList
();
}
}
}
Mall.Repository/User/RB_Member_BalanceRepository.cs
View file @
22dcedbd
...
...
@@ -12,7 +12,11 @@ namespace Mall.Repository.User
/// </summary>
public
class
RB_Member_BalanceRepository
:
RepositoryBase
<
RB_Member_Balance
>
{
public
string
MemberTableName
{
get
{
return
nameof
(
RB_Member_User
);
}
}
/// <summary>
/// 表名称
/// </summary>
public
string
TableName
{
get
{
return
nameof
(
RB_Member_Balance
);
}
}
/// <summary>
/// 分页列表
/// </summary>
...
...
@@ -76,5 +80,48 @@ namespace Mall.Repository.User
string
sql
=
$@"select * from RB_Member_Balance where
{
where
}
order by Id desc"
;
return
Get
<
RB_Member_Balance_Extend
>(
sql
).
ToList
();
}
/// <summary>
/// 营销中心-余额收支
/// </summary>
/// <param name="pageIndex">页码</param>
/// <param name="pageSize">每页显示条数</param>
/// <param name="rowCount">总条数</param>
/// <param name="query">查询条件</param>
/// <returns></returns>
public
List
<
RB_Member_Balance_Extend
>
GetMemberBalancePageList
(
int
pageIndex
,
int
pageSize
,
out
long
rowCount
,
RB_Member_Balance_Extend
query
)
{
StringBuilder
builder
=
new
StringBuilder
();
builder
.
Append
(
$" SELECT a.*,b.`Name` as MemberName FROM
{
TableName
}
as a LEFT JOIN
{
MemberTableName
}
as b on a.UserId = b.Id WHERE 1=1 "
);
if
(
query
!=
null
)
{
if
(
query
.
Id
>
0
)
{
builder
.
Append
(
$" AND a.
{
nameof
(
RB_Member_Balance_Extend
.
Id
)}
=
{
query
.
Id
}
"
);
}
if
(
query
.
TenantId
>
0
)
{
builder
.
Append
(
$" AND a.
{
nameof
(
RB_Member_Balance_Extend
.
TenantId
)}
=
{
query
.
TenantId
}
"
);
}
if
(
query
.
TenantId
>
0
)
{
builder
.
Append
(
$" AND a.
{
nameof
(
RB_Member_Balance_Extend
.
MallBaseId
)}
=
{
query
.
MallBaseId
}
"
);
}
if
(!
string
.
IsNullOrWhiteSpace
(
query
.
MemberName
))
{
builder
.
Append
(
$" AND b.
{
nameof
(
RB_Member_Balance_Extend
.
MemberName
)}
like '%
{
query
.
MemberName
}
%'"
);
}
if
(!
string
.
IsNullOrWhiteSpace
(
query
.
StartDate
))
{
builder
.
Append
(
$" AND DATE_FORMAT(a.
{
nameof
(
RB_Member_Balance_Extend
.
CreateDate
)}
,'%Y-%m-%d' )>= DATE_FORMAT('
{
nameof
(
RB_Member_Balance_Extend
.
StartDate
)}
','%Y-%m-%d' )"
);
}
if
(!
string
.
IsNullOrWhiteSpace
(
query
.
EndDate
))
{
builder
.
Append
(
$" AND DATE_FORMAT(a.
{
nameof
(
RB_Member_Balance_Extend
.
CreateDate
)}
,'%Y-%m-%d' )<= DATE_FORMAT('
{
nameof
(
RB_Member_Balance_Extend
.
EndDate
)}
','%Y-%m-%d' )"
);
}
}
return
GetPage
<
RB_Member_Balance_Extend
>(
pageIndex
,
pageSize
,
out
rowCount
,
builder
.
ToString
()).
ToList
();
}
}
}
Mall.Repository/User/RB_Member_IntegralRepository.cs
View file @
22dcedbd
...
...
@@ -4,6 +4,7 @@ using System.Text;
using
Mall.Model.Entity.User
;
using
Mall.Model.Extend.User
;
using
System.Linq
;
using
Mall.Model.Query
;
namespace
Mall.Repository.User
{
...
...
@@ -12,7 +13,11 @@ namespace Mall.Repository.User
/// </summary>
public
class
RB_Member_IntegralRepository
:
RepositoryBase
<
RB_Member_Integral
>
{
public
string
MemberTableName
{
get
{
return
nameof
(
RB_Member_User
);
}
}
/// <summary>
/// 表名称
/// </summary>
public
string
TableName
{
get
{
return
nameof
(
RB_Member_Integral
);
}
}
/// <summary>
/// 分页列表
/// </summary>
...
...
@@ -24,19 +29,24 @@ namespace Mall.Repository.User
public
List
<
RB_Member_Integral_Extend
>
GetPageList
(
int
pageIndex
,
int
pageSize
,
out
long
rowCount
,
RB_Member_Integral_Extend
dmodel
)
{
string
where
=
" 1=1 "
;
if
(
dmodel
.
TenantId
>
0
)
{
if
(
dmodel
.
TenantId
>
0
)
{
where
+=
$@" and
{
nameof
(
RB_Member_Integral
.
TenantId
)}
=
{
dmodel
.
TenantId
}
"
;
}
if
(
dmodel
.
MallBaseId
>
0
)
{
if
(
dmodel
.
MallBaseId
>
0
)
{
where
+=
$@" and
{
nameof
(
RB_Member_Integral
.
MallBaseId
)}
=
{
dmodel
.
MallBaseId
}
"
;
}
if
(
dmodel
.
Id
>
0
)
{
if
(
dmodel
.
Id
>
0
)
{
where
+=
$@" and
{
nameof
(
RB_Member_Integral
.
Id
)}
=
{
dmodel
.
Id
}
"
;
}
if
(
dmodel
.
Type
>
0
)
{
if
(
dmodel
.
Type
>
0
)
{
where
+=
$@" and
{
nameof
(
RB_Member_Integral
.
Type
)}
=
{
dmodel
.
Type
}
"
;
}
if
(
dmodel
.
UserId
>
0
)
{
if
(
dmodel
.
UserId
>
0
)
{
where
+=
$@" and
{
nameof
(
RB_Member_Integral
.
UserId
)}
=
{
dmodel
.
UserId
}
"
;
}
...
...
@@ -68,6 +78,10 @@ namespace Mall.Repository.User
{
where
+=
$@" and
{
nameof
(
RB_Member_Integral
.
Type
)}
=
{
dmodel
.
Type
}
"
;
}
if
(
dmodel
.
PlatformType
!=
null
&&
(
int
)
dmodel
.
PlatformType
>
0
)
{
where
+=
$@" and
{
nameof
(
RB_Member_Integral
.
PlatformType
)}
=
{
dmodel
.
PlatformType
}
"
;
}
if
(
dmodel
.
UserId
>
0
)
{
where
+=
$@" and
{
nameof
(
RB_Member_Integral
.
UserId
)}
=
{
dmodel
.
UserId
}
"
;
...
...
@@ -76,5 +90,89 @@ namespace Mall.Repository.User
string
sql
=
$@"select * from RB_Member_Integral where
{
where
}
order by Id desc"
;
return
Get
<
RB_Member_Integral_Extend
>(
sql
).
ToList
();
}
/// <summary>
/// 营销中心-积分记录
/// </summary>
/// <param name="pageIndex">页码</param>
/// <param name="pageSize">每页显示条数</param>
/// <param name="rowCount">总条数</param>
/// <param name="query">查询条件</param>
/// <returns></returns>
public
List
<
RB_Member_Integral_Extend
>
GetRechargeRecordPageList
(
int
pageIndex
,
int
pageSize
,
out
long
rowCount
,
RB_Member_Integral_Extend
query
)
{
StringBuilder
builder
=
new
StringBuilder
();
builder
.
Append
(
$" SELECT a.*,b.`Name` as MemberName FROM
{
TableName
}
as a LEFT JOIN
{
MemberTableName
}
as b on a.UserId = b.Id WHERE 1=1 "
);
if
(
query
!=
null
)
{
if
(
query
.
Id
>
0
)
{
builder
.
Append
(
$" AND a.
{
nameof
(
RB_Member_Integral_Extend
.
Id
)}
=
{
query
.
Id
}
"
);
}
if
(
query
.
TenantId
>
0
)
{
builder
.
Append
(
$" AND a.
{
nameof
(
RB_Member_Integral_Extend
.
TenantId
)}
=
{
query
.
TenantId
}
"
);
}
if
(
query
.
TenantId
>
0
)
{
builder
.
Append
(
$" AND a.
{
nameof
(
RB_Member_Integral_Extend
.
MallBaseId
)}
=
{
query
.
MallBaseId
}
"
);
}
if
(!
string
.
IsNullOrWhiteSpace
(
query
.
MemberName
))
{
builder
.
Append
(
$" AND b.
{
nameof
(
RB_Member_Integral_Extend
.
MemberName
)}
like '%
{
query
.
MemberName
}
%'"
);
}
if
(!
string
.
IsNullOrWhiteSpace
(
query
.
StartDate
))
{
builder
.
Append
(
$" AND DATE_FORMAT(a.
{
nameof
(
RB_Member_Integral_Extend
.
CreateDate
)}
,'%Y-%m-%d' )>= DATE_FORMAT('
{
nameof
(
RB_Member_Integral_Extend
.
StartDate
)}
','%Y-%m-%d' )"
);
}
if
(!
string
.
IsNullOrWhiteSpace
(
query
.
EndDate
))
{
builder
.
Append
(
$" AND DATE_FORMAT(a.
{
nameof
(
RB_Member_Integral_Extend
.
CreateDate
)}
,'%Y-%m-%d' )<= DATE_FORMAT('
{
nameof
(
RB_Member_Integral_Extend
.
EndDate
)}
','%Y-%m-%d' )"
);
}
}
return
GetPage
<
RB_Member_Integral_Extend
>(
pageIndex
,
pageSize
,
out
rowCount
,
builder
.
ToString
()).
ToList
();
}
/// <summary>
/// 数据统计-积分收支
/// </summary>
/// <param name="pageIndex">页码</param>
/// <param name="pageSize">每页显示条数</param>
/// <param name="rowCount">总条数</param>
/// <param name="query">查询条件</param>
/// <returns></returns>
public
List
<
Integral_Query
>
GetIntegraStatisticslList
(
int
pageIndex
,
int
pageSize
,
out
long
rowCount
,
Integral_Query
query
)
{
StringBuilder
builder
=
new
StringBuilder
();
if
(
query
!=
null
)
{
if
(
query
.
TenantId
>
0
)
{
builder
.
Append
(
$" AND
{
nameof
(
RB_Member_Integral_Extend
.
TenantId
)}
=
{
query
.
TenantId
}
"
);
}
if
(
query
.
TenantId
>
0
)
{
builder
.
Append
(
$" AND
{
nameof
(
RB_Member_Integral_Extend
.
MallBaseId
)}
=
{
query
.
MallBaseId
}
"
);
}
if
(
query
.
PlatformType
>
0
)
{
builder
.
Append
(
$" AND
{
nameof
(
RB_Member_Integral_Extend
.
PlatformType
)}
=
{
query
.
PlatformType
}
"
);
}
if
(!
string
.
IsNullOrWhiteSpace
(
query
.
StartDate
))
{
builder
.
Append
(
$" AND DATE_FORMAT(
{
nameof
(
RB_Member_Integral_Extend
.
CreateDate
)}
,'%Y-%m-%d' )>= DATE_FORMAT('
{
nameof
(
RB_Member_Integral_Extend
.
StartDate
)}
','%Y-%m-%d' )"
);
}
if
(!
string
.
IsNullOrWhiteSpace
(
query
.
EndDate
))
{
builder
.
Append
(
$" AND DATE_FORMAT(
{
nameof
(
RB_Member_Integral_Extend
.
CreateDate
)}
,'%Y-%m-%d' )<= DATE_FORMAT('
{
nameof
(
RB_Member_Integral_Extend
.
EndDate
)}
','%Y-%m-%d' )"
);
}
}
string
sql
=
@
$" SELECT CreateDate,SUM(Income) as Income, SUM(Expend) as Expend from (
select
DATE_FORMAT
(
CreateDate
,
'
%
Y
-%
m
-%
d
'
)
as
CreateDate
,
Integral
as
Income
,
0
as
Expend
from
rb_member_integral
where
Type
=
1
{
builder
.
ToString
()}
union
all
select
DATE_FORMAT
(
CreateDate
,
'
%
Y
-%
m
-%
d
'
)
as
CreateDate
,
0
as
Income
,
Integral
as
Expend
from
rb_member_integral
where
Type
=
2
{
builder
.
ToString
()}
)
as
t
GROUP
BY
CreateDate
";
return
GetPage
<
Integral_Query
>(
pageIndex
,
pageSize
,
out
rowCount
,
sql
).
ToList
();
}
}
}
Mall.Repository/User/RB_Miniprogram_BottomnavRepository.cs
View file @
22dcedbd
...
...
@@ -19,7 +19,7 @@ namespace Mall.Repository.User
public
List
<
RB_Miniprogram_Bottomnav_Extend
>
GetListRepository
(
RB_Miniprogram_Bottomnav_Extend
query
)
{
StringBuilder
builder
=
new
StringBuilder
();
builder
.
Append
(
" SELECT * FROM RB_Miniprogram_Bottomnav WHERE 1=1 "
);
builder
.
Append
(
" SELECT * FROM RB_Miniprogram_Bottomnav WHERE 1=1
AND Status=0
"
);
if
(
query
!=
null
)
{
if
(
query
.
TenantId
!=
null
&&
query
.
TenantId
>
0
)
...
...
@@ -31,37 +31,8 @@ namespace Mall.Repository.User
builder
.
AppendFormat
(
" AND MallBaseId={0} "
,
query
.
MallBaseId
);
}
}
builder
.
Append
(
" ORDER BY TagSort "
);
return
Get
<
RB_Miniprogram_Bottomnav_Extend
>(
builder
.
ToString
()).
ToList
();
}
/// <summary>
/// 获取小程序分页列表
/// </summary>
/// <param name="pageIndex">页码</param>
/// <param name="pageSize">每页显示条数</param>
/// <param name="rowCount">总条数</param>
/// <param name="query">查询条件</param>
/// <returns></returns>
public
List
<
RB_Miniprogram_Bottomnav_Extend
>
GetPageListRepository
(
int
pageIndex
,
int
pageSize
,
out
long
rowCount
,
RB_Miniprogram_Bottomnav_Extend
query
)
{
StringBuilder
builder
=
new
StringBuilder
();
builder
.
Append
(
@"
SELECT A.*,B.Account,B.MobilePhone
FROM RB_Miniprogram_Bottomnav AS A LEFT JOIN RB_Tenant AS B ON A.TenantId=B.TenantId
WHERE 1=1 "
);
if
(
query
!=
null
)
{
if
(
query
.
Status
>=
0
)
{
builder
.
AppendFormat
(
" AND A.Status={0} "
,
query
.
Status
);
}
if
(
query
.
TenantId
!=
null
&&
query
.
TenantId
>
0
)
{
builder
.
AppendFormat
(
" AND A.TenantId={0} "
,
query
.
TenantId
);
}
}
return
GetPage
<
RB_Miniprogram_Bottomnav_Extend
>(
pageIndex
,
pageSize
,
out
rowCount
,
builder
.
ToString
()).
ToList
();
}
}
}
Mall.WebApi/Controllers/MarketingCenter/IntegralController.cs
0 → 100644
View file @
22dcedbd
using
System
;
using
System.Collections.Generic
;
using
System.Linq
;
using
System.Threading.Tasks
;
using
Mall.Common.API
;
using
Mall.Model.Entity.MarketingCenter
;
using
Mall.Model.Extend.MarketingCenter
;
using
Mall.Model.Extend.User
;
using
Mall.Model.Query
;
using
Mall.Module.MarketingCenter
;
using
Mall.WebApi.Filter
;
using
Microsoft.AspNetCore.Cors
;
using
Microsoft.AspNetCore.Mvc
;
using
Newtonsoft.Json
;
namespace
Mall.WebApi.Controllers.MarketingCenter
{
[
Route
(
"api/[controller]/[action]"
)]
[
ApiExceptionFilter
]
[
ApiController
]
[
EnableCors
(
"AllowCors"
)]
public
class
IntegralController
:
BaseController
{
private
IntegralModule
IntegralModule
=
new
IntegralModule
();
#
region
积分设置
/// <summary>
/// 获取积分设置
/// </summary>
/// <returns></returns>
[
HttpPost
]
public
ApiResult
GetIntegralSettingsList
()
{
var
parms
=
RequestParm
;
var
query
=
JsonConvert
.
DeserializeObject
<
RB_Integral_Settings
>(
RequestParm
.
msg
.
ToString
());
query
.
TenantId
=
UserInfo
.
TenantId
;
query
.
MallBaseId
=
parms
.
MallBaseId
;
var
oldLogisticsModel
=
IntegralModule
.
GetIntegralSettingsList
(
query
).
FirstOrDefault
();
if
(
oldLogisticsModel
==
null
)
{
oldLogisticsModel
=
new
RB_Integral_Settings
();
}
return
ApiResult
.
Success
(
""
,
oldLogisticsModel
);
}
/// <summary>
/// 保存积分设置
/// </summary>
/// <returns></returns>
[
HttpPost
]
public
ApiResult
AddOrUpdateIntegralSettings
()
{
var
parms
=
RequestParm
;
var
query
=
JsonConvert
.
DeserializeObject
<
RB_Integral_Settings
>(
RequestParm
.
msg
.
ToString
());
query
.
TenantId
=
UserInfo
.
TenantId
;
query
.
MallBaseId
=
parms
.
MallBaseId
;
if
(
query
==
null
)
{
return
ApiResult
.
Failed
(
"请传入积分设置"
);
}
else
{
if
(
query
.
ID
==
0
)
{
query
.
CreateDate
=
System
.
DateTime
.
Now
;
}
query
.
UpdateDate
=
System
.
DateTime
.
Now
;
bool
result
=
IntegralModule
.
AddOrUpdateIntegralSettings
(
query
);
if
(
result
)
{
return
ApiResult
.
Success
(
"积分设置保存成功"
);
}
else
{
return
ApiResult
.
Failed
(
"积分设置保存失败"
);
}
}
}
#
endregion
#
region
积分记录
/// <summary>
/// 充值方案列表
/// </summary>
/// <returns></returns>
[
HttpPost
]
public
ApiResult
GetRechargeRulesPage
()
{
var
parms
=
RequestParm
;
ResultPageModel
pagelist
=
JsonConvert
.
DeserializeObject
<
ResultPageModel
>(
RequestParm
.
msg
.
ToString
());
RB_Member_Integral_Extend
demodel
=
JsonConvert
.
DeserializeObject
<
RB_Member_Integral_Extend
>(
RequestParm
.
msg
.
ToString
());
demodel
.
TenantId
=
UserInfo
.
TenantId
;
demodel
.
MallBaseId
=
parms
.
MallBaseId
;
var
list
=
IntegralModule
.
GetRechargeRecordPageList
(
pagelist
.
pageIndex
,
pagelist
.
pageSize
,
out
long
count
,
demodel
);
pagelist
.
count
=
Convert
.
ToInt32
(
count
);
pagelist
.
pageData
=
list
.
Select
(
x
=>
new
{
x
.
Id
,
CreateDate
=
x
.
CreateDate
.
Value
.
ToString
(
"yyyy-MM-dd HH:mm:ss"
),
x
.
MemberName
,
x
.
Integral
,
x
.
Description
,
x
.
Remarks
,
RecordTypeStr
=
Mall
.
Common
.
Plugin
.
EnumHelper
.
GetEnumName
(
x
.
Type
)
});
return
ApiResult
.
Success
(
""
,
pagelist
);
}
#
endregion
#
region
数据统计
-
积分收支
/// <summary>
/// 积分收支
/// </summary>
/// <returns></returns>
[
HttpPost
]
public
ApiResult
GetIntegraStatisticslList
()
{
var
parms
=
RequestParm
;
ResultPageModel
pagelist
=
JsonConvert
.
DeserializeObject
<
ResultPageModel
>(
RequestParm
.
msg
.
ToString
());
Integral_Query
demodel
=
JsonConvert
.
DeserializeObject
<
Integral_Query
>(
RequestParm
.
msg
.
ToString
());
demodel
.
TenantId
=
UserInfo
.
TenantId
;
demodel
.
MallBaseId
=
parms
.
MallBaseId
;
var
list
=
IntegralModule
.
GetIntegraStatisticslList
(
pagelist
.
pageIndex
,
pagelist
.
pageSize
,
out
long
count
,
demodel
);
pagelist
.
count
=
Convert
.
ToInt32
(
count
);
pagelist
.
pageData
=
list
.
Select
(
x
=>
new
{
x
.
CreateDate
,
x
.
Income
,
x
.
Expend
});
return
ApiResult
.
Success
(
""
,
pagelist
);
}
/// <summary>
/// 积分收支统计
/// </summary>
/// <returns></returns>
[
HttpPost
]
public
ApiResult
GetTotalIntegral
()
{
var
parms
=
RequestParm
;
RB_Member_Integral_Extend
demodel
=
JsonConvert
.
DeserializeObject
<
RB_Member_Integral_Extend
>(
RequestParm
.
msg
.
ToString
());
demodel
.
TenantId
=
UserInfo
.
TenantId
;
demodel
.
MallBaseId
=
parms
.
MallBaseId
;
var
list
=
IntegralModule
.
GetTotalIntegral
(
demodel
);
Integral_Query
model
=
new
Integral_Query
();
if
(
list
!=
null
&&
list
.
Any
())
{
model
.
Income
=
list
.
Where
(
x
=>
x
.
Type
==
Common
.
Enum
.
MarketingCenter
.
RecordTypeEnum
.
Income
).
Sum
(
x
=>
x
.
Integral
??
0
).
ToString
();
model
.
Expend
=
list
.
Where
(
x
=>
x
.
Type
==
Common
.
Enum
.
MarketingCenter
.
RecordTypeEnum
.
Expend
).
Sum
(
x
=>
x
.
Integral
??
0
).
ToString
();
}
return
ApiResult
.
Success
(
""
,
new
{
model
.
Income
,
model
.
Expend
});
}
#
endregion
}
}
\ No newline at end of file
Mall.WebApi/Controllers/MarketingCenter/RechargeController.cs
0 → 100644
View file @
22dcedbd
using
System
;
using
System.Collections.Generic
;
using
System.Linq
;
using
System.Threading.Tasks
;
using
Mall.Common.API
;
using
Mall.Common.Plugin
;
using
Mall.Model.Entity.MarketingCenter
;
using
Mall.Model.Extend.BaseSetUp
;
using
Mall.Model.Extend.MarketingCenter
;
using
Mall.Model.Extend.User
;
using
Mall.Module.MarketingCenter
;
using
Mall.WebApi.Filter
;
using
Microsoft.AspNetCore.Cors
;
using
Microsoft.AspNetCore.Mvc
;
using
Newtonsoft.Json
;
using
Newtonsoft.Json.Linq
;
namespace
Mall.WebApi.Controllers.MarketingCenter
{
[
Route
(
"api/[controller]/[action]"
)]
[
ApiExceptionFilter
]
[
ApiController
]
[
EnableCors
(
"AllowCors"
)]
public
class
RechargeController
:
BaseController
{
private
RechargeModule
rechargeModule
=
new
RechargeModule
();
#
region
充值规则设置
/// <summary>
/// 充值方案列表
/// </summary>
/// <returns></returns>
[
HttpPost
]
public
ApiResult
GetRechargeRulesPage
()
{
var
parms
=
RequestParm
;
ResultPageModel
pagelist
=
JsonConvert
.
DeserializeObject
<
ResultPageModel
>(
RequestParm
.
msg
.
ToString
());
RB_Recharge_Rules_Extend
demodel
=
JsonConvert
.
DeserializeObject
<
RB_Recharge_Rules_Extend
>(
RequestParm
.
msg
.
ToString
());
demodel
.
TenantId
=
UserInfo
.
TenantId
;
demodel
.
MallBaseId
=
parms
.
MallBaseId
;
var
list
=
rechargeModule
.
GetRechargeRulesPageList
(
pagelist
.
pageIndex
,
pagelist
.
pageSize
,
out
long
count
,
demodel
);
pagelist
.
count
=
Convert
.
ToInt32
(
count
);
pagelist
.
pageData
=
list
.
Select
(
x
=>
new
{
x
.
ID
,
CreateDate
=
x
.
CreateDate
.
ToString
(
"yyyy-MM-dd HH:mm:ss"
),
x
.
GiveIntegral
,
x
.
GiveMoney
,
x
.
Money
,
x
.
Name
});
return
ApiResult
.
Success
(
""
,
pagelist
);
}
/// <summary>
/// 获取详情
/// </summary>
/// <returns></returns>
public
ApiResult
GetRechargeRules
()
{
var
parms
=
RequestParm
;
var
query
=
JsonConvert
.
DeserializeObject
<
RB_Recharge_Rules_Extend
>(
RequestParm
.
msg
.
ToString
());
query
.
TenantId
=
UserInfo
.
TenantId
;
query
.
MallBaseId
=
parms
.
MallBaseId
;
var
oldLogisticsModel
=
rechargeModule
.
GetRechargeRulesList
(
query
).
FirstOrDefault
();
if
(
oldLogisticsModel
==
null
)
{
oldLogisticsModel
=
new
RB_Recharge_Rules_Extend
();
}
return
ApiResult
.
Success
(
""
,
oldLogisticsModel
);
}
/// <summary>
/// 保存充值方案
/// </summary>
/// <returns></returns>
public
ApiResult
AddOrUpdateRechargeRules
()
{
var
parms
=
RequestParm
;
var
query
=
JsonConvert
.
DeserializeObject
<
RB_Recharge_Rules_Extend
>(
RequestParm
.
msg
.
ToString
());
query
.
TenantId
=
UserInfo
.
TenantId
;
query
.
MallBaseId
=
parms
.
MallBaseId
;
if
(
query
==
null
)
{
return
ApiResult
.
Failed
(
"请传入充值方案"
);
}
else
{
if
(
string
.
IsNullOrWhiteSpace
(
query
.
Name
))
{
return
ApiResult
.
Failed
(
"请输入充值名称"
);
}
if
(
query
.
Money
==
0
)
{
return
ApiResult
.
Failed
(
"请输入充值金额"
);
}
if
(
query
.
ID
==
0
)
{
query
.
CreateDate
=
System
.
DateTime
.
Now
;
}
query
.
UpdateDate
=
System
.
DateTime
.
Now
;
bool
result
=
rechargeModule
.
AddOrUpdateRechargeRules
(
query
);
if
(
result
)
{
return
ApiResult
.
Success
(
"充值方案保存成功"
);
}
else
{
return
ApiResult
.
Failed
(
"充值方案保存失败"
);
}
}
}
/// <summary>
/// 删除充值方案
/// </summary>
/// <returns></returns>
[
HttpPost
]
public
ApiResult
DelRules
()
{
var
parms
=
RequestParm
;
JObject
parmsJob
=
JObject
.
Parse
(
RequestParm
.
msg
.
ToString
());
int
Id
=
parmsJob
.
GetInt
(
"Id"
,
0
);
if
(
Id
<=
0
)
{
return
ApiResult
.
Failed
(
"请传递参数"
);
}
bool
flag
=
rechargeModule
.
DelRechargeRules
(
Id
,
UserInfo
.
TenantId
,
parms
.
MallBaseId
);
if
(
flag
)
{
return
ApiResult
.
Success
();
}
else
{
return
ApiResult
.
Failed
();
}
}
#
endregion
#
region
充值设置
/// <summary>
/// 获取详情
/// </summary>
/// <returns></returns>
[
HttpPost
]
public
ApiResult
GetRechargeSettingsList
()
{
var
parms
=
RequestParm
;
var
query
=
JsonConvert
.
DeserializeObject
<
RB_Recharge_Settings
>(
RequestParm
.
msg
.
ToString
());
query
.
TenantId
=
UserInfo
.
TenantId
;
query
.
MallBaseId
=
parms
.
MallBaseId
;
var
oldLogisticsModel
=
rechargeModule
.
GetRechargeSettingsList
(
query
).
FirstOrDefault
();
if
(
oldLogisticsModel
==
null
)
{
oldLogisticsModel
=
new
RB_Recharge_Settings
();
}
return
ApiResult
.
Success
(
""
,
oldLogisticsModel
);
}
/// <summary>
/// 保存充值方案
/// </summary>
/// <returns></returns>
[
HttpPost
]
public
ApiResult
AddOrUpdateRechargeSettings
()
{
var
parms
=
RequestParm
;
var
query
=
JsonConvert
.
DeserializeObject
<
RB_Recharge_Settings
>(
RequestParm
.
msg
.
ToString
());
query
.
TenantId
=
UserInfo
.
TenantId
;
query
.
MallBaseId
=
parms
.
MallBaseId
;
if
(
query
==
null
)
{
return
ApiResult
.
Failed
(
"请传入充值设置"
);
}
else
{
if
(
query
.
ID
==
0
)
{
query
.
CreateDate
=
System
.
DateTime
.
Now
;
}
query
.
UpdateDate
=
System
.
DateTime
.
Now
;
bool
result
=
rechargeModule
.
AddOrUpdateRechargeSettings
(
query
);
if
(
result
)
{
return
ApiResult
.
Success
(
"充值设置保存成功"
);
}
else
{
return
ApiResult
.
Failed
(
"充值设置保存失败"
);
}
}
}
#
endregion
#
region
余额收支
/// <summary>
/// 余额收支列表
/// </summary>
/// <returns></returns>
[
HttpPost
]
public
ApiResult
GetMemberBalancePageList
()
{
var
parms
=
RequestParm
;
ResultPageModel
pagelist
=
JsonConvert
.
DeserializeObject
<
ResultPageModel
>(
RequestParm
.
msg
.
ToString
());
RB_Member_Balance_Extend
demodel
=
JsonConvert
.
DeserializeObject
<
RB_Member_Balance_Extend
>(
RequestParm
.
msg
.
ToString
());
demodel
.
TenantId
=
UserInfo
.
TenantId
;
demodel
.
MallBaseId
=
parms
.
MallBaseId
;
var
list
=
rechargeModule
.
GetMemberBalancePageList
(
pagelist
.
pageIndex
,
pagelist
.
pageSize
,
out
long
count
,
demodel
);
pagelist
.
count
=
Convert
.
ToInt32
(
count
);
pagelist
.
pageData
=
list
.
Select
(
x
=>
new
{
x
.
Id
,
CreateDate
=
x
.
CreateDate
.
Value
.
ToString
(
"yyyy-MM-dd HH:mm:ss"
),
x
.
MemberName
,
Balance
=
x
.
Balance
??
0
,
x
.
Description
,
x
.
Remarks
,
RecordTypeStr
=
Mall
.
Common
.
Plugin
.
EnumHelper
.
GetEnumName
(
x
.
Type
)
});
return
ApiResult
.
Success
(
""
,
pagelist
);
}
#
endregion
}
}
\ No newline at end of file
Mall.WebApi/Controllers/User/TenantController.cs
View file @
22dcedbd
...
...
@@ -293,9 +293,8 @@ namespace Mall.WebApi.Controllers.User
var
extModel
=
JsonConvert
.
DeserializeObject
<
RB_MiniProgram_Extend
>(
RequestParm
.
msg
.
ToString
());
extModel
.
MallBaseId
=
RequestParm
.
MallBaseId
;
extModel
.
TenantId
=
RequestParm
.
TenantId
;
var
flag
=
programModule
.
SetMiniProgramMallTagModule
(
extModel
);
var
flag
=
programModule
.
SetMiniProgramMallTagModule
(
extModel
,
isUpdateBasic
:
true
);
return
flag
?
ApiResult
.
Success
()
:
ApiResult
.
Failed
();
}
/// <summary>
...
...
@@ -318,7 +317,8 @@ namespace Mall.WebApi.Controllers.User
{
JObject
parms
=
JObject
.
Parse
(
RequestParm
.
msg
.
ToString
());
var
MallBaseId
=
parms
.
GetInt
(
"MallBaseId"
,
0
);
var
extModel
=
programModule
.
GetMiniProgramModule
(
MallBaseId
);
int
isGetNav
=
parms
.
GetInt
(
"isGetNav"
,
0
);
var
extModel
=
programModule
.
GetMiniProgramModule
(
MallBaseId
,
isGetNav
:
isGetNav
);
return
ApiResult
.
Success
(
data
:
extModel
);
}
...
...
Mall.WebApi/Controllers/User/UserController.cs
View file @
22dcedbd
This diff is collapsed.
Click to expand it.
Mall.WebApi/Mall.WebApi.csproj
View file @
22dcedbd
...
...
@@ -15,6 +15,7 @@
<ProjectReference Include="..\Mall.DataHelper\Mall.DataHelper.csproj" />
<ProjectReference Include="..\Mall.Model\Mall.Model.csproj" />
<ProjectReference Include="..\Mall.Module.BaseSetUp\Mall.Module.BaseSetUp.csproj" />
<ProjectReference Include="..\Mall.Module.MarketingCenter\Mall.Module.MarketingCenter.csproj" />
<ProjectReference Include="..\Mall.Module.Product\Mall.Module.Product.csproj" />
<ProjectReference Include="..\Mall.Module.User\Mall.Module.User.csproj" />
<ProjectReference Include="..\Mall.ThirdCore\Mall.ThirdCore.csproj" />
...
...
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