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

aa

Browse Source
This commit is contained in:
suyl
2021-06-10 10:58:42 +08:00
parent 992642d3f8
commit a3078bc1b6
2 changed files with 13 additions and 0 deletions
Download Patch File Download Diff File Expand all files Collapse all files

9
business/model/api.go
View File

@@ -56,6 +56,15 @@ 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"` // 京东运营人组（角色）
OperatorPhone2 string `orm:"size(16)" json:"operatorPhone2"` // 美团运营人电话
OperatorName2 string `orm:"size(32)" json:"operatorName2"` // 美团运营人组（角色）
OperatorPhone3 string `orm:"size(16)" json:"operatorPhone3"` // 饿百运营人电话
OperatorName3 string `orm:"size(32)" json:"operatorName3"` // 饿百运营人组（角色）
}
type OrderSkuExt struct {

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

@@ -778,6 +778,7 @@ func GetOrders(db *DaoDB, ids []int64, isIncludeSku, isIncludeFake bool, fromDat
t2.status waybill_status, t2.courier_name, t2.courier_mobile,
t2.actual_fee, t2.desired_fee, t2.waybill_created_at, t2.waybill_finished_at,
t5.pay_percentage, 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,
ROUND(IF(t1.earning_type = 1, t1.total_shop_money-t1.earning_price-IFNULL(t2.desired_fee,0), t1.total_shop_money *(t1.order_pay_percentage/2)/100)) jx_income`, model.DefaultEarningPricePercentage)
@@ -798,6 +799,9 @@ func GetOrders(db *DaoDB, ids []int64, isIncludeSku, isIncludeFake bool, fromDat
LEFT JOIN place city ON city.code = t5.city_code
LEFT JOIN place district ON district.code = t5.district_code
LEFT JOIN user tu ON mobile = t5.market_man_phone
LEFT JOIN user tu1 ON mobile = t5.operator_phone
LEFT JOIN user tu2 ON mobile = t5.operator_phone2
LEFT JOIN user tu3 ON mobile = t5.operator_phone3
`
if isIncludeSku {
sql += `