diff --git a/business/jxcallback/orderman/orderman_ext.go b/business/jxcallback/orderman/orderman_ext.go index 4b9938142..c615ee70d 100644 --- a/business/jxcallback/orderman/orderman_ext.go +++ b/business/jxcallback/orderman/orderman_ext.go @@ -145,12 +145,15 @@ func (c *OrderManager) GetOrderSkuInfo(ctx *jxcontext.Context, vendorOrderID str t3.img5 image5, t3.desc_img descImg, t3.price price, + b.location_code locationCode2, + b.stock skuStock, t3.upc FROM order_sku t1 LEFT JOIN goods_order t6 ON t6.vendor_order_id = t1.vendor_order_id AND t6.vendor_id = t1.vendor_id LEFT JOIN store t5 ON t5.id = IF(t6.jx_store_id <> 0, t6.jx_store_id, t6.store_id) LEFT JOIN sku t2 ON IF(t1.jx_sku_id != 0, t1.jx_sku_id, t1.sku_id) = t2.id/* AND t2.deleted_at = ?*/ LEFT JOIN sku_name t3 ON t2.name_id = t3.id/* AND t3.deleted_at = ?*/ + LEFT JOIN store_sku_bind b ON b.sku_id = IF(t1.jx_sku_id <> 0, t1.jx_sku_id, t1.sku_id) WHERE t1.vendor_order_id = ? AND t1.vendor_id = ? ORDER BY t1.id `, fullSkuNameSQL) diff --git a/business/model/api.go b/business/model/api.go index 940ded83f..e1ba818c7 100644 --- a/business/model/api.go +++ b/business/model/api.go @@ -76,16 +76,19 @@ type GoodsOrderExt struct { type OrderSkuExt struct { OrderSku - NameID int `orm:"column(name_id)" json:"nameID"` - FullSkuName string `json:"fullSkuName"` - Image string `json:"image"` - Img2 string `orm:"size(512)" json:"image2"` // 第二张图片 - Img3 string `orm:"size(512)" json:"image3"` //第三张图片 - Img4 string `orm:"size(512)" json:"image4"` //第三张图片 - Img5 string `orm:"size(512)" json:"image5"` //第三张图片 - DescImg string `orm:"size(255)" json:"descImg"` // 商品详情图片描述 - Upc string `json:"upc"` // - Price int64 `json:"price"` // 商品库价格 + NameID int `orm:"column(name_id)" json:"nameID"` + FullSkuName string `json:"fullSkuName"` + Image string `json:"image"` + Img2 string `orm:"size(512)" json:"image2"` // 第二张图片 + Img3 string `orm:"size(512)" json:"image3"` //第三张图片 + Img4 string `orm:"size(512)" json:"image4"` //第三张图片 + Img5 string `orm:"size(512)" json:"image5"` //第三张图片 + DescImg string `orm:"size(255)" json:"descImg"` // 商品详情图片描述 + Upc string `json:"upc"` // + Price int64 `json:"price"` // 商品库价格 + LocationCode2 string `json:"locationCode2"` // 本地商品货架码 + SkuStock int64 `json:"skuStock"` // 商品库存 + // RealEarningPrice int64 `json:"realEarningPrice"` // 实际单品结算给门店老板钱 }