fusen/fusenapi
1
0
Fork 0
Code Issues Pull Requests Packages Projects Releases Wiki Activity

修复

Browse Source
This commit is contained in:
Hiven 2023-07-24 10:26:24 +08:00
parent 3201f4d26d
commit f4def7f8a0
3 changed files with 8 additions and 11 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

2
server/home-user-auth/internal/logic/userorderlistlogic.go
View File

@ -7,7 +7,6 @@ import (
"fusenapi/utils/auth" "fusenapi/utils/auth"
"fusenapi/utils/basic" "fusenapi/utils/basic"
//"fusenapi/utils/configs"
"fusenapi/utils/format" "fusenapi/utils/format"
"fusenapi/utils/order" "fusenapi/utils/order"
"math" "math"
@ -173,7 +172,6 @@ func (l *UserOrderListLogic) UserOrderList(req *types.UserOrderListReq, userinfo
product.PcsBox = pcsBox product.PcsBox = pcsBox
product.Price = *fsOrderDetailItem.FsOrderDetail.Amount product.Price = *fsOrderDetailItem.FsOrderDetail.Amount
product.ProductId = *fsOrderDetailItem.OptionPrice product.ProductId = *fsOrderDetailItem.OptionPrice
//product.Size = *fsOrderDetailItem.FsProductInfo.s
product.Title = *fsOrderDetailItem.FsProductInfo.Title product.Title = *fsOrderDetailItem.FsProductInfo.Title
productList = append(productList, &product) productList = append(productList, &product)

8
utils/configs/order.go Normal file
View File

@ -0,0 +1,8 @@
package configs
type WebSetTimeInfo struct {
ProductDay int64
FactoryDeliverDay int64
DeliverUpsDay int64
UpsTransDay int64
}

9
utils/order/order_status.go
View File

@ -105,11 +105,6 @@ func GetOrderStatusAndLogistics(req GetOrderStatusAndLogisticsReq) (res GetOrder
status = constants.STATUS_FONT_SHIPPED status = constants.STATUS_FONT_SHIPPED
//到达-云仓 //到达-云仓
case constants.STATUS_NEW_ARRIVAL: 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: case constants.STATUS_NEW_COMPLETED:
if req.DeliveryMethod == constants.DELIVERY_METHOD_CLOUD { if req.DeliveryMethod == constants.DELIVERY_METHOD_CLOUD {
status = constants.STATUS_FONT_COMPLETED_CLOUD status = constants.STATUS_FONT_COMPLETED_CLOUD
@ -165,11 +160,7 @@ func GetOrderStatusAndLogistics(req GetOrderStatusAndLogisticsReq) (res GetOrder
res.Times = times res.Times = times
} else { } else {
timesData := times[0:3] timesData := times[0:3]
if logisticsStatus == constants.LOGISTICS_STATUS_DRAW {
timesData[1].Time = format.TimeIntToFormat(req.OrderCtime + req.WebSetTimeInfo.ProductDay*daySecond)
}
res.Times = timesData res.Times = timesData
} }
return res return res
} }