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

物料订单状态查询

Browse Source
This commit is contained in:
苏尹岚
2020-03-10 09:34:47 +08:00
parent c6887599ce
commit 6fe1659dce
1 changed files with 22 additions and 27 deletions
Download Patch File Download Diff File Expand all files Collapse all files

45
business/partner/purchase/jx/localjx/order.go
View File

@@ -959,37 +959,32 @@ func GetMatterOrderStatus(ctx *jxcontext.Context, vendorOrderID string) (result
queryOrderStatus, err := api.JdEclpAPI.QueryOrderStatus(order.EclpOutID) queryOrderStatus, err := api.JdEclpAPI.QueryOrderStatus(order.EclpOutID)
getTrackMessagePlusByOrderResult, err := api.JdEclpAPI.GetTrackMessagePlusByOrder(vendorOrderID) getTrackMessagePlusByOrderResult, err := api.JdEclpAPI.GetTrackMessagePlusByOrder(vendorOrderID)
for _, v := range queryOrderStatus.OrderStatusList { for _, v := range queryOrderStatus.OrderStatusList {
time1 := utils.Str2Time(v.OperateTime) matter := &MatterOrderStatus{}
status1 := v.SoStatusName matter.Time = utils.Str2Time(v.OperateTime)
name1 := v.SoStatusName matter.Status = v.SoStatusName
matter.Name = v.SoStatusName
matter.Sign = 1
result = append(result, matter)
}
if len(getTrackMessagePlusByOrderResult.ResultData) > 0 { if len(getTrackMessagePlusByOrderResult.ResultData) > 0 {
for _, vv := range getTrackMessagePlusByOrderResult.ResultData { for _, vv := range getTrackMessagePlusByOrderResult.ResultData {
time2 := utils.Str2Time(strings.ReplaceAll(vv.OpeTime, "/", "-"))
status2 := vv.OpeTitle
name2 := vv.OpeRemark
matter := &MatterOrderStatus{} matter := &MatterOrderStatus{}
if time2.Unix() <= time1.Unix() { matter.Time = utils.Str2Time(strings.ReplaceAll(vv.OpeTime, "/", "-"))
matter.Time = time2 matter.Status = vv.OpeTitle
matter.Status = status2 matter.Name = vv.OpeRemark
matter.Name = name2 matter.Sign = 2
result = append(result, matter)
} else {
matter.Time = time1
matter.Status = status1
matter.Name = name1
result = append(result, matter)
break
}
}
} else {
matter := &MatterOrderStatus{}
matter.Time = time1
matter.Status = status1
matter.Name = name1
result = append(result, matter) result = append(result, matter)
} }
} }
for i := 0; i < len(result)-1; i++ {
for j := 0; j < len(result)-i-1; j++ {
if result[j].Time.Unix() > result[j+1].Time.Unix() || (result[j].Time.Unix() == result[j+1].Time.Unix() && result[j].Sign > result[j+1].Sign) {
tmp := result[j]
result[j] = result[j+1]
result[j+1] = tmp
}
}
}
if len(queryOrderStatus.OrderStatusList) > 0 { if len(queryOrderStatus.OrderStatusList) > 0 {
if queryOrderStatus.OrderStatusList[len(queryOrderStatus.OrderStatusList)-1].SoStatusCode == jdeclpapi.SoStatusCode10034 { if queryOrderStatus.OrderStatusList[len(queryOrderStatus.OrderStatusList)-1].SoStatusCode == jdeclpapi.SoStatusCode10034 {
dao.Begin(db) dao.Begin(db)