From c52abc35269a122444cec58f0be590dc2b66d23c Mon Sep 17 00:00:00 2001 From: =?UTF-8?q?=E9=82=B9=E5=AE=97=E6=A5=A0?= Date: Fri, 15 Apr 2022 18:56:09 +0800 Subject: [PATCH] 1 --- business/model/api.go | 2 +- business/model/dao/dao_order.go | 2 +- business/partner/delivery/delivery.go | 2 +- 3 files changed, 3 insertions(+), 3 deletions(-) diff --git a/business/model/api.go b/business/model/api.go index 28ac9bb3a..8748c3020 100644 --- a/business/model/api.go +++ b/business/model/api.go @@ -34,7 +34,7 @@ type GoodsOrderExt struct { DesiredFee int64 `json:"desiredFee"` // 运单总费用 WaybillCreatedAt time.Time `orm:"type(datetime);index" json:"waybillCreatedAt"` WaybillFinishedAt time.Time `orm:"type(datetime)" json:"waybillFinishedAt"` - VendorWaybillID2 string `orm:"size(48)" json:"vendorWaybillID2"` // 某些平台有多个ID，比如美团配送，当前美团配送的 delivery_id存这里 + VendorWaybillId2Waybill string `orm:"column(vendor_waybill_id2);size(48)" json:"vendorWaybillId2Waybill"` // 某些平台有多个ID，比如美团配送，当前美团配送的 delivery_id存这里 DistrictName string `json:"districtName"` CityName string `json:"cityName"` diff --git a/business/model/dao/dao_order.go b/business/model/dao/dao_order.go index bcd032361..0b943cc25 100644 --- a/business/model/dao/dao_order.go +++ b/business/model/dao/dao_order.go @@ -821,7 +821,7 @@ func GetOrders(db *DaoDB, ids []int64, isIncludeSku, isIncludeFake bool, fromDat DISTINCT t1.*, -- 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, + 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.operator_phone, t5.operator_phone2, t5.operator_phone3, tu1.name operator_name, tu2.name operator_name2, tu3.name operator_name3, t6.vendor_pay_percentage, diff --git a/business/partner/delivery/delivery.go b/business/partner/delivery/delivery.go index 43121b507..efd789ba5 100644 --- a/business/partner/delivery/delivery.go +++ b/business/partner/delivery/delivery.go @@ -188,7 +188,7 @@ func GetOrderRiderInfoToPlatform(orderId string) { for _, v := range orders { var riderInfo *mtpsapi.RiderInfo if handlerInfo := partner.GetDeliveryPlatformFromVendorID(v.WaybillVendorID); handlerInfo != nil { - riderInfo, err = handlerInfo.Handler.GetRiderInfo(v.VendorOrderID, utils.Str2Int64(v.VendorWaybillID2), v.VendorWaybillID) + riderInfo, err = handlerInfo.Handler.GetRiderInfo(v.VendorOrderID, utils.Str2Int64(v.VendorWaybillId2Waybill), v.VendorWaybillID) if err != nil { globals.SugarLogger.Errorf("Get Order waybill rider info err :%v", err) continue