|
@@ -108,6 +108,9 @@ func OrdersElmGet(p int, pageSize int, sTime, eTime int64, timeType string, pvd |
|
|
} |
|
|
} |
|
|
|
|
|
|
|
|
for _, v := range order.Result { |
|
|
for _, v := range order.Result { |
|
|
|
|
|
if v.Sid == nil { |
|
|
|
|
|
continue |
|
|
|
|
|
} |
|
|
if *v.OrderState == 1 { |
|
|
if *v.OrderState == 1 { |
|
|
continue |
|
|
continue |
|
|
} |
|
|
} |
|
@@ -134,6 +137,9 @@ func OrdersElmGet(p int, pageSize int, sTime, eTime int64, timeType string, pvd |
|
|
orderType = 1 |
|
|
orderType = 1 |
|
|
} |
|
|
} |
|
|
res.Uid = utils.StrToInt(ex[2]) |
|
|
res.Uid = utils.StrToInt(ex[2]) |
|
|
|
|
|
if res.Uid == 0 { |
|
|
|
|
|
continue |
|
|
|
|
|
} |
|
|
res.StationUid = utils.StrToInt(ex[3]) |
|
|
res.StationUid = utils.StrToInt(ex[3]) |
|
|
res.Oid = utils.StrToInt64(utils.OrderUUID(utils.StrToInt(ex[2]))) |
|
|
res.Oid = utils.StrToInt64(utils.OrderUUID(utils.StrToInt(ex[2]))) |
|
|
res.PvdOid = utils.Int64ToStr(*v.BizOrderId) |
|
|
res.PvdOid = utils.Int64ToStr(*v.BizOrderId) |
|
|