diff --git a/business/jxstore/tempop/tempop.go b/business/jxstore/tempop/tempop.go index 77001ff3a..2987d56a3 100644 --- a/business/jxstore/tempop/tempop.go +++ b/business/jxstore/tempop/tempop.go @@ -1937,13 +1937,13 @@ func UploadJdsImage(ctx *jxcontext.Context) (err error) { data = ` {"address":"甬旺农贸市场蔬菜摊","cityName": "苏州市","id": 100002,"name": "斜塘顺达广场店","payeeName": "李川川","status": 1,"tel1": "13812641804","tel2": ""} ` - weixinmsg.SmartMessageTemplateSend("oYN_usv1RPvrSxCvo1WsbwI8lZa0", weixinmsg.WX_AFS_ORDER_WAIT4APPROVE_TEMPLATE_ID, globals.WxBackstageHost+fmt.Sprintf("%s%d", weixinmsg.WX_TO_ORDER_PAGE_URL, storeID), weixinmsg.WX_MINI_TO_ORDER_PAGE_URL+fmt.Sprintf("?jxStoreId=%v&data=%v", storeID, data), nil) + weixinmsg.SmartMessageTemplateSend("oYN_uskdlApt6sv5Y4m_t62iO0f4", weixinmsg.WX_NEWORDER_TEMPLATE_ID, globals.WxBackstageHost+fmt.Sprintf("%s%d", weixinmsg.WX_TO_ORDER_PAGE_URL, storeID), weixinmsg.WX_MINI_TO_ORDER_PAGE_URL+fmt.Sprintf("?jxStoreId=%v&data=%v", storeID, data), nil) storeID = 100118 data = ` {"address":"成都市金牛区抚琴综合市场博力多超市旁边扶手楼梯上","cityName": "成都市","id": 100002,"name": "抚琴店-下单送盐","payeeName": "李川川","status": 1,"tel1": "13812641804","tel2": ""} ` - weixinmsg.SmartMessageTemplateSend("oYN_usv1RPvrSxCvo1WsbwI8lZa0", weixinmsg.WX_AFS_ORDER_WAIT4APPROVE_TEMPLATE_ID, globals.WxBackstageHost+fmt.Sprintf("%s%d", weixinmsg.WX_TO_ORDER_PAGE_URL, storeID), weixinmsg.WX_MINI_TO_ORDER_PAGE_URL+fmt.Sprintf("?jxStoreId=%v&data=%v", storeID, data), nil) + weixinmsg.SmartMessageTemplateSend("oYN_uskdlApt6sv5Y4m_t62iO0f4", weixinmsg.WX_NEWORDER_TEMPLATE_ID, globals.WxBackstageHost+fmt.Sprintf("%s%d", weixinmsg.WX_TO_ORDER_PAGE_URL, storeID), weixinmsg.WX_MINI_TO_ORDER_PAGE_URL+fmt.Sprintf("?jxStoreId=%v&data=%v", storeID, data), nil) //orderman.RefreshJdAfsOrderTotalShopMoney() return err } diff --git a/business/model/dao/dao_order.go b/business/model/dao/dao_order.go index 0aec2d520..f4f10956e 100644 --- a/business/model/dao/dao_order.go +++ b/business/model/dao/dao_order.go @@ -802,6 +802,7 @@ func GetOrders(db *DaoDB, ids []int64, isIncludeSku, isIncludeFake bool, fromDat LEFT JOIN user tu1 ON tu1.mobile = t5.operator_phone LEFT JOIN user tu2 ON tu2.mobile = t5.operator_phone2 LEFT JOIN user tu3 ON tu3.mobile = t5.operator_phone3 + LEFT JOIN (SELECT MAX(created_at), vendor_order_id FROM afs_order GROUP BY 2) t7 ON t7.vendor_order_id = t1.vendor_order_id ` if isIncludeSku { sql += `