diff --git a/business/jxcallback/orderman/order.go b/business/jxcallback/orderman/order.go index adb833c99..354ab9896 100644 --- a/business/jxcallback/orderman/order.go +++ b/business/jxcallback/orderman/order.go @@ -185,13 +185,20 @@ func (c *OrderManager) updateOrderSkuOtherInfo(order *model.GoodsOrder, db orm.O } orderSkus := order.Skus var sql string - if orderSkus[0].VendorID == model.VendorIDJD { // todo 为什么要区分京东与其它? + if order.VendorID == model.VendorIDJD { // todo 为什么要区分京东与其它? sql = ` SELECT t1.jdskuid, t1.skuid, t2.price, t3.weight FROM skumapper t1 LEFT JOIN jx_sku_store_bind t2 ON t1.skuid = t2.jxskuid AND t2.jxstoreid = ? LEFT JOIN jx_sku t3 ON t2.jxskuid = t3.id WHERE t1.jdskuid IN (-1,` + } else if order.VendorID == model.VendorIDELM { + sql = ` + SELECT t1.sku_id, t1.custom_sku_id, t2.price, t3.weight + FROM eb_sku_id_map t1 + LEFT JOIN jx_sku_store_bind t2 ON t1.custom_sku_id = t2.jxskuid AND t2.jxstoreid = ? + LEFT JOIN jx_sku t3 ON t2.jxskuid = t3.id + WHERE t1.sku_id IN (-1,` } else { sql = ` SELECT t2.jxskuid, t2.jxskuid, t2.price, t3.weight @@ -202,7 +209,7 @@ func (c *OrderManager) updateOrderSkuOtherInfo(order *model.GoodsOrder, db orm.O sqlParams := []interface{}{jxStoreID} for _, v := range orderSkus { - if orderSkus[0].VendorID == model.VendorIDJD { + if order.VendorID == model.VendorIDJD || order.VendorID == model.VendorIDELM { sql += "?," sqlParams = append(sqlParams, int(utils.Str2Int64(v.VendorSkuID))) } else if v.SkuID != 0 { @@ -224,16 +231,16 @@ func (c *OrderManager) updateOrderSkuOtherInfo(order *model.GoodsOrder, db orm.O } // globals.SugarLogger.Debug(skumapper) for _, v := range orderSkus { - if order.VendorID == model.VendorIDJD { + if order.VendorID == model.VendorIDJD || order.VendorID == model.VendorIDELM { if values, ok := skumapper[v.VendorSkuID]; ok { v.JxSkuID = int(utils.Str2Int64(utils.Interface2String(values[1]))) v.ShopPrice = utils.Str2Int64WithDefault(utils.Interface2String(values[2]), 0) order.ShopPrice += v.ShopPrice * int64(v.Count) if v.ShopPrice == 0 { - globals.SugarLogger.Infof("updateOrderSkuOtherInfo [运营%s]京东订单sku门店价格为零(一般原因为没有门店价格信息),orderID:%s, StoreID:%d, SkuID:%d, sku:%v", opNum, order.VendorOrderID, jxStoreID, v.JxSkuID, v) + globals.SugarLogger.Infof("updateOrderSkuOtherInfo [运营%s]%s订单sku门店价格为零(一般原因为没有门店价格信息),orderID:%s, StoreID:%d, SkuID:%d, sku:%v", opNum, model.VendorChineseNames[order.VendorID], order.VendorOrderID, jxStoreID, v.JxSkuID, v) } } else { - globals.SugarLogger.Infof("updateOrderSkuOtherInfo [运营%s]京东订单sku找不到门店价格(或商品映射),orderID:%s, StoreID:%d, VendorSkuID:%s, sku:%v", opNum, order.VendorOrderID, jxStoreID, v.VendorSkuID, v) + globals.SugarLogger.Infof("updateOrderSkuOtherInfo [运营%s]%s订单sku找不到门店价格(或商品映射),orderID:%s, StoreID:%d, VendorSkuID:%s, sku:%v", opNum, model.VendorChineseNames[order.VendorID], order.VendorOrderID, jxStoreID, v.VendorSkuID, v) } } else { if v.SkuID != 0 { @@ -244,13 +251,13 @@ func (c *OrderManager) updateOrderSkuOtherInfo(order *model.GoodsOrder, db orm.O v.ShopPrice = utils.Str2Int64WithDefault(utils.Interface2String(values[2]), 0) order.ShopPrice += v.ShopPrice * int64(v.Count) if v.ShopPrice == 0 { - globals.SugarLogger.Infof("updateOrderSkuOtherInfo [运营%s]饿了么订单sku门店价格为零,orderID:%s, StoreID:%d, SkuID:%d, sku:%v", opNum, order.VendorOrderID, jxStoreID, v.SkuID, v) + globals.SugarLogger.Infof("updateOrderSkuOtherInfo [运营%s]%s订单sku门店价格为零,orderID:%s, StoreID:%d, SkuID:%d, sku:%v", opNum, model.VendorChineseNames[order.VendorID], order.VendorOrderID, jxStoreID, v.SkuID, v) } } else { - globals.SugarLogger.Infof("updateOrderSkuOtherInfo [运营%s]饿了么订单sku找不到门店价格,orderID:%s, StoreID:%d, SkuID:%d, sku:%v", opNum, order.VendorOrderID, jxStoreID, v.SkuID, v) + globals.SugarLogger.Infof("updateOrderSkuOtherInfo [运营%s]%s订单sku找不到门店价格,orderID:%s, StoreID:%d, SkuID:%d, sku:%v", opNum, model.VendorChineseNames[order.VendorID], order.VendorOrderID, jxStoreID, v.SkuID, v) } } else { - globals.SugarLogger.Infof("updateOrderSkuOtherInfo [运营%s]饿了么订单sku没有京西ID信息,orderID:%s, VendorSkuID:%s, sku:%v", opNum, order.VendorOrderID, v.VendorSkuID, v) + globals.SugarLogger.Infof("updateOrderSkuOtherInfo [运营%s]%s订单sku没有京西ID信息,orderID:%s, VendorSkuID:%s, sku:%v", opNum, model.VendorChineseNames[order.VendorID], order.VendorOrderID, v.VendorSkuID, v) } } }