From 89724aaf37ccc743453b645ff8295348d85b382a Mon Sep 17 00:00:00 2001 From: =?UTF-8?q?=E9=82=B9=E5=AE=97=E6=A5=A0?= Date: Thu, 8 Jan 2026 15:06:36 +0800 Subject: [PATCH] 1 --- business/model/dao/store.go | 4 ---- business/model/settlement_info.go | 32 +++++++++++++++---------------- 2 files changed, 16 insertions(+), 20 deletions(-) diff --git a/business/model/dao/store.go b/business/model/dao/store.go index b42340ef9..f428a2ded 100644 --- a/business/model/dao/store.go +++ b/business/model/dao/store.go @@ -3,7 +3,6 @@ package dao import ( "errors" "fmt" - "git.rosy.net.cn/jx-callback/globals" "git.rosy.net.cn/jx-print/dao" "sort" "strings" @@ -1903,15 +1902,12 @@ func StatisticsSettlementByCity(db *DaoDB, cityCode []string, start, end time.Ti ` param = append(param, size, offset) - globals.SugarLogger.Debugf("--sql := %s", sql) - globals.SugarLogger.Debugf("--sql := %s", utils.Format4Output(param, false)) txDB, _ := Begin(db) defer Commit(db, txDB) var msgList []*model.SettlementByCityCode if err = GetRowsTx(txDB, &msgList, sql, param...); err != nil { return nil, err } - globals.SugarLogger.Debugf("--msgList := %s", utils.Format4Output(msgList, false)) if len(msgList) > 0 { for _, v := range msgList { diff --git a/business/model/settlement_info.go b/business/model/settlement_info.go index 6293b613c..a51c1b0ca 100644 --- a/business/model/settlement_info.go +++ b/business/model/settlement_info.go @@ -33,20 +33,20 @@ type JxSettlementInfo struct { // SettlementByCityCode 根据城市统计 type SettlementByCityCode struct { - CityName string `json:"city_name"` // 市 - JxStoreID int64 `json:"jx_store_id"` // jx门店ID - BrandId int `json:"brand_id"` // 品牌ID - UserName string `json:"user_name"` // 名称 - Mobile string `json:"mobile"` // 电话 - OrderCount int `json:"order_count"` // 有效订单数 - PackageSetting int `json:"package_setting"` // 服务费 - PackagingFee int `json:"packaging_fee"` // 包装费-每单0.4元 - TotalDesiredFee int `json:"total_desired_fee"` // 总运费 - JxIncome float64 `json:"jx_income"` // 京西收益 - MarketIncome float64 `json:"market_income"` // 市场收益 - StoreInCome float64 `json:"store_income"` // 门店收入 - TotalShopMoney int `json:"total_shop_money"` // 平台结算金额 - PlatformIncome float64 `json:"platform_income"` // 平台收益 - RefundMoney int `json:"refund_money"` // 订单售后金额 - Profit float64 `json:"-"` // 纯收益 + CityName string `json:"city_name"` // 市 + JxStoreID int64 `json:"jx_store_id" orm:"column(jx_store_id)"` // jx门店ID + BrandId int `json:"brand_id"` // 品牌ID + UserName string `json:"user_name"` // 名称 + Mobile string `json:"mobile"` // 电话 + OrderCount int `json:"order_count"` // 有效订单数 + PackageSetting int `json:"package_setting"` // 服务费 + PackagingFee int `json:"packaging_fee"` // 包装费-每单0.4元 + TotalDesiredFee int `json:"total_desired_fee"` // 总运费 + JxIncome float64 `json:"jx_income"` // 京西收益 + MarketIncome float64 `json:"market_income"` // 市场收益 + StoreInCome float64 `json:"store_income"` // 门店收入 + TotalShopMoney int `json:"total_shop_money"` // 平台结算金额 + PlatformIncome float64 `json:"platform_income"` // 平台收益 + RefundMoney int `json:"refund_money"` // 订单售后金额 + Profit float64 `json:"-"` // 纯收益 }