liulei/jx-callback
1
0
Fork 0
Code Issues Pull Requests Actions Packages Projects Releases Wiki Activity

1

Browse Source
This commit is contained in:
邹宗楠
2026-01-08 15:06:36 +08:00
parent 39ae006a09
commit 89724aaf37
2 changed files with 16 additions and 20 deletions
Download Patch File Download Diff File Expand all files Collapse all files

4
business/model/dao/store.go
View File

@@ -3,7 +3,6 @@ package dao
import ( import (
"errors" "errors"
"fmt" "fmt"
"git.rosy.net.cn/jx-callback/globals"
"git.rosy.net.cn/jx-print/dao" "git.rosy.net.cn/jx-print/dao"
"sort" "sort"
"strings" "strings"
@@ -1903,15 +1902,12 @@ func StatisticsSettlementByCity(db *DaoDB, cityCode []string, start, end time.Ti
` `
param = append(param, size, offset) param = append(param, size, offset)
globals.SugarLogger.Debugf("--sql := %s", sql)
globals.SugarLogger.Debugf("--sql := %s", utils.Format4Output(param, false))
txDB, _ := Begin(db) txDB, _ := Begin(db)
defer Commit(db, txDB) defer Commit(db, txDB)
var msgList []*model.SettlementByCityCode var msgList []*model.SettlementByCityCode
if err = GetRowsTx(txDB, &msgList, sql, param...); err != nil { if err = GetRowsTx(txDB, &msgList, sql, param...); err != nil {
return nil, err return nil, err
} }
globals.SugarLogger.Debugf("--msgList := %s", utils.Format4Output(msgList, false))
if len(msgList) > 0 { if len(msgList) > 0 {
for _, v := range msgList { for _, v := range msgList {

32
business/model/settlement_info.go
View File

@@ -33,20 +33,20 @@ type JxSettlementInfo struct {
// SettlementByCityCode 根据城市统计 // SettlementByCityCode 根据城市统计
type SettlementByCityCode struct { type SettlementByCityCode struct {
CityName string `json:"city_name"` // 市 CityName string `json:"city_name"` // 市
JxStoreID int64 `json:"jx_store_id"` // jx门店ID JxStoreID int64 `json:"jx_store_id" orm:"column(jx_store_id)"` // jx门店ID
BrandId int `json:"brand_id"` // 品牌ID BrandId int `json:"brand_id"` // 品牌ID
UserName string `json:"user_name"` // 名称 UserName string `json:"user_name"` // 名称
Mobile string `json:"mobile"` // 电话 Mobile string `json:"mobile"` // 电话
OrderCount int `json:"order_count"` // 有效订单数 OrderCount int `json:"order_count"` // 有效订单数
PackageSetting int `json:"package_setting"` // 服务费 PackageSetting int `json:"package_setting"` // 服务费
PackagingFee int `json:"packaging_fee"` // 包装费-每单0.4元 PackagingFee int `json:"packaging_fee"` // 包装费-每单0.4元
TotalDesiredFee int `json:"total_desired_fee"` // 总运费 TotalDesiredFee int `json:"total_desired_fee"` // 总运费
JxIncome float64 `json:"jx_income"` // 京西收益 JxIncome float64 `json:"jx_income"` // 京西收益
MarketIncome float64 `json:"market_income"` // 市场收益 MarketIncome float64 `json:"market_income"` // 市场收益
StoreInCome float64 `json:"store_income"` // 门店收入 StoreInCome float64 `json:"store_income"` // 门店收入
TotalShopMoney int `json:"total_shop_money"` // 平台结算金额 TotalShopMoney int `json:"total_shop_money"` // 平台结算金额
PlatformIncome float64 `json:"platform_income"` // 平台收益 PlatformIncome float64 `json:"platform_income"` // 平台收益
RefundMoney int `json:"refund_money"` // 订单售后金额 RefundMoney int `json:"refund_money"` // 订单售后金额
Profit float64 `json:"-"` // 纯收益 Profit float64 `json:"-"` // 纯收益
} }