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

aa

Browse Source
This commit is contained in:
苏尹岚
2021-01-27 15:26:01 +08:00
parent d2955b2a2f
commit e38ab5104d
2 changed files with 18 additions and 4 deletions
Download Patch File Download Diff File Expand all files Collapse all files

11
business/partner/purchase/ebai/store.go
View File

@@ -30,6 +30,7 @@ type tEbaiStoreInfo struct {
CityID int `orm:"column(city_id)"` CityID int `orm:"column(city_id)"`
DistrictID int `orm:"column(district_id)"` DistrictID int `orm:"column(district_id)"`
VendorStoreName string VendorStoreName string
BrandName string
} }
func (p *PurchaseHandler) CreateStore(db *dao.DaoDB, storeID int, userName string) (vendorStoreID string, err error) { func (p *PurchaseHandler) CreateStore(db *dao.DaoDB, storeID int, userName string) (vendorStoreID string, err error) {
@@ -151,9 +152,11 @@ func (p *PurchaseHandler) UpdateStore(db *dao.DaoDB, storeID int, userName strin
SELECT SELECT
t1.*, t1.*,
t2.status ebai_store_status, t2.vendor_store_id, t2.vendor_org_code, t2.status ebai_store_status, t2.vendor_store_id, t2.vendor_org_code,
IF(t1.updated_at > t2.updated_at, t1.last_operator, t2.last_operator) real_last_operator, t2.sync_status, t2.vendor_store_name IF(t1.updated_at > t2.updated_at, t1.last_operator, t2.last_operator) real_last_operator, t2.sync_status, t2.vendor_store_name,
t3.name brand_name
FROM store t1 FROM store t1
JOIN store_map t2 ON t1.id = t2.store_id AND t2.vendor_id = ? AND (t2.deleted_at = ?) JOIN store_map t2 ON t1.id = t2.store_id AND t2.vendor_id = ? AND (t2.deleted_at = ?)
LEFT JOIN brand t3 ON t3.id = t1.brand_id
WHERE t1.id = ? WHERE t1.id = ?
ORDER BY t2.updated_at ORDER BY t2.updated_at
` `
@@ -398,7 +401,11 @@ func genStoreMapFromStore(store *tEbaiStoreInfo) map[string]interface{} {
if store.VendorStoreName != "" { if store.VendorStoreName != "" {
params["name"] = store.VendorStoreName params["name"] = store.VendorStoreName
} else { } else {
params["name"] = jxutils.ComposeStoreName(store.Name, model.VendorIDEBAI) if store.BrandID != 1 {
params["name"] = store.Name
} else {
params["name"] = jxutils.ComposeStoreName(store.Name, model.VendorIDEBAI)
}
} }
} }
boxFee, _ := dao.GetSysConfigAsInt64(dao.GetDB(), model.ConfigSysEbaiBoxFee) boxFee, _ := dao.GetSysConfigAsInt64(dao.GetDB(), model.ConfigSysEbaiBoxFee)

11
business/partner/purchase/jd/store.go
View File

@@ -33,6 +33,7 @@ type tJdStoreInfo struct {
RealLastOperator string RealLastOperator string
SyncStatus int SyncStatus int
VendorStoreName string VendorStoreName string
BrandName string
} }
var ( var (
@@ -127,9 +128,11 @@ func (p *PurchaseHandler) UpdateStore(db *dao.DaoDB, storeID int, userName strin
t1.*, city.jd_code jd_city_code, district.jd_code jd_district_code, t1.*, city.jd_code jd_city_code, district.jd_code jd_district_code,
t2.status jd_store_status, t2.vendor_store_id, IF(t1.updated_at > t2.updated_at, t1.last_operator, t2.status jd_store_status, t2.vendor_store_id, IF(t1.updated_at > t2.updated_at, t1.last_operator,
t2.last_operator) real_last_operator, t2.last_operator) real_last_operator,
t2.sync_status, t2.freight_deduction_pack, t2.vendor_org_code, t2.vendor_store_name t2.sync_status, t2.freight_deduction_pack, t2.vendor_org_code, t2.vendor_store_name,
t3.name brand_name
FROM store t1 FROM store t1
JOIN store_map t2 ON t1.id = t2.store_id AND t2.vendor_id = ? AND (t2.deleted_at = ?) JOIN store_map t2 ON t1.id = t2.store_id AND t2.vendor_id = ? AND (t2.deleted_at = ?)
LEFT JOIN brand t3 ON t3.id = t1.brand_id
LEFT JOIN place city ON t1.city_code = city.code LEFT JOIN place city ON t1.city_code = city.code
LEFT JOIN place district ON t1.district_code = district.code LEFT JOIN place district ON t1.district_code = district.code
WHERE t1.id = ? WHERE t1.id = ?
@@ -159,7 +162,11 @@ func (p *PurchaseHandler) UpdateStore(db *dao.DaoDB, storeID int, userName strin
if store.VendorStoreName != "" { if store.VendorStoreName != "" {
storeParams.StationName = store.VendorStoreName storeParams.StationName = store.VendorStoreName
} else { } else {
storeParams.StationName = jxutils.ComposeStoreName(store.Name, model.VendorIDJD) if store.BrandID != 1 {
storeParams.StationName = store.Name
} else {
storeParams.StationName = jxutils.ComposeStoreName(store.Name, model.VendorIDJD)
}
} }
storeParams.StationName = utils.LimitUTF8StringLen(storeParams.StationName, jdapi.MaxStoreNameLen) storeParams.StationName = utils.LimitUTF8StringLen(storeParams.StationName, jdapi.MaxStoreNameLen)
} }