From dd4c3b1d7296a760b6f2f79da9feacb010689d47 Mon Sep 17 00:00:00 2001 From: richboo111 Date: Mon, 23 Oct 2023 10:56:05 +0800 Subject: [PATCH 1/5] 1 --- controllers/cms_store.go | 11 ++--------- 1 file changed, 2 insertions(+), 9 deletions(-) diff --git a/controllers/cms_store.go b/controllers/cms_store.go index 5a0664f15..495daa212 100644 --- a/controllers/cms_store.go +++ b/controllers/cms_store.go @@ -1687,20 +1687,13 @@ func (c *StoreController) BatchUpdateMTStoreLogos() { // @Description 批量绑定淘鲜达门店 // @Param token header string true "认证token" // @Param vendorOrgCode formData string true "账号id" +// @Param storeID formData int true "本地门店id" // @Param bindInfos formData string true "TaoBindInfo" // @Success 200 {object} controllers.CallResult // @Failure 200 {object} controllers.CallResult // @router /SingleBindTaoVegetable [post] func (c *StoreController) SingleBindTaoVegetable() { - c.callSingleBindTaoVegetable(func(params *tStoreSingleBindTaoVegetableParams) (retVal interface{}, hint string, err error) { - taoBindInfo := make([]cms.TaoBindInfo, 0) - b := bytes.NewBufferString(params.BindInfos) - decoder := json.NewDecoder(b) - if err = decoder.Decode(&taoBindInfo); err == nil { - err, hint = cms.SingleBindTaoVegetable(params.Ctx, taoBindInfo, params.VendorOrgCode) - } - return nil, hint, err - }) + } // @Title 更新淘鲜达门店信息 From 16c56a1b6ee078ee8160d6e3a56c9195065c9c24 Mon Sep 17 00:00:00 2001 From: richboo111 Date: Mon, 23 Oct 2023 11:00:45 +0800 Subject: [PATCH 2/5] 1 --- business/jxstore/cms/store.go | 5 ++--- controllers/cms_store.go | 10 +++++++++- 2 files changed, 11 insertions(+), 4 deletions(-) diff --git a/business/jxstore/cms/store.go b/business/jxstore/cms/store.go index fe11828ee..8c85c6f48 100644 --- a/business/jxstore/cms/store.go +++ b/business/jxstore/cms/store.go @@ -6428,9 +6428,8 @@ var TaoStoreStatus = map[string]int{ } // SingleBindTaoVegetable 单独绑定淘鲜达平台三方映射 -func SingleBindTaoVegetable(ctx *jxcontext.Context, bind []TaoBindInfo, vendorOrgCode string) (error, string) { +func SingleBindTaoVegetable(ctx *jxcontext.Context, bind []TaoBindInfo, vendorOrgCode string, storeID int) (error, string) { var ( - storeID = "" db *dao.DaoDB errList errlist.ErrList errIDName = make([]string, 0) @@ -6452,7 +6451,7 @@ func SingleBindTaoVegetable(ctx *jxcontext.Context, bind []TaoBindInfo, vendorOr // } //} storeMap := &model.StoreMap{ - StoreID: utils.Str2Int(storeID), + StoreID: storeID, VendorID: model.VendorIDTaoVegetable, VendorOrgCode: vendorOrgCode, Status: TaoStoreStatus[v.Status], diff --git a/controllers/cms_store.go b/controllers/cms_store.go index 495daa212..3ec5d3714 100644 --- a/controllers/cms_store.go +++ b/controllers/cms_store.go @@ -1693,7 +1693,15 @@ func (c *StoreController) BatchUpdateMTStoreLogos() { // @Failure 200 {object} controllers.CallResult // @router /SingleBindTaoVegetable [post] func (c *StoreController) SingleBindTaoVegetable() { - + c.callSingleBindTaoVegetable(func(params *tStoreSingleBindTaoVegetableParams) (retVal interface{}, hint string, err error) { + taoBindInfo := make([]cms.TaoBindInfo, 0) + b := bytes.NewBufferString(params.BindInfos) + decoder := json.NewDecoder(b) + if err = decoder.Decode(&taoBindInfo); err == nil { + err, hint = cms.SingleBindTaoVegetable(params.Ctx, taoBindInfo, params.VendorOrgCode, params.StoreID) + } + return nil, hint, err + }) } // @Title 更新淘鲜达门店信息 From af5ca9f371c5d619210091f30b73985019a572fe Mon Sep 17 00:00:00 2001 From: richboo111 Date: Mon, 23 Oct 2023 11:32:20 +0800 Subject: [PATCH 3/5] 1 --- business/jxstore/cms/store.go | 5 +++-- controllers/cms_store.go | 3 +-- 2 files changed, 4 insertions(+), 4 deletions(-) diff --git a/business/jxstore/cms/store.go b/business/jxstore/cms/store.go index 8c85c6f48..4bd1aaf59 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"` //渠道营业状态 @@ -6428,7 +6429,7 @@ var TaoStoreStatus = map[string]int{ } // SingleBindTaoVegetable 单独绑定淘鲜达平台三方映射 -func SingleBindTaoVegetable(ctx *jxcontext.Context, bind []TaoBindInfo, vendorOrgCode string, storeID int) (error, string) { +func SingleBindTaoVegetable(ctx *jxcontext.Context, bind []TaoBindInfo, vendorOrgCode string) (error, string) { var ( db *dao.DaoDB errList errlist.ErrList @@ -6451,7 +6452,7 @@ func SingleBindTaoVegetable(ctx *jxcontext.Context, bind []TaoBindInfo, vendorOr // } //} storeMap := &model.StoreMap{ - StoreID: storeID, + StoreID: v.storeID, VendorID: model.VendorIDTaoVegetable, VendorOrgCode: vendorOrgCode, Status: TaoStoreStatus[v.Status], diff --git a/controllers/cms_store.go b/controllers/cms_store.go index 3ec5d3714..5a0664f15 100644 --- a/controllers/cms_store.go +++ b/controllers/cms_store.go @@ -1687,7 +1687,6 @@ func (c *StoreController) BatchUpdateMTStoreLogos() { // @Description 批量绑定淘鲜达门店 // @Param token header string true "认证token" // @Param vendorOrgCode formData string true "账号id" -// @Param storeID formData int true "本地门店id" // @Param bindInfos formData string true "TaoBindInfo" // @Success 200 {object} controllers.CallResult // @Failure 200 {object} controllers.CallResult @@ -1698,7 +1697,7 @@ func (c *StoreController) SingleBindTaoVegetable() { b := bytes.NewBufferString(params.BindInfos) decoder := json.NewDecoder(b) if err = decoder.Decode(&taoBindInfo); err == nil { - err, hint = cms.SingleBindTaoVegetable(params.Ctx, taoBindInfo, params.VendorOrgCode, params.StoreID) + err, hint = cms.SingleBindTaoVegetable(params.Ctx, taoBindInfo, params.VendorOrgCode) } return nil, hint, err }) From b84bb578cf337a06c3ef223d318975ff33919570 Mon Sep 17 00:00:00 2001 From: richboo111 Date: Mon, 23 Oct 2023 11:34:34 +0800 Subject: [PATCH 4/5] 1 --- business/jxstore/cms/store.go | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-) diff --git a/business/jxstore/cms/store.go b/business/jxstore/cms/store.go index 4bd1aaf59..441976f06 100644 --- a/business/jxstore/cms/store.go +++ b/business/jxstore/cms/store.go @@ -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 From 5a8d241f67b13bf6ace28e52026cbda83b553335 Mon Sep 17 00:00:00 2001 From: richboo111 Date: Mon, 23 Oct 2023 14:22:03 +0800 Subject: [PATCH 5/5] 1 --- business/jxutils/weixinmsg/weixinmsg.go | 4 ++-- 1 file changed, 2 insertions(+), 2 deletions(-) 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{}{