1

business/jxutils/weixinmsg/weixinmsg.go

@@ -214,6 +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 {
+		expectedDeliveredTime = "请立即送达"
+	}
 
 	data := map[string]interface{}{
 		"keyword1": map[string]interface{}{ //订单来源
@@ -229,11 +235,11 @@ func NotifyNewOrder(order *model.GoodsOrder) (err error) {
 			"color": WX_NEW_ORDER_TEMPLATE_COLOR,
 		},
 		"keyword4": map[string]interface{}{ //下单时间及金额
-			"value": utils.Time2Str(order.CreatedAt) + "(￥" + utils.Int64ToStr(order.ActualPayPrice) + ")",
+			"value": utils.Time2Str(order.CreatedAt),
 			"color": WX_NEW_ORDER_TEMPLATE_COLOR,
 		},
 		"keyword5": map[string]interface{}{ //配送时间
-			"value": order.ExpectedDeliveredTime,
+			"value": expectedDeliveredTime,
 			"color": WX_NEW_ORDER_TEMPLATE_COLOR,
 		},
 	}