From 4f8ded015340f619ceec5026d9e7348f712db1f9 Mon Sep 17 00:00:00 2001 From: gazebo Date: Thu, 31 Oct 2019 15:05:55 +0800 Subject: [PATCH] =?UTF-8?q?=E5=BE=AE=E7=9B=9F=E4=B8=AD=EF=BC=8C=E6=A0=B9?= =?UTF-8?q?=E6=8D=AE=E6=B6=88=E6=81=AF=E4=B8=AD=E7=9A=84orderStatus?= =?UTF-8?q?=E5=85=88=E5=88=A4=E6=96=AD=E8=AE=A2=E5=8D=95=E7=8A=B6=E6=80=81?= =?UTF-8?q?=EF=BC=8C=E9=81=BF=E5=85=8D=E4=B8=8D=E5=BF=85=E8=A6=81=E7=9A=84?= =?UTF-8?q?QueryOrderDetail2=E7=9A=84=E8=B0=83=E7=94=A8?= MIME-Version: 1.0 Content-Type: text/plain; charset=UTF-8 Content-Transfer-Encoding: 8bit --- business/cs/weimob_order.go | 17 +++++++++-------- 1 file changed, 9 insertions(+), 8 deletions(-) diff --git a/business/cs/weimob_order.go b/business/cs/weimob_order.go index cdcb2e0ec..32189ab8b 100644 --- a/business/cs/weimob_order.go +++ b/business/cs/weimob_order.go @@ -28,13 +28,15 @@ func OnCallbackMsg(msg *weimobapi.CallbackMsg) (response *weimobapi.CallbackResp func onOrderMsg(msg *weimobapi.CallbackMsg) (response *weimobapi.CallbackResponse) { globals.SugarLogger.Debugf("onOrderMsg:%s", utils.Format4Output(msg, true)) if msg.Event == weimobapi.MsgEventOrderStatusChange { - if orderDetail, err := api.WeimobAPI.QueryOrderDetail2(msg.OrderNo, false); err == nil { - if orderDetail.OrderStatus == weimobapi.OrderStatusFinished && orderDetail.PaymentAmount >= minCSOrderPayment { - changeStoreSkusByOrder(orderDetail) + if utils.ForceInterface2Int64(msg.MsgBody["orderStatus"]) == weimobapi.MsgOrderStatusFinished { + if orderDetail, err := api.WeimobAPI.QueryOrderDetail2(msg.OrderNo, false); err == nil { + if orderDetail.OrderStatus == weimobapi.OrderStatusFinished && orderDetail.PaymentAmount >= minCSOrderPayment { + changeStoreSkusByOrder(orderDetail) + } + } else { + globals.SugarLogger.Debugf("onOrderMsg order:%s failed with err:%v", msg.OrderNo, err) + response = weimobapi.Err2CallbackResponse(err, "") } - } else { - globals.SugarLogger.Debugf("onOrderMsg order:%s failed with err:%v", msg.OrderNo, err) - response = weimobapi.Err2CallbackResponse(err, "") } } return response @@ -43,8 +45,7 @@ func onOrderMsg(msg *weimobapi.CallbackMsg) (response *weimobapi.CallbackRespons func changeStoreSkusByOrder(order *weimobapi.OrderDetail) { globals.SugarLogger.Debugf("changeStoreSkusByOrder order:%s", utils.Format4Output(order, true)) receiverMobile := order.DeliveryDetail.LogisticsDeliveryDetail.ReceiverMobile - storeList, err := dao.GetStoreList(dao.GetDB(), nil, []string{receiverMobile}, "") - if err != nil { + if storeList, err := dao.GetStoreList(dao.GetDB(), nil, []string{receiverMobile}, ""); err == nil { if len(storeList) == 1 { var skuBindInfos []*cms.StoreSkuBindInfo storeID := storeList[0].ID