liulei/jx-callback
1
0
Fork 0
Code Issues Pull Requests Actions Packages Projects Releases Wiki Activity

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

Browse Source
This commit is contained in:
邹宗楠
2023-10-07 16:57:54 +08:00
parent d96f9a7b47 009e109f68
commit 1af74ab37a
1 changed files with 11 additions and 2 deletions
Download Patch File Download Diff File Expand all files Collapse all files

13
business/jxutils/weixinmsg/weixinmsg.go
View File

@@ -218,11 +218,20 @@ func NotifyNewOrder(order *model.GoodsOrder) (err error) {
storeDetail, err := dao.GetStoreDetail(dao.GetDB(), jxutils.GetSaleStoreIDFromOrder(order), order.VendorID, "") storeDetail, err := dao.GetStoreDetail(dao.GetDB(), jxutils.GetSaleStoreIDFromOrder(order), order.VendorID, "")
var expectedDeliveredTime = "" 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 = "立即送" expectedDeliveredTime = "立即送"
} else { }
if order.BusinessType == model.BusinessTypeDingshida {
expectedDeliveredTime = "预定单" 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{}{ data := map[string]interface{}{
"keyword1": map[string]interface{}{ //订单来源 "keyword1": map[string]interface{}{ //订单来源