From c72794a9221d504a3fa49b7c28a41080985246c0 Mon Sep 17 00:00:00 2001 From: richboo111 Date: Fri, 5 May 2023 17:05:19 +0800 Subject: [PATCH] 1 --- business/jxutils/weixinmsg/weixinmsg.go | 7 ++++--- 1 file changed, 4 insertions(+), 3 deletions(-) diff --git a/business/jxutils/weixinmsg/weixinmsg.go b/business/jxutils/weixinmsg/weixinmsg.go index 2abf492f6..1841068ee 100644 --- a/business/jxutils/weixinmsg/weixinmsg.go +++ b/business/jxutils/weixinmsg/weixinmsg.go @@ -214,11 +214,12 @@ func NotifyNewOrder(order *model.GoodsOrder) (err error) { return nil } storeDetail, err := dao.GetStoreDetail(dao.GetDB(), jxutils.GetSaleStoreIDFromOrder(order), order.VendorID, "") + var expectedDeliveredTime = "" - if utils.Time2Str(order.ExpectedDeliveredTime) != "1970-01-01 00:00:00" { - expectedDeliveredTime = "请于" + utils.Time2Str(order.ExpectedDeliveredTime) + "前送达" - } else { + if utils.Time2Str(order.ExpectedDeliveredTime) == "1970-01-01 00:00:00" || len(utils.Time2Str(order.ExpectedDeliveredTime)) == 0 { expectedDeliveredTime = "请立即送达" + } else { + expectedDeliveredTime = "请于" + utils.Time2Str(order.ExpectedDeliveredTime) + "前送达" } data := map[string]interface{}{