diff --git a/business/model/dao/store.go b/business/model/dao/store.go index 08ac3f9ae..489869d41 100644 --- a/business/model/dao/store.go +++ b/business/model/dao/store.go @@ -78,7 +78,7 @@ func (s *StoreDetail) GetPricePerentage(price int) (pricePercentage int) { func getStoreDetail(db *DaoDB, storeID, vendorID int, vendorStoreID string) (storeDetail *StoreDetail, err error) { sql := ` SELECT t1.*, - t2.vendor_store_id, t2.status vendor_status, t2.delivery_fee, t2.sync_status, + t2.vendor_store_id, t2.status vendor_status, t2.delivery_fee, t2.sync_status, t2.vendor_org_code, t2.price_percentage, t2.auto_pickup, t2.delivery_type, t2.delivery_competition, t2.is_sync, t3.value price_percentage_pack_str, t4.value freight_deduction_pack_str, diff --git a/business/model/dao/store_sku.go b/business/model/dao/store_sku.go index e2c7c908f..b5cab108b 100644 --- a/business/model/dao/store_sku.go +++ b/business/model/dao/store_sku.go @@ -329,7 +329,7 @@ func newGetStoreSkus2(db *DaoDB, vendorID, storeID int, skuIDs []int, mustDirty } sql += ` FROM store_sku_bind t1 - LEFT JOIN store_map t14 ON t14.store_id = t1.store_id AND t14.vendor_id = ? AND t14.deleted_at = ? + JOIN store_map t14 ON t14.store_id = t1.store_id AND t14.vendor_id = ? AND t14.deleted_at = ? LEFT JOIN sku t2 ON t1.sku_id = t2.id AND t2.deleted_at = ? AND t2.status = ? LEFT JOIN sku_name t3 ON t2.name_id = t3.id AND t3.deleted_at = ? AND t3.status = ? LEFT JOIN sku_category t4 ON t3.category_id = t4.id AND t4.deleted_at = ? diff --git a/business/partner/purchase/jd/jd.go b/business/partner/purchase/jd/jd.go index b3e40a2b7..580f56d95 100644 --- a/business/partner/purchase/jd/jd.go +++ b/business/partner/purchase/jd/jd.go @@ -24,7 +24,7 @@ func init() { func getAPI(appOrgCode string) (apiObj *jdapi.API) { if appOrgCode == "" { - // globals.SugarLogger.Warnf("getAPI appOrgCode is empty") + globals.SugarLogger.Warnf("getAPI appOrgCode is empty") } return partner.CurAPIManager.GetAPI(model.VendorIDJD, appOrgCode).(*jdapi.API) }