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
38ff7ceb
Commit
38ff7ceb
authored
Jun 15, 2020
by
吴春
Browse files
Options
Browse Files
Download
Email Patches
Plain Diff
提交代码
parent
9fe7ca79
Hide whitespace changes
Inline
Side-by-side
Showing
2 changed files
with
95 additions
and
52 deletions
+95
-52
PublishController.cs
Mall.WebApi/Controllers/AppletWeChat/PublishController.cs
+1
-1
UserController.cs
Mall.WebApi/Controllers/User/UserController.cs
+94
-51
No files found.
Mall.WebApi/Controllers/AppletWeChat/PublishController.cs
View file @
38ff7ceb
...
...
@@ -43,7 +43,7 @@ namespace Mall.WebApi.Controllers.AppletWeChat
string
newStr
=
txtStr
.
Replace
(
"$MallBaseId$"
,
query
.
MallBaseId
.
ToString
()).
Replace
(
"$TenantId$"
,
query
.
TenantId
.
ToString
());
System
.
IO
.
File
.
WriteAllText
(
path
,
newStr
);
return
ApiResult
.
Failed
(
"基础信息配置成功"
);
return
ApiResult
.
Success
(
"基础信息配置成功"
);
}
else
{
...
...
Mall.WebApi/Controllers/User/UserController.cs
View file @
38ff7ceb
...
...
@@ -18,6 +18,7 @@ using Microsoft.AspNetCore.Authorization;
using
Microsoft.AspNetCore.Http
;
using
Microsoft.Extensions.Configuration
;
using
Microsoft.Extensions.Configuration.Json
;
using
Google.Protobuf.WellKnownTypes
;
namespace
Mall.WebApi.Controllers.User
{
...
...
@@ -381,7 +382,7 @@ namespace Mall.WebApi.Controllers.User
RB_Member_Grade_Extend
demodel
=
JsonConvert
.
DeserializeObject
<
RB_Member_Grade_Extend
>(
parms
.
msg
.
ToString
());
demodel
.
TenantId
=
Convert
.
ToInt32
(
parms
.
uid
);
demodel
.
MallBaseId
=
parms
.
MallBaseId
;
demodel
.
MallBaseId
=
parms
.
MallBaseId
;
var
list
=
userModule
.
GetMemberGradeList
(
demodel
);
return
ApiResult
.
Success
(
""
,
list
.
Select
(
x
=>
new
{
...
...
@@ -520,7 +521,8 @@ namespace Mall.WebApi.Controllers.User
demodel
.
Status
=
0
;
demodel
.
TenantId
=
Convert
.
ToInt32
(
parms
.
uid
);
demodel
.
MallBaseId
=
parms
.
MallBaseId
;
if
(
userModule
.
ValidateMemberGrade
(
demodel
))
{
if
(
userModule
.
ValidateMemberGrade
(
demodel
))
{
return
ApiResult
.
Failed
(
"该等级已存在,请重新选择等级"
);
}
bool
flag
=
userModule
.
SetMemberGradeInfo
(
demodel
);
...
...
@@ -878,7 +880,7 @@ namespace Mall.WebApi.Controllers.User
{
var
requestParm
=
RequestParm
;
RB_Distributor_Custom_Extend
demodel
=
JsonConvert
.
DeserializeObject
<
RB_Distributor_Custom_Extend
>(
requestParm
.
msg
.
ToString
());
if
(
demodel
.
HeadImage
==
null
||
string
.
IsNullOrWhiteSpace
(
demodel
.
HeadImage
))
if
(
demodel
.
HeadImage
==
null
||
string
.
IsNullOrWhiteSpace
(
demodel
.
HeadImage
))
{
return
ApiResult
.
ParamIsNull
(
"请传递分销申请下头部图片"
);
}
...
...
@@ -911,7 +913,7 @@ namespace Mall.WebApi.Controllers.User
{
return
ApiResult
.
ParamIsNull
(
"请传递分销中心下分销佣金"
);
}
if
(
demodel
.
DistributionCommissionImage
==
null
||
string
.
IsNullOrWhiteSpace
(
demodel
.
DistributionCommissionImage
))
if
(
demodel
.
DistributionCommissionImage
==
null
||
string
.
IsNullOrWhiteSpace
(
demodel
.
DistributionCommissionImage
))
{
return
ApiResult
.
ParamIsNull
(
"请传递分销中心下分销佣金图片"
);
}
...
...
@@ -919,7 +921,7 @@ namespace Mall.WebApi.Controllers.User
{
return
ApiResult
.
ParamIsNull
(
"请传递分销中心下分销订单"
);
}
if
(
demodel
.
DistributionOrderImage
==
null
||
string
.
IsNullOrWhiteSpace
(
demodel
.
DistributionOrderImage
))
if
(
demodel
.
DistributionOrderImage
==
null
||
string
.
IsNullOrWhiteSpace
(
demodel
.
DistributionOrderImage
))
{
return
ApiResult
.
ParamIsNull
(
"请传递分销中心下分销订单图片"
);
}
...
...
@@ -927,7 +929,7 @@ namespace Mall.WebApi.Controllers.User
{
return
ApiResult
.
ParamIsNull
(
"请传递分销中心下提现明细"
);
}
if
(
demodel
.
WithdrawDetialsImage
==
null
||
string
.
IsNullOrWhiteSpace
(
demodel
.
WithdrawDetialsImage
))
if
(
demodel
.
WithdrawDetialsImage
==
null
||
string
.
IsNullOrWhiteSpace
(
demodel
.
WithdrawDetialsImage
))
{
return
ApiResult
.
ParamIsNull
(
"请传递分销中心下提现明细图片"
);
}
...
...
@@ -935,7 +937,7 @@ namespace Mall.WebApi.Controllers.User
{
return
ApiResult
.
ParamIsNull
(
"请传递分销中心下我的团队"
);
}
if
(
demodel
.
MyTeamImage
==
null
||
string
.
IsNullOrWhiteSpace
(
demodel
.
MyTeamImage
))
if
(
demodel
.
MyTeamImage
==
null
||
string
.
IsNullOrWhiteSpace
(
demodel
.
MyTeamImage
))
{
return
ApiResult
.
ParamIsNull
(
"请传递分销中心下我的团队图片"
);
}
...
...
@@ -943,7 +945,7 @@ namespace Mall.WebApi.Controllers.User
{
return
ApiResult
.
ParamIsNull
(
"请传递分销中心下推广二维码"
);
}
if
(
demodel
.
PromoteQRCodeImage
==
null
||
string
.
IsNullOrWhiteSpace
(
demodel
.
PromoteQRCodeImage
))
if
(
demodel
.
PromoteQRCodeImage
==
null
||
string
.
IsNullOrWhiteSpace
(
demodel
.
PromoteQRCodeImage
))
{
return
ApiResult
.
ParamIsNull
(
"请传递分销中心下推广二维码图片"
);
}
...
...
@@ -1835,7 +1837,8 @@ namespace Mall.WebApi.Controllers.User
return
ApiResult
.
Failed
(
"支付失败"
);
}
}
else
{
else
{
string
msg1
=
userModule
.
SetDistributorRemitAudit
(
RemitId
,
Type
,
Remark
,
re
.
uid
,
re
.
MallBaseId
);
if
(
msg1
!=
""
)
{
...
...
@@ -1856,7 +1859,8 @@ namespace Mall.WebApi.Controllers.User
return
ApiResult
.
Failed
(
"状态不对,请核实后再试"
);
}
}
else
{
else
{
return
ApiResult
.
Failed
(
"暂不支持该类型"
);
}
...
...
@@ -1972,7 +1976,7 @@ namespace Mall.WebApi.Controllers.User
case
10
:
datarow
.
ExcelRows
.
Add
(
new
ExcelColumn
(
value
:
item
.
WithdrawalWay
.
GetEnumName
())
{
});
break
;
case
11
:
datarow
.
ExcelRows
.
Add
(
new
ExcelColumn
(
value
:
item
.
RemitDate
.
HasValue
?
item
.
RemitDate
.
Value
.
ToString
(
"yyyy-MM-dd HH:mm:ss"
):
""
)
{
});
break
;
datarow
.
ExcelRows
.
Add
(
new
ExcelColumn
(
value
:
item
.
RemitDate
.
HasValue
?
item
.
RemitDate
.
Value
.
ToString
(
"yyyy-MM-dd HH:mm:ss"
)
:
""
)
{
});
break
;
}
}
slist
.
Add
(
datarow
);
...
...
@@ -2009,11 +2013,15 @@ namespace Mall.WebApi.Controllers.User
RB_Member_User_Extend
demodel
=
JsonConvert
.
DeserializeObject
<
RB_Member_User_Extend
>(
parms
.
msg
.
ToString
());
demodel
.
TenantId
=
Convert
.
ToInt32
(
parms
.
uid
);
demodel
.
MallBaseId
=
parms
.
MallBaseId
;
var
list
=
userModule
.
GetListByPhoneOrAliasName
(
demodel
);
if
(
string
.
IsNullOrWhiteSpace
(
demodel
.
AliasName
))
{
return
ApiResult
.
Failed
(
"请传入您要查找的信息"
);
}
var
list
=
userModule
.
GetListByPhoneOrAliasName
(
demodel
).
Take
(
50
);
var
result
=
list
.
Select
(
x
=>
new
{
x
.
Id
,
AliasName
=
x
.
Name
,
AliasName
=
x
.
Name
,
x
.
Moblie
,
x
.
Photo
});
...
...
@@ -2154,24 +2162,27 @@ namespace Mall.WebApi.Controllers.User
/// </summary>
/// <returns></returns>
[
HttpPost
]
public
ApiResult
UpdateUserPhotoForWeiXin
()
{
public
ApiResult
UpdateUserPhotoForWeiXin
()
{
var
req
=
RequestParm
;
JObject
parms
=
JObject
.
Parse
(
req
.
msg
.
ToString
());
int
Count
=
parms
.
GetInt
(
"Count"
,
1
);
int
UserId
=
parms
.
GetInt
(
"UserId"
,
0
);
if
(
Count
==
0
)
{
Count
=
1
;
}
if
(
UserId
<=
0
&&
Count
==
0
)
{
if
(
UserId
<=
0
&&
Count
==
0
)
{
return
ApiResult
.
ParamIsNull
();
}
}
bool
flag
=
userModule
.
UpdateUserPhotoForWeiXin
(
UserId
,
Count
,
req
.
TenantId
,
req
.
MallBaseId
);
if
(
flag
)
{
return
ApiResult
.
Success
();
}
else
{
else
{
return
ApiResult
.
Failed
();
}
}
}
/// <summary>
...
...
@@ -2210,7 +2221,8 @@ namespace Mall.WebApi.Controllers.User
/// </summary>
/// <returns></returns>
[
HttpPost
]
public
ApiResult
GetHpDistributorGradePageList
()
{
public
ApiResult
GetHpDistributorGradePageList
()
{
var
parms
=
RequestParm
;
ResultPageModel
pagelist
=
JsonConvert
.
DeserializeObject
<
ResultPageModel
>(
parms
.
msg
.
ToString
());
RB_Distributor_HPGradeInfo_Extend
demodel
=
JsonConvert
.
DeserializeObject
<
RB_Distributor_HPGradeInfo_Extend
>(
parms
.
msg
.
ToString
());
...
...
@@ -2237,7 +2249,7 @@ namespace Mall.WebApi.Controllers.User
[
HttpPost
]
public
ApiResult
GetHpDistributorGradeList
()
{
var
parms
=
RequestParm
;
var
parms
=
RequestParm
;
RB_Distributor_HPGradeInfo_Extend
demodel
=
JsonConvert
.
DeserializeObject
<
RB_Distributor_HPGradeInfo_Extend
>(
parms
.
msg
.
ToString
());
demodel
.
TenantId
=
Convert
.
ToInt32
(
parms
.
uid
);
...
...
@@ -2256,13 +2268,16 @@ namespace Mall.WebApi.Controllers.User
/// </summary>
/// <returns></returns>
[
HttpPost
]
public
ApiResult
SetHpDistributorGradeInfo
()
{
public
ApiResult
SetHpDistributorGradeInfo
()
{
var
req
=
RequestParm
;
RB_Distributor_HPGradeInfo_Extend
demodel
=
JsonConvert
.
DeserializeObject
<
RB_Distributor_HPGradeInfo_Extend
>(
req
.
msg
.
ToString
());
if
(
string
.
IsNullOrEmpty
(
demodel
.
GradeName
))
{
if
(
string
.
IsNullOrEmpty
(
demodel
.
GradeName
))
{
return
ApiResult
.
ParamIsNull
(
"等级名称"
);
}
if
((
demodel
.
Grade
??
0
)
<=
0
)
{
if
((
demodel
.
Grade
??
0
)
<=
0
)
{
return
ApiResult
.
ParamIsNull
(
"请选择等级"
);
}
...
...
@@ -2277,7 +2292,8 @@ namespace Mall.WebApi.Controllers.User
{
return
ApiResult
.
Success
();
}
else
{
else
{
return
ApiResult
.
Failed
();
}
}
...
...
@@ -2287,11 +2303,13 @@ namespace Mall.WebApi.Controllers.User
/// </summary>
/// <returns></returns>
[
HttpPost
]
public
ApiResult
DelHpDistributorGradeInfo
()
{
public
ApiResult
DelHpDistributorGradeInfo
()
{
var
req
=
RequestParm
;
JObject
parms
=
JObject
.
Parse
(
req
.
msg
.
ToString
());
int
GradeId
=
parms
.
GetInt
(
"GradeId"
,
0
);
if
(
GradeId
<=
0
)
{
if
(
GradeId
<=
0
)
{
return
ApiResult
.
ParamIsNull
();
}
...
...
@@ -2300,7 +2318,8 @@ namespace Mall.WebApi.Controllers.User
{
return
ApiResult
.
Success
();
}
else
{
else
{
return
ApiResult
.
Failed
();
}
}
...
...
@@ -2310,7 +2329,8 @@ namespace Mall.WebApi.Controllers.User
/// </summary>
/// <returns></returns>
[
HttpPost
]
public
ApiResult
GetHpDistributorPageList
()
{
public
ApiResult
GetHpDistributorPageList
()
{
var
parms
=
RequestParm
;
ResultPageModel
pagelist
=
JsonConvert
.
DeserializeObject
<
ResultPageModel
>(
parms
.
msg
.
ToString
());
RB_Distributor_HPCommission_Extend
demodel
=
JsonConvert
.
DeserializeObject
<
RB_Distributor_HPCommission_Extend
>(
parms
.
msg
.
ToString
());
...
...
@@ -2326,12 +2346,14 @@ namespace Mall.WebApi.Controllers.User
x
.
DecimalType
,
x
.
Enabled
,
x
.
IsCommon
,
CategoryList
=
x
.
CategoryList
.
Select
(
y
=>
new
{
CategoryList
=
x
.
CategoryList
.
Select
(
y
=>
new
{
y
.
Id
,
y
.
CategoryId
,
y
.
CategoryName
}),
RatioList
=
x
.
RatioList
.
Select
(
z
=>
new
{
RatioList
=
x
.
RatioList
.
Select
(
z
=>
new
{
z
.
Id
,
z
.
GradeId
,
z
.
GradeName
,
...
...
@@ -2347,7 +2369,8 @@ namespace Mall.WebApi.Controllers.User
/// </summary>
/// <returns></returns>
[
HttpPost
]
public
ApiResult
GetHpdistributorInfo
()
{
public
ApiResult
GetHpdistributorInfo
()
{
var
req
=
RequestParm
;
JObject
parms
=
JObject
.
Parse
(
req
.
msg
.
ToString
());
int
CommissionId
=
parms
.
GetInt
(
"CommissionId"
,
0
);
...
...
@@ -2387,31 +2410,40 @@ namespace Mall.WebApi.Controllers.User
/// </summary>
/// <returns></returns>
[
HttpPost
]
public
ApiResult
SetHpDistributorInfo
()
{
public
ApiResult
SetHpDistributorInfo
()
{
var
req
=
RequestParm
;
RB_Distributor_HPCommission_Extend
demodel
=
JsonConvert
.
DeserializeObject
<
RB_Distributor_HPCommission_Extend
>(
req
.
msg
.
ToString
());
if
(
string
.
IsNullOrEmpty
(
demodel
.
Name
))
{
if
(
string
.
IsNullOrEmpty
(
demodel
.
Name
))
{
return
ApiResult
.
ParamIsNull
(
"请传递和平分销返佣名称"
);
}
if
((
demodel
.
DecimalType
??
0
)
<=
0
)
{
if
((
demodel
.
DecimalType
??
0
)
<=
0
)
{
return
ApiResult
.
ParamIsNull
(
"请选择小数类型"
);
}
if
(
demodel
.
RatioList
==
null
||
!
demodel
.
RatioList
.
Any
())
{
if
(
demodel
.
RatioList
==
null
||
!
demodel
.
RatioList
.
Any
())
{
return
ApiResult
.
ParamIsNull
(
"请选择返佣等级"
);
}
foreach
(
var
item
in
demodel
.
RatioList
)
{
if
(
item
.
GradeId
<=
0
)
{
foreach
(
var
item
in
demodel
.
RatioList
)
{
if
(
item
.
GradeId
<=
0
)
{
return
ApiResult
.
ParamIsNull
(
"请传递等级id"
);
}
if
((
item
.
CommissionRatio
??
0
)
<=
0
)
{
if
((
item
.
CommissionRatio
??
0
)
<=
0
)
{
return
ApiResult
.
ParamIsNull
(
"请传递等级返佣比例"
);
}
if
(
item
.
CommissionRatio
>
100
)
{
if
(
item
.
CommissionRatio
>
100
)
{
return
ApiResult
.
ParamIsNull
(
"返佣比例有误,不能大于100"
);
}
}
demodel
.
IsCommon
=
2
;
if
(
demodel
.
CategoryList
==
null
||
!
demodel
.
CategoryList
.
Any
())
{
if
(
demodel
.
CategoryList
==
null
||
!
demodel
.
CategoryList
.
Any
())
{
demodel
.
IsCommon
=
1
;
//通用
}
...
...
@@ -2430,11 +2462,13 @@ namespace Mall.WebApi.Controllers.User
/// </summary>
/// <returns></returns>
[
HttpPost
]
public
ApiResult
SetGetHpDistributorEnabled
()
{
public
ApiResult
SetGetHpDistributorEnabled
()
{
var
req
=
RequestParm
;
JObject
prams
=
JObject
.
Parse
(
req
.
msg
.
ToString
());
int
CommissionId
=
prams
.
GetInt
(
"CommissionId"
,
0
);
if
(
CommissionId
<=
0
)
{
if
(
CommissionId
<=
0
)
{
return
ApiResult
.
ParamIsNull
();
}
...
...
@@ -2443,7 +2477,8 @@ namespace Mall.WebApi.Controllers.User
{
return
ApiResult
.
Success
();
}
else
{
else
{
return
ApiResult
.
Failed
();
}
}
...
...
@@ -2453,7 +2488,8 @@ namespace Mall.WebApi.Controllers.User
/// </summary>
/// <returns></returns>
[
HttpPost
]
public
ApiResult
GetHpDistributorIsEnabled
()
{
public
ApiResult
GetHpDistributorIsEnabled
()
{
var
req
=
RequestParm
;
int
enabled
=
userModule
.
GetHpDistributorIsEnabled
(
req
.
TenantId
,
req
.
MallBaseId
);
...
...
@@ -2465,7 +2501,8 @@ namespace Mall.WebApi.Controllers.User
/// </summary>
/// <returns></returns>
[
HttpPost
]
public
ApiResult
DelHpDistributorInfo
()
{
public
ApiResult
DelHpDistributorInfo
()
{
var
req
=
RequestParm
;
JObject
prams
=
JObject
.
Parse
(
req
.
msg
.
ToString
());
int
CommissionId
=
prams
.
GetInt
(
"CommissionId"
,
0
);
...
...
@@ -2490,11 +2527,13 @@ namespace Mall.WebApi.Controllers.User
/// </summary>
/// <returns></returns>
[
HttpPost
]
public
ApiResult
GetHpUserDistributorInfo
()
{
public
ApiResult
GetHpUserDistributorInfo
()
{
var
req
=
RequestParm
;
JObject
parms
=
JObject
.
Parse
(
req
.
msg
.
ToString
());
int
UserId
=
parms
.
GetInt
(
"UserId"
,
0
);
if
(
UserId
<=
0
)
{
if
(
UserId
<=
0
)
{
return
ApiResult
.
ParamIsNull
();
}
...
...
@@ -2507,12 +2546,14 @@ namespace Mall.WebApi.Controllers.User
/// </summary>
/// <returns></returns>
[
HttpPost
]
public
ApiResult
GetHpGoodsSuggestPrice
()
{
public
ApiResult
GetHpGoodsSuggestPrice
()
{
var
req
=
RequestParm
;
JObject
parms
=
JObject
.
Parse
(
req
.
msg
.
ToString
());
string
CategoryIds
=
parms
.
GetStringValue
(
"CategoryIds"
);
decimal
CostPrice
=
parms
.
GetDecimal
(
"CostPrice"
);
if
(
CostPrice
<=
0
)
{
if
(
CostPrice
<=
0
)
{
return
ApiResult
.
ParamIsNull
(
"请传递成本价格"
);
}
...
...
@@ -2549,12 +2590,14 @@ namespace Mall.WebApi.Controllers.User
/// </summary>
/// <returns></returns>
[
HttpPost
]
public
ApiResult
GetWeiXinQRCodeForHT
()
{
public
ApiResult
GetWeiXinQRCodeForHT
()
{
var
req
=
RequestParm
;
JObject
parms
=
JObject
.
Parse
(
req
.
msg
.
ToString
());
string
Path
=
parms
.
GetStringValue
(
"Path"
);
//路径
int
With
=
parms
.
GetInt
(
"With"
,
430
);
//大小
if
(
string
.
IsNullOrEmpty
(
Path
))
{
if
(
string
.
IsNullOrEmpty
(
Path
))
{
return
ApiResult
.
ParamIsNull
(
"请传递路径"
);
}
...
...
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