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

- fix bug about elm order callback msg replay.

Browse Source
This commit is contained in:
gazebo
2018-07-16 11:10:16 +08:00
parent e1e5e93319
commit d3ba00679d
6 changed files with 34 additions and 33 deletions
Download Patch File Download Diff File Expand all files Collapse all files

25
business/model/order.go
View File

@@ -28,7 +28,7 @@ type GoodsOrder struct {
CoordinateType int
SkuCount int // 商品类别数量，即有多少种商品（注意在某些情况下，相同SKU的商品由于售价不同，也会当成不同商品在这个值里）
GoodsCount int // 商品个数
Status int // 参见相关常量定义
Status int // 参见OrderStatus*相关的常量定义
VendorStatus string `orm:"size(16)"`
LockStatus int
BuyerComment string `orm:"size(255)"`
@@ -77,17 +77,18 @@ func (o *OrderSku) TableIndex() [][]string {
}
type Waybill struct {
ID int64 `orm:"column(id)"`
VendorOrderID string `orm:"column(vendor_order_id);size(48)"`
OrderVendorID int `orm:"column(order_vendor_id)"`
VendorWaybillID string `orm:"column(vendor_waybill_id);size(48)"`
VendorWaybillID2 string `orm:"column(vendor_waybill_id2);size(48)"` // 某些平台有多个ID，比如美团配送，当前美团配送的 delivery_id存这里
WaybillVendorID int `orm:"column(waybill_vendor_id)"`
CourierName string `orm:"size(32)"`
CourierMobile string `orm:"size(32)"`
Status int
VendorStatus string `orm:"size(16)"`
ActualFee int64
ID int64 `orm:"column(id)"`
VendorOrderID string `orm:"column(vendor_order_id);size(48)"`
OrderVendorID int `orm:"column(order_vendor_id)"`
VendorWaybillID string `orm:"column(vendor_waybill_id);size(48)"`
VendorWaybillID2 string `orm:"column(vendor_waybill_id2);size(48)"` // 某些平台有多个ID，比如美团配送，当前美团配送的 delivery_id存这里
WaybillVendorID int `orm:"column(waybill_vendor_id)"`
CourierName string `orm:"size(32)"`
CourierMobile string `orm:"size(32)"`
Status int // 参见WaybillStatus*相关的常量定义
VendorStatus string `orm:"size(16)"`
ActualFee int64 // 实际要支付给快递公司的实际费用
DesiredFee int64 // 根据合同计算出来的预期费用
DuplicatedCount int // 重复新定单消息数，这个一般不是由于消息重发赞成的（消息重发由OrderStatus过滤），一般是业务逻辑赞成的
WaybillCreatedAt time.Time `orm:"type(datetime);index"`
WaybillFinishedAt time.Time `orm:"type(datetime)"`