danial/kami_merchant
1
0
Fork 0
Code Issues Packages Projects Releases Wiki Activity

Merge remote-tracking branch 'origin/master'

Browse Source
This commit is contained in:
孙晓龙
2024-01-17 11:02:09 +08:00
parent b7ae30c1c3 d22088edf2
commit 4194996693
7 changed files with 65 additions and 22 deletions
Download Patch File Download Diff File Expand all files Collapse all files

2
conf/app.conf
View File

@@ -24,7 +24,7 @@ dbhost = localhost
dbport = 3306
dbuser = root
dbpasswd = 123456
dbbase = kami
dbbase = juhe_pay
[redis]
host = localhost

34
controllers/trade_record.go
View File

@@ -61,18 +61,21 @@ func (c *TradeRecord) TradeQueryAndListPage() {
if end != "" {
in["create_time__lte"] = end
}
if cardNo != "" {
in["ex_value__contains"] = cardNo
}
// 计算分页数
count := order.GetOrderProfitLenByMap(in)
count := order.GetOrderLenByMap(in)
totalPage := count / limit // 计算总页数
if count%limit != 0 { // 不满一页的数据按一页计算
totalPage++
}
// 数据获取
var list []order.OrderProfitInfo
var list []order.OrderInfo
if page <= totalPage {
list = order.GetOrderProfitByMap(in, limit, (page-1)*limit)
list = order.GetOrderByMap(in, limit, (page-1)*limit)
}
type resDataStruct struct {
@@ -83,14 +86,21 @@ func (c *TradeRecord) TradeQueryAndListPage() {
var res []resDataStruct
bankIdList := make([]string, 0)
for _, info := range list {
orderInfo := order.GetOrderByBankOrderId(info.BankOrderId)
if orderInfo.ExValue == "" || strings.Contains(orderInfo.ExValue, cardNo) {
res = append(res, resDataStruct{
info,
orderInfo.ExValue,
orderInfo.CreateTime,
})
bankIdList = append(bankIdList, info.BankOrderId)
}
orderProfitInfo := order.GetOrderProfitListByBankOrderIdList(bankIdList)
for _, info := range list {
for _, profitInfo := range orderProfitInfo {
if info.BankOrderId == profitInfo.BankOrderId {
res = append(res, resDataStruct{
profitInfo,
info.ExValue,
info.CreateTime,
})
}
}
}
@@ -102,8 +112,8 @@ func (c *TradeRecord) TradeQueryAndListPage() {
out["root"] = res // 显示数据
out["profitSummary"] = account.ProfitSummary{
TotalProfit: service.QueryTotalSummary(u.MerchantUid, in),
TodayProfit: service.QueryTodaySummary(u.MerchantUid, in),
TotalProfit: service.QueryTotalSummary(in),
TodayProfit: service.QueryTodaySummary(in),
}
c.Data["json"] = out

2
models/order/info.go
View File

@@ -107,7 +107,7 @@ func GetOrderByMap(params map[string]string, display, offset int) []OrderInfo {
qs = qs.Filter(k, v)
}
}
_, err := qs.Limit(display, offset).OrderBy("-update_time").All(&orderInfoList)
_, err := qs.Limit(display, offset).OrderBy("-create_time").All(&orderInfoList)
if err != nil {
logs.Error("get order by map fail: ", err)
}

13
models/order/profit_info.go
View File

@@ -78,6 +78,19 @@ func GetOrderProfitByBankOrderId(bankOrderId string) OrderProfitInfo {
return orderProfit
}
func GetOrderProfitListByBankOrderIdList(bankOrderIdList []string) []OrderProfitInfo {
o := orm.NewOrm()
orderProfitList := make([]OrderProfitInfo, 0)
if len(bankOrderIdList) == 0 {
return orderProfitList
}
_, err := o.QueryTable(ORDER_PROFIT_INFO).Filter("bank_order_id__in", bankOrderIdList).All(&orderProfitList)
if err != nil {
logs.Error("GetOrderProfitByBankOrderId fail：", err)
}
return orderProfitList
}
func GetOrderProfitLenByMap(params map[string]string) int {
o := orm.NewOrm()
qs := o.QueryTable(ORDER_PROFIT_INFO)

29
service/profit.go
View File

@@ -8,8 +8,16 @@ import (
"time"
)
func QueryTotalSummary(merchantId string, in map[string]string) account.Summary {
orderProfitList := order.GetOrderProfitListByMerchantId(merchantId, in)
func QueryTotalSummary(params map[string]string) account.Summary {
orderInfoList := order.GetOrderByMap(params, -1, 0)
bankOrderIdList := make([]string, 0)
for _, info := range orderInfoList {
bankOrderIdList = append(bankOrderIdList, info.BankOrderId)
}
orderProfitList := order.GetOrderProfitListByBankOrderIdList(bankOrderIdList)
supplierAll := 0.0
platformAll := 0.0
@@ -89,7 +97,7 @@ func QuerySummaryByOrderInfo(infoInfoList []order.OrderInfo) account.Summary {
}
}
func QueryTodaySummary(merchantId string, in map[string]string) account.Summary {
func QueryTodaySummary(in map[string]string) account.Summary {
now := time.Now()
todayAtMidnight := time.Date(now.Year(), now.Month(), now.Day(), 0, 0, 0, 0, now.Location())
tomorrowAtMidNight := time.Date(now.Year(), now.Month(), now.Day(), 59, 59, 59, 0, now.Location())
@@ -123,8 +131,13 @@ func QueryTodaySummary(merchantId string, in map[string]string) account.Summary
paramsProfit["create_time__lte"] = end
}
paramsProfit["merchant_uid"] = merchantId
dataInfo := order.GetOrderProfitByMap(paramsProfit, -1, 0)
orderInfoList := order.GetOrderByMap(paramsProfit, -1, 0)
bankOrderIDLst := make([]string, 0)
for _, info := range orderInfoList {
bankOrderIDLst = append(bankOrderIDLst, info.BankOrderId)
}
dataInfo := order.GetOrderProfitListByBankOrderIdList(bankOrderIDLst)
totalNum := 0
todayAllAmount := 0.0
@@ -132,6 +145,7 @@ func QueryTodaySummary(merchantId string, in map[string]string) account.Summary
todayPlatformAll := 0.0
todayAgentAll := 0.0
todaySuccessNum := 0
todayPaidAmount := 0.0
for _, info := range dataInfo {
totalNum += 1
@@ -145,6 +159,7 @@ func QueryTodaySummary(merchantId string, in map[string]string) account.Summary
todayPlatformAll += info.PlatformProfit
todayAgentAll += info.AgentProfit
todaySuccessNum += 1
todayPaidAmount += info.FactAmount
}
succeedRate := 0.0
@@ -157,10 +172,10 @@ func QueryTodaySummary(merchantId string, in map[string]string) account.Summary
return account.Summary{
TotalNum: totalNum,
TotalAmount: math.Round(todayAllAmount*100) / 100,
TotalAmount: todayAllAmount,
PaidNum: todaySuccessNum,
PaidAmount: todayPaidAmount,
PlatformIncome: math.Round(todayPlatformAll*100) / 100,
AgencyIncome: todayAgentAll,
SucceedRate: succeedRate,
}
}

1
static/js/trade_record.js
View File

@@ -180,6 +180,7 @@ let trade = {
$("#totalSucceedRate").html(profitSummary.totalProfit.succeedRate)
$("#TodaySuccessNum").html(profitSummary.todayProfit.paidNum);
$("#TodayPaidAmount").html(profitSummary.todayProfit.paidAmount);
$("#TodayAllAmount").html(profitSummary.todayProfit.totalAmount);
$("#TodaySupplierProfit").html(profitSummary.todayProfit.TadaySupplierProfit);
$("#TodayPlatformProfit").html(profitSummary.todayProfit.platformIncome);

6
views/trade_record.html
View File

@@ -155,13 +155,17 @@
今日订单数：
<span id="TodayAllNum"></span>
</div>
<div class="col-sm-2 color-red" style="font-weight: normal;">
今日订单总金额：
<span id="TodayAllAmount"></span>
</div>
<div class="col-sm-2 color-red" style="font-weight: normal;">
今日成功订单数：
<span id="TodaySuccessNum"></span>
</div>
<div class="col-sm-2 color-red" style="font-weight: normal;">
今日成功订单总金额：
<span id="TodayAllAmount"></span>
<span id="TodayPaidAmount"></span>
</div>
<!-- <div class="color-red" style="font-weight: normal;">-->