diff --git a/server/home-user-auth/internal/logic/userorderlistlogic.go b/server/home-user-auth/internal/logic/userorderlistlogic.go index ea5cf6cd..b6d2b9a4 100644 --- a/server/home-user-auth/internal/logic/userorderlistlogic.go +++ b/server/home-user-auth/internal/logic/userorderlistlogic.go @@ -7,7 +7,6 @@ import ( "fusenapi/utils/auth" "fusenapi/utils/basic" - //"fusenapi/utils/configs" "fusenapi/utils/format" "fusenapi/utils/order" "math" @@ -173,7 +172,6 @@ func (l *UserOrderListLogic) UserOrderList(req *types.UserOrderListReq, userinfo product.PcsBox = pcsBox product.Price = *fsOrderDetailItem.FsOrderDetail.Amount product.ProductId = *fsOrderDetailItem.OptionPrice - //product.Size = *fsOrderDetailItem.FsProductInfo.s product.Title = *fsOrderDetailItem.FsProductInfo.Title productList = append(productList, &product) diff --git a/utils/configs/order.go b/utils/configs/order.go new file mode 100644 index 00000000..291ac401 --- /dev/null +++ b/utils/configs/order.go @@ -0,0 +1,8 @@ +package configs + +type WebSetTimeInfo struct { + ProductDay int64 + FactoryDeliverDay int64 + DeliverUpsDay int64 + UpsTransDay int64 +} diff --git a/utils/order/order_status.go b/utils/order/order_status.go index 5c3b0da4..e12af5a8 100644 --- a/utils/order/order_status.go +++ b/utils/order/order_status.go @@ -105,11 +105,6 @@ func GetOrderStatusAndLogistics(req GetOrderStatusAndLogisticsReq) (res GetOrder status = constants.STATUS_FONT_SHIPPED //到达-云仓 case constants.STATUS_NEW_ARRIVAL: - if req.DeliveryMethod == constants.DELIVERY_METHOD_CLOUD { - logisticsStatus = constants.LOGISTICS_STATUS_SHIPPING - } - status = constants.STATUS_FONT_INVENTORY - //订单完成 case constants.STATUS_NEW_COMPLETED: if req.DeliveryMethod == constants.DELIVERY_METHOD_CLOUD { status = constants.STATUS_FONT_COMPLETED_CLOUD @@ -165,11 +160,7 @@ 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 }