liulei/jx-callback
1
0
Fork 0
Code Issues Pull Requests Actions Packages Projects Releases Wiki Activity

Merge remote-tracking branch 'origin/mark' into su

Browse Source
This commit is contained in:
苏尹岚
2019-11-06 14:32:40 +08:00
parent 186f19e81b dc7d712ff6
commit 89a5c2ac9f
22 changed files with 127 additions and 246 deletions
Download Patch File Download Diff File Expand all files Collapse all files

10
business/jxutils/jxutils.go
View File

@@ -80,18 +80,12 @@ func getJxStoreIDFromOrder(order *model.GoodsOrder) (retVal int) {
// 此函数得到的是order的销售门店京西ID，与GetJxStoreIDFromOrder的区别是order.StoreID的解释不同，参考其它相关资料
func GetSaleStoreIDFromOrder(order *model.GoodsOrder) (retVal int) {
if order.VendorID != model.VendorIDWSC {
return getJxStoreIDFromOrder(order)
}
return order.StoreID
return getJxStoreIDFromOrder(order)
}
// 此函数得到的是order的商品的展示门店京西ID，与GetJxStoreIDFromOrder的区别是order.StoreID的解释不同，参考其它相关资料
func GetShowStoreIDFromOrder(order *model.GoodsOrder) (retVal int) {
if order.VendorID != model.VendorIDWSC {
return getJxStoreIDFromOrder(order)
}
return order.JxStoreID
return getJxStoreIDFromOrder(order)
}
func GetSkuIDFromOrderSku(sku *model.OrderSku) (skuID int) {

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

@@ -14,8 +14,6 @@ import (
"git.rosy.net.cn/jx-callback/globals"
)
const weixinTemplateID4StoreStatusChanged = "Fl0vOnBKTQqRFx3-shGKxdCnxMdQXNeODzgkuwd7oxw"
// todo msgType不依赖于钉钉
func SendUserMessage(msgType string, user *model.User, title, content string) (err error) {
userID := user.GetID()