diff --git a/business/model/order.go b/business/model/order.go index 2bfc4e331..2d3137363 100644 --- a/business/model/order.go +++ b/business/model/order.go @@ -15,8 +15,6 @@ type GoodsOrder struct { StoreID int `orm:"column(store_id)"` // 外部系统里记录的 jxstoreid JxStoreID int `orm:"column(jx_store_id)"` // 根据VendorStoreID在本地系统里查询出来的 jxstoreid StoreName string `orm:"size(64)"` - SubStoreID int `orm:"column(sub_store_id)"` - SubStoreName string `orm:"size(64)"` ShopPrice int64 // 单位为分 门店标价 SalePrice int64 // 单位为分 售卖价 ActualPayPrice int64 // 单位为分 顾客实际支付 @@ -58,6 +56,8 @@ type OrderSku struct { ID int64 `orm:"column(id)"` VendorOrderID string `orm:"column(vendor_order_id);size(48)"` VendorID int `orm:"column(vendor_id)"` + StoreSubID int `orm:"column(store_sub_id)"` + StoreSubName string `orm:"size(64)"` Count int VendorSkuID string `orm:"column(vendor_sku_id);size(48)"` SkuID int `orm:"column(sku_id)"` // 外部系统里记录的 jxskuid diff --git a/conf/app.conf b/conf/app.conf index e93d837ca..b13505cdc 100644 --- a/conf/app.conf +++ b/conf/app.conf @@ -16,7 +16,7 @@ autonaviKey = "4427170f870af2110becb8852d36ab08" callLegacyMsgHandler = false callNewMsgHandler = true -generateLegacyJxOrder = true +generateLegacyJxOrder = false [dev] freshFoodServerURL = "http://portal.beta.jxc4.com"