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

修改配送费收取规则

Browse Source
This commit is contained in:
邹宗楠
2023-05-25 10:52:26 +08:00
parent be2e7d24a7
commit 44a738be66
4 changed files with 126 additions and 53 deletions
Download Patch File Download Diff File Expand all files Collapse all files

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

@@ -712,24 +712,6 @@ func (c *OrderManager) GetLogisticsOrderStatusList(orderId, LogisticsId string,
return result, nil
}
// GetWayBillStatusList 根据订单号和物流号查询运单的变化状态
func (c *OrderManager) GetWayBillStatusList(orderId, LogisticsId string, vendorId 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,
orderId,
vendorId,
}
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 result, nil
}
// GetOrderStatusList2 查询订单流程 refVendorOrderID 订单Id
func GetOrderStatusList2(refVendorOrderID string, wayBillId string, orderType int, vendorID int) (statusList []*model.OrderStatus, err error) {
sql := `
@@ -1718,3 +1700,21 @@ func GetOrderUserBuyFirst(ctx *jxcontext.Context, vendorOrderID string) (isFirst
}
return isFirst, err
}
// GetWayBillStatusList 根据订单号和物流号查询运单的变化状态
func (c *OrderManager) GetWayBillStatusList(orderId, LogisticsId string, vendorId 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,
orderId,
vendorId,
}
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 result, nil
}