diff --git a/business/jxcallback/orderman/order.go b/business/jxcallback/orderman/order.go index 489dcaee8..8faf2ef3d 100644 --- a/business/jxcallback/orderman/order.go +++ b/business/jxcallback/orderman/order.go @@ -195,6 +195,11 @@ func (c *OrderManager) updateOrderSkuOtherInfo(order *model.GoodsOrder, db orm.O sqlParams = append(sqlParams, v.SkuID) } } + opNum := "2" + if order.VendorStoreID == "166875411" || order.VendorStoreID == "166875412" || jxStoreID == 100928 || jxStoreID == 100929 { + opNum = "" + } + sql = sql[:len(sql)-1] + ")" var lists []orm.ParamsList if num, err := db.Raw(sql, sqlParams...).ValuesList(&lists); err == nil { @@ -210,10 +215,10 @@ 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 [运营2]京东订单sku门店价格为零(一般原因为没有门店价格信息),orderID:%s, StoreID:%d, SkuID:%d, sku:%v", order.VendorOrderID, jxStoreID, v.JxSkuID, v) + globals.SugarLogger.Infof("updateOrderSkuOtherInfo [运营%s]京东订单sku门店价格为零(一般原因为没有门店价格信息),orderID:%s, StoreID:%d, SkuID:%d, sku:%v", opNum, order.VendorOrderID, jxStoreID, v.JxSkuID, v) } } else { - globals.SugarLogger.Infof("updateOrderSkuOtherInfo [运营2]京东订单sku找不到门店价格(或商品映射),orderID:%s, StoreID:%d, VendorSkuID:%s, sku:%v", order.VendorOrderID, jxStoreID, v.VendorSkuID, v) + globals.SugarLogger.Infof("updateOrderSkuOtherInfo [运营%s]京东订单sku找不到门店价格(或商品映射),orderID:%s, StoreID:%d, VendorSkuID:%s, sku:%v", opNum, order.VendorOrderID, jxStoreID, v.VendorSkuID, v) } } else { if v.SkuID != 0 { @@ -221,13 +226,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 [运营2]饿了么订单sku门店价格为零,orderID:%s, StoreID:%d, SkuID:%d, sku:%v", order.VendorOrderID, jxStoreID, v.SkuID, v) + globals.SugarLogger.Infof("updateOrderSkuOtherInfo [运营%s]饿了么订单sku门店价格为零,orderID:%s, StoreID:%d, SkuID:%d, sku:%v", opNum, order.VendorOrderID, jxStoreID, v.SkuID, v) } } else { - globals.SugarLogger.Infof("updateOrderSkuOtherInfo [运营2]饿了么订单sku找不到门店价格,orderID:%s, StoreID:%d, SkuID:%d, sku:%v", order.VendorOrderID, jxStoreID, v.SkuID, v) + globals.SugarLogger.Infof("updateOrderSkuOtherInfo [运营%s]饿了么订单sku找不到门店价格,orderID:%s, StoreID:%d, SkuID:%d, sku:%v", opNum, order.VendorOrderID, jxStoreID, v.SkuID, v) } } else { - globals.SugarLogger.Infof("updateOrderSkuOtherInfo [运营2]饿了么订单sku没有京西ID信息,orderID:%s, VendorSkuID:%s, sku:%v", order.VendorOrderID, v.VendorSkuID, v) + globals.SugarLogger.Infof("updateOrderSkuOtherInfo [运营%s]饿了么订单sku没有京西ID信息,orderID:%s, VendorSkuID:%s, sku:%v", opNum, order.VendorOrderID, v.VendorSkuID, v) } } } diff --git a/legacy/jd/controller/order.go b/legacy/jd/controller/order.go index d77ba9a11..de61c2088 100644 --- a/legacy/jd/controller/order.go +++ b/legacy/jd/controller/order.go @@ -143,7 +143,7 @@ func (c *OrderController) OrderDeliveryStatus(jdOrderDeliveryStatusMsg *jdapi.Ca func OnNewOrder(msg *jdapi.CallbackOrderMsg, userMobile string, db orm.Ormer) { controllers.OnNewOrder(msg.BillID, controllers.JD_VENDORID, userMobile, 0, db, func(acceptIt bool) { globals.SugarLogger.Infof("OrderAcceptOperate billid:%v, acceptIt:%v", msg.BillID, acceptIt) - api.JdAPI.OrderAcceptOperate(msg.BillID, acceptIt) + api.JdAPI.OrderAcceptOperate(msg.BillID, acceptIt, "") }) }