订单列表--完善

utils/order/order_status.go

@@ -38,7 +38,7 @@ type GetOrderStatusAndLogisticsReq struct {
 	DeliveryMethod constants.DeliveryMethod
 	IsPayCompleted int64
 	OrderCtime     int64
-	
+
 	SureTime       int64
 	ProductTime    int64
 	ProductEndtime int64
@@ -48,7 +48,6 @@ type GetOrderStatusAndLogisticsReq struct {
 	ArrivalTime    int64
 	RecevieTime    int64
 
-	
 	WebSetTimeInfo configs.WebSetTimeInfo
 }
 
@@ -72,11 +71,11 @@ func GetOrderStatusAndLogistics(req GetOrderStatusAndLogisticsReq) (res GetOrder
 	times := make([]GetOrderStatusAndLogisticsResTimes, 5)
 	m := 1
 	for i := 0; i < 5; i++ {
-		m++
 		times[i] = GetOrderStatusAndLogisticsResTimes{
 			Key:  m,
 			Time: "",
 		}
+		m++
 	}
 
 	switch req.OrderStatus {
@@ -162,6 +161,9 @@ func GetOrderStatusAndLogistics(req GetOrderStatusAndLogisticsReq) (res GetOrder
 		res.Times = times
 	} else {
 		timesData := times[0:3]
+		if logisticsStatus == constants.LOGISTICS_STATUS_DRAW {
+			timesData[1].Time = format.TimeIntToFormat(req.OrderCtime + req.WebSetTimeInfo.ProductDay*daySecond)
+		}
 		res.Times = timesData
 	}
 	return res