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

1

Browse Source
This commit is contained in:
邹宗楠
2023-09-06 13:51:43 +08:00
parent a235007153
commit ab6db54205
26 changed files with 278 additions and 110 deletions
Download Patch File Download Diff File Expand all files Collapse all files

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

@@ -1494,12 +1494,13 @@ func GetWaybills(db *DaoDB, vendorOrderID string, vendors []int64) (waybills []*
FROM waybill
WHERE vendor_order_id = ?
`
sqlParams := []interface{}{vendorOrderID}
if len(vendors) > model.NO {
sql += " AND waybill_vendor_id IN (" + GenQuestionMarks(len(vendors)) + ")"
sqlParams = append(sqlParams, vendors)
}
sql += ` ORDER BY waybill_created_at asc`
sqlParams := []interface{}{vendorOrderID}
sqlParams = append(sqlParams, vendors)
err = GetRows(db, &waybills, sql, sqlParams)
return waybills, err
}

12
business/model/order.go
View File

@@ -244,10 +244,14 @@ type Waybill struct {
WaybillFinishedAt time.Time `orm:"type(datetime)" json:"waybillFinishedAt"`
StatusTime time.Time `orm:"type(datetime)" json:"-"` // last status time
ModelTimeInfo `json:"-"`
OriginalData string `orm:"type(text)" json:"-"`
Remark string `orm:"-" json:"-"` // 用于传递remark
PunctualFee int64 `orm:"column(punctual_fee)" json:"punctualFee"` // 对应美团外卖运单的准时保险费
VendorOrgCode string `orm:"size(64)" json:"vendorOrgCode"` // 同一平台下不同的商户代码，如果只有一个，可以为空
OriginalData string `orm:"type(text)" json:"-"` // 用来保存门店到用户间的坐标点
Distance int64 `orm:"column(distance);size(16)" json:"distance"` // 门店和用户之间的推荐距离
CourierCoordinate string `orm:"column(courier_coordinate);size(32)" json:"courier_coordinate"` // 骑手坐标
DurationTime int64 `orm:"column(duration_time);size(16)" json:"duration_time"` // 骑行时间
Remark string `orm:"-" json:"-"` // 用于传递remark
PunctualFee int64 `orm:"column(punctual_fee)" json:"punctualFee"` // 对应美团外卖运单的准时保险费
VendorOrgCode string `orm:"size(64)" json:"vendorOrgCode"` // 同一平台下不同的商户代码，如果只有一个，可以为空
}
func (w *Waybill) TableUnique() [][]string {