From 991128242a8f213479e4dce5f2699150eac66333 Mon Sep 17 00:00:00 2001 From: gazebo Date: Sat, 27 Jul 2019 16:24:00 +0800 Subject: [PATCH] =?UTF-8?q?-=20OrderSku.StoreSubID=E5=BD=93=E6=88=90?= =?UTF-8?q?=E6=B4=BB=E5=8A=A8ID=E6=9D=A5=E4=BD=BF=E7=94=A8?= MIME-Version: 1.0 Content-Type: text/plain; charset=UTF-8 Content-Transfer-Encoding: 8bit --- business/jxcallback/orderman/order.go | 1 + business/model/order.go | 4 ++-- 2 files changed, 3 insertions(+), 2 deletions(-) diff --git a/business/jxcallback/orderman/order.go b/business/jxcallback/orderman/order.go index 17834f633..b3197895a 100644 --- a/business/jxcallback/orderman/order.go +++ b/business/jxcallback/orderman/order.go @@ -335,6 +335,7 @@ func (c *OrderManager) updateOrderSkuOtherInfo(order *model.GoodsOrder, db *dao. if skuID := jxutils.GetSkuIDFromOrderSku(v); skuID > 0 /*&& v.StoreSubName != ""*/ { if actStoreSku := actStoreSkuMap.GetActStoreSku(jxStoreID, skuID, order.VendorID); actStoreSku != nil { v.EarningPrice = actStoreSku.EarningPrice + v.StoreSubID = actStoreSku.ActID } } } diff --git a/business/model/order.go b/business/model/order.go index 73807c7a9..66f6e5ed8 100644 --- a/business/model/order.go +++ b/business/model/order.go @@ -83,8 +83,8 @@ type OrderSku struct { ID int64 `orm:"column(id)" json:"-"` VendorOrderID string `orm:"column(vendor_order_id);size(48)" json:"vendorOrderID"` VendorID int `orm:"column(vendor_id)" json:"vendorID"` - StoreSubID int `orm:"column(store_sub_id)" json:"storeSubID"` - StoreSubName string `orm:"size(64)" json:"storeSubName"` // 当前这个字段被用作vendorActType + StoreSubID int `orm:"column(store_sub_id)" json:"storeSubID"` // 当前这个字段被当成活动ID用 + StoreSubName string `orm:"size(64)" json:"storeSubName"` // 当前这个字段被用作vendorActType Count int `json:"count"` VendorSkuID string `orm:"column(vendor_sku_id);size(48)" json:"vendorSkuID"` SkuID int `orm:"column(sku_id)" json:"skuID"` // 外部系统里记录的 jxskuid