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-09-01 19:59:10 +08:00
parent 5e1fdb3368 cf871b52e6
commit 474c4b6209
6 changed files with 51 additions and 6 deletions
Download Patch File Download Diff File Expand all files Collapse all files

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

@@ -399,7 +399,7 @@ func NotifyUserApplyCancel(order *model.GoodsOrder, cancelReason string) (err er
"color": WX_NEW_ORDER_TEMPLATE_COLOR,
},
"keyword1": map[string]interface{}{ // 订单编号
"value": fmt.Sprintf("%s第%d号订单, %s", model.VendorChineseNames[order.VendorID], order.OrderSeq, order.VendorOrderID),
"value": fmt.Sprintf("storeDetail.Name,%s#%d号订单, %s", model.VendorChineseNames[order.VendorID], order.OrderSeq, order.VendorOrderID),
"color": VendorColors[order.VendorID],
},
"keyword2": map[string]interface{}{ // 订单日期

2
business/model/sku.go
View File

@@ -190,7 +190,7 @@ type SkuName struct {
Video string `json:"video"` //商品视频地址
VideoID string `orm:"column(video_id)" json:"videoID"` //商品视频美团ID
TiktokAttribute string `orm:"column(tiktok_attribute);size(1024)" json:"tiktokAttribute"` //抖音分类属性的存储
MtAttribute string `orm:"column(mt_attribute);size(1024)" json:"MtAttribute"` //美团分类属性的存储
MtAttribute string `orm:"column(mt_attribute);size(1024)" json:"mtAttribute"` //美团分类属性的存储
}
func (*SkuName) TableUnique() [][]string {

2
business/partner/purchase/im/im.go
View File

@@ -25,7 +25,7 @@ func SendVendorV2(data SendData) (err error) {
if data.VendorID == model.VendorIDMTWM {
dataStr, _ := json.Marshal(data.Data)
temp := string(dataStr)
fmt.Println(temp)
globals.SugarLogger.Debugf("SendVendorV2 temp=%s", temp)
if _, err = api.MtwmAPI.MsgSend(string(dataStr)); err != nil {
return err
}

3
business/partner/purchase/mtwm/store_sku2.go
View File

@@ -537,12 +537,11 @@ func SwitchAttr(apiObj *mtwmapi.API, vendorStoreID string, vendorCatID int64, na
}}
}
}
attrValues = append(attrValues, attrValue)
}
}
attrValues = append(attrValues, attrValue)
temp, _ := json.Marshal(attrValues)
attrs = string(temp)
globals.SugarLogger.Debugf("SwitchAttr attrValues=%s", utils.Format4Output(attrValues, false))
} else {
switch vendorCatID { //兜底处理
case 200002727: