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

冲突修改

Browse Source
This commit is contained in:
苏尹岚
2020-03-30 09:57:11 +08:00
parent 7c01a20bf8 b0fdf7af1d
commit 949e308c59
3 changed files with 18 additions and 15 deletions
Download Patch File Download Diff File Expand all files Collapse all files

2
business/jxstore/cms/sku.go
View File

@@ -392,9 +392,11 @@ func GetSkuNames(ctx *jxcontext.Context, keyword string, isBySku bool, params ma
FROM sku_name t1 FROM sku_name t1
LEFT JOIN sku t2 ON t1.id = t2.name_id AND t2.deleted_at = ? LEFT JOIN sku t2 ON t1.id = t2.name_id AND t2.deleted_at = ?
LEFT JOIN sku_name_place_bind t3 ON t1.id = t3.name_id LEFT JOIN sku_name_place_bind t3 ON t1.id = t3.name_id
LEFT JOIN price_refer_snapshot t4 ON t4.city_code = ? AND t4.snapshot_at = ? AND t4.sku_id = t2.id
WHERE t1.deleted_at = ?` WHERE t1.deleted_at = ?`
sqlParams := []interface{}{ sqlParams := []interface{}{
utils.DefaultTimeValue, utils.DefaultTimeValue,
0, utils.Time2Date(time.Now().AddDate(0, 0, -1)),
utils.DefaultTimeValue, utils.DefaultTimeValue,
} }
if keyword != "" { if keyword != "" {

20
business/jxstore/event/event.go
View File

@@ -175,16 +175,16 @@ func GetCheckVendorCookie(ctx *jxcontext.Context, vendorIDs []int, isAuto bool)
errMsg += fmt.Sprintf(" 饿百账号:[饿百后台饿鲜达全国账号]的Cookie无效了！", vv) errMsg += fmt.Sprintf(" 饿百账号:[饿百后台饿鲜达全国账号]的Cookie无效了！", vv)
flag = true flag = true
} }
result2, err2 := api.EbaiAPI.GetExianDaSkuDepot("190600741") // result2, err2 := api.EbaiAPI.GetExianDaSkuDepot("190600741")
if err2 != nil || result2 == nil { // if err2 != nil || result2 == nil {
cc := &CheckCookie{} // cc := &CheckCookie{}
cc.VendorID = v // cc.VendorID = v
cc.VendorOrgCode = "饿鲜达供应链系统" // cc.VendorOrgCode = "饿鲜达供应链系统"
cc.Status = "无效" // cc.Status = "无效"
ccList = append(ccList, cc) // ccList = append(ccList, cc)
errMsg += fmt.Sprintf(" 饿百账号:[饿鲜达供应链系统]的Cookie无效了！", vv) // errMsg += fmt.Sprintf(" 饿百账号:[饿鲜达供应链系统]的Cookie无效了！", vv)
flag = true // flag = true
} // }
case model.VendorIDMTWM: case model.VendorIDMTWM:
_, err := api.MtwmAPI.PackagePriceGet(mtStoreID) _, err := api.MtwmAPI.PackagePriceGet(mtStoreID)
if err != nil { if err != nil {

1
business/model/sku.go
View File

@@ -289,4 +289,5 @@ type SkuNameExt struct {
FullName string `json:"fullName"` FullName string `json:"fullName"`
Places []int `orm:"-" json:"places"` Places []int `orm:"-" json:"places"`
PlacesStr string `json:"-"` PlacesStr string `json:"-"`
MidUnitPrice int `json:"midUnitPrice"`
} }