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-24 10:23:59 +08:00
parent 0dce9e560d 5a8d241f67
commit 9b8b41326c
2 changed files with 5 additions and 5 deletions
Download Patch File Download Diff File Expand all files Collapse all files

6
business/jxstore/cms/store.go
View File

@@ -6417,6 +6417,7 @@ func BatchUpdateMTStoreLogos(vendorOrgCode string, relInfo []MtRelInfo) (hint st
} }
type TaoBindInfo struct { type TaoBindInfo struct {
storeID int `json:"storeID"`
VendorStoreID string `json:"vendorStoreID"` VendorStoreID string `json:"vendorStoreID"`
VendorStoreName string `json:"vendorStoreName"` VendorStoreName string `json:"vendorStoreName"`
Status string `json:"status"` //渠道营业状态 Status string `json:"status"` //渠道营业状态
@@ -6430,7 +6431,6 @@ var TaoStoreStatus = map[string]int{
// SingleBindTaoVegetable 单独绑定淘鲜达平台三方映射 // SingleBindTaoVegetable 单独绑定淘鲜达平台三方映射
func SingleBindTaoVegetable(ctx *jxcontext.Context, bind []TaoBindInfo, vendorOrgCode string) (error, string) { func SingleBindTaoVegetable(ctx *jxcontext.Context, bind []TaoBindInfo, vendorOrgCode string) (error, string) {
var ( var (
storeID = ""
db *dao.DaoDB db *dao.DaoDB
errList errlist.ErrList errList errlist.ErrList
errIDName = make([]string, 0) errIDName = make([]string, 0)
@@ -6452,7 +6452,7 @@ func SingleBindTaoVegetable(ctx *jxcontext.Context, bind []TaoBindInfo, vendorOr
// } // }
//} //}
storeMap := &model.StoreMap{ storeMap := &model.StoreMap{
StoreID: utils.Str2Int(storeID), StoreID: v.storeID,
VendorID: model.VendorIDTaoVegetable, VendorID: model.VendorIDTaoVegetable,
VendorOrgCode: vendorOrgCode, VendorOrgCode: vendorOrgCode,
Status: TaoStoreStatus[v.Status], Status: TaoStoreStatus[v.Status],
@@ -6466,7 +6466,7 @@ func SingleBindTaoVegetable(ctx *jxcontext.Context, bind []TaoBindInfo, vendorOr
//跟美团同步 平台调价、调价套餐 //跟美团同步 平台调价、调价套餐
var ( var (
cond = map[string]interface{}{ cond = map[string]interface{}{
model.FieldStoreID: storeID, model.FieldStoreID: v.storeID,
model.FieldVendorID: model.VendorIDMTWM, model.FieldVendorID: model.VendorIDMTWM,
} }
tempMaps []*model.StoreMap tempMaps []*model.StoreMap

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

@@ -410,7 +410,7 @@ func NotifyUserApplyCancel(order *model.GoodsOrder, cancelReason string) (err er
"color": WX_NEW_ORDER_TEMPLATE_COLOR, "color": WX_NEW_ORDER_TEMPLATE_COLOR,
}, },
"keyword1": map[string]interface{}{ // 订单编号 "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], "color": VendorColors[order.VendorID],
}, },
"keyword2": map[string]interface{}{ // 订单日期 "keyword2": map[string]interface{}{ // 订单日期
@@ -768,7 +768,7 @@ func NotifyAfsOrderStatus(afsOrder *model.AfsOrder) (err error) {
"color": WX_HIGHLEVEL_TEMPLATE_COLOR2, "color": WX_HIGHLEVEL_TEMPLATE_COLOR2,
}, },
"keyword1": map[string]interface{}{ "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, "color": WX_TEMPLATE_VENDERCOLOR_JDDJ,
}, },
"keyword2": map[string]interface{}{ "keyword2": map[string]interface{}{