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
4896c7e4
Commit
4896c7e4
authored
Jul 02, 2020
by
吴春
Browse files
Options
Browse Files
Download
Email Patches
Plain Diff
提交代码
parent
88283ba2
Hide whitespace changes
Inline
Side-by-side
Showing
4 changed files
with
76 additions
and
1 deletion
+76
-1
OrderStatistics_Query.cs
Mall.Model/Query/OrderStatistics_Query.cs
+51
-0
ProductModule.cs
Mall.Module.Product/ProductModule.cs
+3
-0
LiveHouseController.cs
Mall.WebApi/Controllers/AppletWeChat/LiveHouseController.cs
+20
-1
WeChatPayController.cs
Mall.WebApi/Controllers/AppletWeChat/WeChatPayController.cs
+2
-0
No files found.
Mall.Model/Query/OrderStatistics_Query.cs
View file @
4896c7e4
...
...
@@ -49,6 +49,24 @@ namespace Mall.Model.Query
/// </summary>
public
int
Number
{
get
;
set
;
}
/// <summary>
/// 返佣人员id
/// </summary>
public
int
OneUserId
{
get
;
set
;
}
/// <summary>
/// 返佣人员名称
/// </summary>
public
string
OneUserName
{
get
;
set
;
}
/// <summary>
/// 返佣人员id
/// </summary>
public
int
TwoUserId
{
get
;
set
;
}
/// <summary>
/// 返佣人员名称
/// </summary>
public
string
TwoUserName
{
get
;
set
;
}
/// <summary>
/// 供应商名称
...
...
@@ -63,6 +81,39 @@ namespace Mall.Model.Query
public
int
SupplierId
{
get
;
set
;
}
/// <summary>
/// 特一级返佣
/// </summary>
public
decimal
SpecialCommission
{
get
;
set
;
}
/// <summary>
/// 总代理返佣
/// </summary>
public
decimal
GeneralAgentCommission
{
get
;
set
;
}
/// <summary>
/// 分公司
/// </summary>
public
decimal
BranchCommission
{
get
;
set
;
}
/// <summary>
/// 分公司
/// </summary>
public
string
BranchName
{
get
;
set
;
}
/// <summary>
/// 特一级返佣
/// </summary>
public
string
SpecialName
{
get
;
set
;
}
/// <summary>
/// 总代理返佣
/// </summary>
public
string
GeneralAgentName
{
get
;
set
;
}
/// <summary>
/// 结算款
/// </summary>
...
...
Mall.Module.Product/ProductModule.cs
View file @
4896c7e4
...
...
@@ -4743,6 +4743,9 @@ namespace Mall.Module.Product
return
list
;
}
#
endregion
#
region
商品代理
...
...
Mall.WebApi/Controllers/AppletWeChat/LiveHouseController.cs
View file @
4896c7e4
...
...
@@ -8,6 +8,7 @@ using Mall.Common.Plugin;
using
Mall.Model.Extend.User
;
using
Mall.Model.Query
;
using
Mall.Module.MarketingCenter
;
using
Mall.Module.Product
;
using
Mall.Module.User
;
using
Mall.WebApi.Filter
;
using
Microsoft.AspNetCore.Authorization
;
...
...
@@ -28,6 +29,8 @@ namespace Mall.WebApi.Controllers.AppletWeChat
private
readonly
MiniProgramModule
appletWeChatModule
=
new
MiniProgramModule
();
private
readonly
SupplierModule
supplierModule
=
new
SupplierModule
();
private
readonly
ProductModule
productModule
=
new
ProductModule
();
#
region
直播房间信息
[
HttpPost
]
[
AllowAnonymous
]
...
...
@@ -121,7 +124,7 @@ namespace Mall.WebApi.Controllers.AppletWeChat
item
.
ALLCommission
=
item
.
CostFreight
+
item
.
CostMoney
+
item
.
PackingMoney
+
item
.
GoodsFreight
+
item
.
OneCommission
+
item
.
TwoCommission
+
item
.
OtherPrice
;
item
.
NoPaid
=
item
.
ALLCommission
-
item
.
Paid
;
item
.
GrossProfit
=
item
.
AllPrice
-
item
.
ALLCommission
;
item
.
GrossProfitRate
=
item
.
AllPrice
==
0
?
0
:
Math
.
Round
((
item
.
GrossProfit
/
item
.
AllPrice
),
2
,
MidpointRounding
.
AwayFromZero
);
item
.
GrossProfitRate
=
item
.
AllPrice
==
0
?
0
:
Math
.
Round
((
item
.
GrossProfit
/
item
.
AllPrice
),
2
,
MidpointRounding
.
AwayFromZero
);
}
pagelist
.
count
=
Convert
.
ToInt32
(
count
);
pagelist
.
pageData
=
list
;
...
...
@@ -161,8 +164,16 @@ namespace Mall.WebApi.Controllers.AppletWeChat
new
ExcelColumn
(
value
:
"包装费摊销"
)
{
CellWidth
=
15
,
HAlignmentEnum
=
HAlignmentEnum
.
CENTER
,
VAlignmentEnum
=
VAlignmentEnum
.
CENTER
},
new
ExcelColumn
(
value
:
"快递费"
)
{
CellWidth
=
15
,
HAlignmentEnum
=
HAlignmentEnum
.
CENTER
,
VAlignmentEnum
=
VAlignmentEnum
.
CENTER
},
new
ExcelColumn
(
value
:
"商品运费摊销"
)
{
CellWidth
=
15
,
HAlignmentEnum
=
HAlignmentEnum
.
CENTER
,
VAlignmentEnum
=
VAlignmentEnum
.
CENTER
},
new
ExcelColumn
(
value
:
"公司返佣"
)
{
CellWidth
=
15
,
HAlignmentEnum
=
HAlignmentEnum
.
CENTER
,
VAlignmentEnum
=
VAlignmentEnum
.
CENTER
},
new
ExcelColumn
(
value
:
"公司"
)
{
CellWidth
=
15
,
HAlignmentEnum
=
HAlignmentEnum
.
CENTER
,
VAlignmentEnum
=
VAlignmentEnum
.
CENTER
},
new
ExcelColumn
(
value
:
"总代理返佣"
)
{
CellWidth
=
15
,
HAlignmentEnum
=
HAlignmentEnum
.
CENTER
,
VAlignmentEnum
=
VAlignmentEnum
.
CENTER
},
new
ExcelColumn
(
value
:
"总代理"
)
{
CellWidth
=
15
,
HAlignmentEnum
=
HAlignmentEnum
.
CENTER
,
VAlignmentEnum
=
VAlignmentEnum
.
CENTER
},
new
ExcelColumn
(
value
:
"特一级返佣"
)
{
CellWidth
=
15
,
HAlignmentEnum
=
HAlignmentEnum
.
CENTER
,
VAlignmentEnum
=
VAlignmentEnum
.
CENTER
},
new
ExcelColumn
(
value
:
"特一级"
)
{
CellWidth
=
15
,
HAlignmentEnum
=
HAlignmentEnum
.
CENTER
,
VAlignmentEnum
=
VAlignmentEnum
.
CENTER
},
new
ExcelColumn
(
value
:
"一级返佣"
)
{
CellWidth
=
15
,
HAlignmentEnum
=
HAlignmentEnum
.
CENTER
,
VAlignmentEnum
=
VAlignmentEnum
.
CENTER
},
new
ExcelColumn
(
value
:
"一级返佣人"
)
{
CellWidth
=
15
,
HAlignmentEnum
=
HAlignmentEnum
.
CENTER
,
VAlignmentEnum
=
VAlignmentEnum
.
CENTER
},
new
ExcelColumn
(
value
:
"二级返佣"
)
{
CellWidth
=
15
,
HAlignmentEnum
=
HAlignmentEnum
.
CENTER
,
VAlignmentEnum
=
VAlignmentEnum
.
CENTER
},
new
ExcelColumn
(
value
:
"二级返佣人"
)
{
CellWidth
=
15
,
HAlignmentEnum
=
HAlignmentEnum
.
CENTER
,
VAlignmentEnum
=
VAlignmentEnum
.
CENTER
},
new
ExcelColumn
(
value
:
"其他"
)
{
CellWidth
=
15
,
HAlignmentEnum
=
HAlignmentEnum
.
CENTER
,
VAlignmentEnum
=
VAlignmentEnum
.
CENTER
},
new
ExcelColumn
(
value
:
"合计数"
)
{
CellWidth
=
15
,
HAlignmentEnum
=
HAlignmentEnum
.
CENTER
,
VAlignmentEnum
=
VAlignmentEnum
.
CENTER
},
new
ExcelColumn
(
value
:
"已付"
)
{
CellWidth
=
15
,
HAlignmentEnum
=
HAlignmentEnum
.
CENTER
,
VAlignmentEnum
=
VAlignmentEnum
.
CENTER
},
...
...
@@ -210,8 +221,16 @@ namespace Mall.WebApi.Controllers.AppletWeChat
datarow
.
ExcelRows
.
Add
(
new
ExcelColumn
(
value
:
item
.
PackingMoney
.
ToString
(
"#0.00"
))
{
});
datarow
.
ExcelRows
.
Add
(
new
ExcelColumn
(
value
:
item
.
CostFreight
.
ToString
(
"#0.00"
))
{
});
datarow
.
ExcelRows
.
Add
(
new
ExcelColumn
(
value
:
item
.
GoodsFreight
.
ToString
(
"#0.00"
))
{
});
datarow
.
ExcelRows
.
Add
(
new
ExcelColumn
(
value
:
item
.
BranchCommission
.
ToString
(
"#0.00"
))
{
});
datarow
.
ExcelRows
.
Add
(
new
ExcelColumn
(
value
:
item
.
BranchName
)
{
});
datarow
.
ExcelRows
.
Add
(
new
ExcelColumn
(
value
:
item
.
GeneralAgentCommission
.
ToString
(
"#0.00"
))
{
});
datarow
.
ExcelRows
.
Add
(
new
ExcelColumn
(
value
:
item
.
GeneralAgentName
)
{
});
datarow
.
ExcelRows
.
Add
(
new
ExcelColumn
(
value
:
item
.
SpecialCommission
.
ToString
(
"#0.00"
))
{
});
datarow
.
ExcelRows
.
Add
(
new
ExcelColumn
(
value
:
item
.
SpecialName
)
{
});
datarow
.
ExcelRows
.
Add
(
new
ExcelColumn
(
value
:
item
.
OneCommission
.
ToString
(
"#0.00"
))
{
});
datarow
.
ExcelRows
.
Add
(
new
ExcelColumn
(
value
:
item
.
OneUserName
)
{
});
datarow
.
ExcelRows
.
Add
(
new
ExcelColumn
(
value
:
item
.
TwoCommission
.
ToString
(
"#0.00"
))
{
});
datarow
.
ExcelRows
.
Add
(
new
ExcelColumn
(
value
:
item
.
TwoUserName
)
{
});
datarow
.
ExcelRows
.
Add
(
new
ExcelColumn
(
value
:
item
.
OtherPrice
.
ToString
(
"#0.00"
))
{
});
datarow
.
ExcelRows
.
Add
(
new
ExcelColumn
(
value
:
item
.
ALLCommission
.
ToString
(
"#0.00"
))
{
});
datarow
.
ExcelRows
.
Add
(
new
ExcelColumn
(
value
:
item
.
Paid
.
ToString
(
"#0.00"
))
{
});
...
...
Mall.WebApi/Controllers/AppletWeChat/WeChatPayController.cs
View file @
4896c7e4
...
...
@@ -54,6 +54,7 @@ namespace Mall.WebApi.Controllers.AppletWeChat
/// </summary>
/// <param name="request"></param>
/// <returns></returns>
[
HttpPost
]
public
ApiResult
GetPayInfo
()
{
var
request
=
RequestParm
;
...
...
@@ -107,6 +108,7 @@ namespace Mall.WebApi.Controllers.AppletWeChat
/// </summary>
/// <param name="request"></param>
/// <returns></returns>
[
HttpPost
]
public
ApiResult
GetRechargePayInfo
()
{
var
request
=
RequestParm
;
...
...
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