diff --git a/business/jxstore/cms/store.go b/business/jxstore/cms/store.go index fe11828ee..441976f06 100644 --- a/business/jxstore/cms/store.go +++ b/business/jxstore/cms/store.go @@ -6417,6 +6417,7 @@ func BatchUpdateMTStoreLogos(vendorOrgCode string, relInfo []MtRelInfo) (hint st } type TaoBindInfo struct { + storeID int `json:"storeID"` VendorStoreID string `json:"vendorStoreID"` VendorStoreName string `json:"vendorStoreName"` Status string `json:"status"` //渠道营业状态 @@ -6430,7 +6431,6 @@ var TaoStoreStatus = map[string]int{ // SingleBindTaoVegetable 单独绑定淘鲜达平台三方映射 func SingleBindTaoVegetable(ctx *jxcontext.Context, bind []TaoBindInfo, vendorOrgCode string) (error, string) { var ( - storeID = "" db *dao.DaoDB errList errlist.ErrList errIDName = make([]string, 0) @@ -6452,7 +6452,7 @@ func SingleBindTaoVegetable(ctx *jxcontext.Context, bind []TaoBindInfo, vendorOr // } //} storeMap := &model.StoreMap{ - StoreID: utils.Str2Int(storeID), + StoreID: v.storeID, VendorID: model.VendorIDTaoVegetable, VendorOrgCode: vendorOrgCode, Status: TaoStoreStatus[v.Status], @@ -6466,7 +6466,7 @@ func SingleBindTaoVegetable(ctx *jxcontext.Context, bind []TaoBindInfo, vendorOr //跟美团同步 平台调价、调价套餐 var ( cond = map[string]interface{}{ - model.FieldStoreID: storeID, + model.FieldStoreID: v.storeID, model.FieldVendorID: model.VendorIDMTWM, } tempMaps []*model.StoreMap diff --git a/business/jxutils/weixinmsg/weixinmsg.go b/business/jxutils/weixinmsg/weixinmsg.go index 3d5bcdedc..a683c728c 100644 --- a/business/jxutils/weixinmsg/weixinmsg.go +++ b/business/jxutils/weixinmsg/weixinmsg.go @@ -410,7 +410,7 @@ func NotifyUserApplyCancel(order *model.GoodsOrder, cancelReason string) (err er "color": WX_NEW_ORDER_TEMPLATE_COLOR, }, "keyword1": map[string]interface{}{ // 订单编号 - "value": fmt.Sprintf("storeDetail.Name,%s#%d号订单, %s", model.VendorChineseNames[order.VendorID], order.OrderSeq, order.VendorOrderID), + "value": storeDetail.Name + fmt.Sprintf(",%s#%d号订单, %s", model.VendorChineseNames[order.VendorID], order.OrderSeq, order.VendorOrderID), "color": VendorColors[order.VendorID], }, "keyword2": map[string]interface{}{ // 订单日期 @@ -768,7 +768,7 @@ func NotifyAfsOrderStatus(afsOrder *model.AfsOrder) (err error) { "color": WX_HIGHLEVEL_TEMPLATE_COLOR2, }, "keyword1": map[string]interface{}{ - "value": fmt.Sprintf("%s 第%d号订单:", model.VendorChineseNames[afsOrder.VendorID], order.OrderSeq) + afsOrder.AfsOrderID, + "value": storeDetail.Name + "," + fmt.Sprintf("%s 第%d号订单:", model.VendorChineseNames[afsOrder.VendorID], order.OrderSeq) + afsOrder.AfsOrderID, "color": WX_TEMPLATE_VENDERCOLOR_JDDJ, }, "keyword2": map[string]interface{}{