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-05-11 10:58:55 +08:00
parent 476f8c0943 6d314dbacc
commit 816b200db7
21 changed files with 471 additions and 214 deletions
Download Patch File Download Diff File Expand all files Collapse all files

3
business/model/api_config.go
View File

@@ -2,9 +2,6 @@ package model
// VendorIDJD, VendorIDMTWM与VendorIDELM的定义和老系统是兼容的
const (
IMVendorIDMT = "10" //美团IM
IMVendorIDELM = "11" //饿了么im
VendorTypeUnknown = 0 // 未知
VendorTypePurchase = 1 // 购物平台
VendorTypeDelivery = 2 // 快递平台

6
business/model/dao/store.go
View File

@@ -1654,9 +1654,9 @@ func GetStoreBaseByVendorStoreID(vendorStoreID string, vendorID int) (storeDetai
return nil, errors.New("vendorStoreID不能为空")
}
DefaultTimeValue := utils.Str2Time("1970-01-01 00:00:00")
sql := `SELECT t.* FROM store t WHERE t.id = (SELECT s.store_id FROM store_map s WHERE s.vendor_store_id= ? AND s.vendor_id= ? AND s.deleted_at= ? )`
if err := GetRow(GetDB(), &storeDetail, sql, []interface{}{vendorStoreID, vendorID, DefaultTimeValue}); err != nil {
//DefaultTimeValue := utils.Str2Time("1970-01-01 00:00:00")
sql := `SELECT t.* FROM store t WHERE t.id = (SELECT s.store_id FROM store_map s WHERE s.vendor_store_id= ? AND s.vendor_id= ? AND s.deleted_at= '1970-01-01 00:00:00' )`
if err := GetRow(GetDB(), &storeDetail, sql, []interface{}{vendorStoreID, vendorID}); err != nil {
return nil, err
}
return storeDetail, err

4
business/model/sku.go
View File

@@ -23,8 +23,8 @@ const (
const (
SkuStatusDeleted = -1 // 商品删除
SkuStatusDontSale = 0 // 商品正常
SkuStatusNormal = 1 // 商品不可售
SkuStatusDontSale = 0 // 商品不可售
SkuStatusNormal = 1 // 商品正常
)
const (