From e87c2d9ee4ad9798113ca603bdbc7ac7e34fb2e6 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:21:18 +0800 Subject: [PATCH] 1 --- business/model/api.go | 2 +- business/model/order.go | 1 - 2 files changed, 1 insertion(+), 2 deletions(-) diff --git a/business/model/api.go b/business/model/api.go index 090d06ae3..28ac9bb3a 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:"column(vendor_waybill_id2);size(48)" json:"vendorWaybillID2"` // 某些平台有多个ID，比如美团配送，当前美团配送的 delivery_id存这里 + VendorWaybillID2 string `orm:"size(48)" json:"vendorWaybillID2"` // 某些平台有多个ID，比如美团配送，当前美团配送的 delivery_id存这里 DistrictName string `json:"districtName"` CityName string `json:"cityName"` diff --git a/business/model/order.go b/business/model/order.go index e06d04c54..e106b6f77 100644 --- a/business/model/order.go +++ b/business/model/order.go @@ -136,7 +136,6 @@ type GoodsOrder struct { VendorWaybillID string `orm:"column(vendor_waybill_id);size(48)" json:"vendorWaybillID"` WaybillVendorID int `orm:"column(waybill_vendor_id)" json:"waybillVendorID"` // 表示当前承运商，-1表示还没有安排 - //VendorWaybillId2 string `orm:"column(vendor_waybill_id2)" json:"vendorWaybillId2"` // 美团标志id AdjustCount int8 `json:"adjustCount"` // 调整单（次数） DeliveryFlag int8 `json:"deliveryFlag"` // 第1位为1表示禁止调度器调度三方配送 DuplicatedCount int `json:"-"` // 重复新订单消息数，这个一般不是由于消息重发造成的（消息重发由OrderStatus过滤），一般是业务逻辑造成的