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-05-25 11:59:23 +08:00
parent 44a738be66
commit d8714def74
3 changed files with 28 additions and 25 deletions
Download Patch File Download Diff File Expand all files Collapse all files

37
business/jxcallback/orderman/orderman_ext.go
View File

@@ -712,29 +712,22 @@ func (c *OrderManager) GetLogisticsOrderStatusList(orderId, LogisticsId string,
return result, nil
}
// GetOrderStatusList2 查询订单流程 refVendorOrderID 订单Id
func GetOrderStatusList2(refVendorOrderID string, wayBillId string, orderType int, vendorID int) (statusList []*model.OrderStatus, err error) {
sql := `
SELECT *
// GetWayBillStatusList 根据订单号和物流号查询运单的变化状态
func (c *OrderManager) GetWayBillStatusList(orderId, LogisticsId string, vendorId int) ([]*model.OrderStatus, error) {
sql := `SELECT *
FROM order_status t1
WHERE t1.ref_vendor_order_id = ? AND t1.vendor_order_id = ? AND t1.vendor_id = ?
`
WHERE t1.vendor_order_id = ? AND t1.ref_vendor_order_id = ? AND t1.vendor_id = ?`
sqlParams := []interface{}{
refVendorOrderID,
wayBillId,
vendorID,
LogisticsId,
orderId,
vendorId,
}
if orderType > 0 {
sql += " AND t1.order_type = ?"
sqlParams = append(sqlParams, orderType)
}
sql += " ORDER BY t1.status_time, t1.order_type DESC, t1.status"
db := dao.GetDB()
if err = dao.GetRows(db, &statusList, sql, sqlParams...); err != nil {
sql += ` ORDER BY status_time ASC `
var result []*model.OrderStatus
if err := dao.GetRows(dao.GetDB(), &result, sql, sqlParams...); err != nil {
return nil, err
}
return statusList, nil
return result, nil
}
// GetOrderStatusCancelList 取消订单
@@ -1701,15 +1694,15 @@ func GetOrderUserBuyFirst(ctx *jxcontext.Context, vendorOrderID string) (isFirst
return isFirst, err
}
// GetWayBillStatusList 根据订单号和物流号查询运单的变化状态
func (c *OrderManager) GetWayBillStatusList(orderId, LogisticsId string, vendorId int) ([]*model.OrderStatus, error) {
// GetWaybillStatusList 查询订单的运单记录
func (c *OrderManager) GetWaybillStatusList(orderId, waybillID string, waybillVendorId int) ([]*model.OrderStatus, error) {
sql := `SELECT *
FROM order_status t1
WHERE t1.vendor_order_id = ? AND t1.ref_vendor_order_id = ? AND t1.vendor_id = ?`
sqlParams := []interface{}{
LogisticsId,
waybillID,
orderId,
vendorId,
waybillVendorId,
}
sql += ` ORDER BY status_time ASC `
var result []*model.OrderStatus