diff --git a/business/jxstore/act/act.go b/business/jxstore/act/act.go index 8f210537f..033e99b96 100644 --- a/business/jxstore/act/act.go +++ b/business/jxstore/act/act.go @@ -663,7 +663,7 @@ func CreateActForMtByOrder(ctx *jxcontext.Context, act *model.Act, vendorIDs []i } setActDefault(act) //处理actStoreSku - //参数有可能传多个店多个商品,先分好组:map = [门店ID][]{商品ID1,商品ID2},[门店ID][]{商品ID1,商品ID3,商品ID4} + //参数有可能传多个店多个商品,先分好组:map = [门店ID1][]{商品ID1,商品ID2},[门店ID2][]{商品ID1,商品ID3,商品ID4} for _, v := range actStoreSku { if resultList, _ := dao.GetStoresSkusInfo(db, []int{v.StoreID}, []int{v.SkuID}); len(resultList) > 0 { actStoreSkuMap[v.StoreID] = append(actStoreSkuMap[v.StoreID], &model.StoreSkuBind{ diff --git a/business/jxstore/tempop/tempop.go b/business/jxstore/tempop/tempop.go index 240b374c5..3e5116187 100644 --- a/business/jxstore/tempop/tempop.go +++ b/business/jxstore/tempop/tempop.go @@ -4,6 +4,7 @@ import ( "bytes" "context" "fmt" + "git.rosy.net.cn/jx-callback/business/jxutils/weixinmsg" "regexp" "strings" "time" @@ -1919,16 +1920,21 @@ func UploadJdsImage(ctx *jxcontext.Context) (err error) { // } //} //补商品 - order, _ := partner.CurOrderManager.LoadOrder("2113607158000051", model.VendorIDJD) - handler := partner.GetPurchaseOrderHandlerFromVendorID(model.VendorIDJD) - order2, _ := handler.GetOrder(order.VendorOrgCode, order.VendorOrderID, "") - if len(order.Skus) == 0 { - if len(order2.Skus) > 0 { - for _, v := range order2.Skus { - dao.CreateEntity(dao.GetDB(), v) - } - } - } + //order, _ := partner.CurOrderManager.LoadOrder("2113480902000652", model.VendorIDJD) + //handler := partner.GetPurchaseOrderHandlerFromVendorID(model.VendorIDJD) + //order2, _ := handler.GetOrder(order.VendorOrgCode, order.VendorOrderID, "") + //if len(order.Skus) == 0 { + // if len(order2.Skus) > 0 { + // for _, v := range order2.Skus { + // dao.CreateEntity(dao.GetDB(), v) + // } + // } + //} + storeID := 100002 + data := ` + {"address":"甬旺农贸市场蔬菜摊","cityName": "苏州市","id": 100002,"name": "斜塘顺达广场店","payeeName": "李川川","status": 1,"tel1": "13812641804","tel2": ""} + ` + 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) return err } diff --git a/conf/app.conf b/conf/app.conf index d524e0db1..b0967bc05 100644 --- a/conf/app.conf +++ b/conf/app.conf @@ -138,8 +138,8 @@ storeNameEbai2 = "好菜鲜生" smsSignName = "京西菜市" smsMobileVerifyTemplate = "SMS_175583158" -smsNewOrderTemplate = "SMS_217235242" -smsNewOrderTemplateQ = "SMS_217235240" +smsNewOrderTemplate = "SMS_218287880" +smsNewOrderTemplateQ = "SMS_218292870" smsOrderCanceledTemplate = "SMS_175573134" smsNewUserOrderTemplate = "SMS_190284055" smsJxOrderDelivering = "SMS_217235545"