From 754c190220e8e1affee7657865fd989195b6b434 Mon Sep 17 00:00:00 2001 From: =?UTF-8?q?=E8=8B=8F=E5=B0=B9=E5=B2=9A?= <770236076@qq.com> Date: Mon, 6 Jan 2020 10:13:31 +0800 Subject: [PATCH] =?UTF-8?q?=E5=A2=9E=E5=8A=A0=E4=B8=AD=E4=BD=8D=E4=BB=B7?= MIME-Version: 1.0 Content-Type: text/plain; charset=UTF-8 Content-Transfer-Encoding: 8bit --- business/jxstore/cms/store_sku.go | 5 ++++- business/model/dao/store_sku.go | 2 ++ 2 files changed, 6 insertions(+), 1 deletion(-) diff --git a/business/jxstore/cms/store_sku.go b/business/jxstore/cms/store_sku.go index 0207aa87f..b2d210c07 100644 --- a/business/jxstore/cms/store_sku.go +++ b/business/jxstore/cms/store_sku.go @@ -261,6 +261,7 @@ func getGetStoresSkusBaseSQL(db *dao.DaoDB, storeIDs, skuIDs []int, isFocus bool sql += ` JOIN store_sku_bind t4 ON t4.store_id = t3.id AND t4.sku_id = t2.id AND t4.deleted_at = ? LEFT JOIN sku_name_place_bind t5 ON t1.id = t5.name_id AND t3.city_code = t5.place_code + LEFT JOIN price_refer_snapshot t6 ON t6.city_code = t3.city_code AND t6.name_id = t1.id WHERE t1.deleted_at = ? AND (t1.is_global = 1 OR t5.id IS NOT NULL OR 1 = ?)/* AND t1.status = ?*/ ` sqlParams = append(sqlParams, []interface{}{ @@ -493,7 +494,9 @@ func GetStoresSkusNew(ctx *jxcontext.Context, storeIDs, skuIDs []int, isFocus bo t4.jd_sync_status, t4.ebai_sync_status, t4.mtwm_sync_status, t4.jd_price, t4.ebai_price, t4.mtwm_price, t4.jx_price, t4.jd_lock_time, t4.ebai_lock_time, t4.mtwm_lock_time, t4.jx_lock_time, - t4.status_sale_begin, t4.status_sale_end + t4.status_sale_begin, t4.status_sale_end, + t6.mid_unit_price real_mid_unit_price, + ROUND(t6.mid_unit_price * IF(t3.pay_percentage < 50,70,t3.pay_percentage) /100) mid_unit_price `, jdVendorIDField) + sql var tmpList []*tGetStoresSkusInfo beginTime := time.Now() diff --git a/business/model/dao/store_sku.go b/business/model/dao/store_sku.go index 55d7956ee..867fd4896 100644 --- a/business/model/dao/store_sku.go +++ b/business/model/dao/store_sku.go @@ -133,6 +133,8 @@ type StoreSkuNameExt struct { PendingOpType int8 `json:"pendingOpType"` // 取值同 StoreOpRequest.Type PendingUnitPrice int `json:"pendingUnitPrice"` // 这个是待审核的价格申请 Status int + RealMidUnitPrice int `json:"realMidUnitPrice"` + midUnitPrice int `json:"midUnitPrice"` } // GetStoreSkus用