From 6251228b6cc799a9156aa668c690125bf4df6452 Mon Sep 17 00:00:00 2001 From: gazebo Date: Thu, 2 Jan 2020 17:39:03 +0800 Subject: [PATCH] =?UTF-8?q?=E8=AE=A2=E5=8D=95=E5=AF=BC=E5=87=BApayPercenta?= =?UTF-8?q?ge?= MIME-Version: 1.0 Content-Type: text/plain; charset=UTF-8 Content-Transfer-Encoding: 8bit --- business/model/api.go | 5 +++-- business/model/dao/dao_order.go | 1 + 2 files changed, 4 insertions(+), 2 deletions(-) diff --git a/business/model/api.go b/business/model/api.go index eb3580556..3e9cc32bb 100644 --- a/business/model/api.go +++ b/business/model/api.go @@ -35,8 +35,9 @@ type GoodsOrderExt struct { WaybillCreatedAt time.Time `orm:"type(datetime);index" json:"waybillCreatedAt"` WaybillFinishedAt time.Time `orm:"type(datetime)" json:"waybillFinishedAt"` - DistrictName string `json:"districtName"` - CityName string `json:"cityName"` + DistrictName string `json:"districtName"` + CityName string `json:"cityName"` + PayPercentage int `json:"payPercentage"` SkuInfo string `json:"skuInfo,omitempty"` ShortSkuInfo `json:"-"` diff --git a/business/model/dao/dao_order.go b/business/model/dao/dao_order.go index 7dadf5c58..85618a299 100644 --- a/business/model/dao/dao_order.go +++ b/business/model/dao/dao_order.go @@ -728,6 +728,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(t5.pay_percentage > 0, t5.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, + t5.pay_percentage, city.name city_name, district.name district_name`, model.DefaultEarningPricePercentage) if isIncludeSku { sql += `,