Merge branch 'jdshop' of https://e.coding.net/rosydev/jx-callback into jdshop

This commit is contained in:
richboo111
2023-03-17 14:14:40 +08:00
4 changed files with 19 additions and 8 deletions

View File

@@ -8,6 +8,7 @@ import (
"git.rosy.net.cn/jx-callback/business/model/dao"
"git.rosy.net.cn/jx-callback/business/partner"
"git.rosy.net.cn/jx-callback/globals"
"time"
)
const (
@@ -83,6 +84,9 @@ func ManagerOrderPrint(order *model.GoodsOrder, storeTel string, storeDetail *da
printOrder[PayOrderTime] = utils.Time2Str(order.OrderCreatedAt)
printOrder[TrySendTime] = utils.Time2Str(order.ExpectedDeliveredTime)
if order.ExpectedDeliveredTime.Unix() == utils.DefaultTimeValue.Unix() {
printOrder[TrySendTime] = utils.Time2Str(order.OrderCreatedAt.Add(time.Hour * 1))
}
printOrder[OrderNo] = order.VendorOrderID
printOrder[VendorID] = utils.Int2Str(order.VendorID)
printOrder[VendorName] = jxutils.GetVendorName(order.VendorID)