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:
邹宗楠
2022-10-17 14:06:23 +08:00
parent 0695aa132c
commit 53fe97cbc1
49 changed files with 78 additions and 225 deletions
Download Patch File Download Diff File Expand all files Collapse all files

6
business/model/api.go
View File

@@ -59,9 +59,9 @@ type GoodsOrderExt struct {
MarketManPhone string `json:"marketManPhone"` //市場負責人電話
MarketManName string `json:"marketManName"`
OperatorPhone string `orm:"size(16)" json:"operatorPhone"` // 京东运营人电话
OperatorName string `orm:"size(32)" json:"operatorName"` // 京东运营人组（角色）
Comment string `json:"comment"` // 门店备注
OperatorPhone string `orm:"size(16)" json:"operatorPhone"` // 京东运营人电话
OperatorName string `orm:"size(32)" json:"operatorName"` // 京东运营人组（角色）
OperatorPhone2 string `orm:"size(16)" json:"operatorPhone2"` // 美团运营人电话
OperatorName2 string `orm:"size(32)" json:"operatorName2"` // 美团运营人组（角色）

2
business/model/dao/common.go
View File

@@ -3,7 +3,6 @@ package dao
import (
"git.rosy.net.cn/baseapi/utils"
"git.rosy.net.cn/jx-callback/business/model"
"git.rosy.net.cn/jx-callback/globals"
)
func GetDataResource(db *DaoDB, hashCode, fullURL string) (dataRes *model.DataResource, err error) {
@@ -54,7 +53,6 @@ func GetVendorOrgCode(db *DaoDB, vendorID int, vendorOrgCode, vendorType string)
}
sql += " ORDER BY comment"
err = GetRows(db, &vendorOrgs, sql, sqlParams)
globals.SugarLogger.Debug("===========sql= ", sql)
return vendorOrgs, err
}

2
business/model/dao/dao_order.go
View File

@@ -822,7 +822,7 @@ func GetOrders(db *DaoDB, ids []int64, isIncludeSku, isIncludeFake bool, fromDat
-- CAST(IF(t1.earning_price <> 0, t1.earning_price, IF(t1.shop_price <> 0 && t1.shop_price < t1.sale_price, t1.shop_price, t1.sale_price) * IF(t1.order_pay_percentage > 0, t1.order_pay_percentage, %d) / 100) AS SIGNED) earning_price,
t2.status waybill_status, t2.courier_name, t2.courier_mobile,
t2.actual_fee, t2.desired_fee, t2.waybill_created_at, t2.waybill_finished_at, t2.vendor_waybill_id2 vendor_waybill_id2_waybill,
t5.pay_percentage, t5.old_pay_percentage, t5.market_man_phone, tu.name market_man_name,
t5.pay_percentage, t5.comment ,t5.old_pay_percentage, t5.market_man_phone, tu.name market_man_name,
t5.operator_phone, t5.operator_phone2, t5.operator_phone3, tu1.name operator_name, tu2.name operator_name2, tu3.name operator_name3,
t6.vendor_pay_percentage,
city.name city_name, district.name district_name,