订单商品使用最原始的拼接
This commit is contained in:
@@ -408,6 +408,7 @@ func (c *OrderManager) updateOrderSkuOtherInfo(order *model.GoodsOrder, db *dao.
|
|||||||
v.ShopPrice = v.SalePrice * 70 / 100
|
v.ShopPrice = v.SalePrice * 70 / 100
|
||||||
}
|
}
|
||||||
}
|
}
|
||||||
|
v.SkuName = jxutils.ComposeSkuNameOriginal(skuBindInfo.Prefix, skuBindInfo.Name, skuBindInfo.Comment, skuBindInfo.Unit, skuBindInfo.SpecQuality, skuBindInfo.SpecUnit, 0)
|
||||||
v.Weight = skuBindInfo.Weight // 以本地信息中的WEIGHT为准
|
v.Weight = skuBindInfo.Weight // 以本地信息中的WEIGHT为准
|
||||||
//饿鲜达的订单做一下处理
|
//饿鲜达的订单做一下处理
|
||||||
if strings.Contains(order.StoreName, model.ExdStoreName) {
|
if strings.Contains(order.StoreName, model.ExdStoreName) {
|
||||||
|
|||||||
@@ -284,6 +284,12 @@ type StoreSkuPriceAndWeight struct {
|
|||||||
SkuID int `orm:"column(sku_id)"`
|
SkuID int `orm:"column(sku_id)"`
|
||||||
Weight int
|
Weight int
|
||||||
Price int
|
Price int
|
||||||
|
Prefix string
|
||||||
|
Name string
|
||||||
|
Unit string
|
||||||
|
Comment string
|
||||||
|
SpecQuality float32
|
||||||
|
SpecUnit string
|
||||||
}
|
}
|
||||||
|
|
||||||
type StoreSkuAndName struct {
|
type StoreSkuAndName struct {
|
||||||
@@ -619,10 +625,12 @@ func GetStoreSkuPriceAndWeight(db *DaoDB, vendorStoreID string, vendorID int, ve
|
|||||||
vendorSkuIDField = fmt.Sprintf("t2.%s_id", ConvertDBFieldPrefix(model.VendorNames[vendorID]))
|
vendorSkuIDField = fmt.Sprintf("t2.%s_id", ConvertDBFieldPrefix(model.VendorNames[vendorID]))
|
||||||
}
|
}
|
||||||
sql := fmt.Sprintf(`
|
sql := fmt.Sprintf(`
|
||||||
SELECT %s vendor_sku_id, t1.id sku_id, t2.price, t1.weight
|
SELECT %s vendor_sku_id, t1.id sku_id, t2.price, t1.weight,
|
||||||
|
t5.prefix, t5.name, t1.comment, t5.unit, t1.sepc_quality, t1.sepc_unit
|
||||||
FROM sku t1
|
FROM sku t1
|
||||||
JOIN store_sku_bind t2 ON t2.sku_id = t1.id AND t2.deleted_at = ?
|
JOIN store_sku_bind t2 ON t2.sku_id = t1.id AND t2.deleted_at = ?
|
||||||
JOIN store_map t3 ON t3.store_id = t2.store_id AND t3.vendor_id = ? AND t3.vendor_store_id = ? AND t3.deleted_at = ?
|
JOIN store_map t3 ON t3.store_id = t2.store_id AND t3.vendor_id = ? AND t3.vendor_store_id = ? AND t3.deleted_at = ?
|
||||||
|
JOIN sku_name t5 ON t5.id = t1.name_id
|
||||||
%s
|
%s
|
||||||
WHERE %s IN (`+GenQuestionMarks(len(vendorSkuIDs))+`)`, vendorSkuIDField, sqlThingMap, vendorSkuIDField)
|
WHERE %s IN (`+GenQuestionMarks(len(vendorSkuIDs))+`)`, vendorSkuIDField, sqlThingMap, vendorSkuIDField)
|
||||||
sqlParams := []interface{}{
|
sqlParams := []interface{}{
|
||||||
|
|||||||
Reference in New Issue
Block a user