fix:支付
This commit is contained in:
@@ -120,7 +120,7 @@ func GenerateOrderNumber() string {
|
||||
return orderNumber
|
||||
}
|
||||
|
||||
// 初始化订单状态
|
||||
// 初始化订单状态--链路
|
||||
func GenerateOrderStatusLink(deliveryMethod int64, noTime time.Time, expectedTime time.Time) []gmodel.OrderStatus {
|
||||
var list []gmodel.OrderStatus
|
||||
|
||||
@@ -142,6 +142,39 @@ func GenerateOrderStatusLink(deliveryMethod int64, noTime time.Time, expectedTim
|
||||
return list
|
||||
}
|
||||
|
||||
// 更新订单状态--链路
|
||||
func UpdateOrderStatusLink(statusLink []gmodel.OrderStatus, status gmodel.OrderStatus) []gmodel.OrderStatus {
|
||||
var list []gmodel.OrderStatus
|
||||
for _, v := range statusLink {
|
||||
if v.StatusCode == status.StatusCode {
|
||||
item := v
|
||||
if status.StatusTitle != "" {
|
||||
item.StatusTitle = status.StatusTitle
|
||||
}
|
||||
if status.StatusCode != 0 {
|
||||
item.StatusCode = status.StatusCode
|
||||
}
|
||||
if status.Utime != nil {
|
||||
item.Utime = status.Utime
|
||||
}
|
||||
if status.Metadata != nil {
|
||||
item.Metadata = status.Metadata
|
||||
}
|
||||
if status.ExpectedTime != nil {
|
||||
item.ExpectedTime = status.ExpectedTime
|
||||
}
|
||||
if status.Children != nil || len(status.Children) > 0 {
|
||||
item.Children = status.Children
|
||||
}
|
||||
|
||||
list = append(list, item)
|
||||
} else {
|
||||
list = append(list, v)
|
||||
}
|
||||
}
|
||||
return list
|
||||
}
|
||||
|
||||
// 获取订单状态
|
||||
func GetOrderStatusLinkUser(deliveryMethod int64, statusLink []gmodel.OrderStatus) []gmodel.OrderStatus {
|
||||
var list []gmodel.OrderStatus
|
||||
|
||||
Reference in New Issue
Block a user