From bc380051e56eff3368a3387618b45d7a315f5578 Mon Sep 17 00:00:00 2001 From: richboo111 Date: Sat, 7 Oct 2023 09:47:46 +0800 Subject: [PATCH] 1 --- business/jxutils/weixinmsg/weixinmsg.go | 13 +++++++++++-- 1 file changed, 11 insertions(+), 2 deletions(-) diff --git a/business/jxutils/weixinmsg/weixinmsg.go b/business/jxutils/weixinmsg/weixinmsg.go index 646f2ead4..3d5bcdedc 100644 --- a/business/jxutils/weixinmsg/weixinmsg.go +++ b/business/jxutils/weixinmsg/weixinmsg.go @@ -218,11 +218,20 @@ func NotifyNewOrder(order *model.GoodsOrder) (err error) { storeDetail, err := dao.GetStoreDetail(dao.GetDB(), jxutils.GetSaleStoreIDFromOrder(order), order.VendorID, "") var expectedDeliveredTime = "" - if utils.Time2Str(order.ExpectedDeliveredTime) == "1970-01-01 00:00:00" || len(utils.Time2Str(order.ExpectedDeliveredTime)) == 0 { + //if order.VendorID == model.VendorIDMTWM { + if order.BusinessType == model.BusinessTypeImmediate { expectedDeliveredTime = "立即送" - } else { + } + if order.BusinessType == model.BusinessTypeDingshida { expectedDeliveredTime = "预定单" } + //} else { + // if utils.Time2Str(order.ExpectedDeliveredTime) == "1970-01-01 00:00:00" || len(utils.Time2Str(order.ExpectedDeliveredTime)) == 0 { + // expectedDeliveredTime = "立即送" + // } else { + // expectedDeliveredTime = "预定单" + // } + //} data := map[string]interface{}{ "keyword1": map[string]interface{}{ //订单来源