From df7d58c50dd9858a0361fdff2bae7baf8b4f2df8 Mon Sep 17 00:00:00 2001 From: gazebo Date: Thu, 20 Jun 2019 17:04:47 +0800 Subject: [PATCH] =?UTF-8?q?-=20updateOrderOtherInfo=E4=B8=AD=E5=BF=BD?= =?UTF-8?q?=E7=95=A5=E6=89=BE=E4=B8=8D=E5=88=B0=E9=97=A8=E5=BA=97=E6=98=A0?= =?UTF-8?q?=E5=B0=84=E7=9A=84=E9=94=99=E8=AF=AF?= MIME-Version: 1.0 Content-Type: text/plain; charset=UTF-8 Content-Transfer-Encoding: 8bit --- business/jxcallback/orderman/order.go | 13 +++++++++---- 1 file changed, 9 insertions(+), 4 deletions(-) diff --git a/business/jxcallback/orderman/order.go b/business/jxcallback/orderman/order.go index 4004cede6..fad9d9b48 100644 --- a/business/jxcallback/orderman/order.go +++ b/business/jxcallback/orderman/order.go @@ -330,16 +330,21 @@ func (c *OrderManager) updateOrderSkuOtherInfo(order *model.GoodsOrder, db *dao. func (c *OrderManager) updateOrderOtherInfo(order *model.GoodsOrder, db *dao.DaoDB) (err error) { globals.SugarLogger.Debugf("updateOrderOtherInfo orderID:%s, VendorStoreID:%s", order.VendorOrderID, order.VendorStoreID) + payPercentage := 0 storeDetail, err := dao.GetStoreDetailByVendorStoreID(db, order.VendorStoreID, order.VendorID) if err != nil { globals.SugarLogger.Warnf("updateOrderOtherInfo GetStoreDetailByVendorStoreID orderID:%s, VendorStoreID:%s, error:%v", order.VendorOrderID, order.VendorStoreID, err) - return err + if !dao.IsNoRowsError(err) { + return err + } + err = nil + } else { + order.JxStoreID = storeDetail.Store.ID + payPercentage = storeDetail.PayPercentage } - order.JxStoreID = storeDetail.Store.ID if err = c.updateOrderSkuOtherInfo(order, db); err == nil { jxutils.RefreshOrderSkuRelated(order) - - caculateOrderEarningPrice(order, storeDetail.PayPercentage) + caculateOrderEarningPrice(order, payPercentage) } return err }