This commit is contained in:
suyl
2021-06-09 09:53:47 +08:00
parent 545c625a5b
commit 5f1f3f744d
2 changed files with 59 additions and 76 deletions

View File

@@ -94,9 +94,7 @@ func (c *PurchaseHandler) onOrderMsg(a *jdapi.API, msg *jdapi.CallbackOrderMsg)
if jdapi.StatusIDNewOrder == msg.StatusID {
status.Status = model.OrderStatusNew // 因为京东将事件32000与状态32000混用事件32000可能是新订单也可能是已接单统一当成新订单处理
}
globals.SugarLogger.Debugf("jd deliverOrder 4 %v", utils.Format4Output(msg, true))
if partner.CurOrderManager.GetStatusDuplicatedCount(status) > 0 {
globals.SugarLogger.Debugf("jd deliverOrder 5 %d", partner.CurOrderManager.GetStatusDuplicatedCount(status))
return nil
}
if msg.MsgURL == jdapi.CallbackMsgOrderAccounting {
@@ -124,7 +122,6 @@ func (c *PurchaseHandler) onOrderMsg(a *jdapi.API, msg *jdapi.CallbackOrderMsg)
// globals.SugarLogger.Warnf("京东取消拣货:%v", err2)
// }
// }
globals.SugarLogger.Debugf("OnOrderStatusChanged jd %s", AppKey2OrgCode(msg.AppKey))
globals.SugarLogger.Debug("OnOrderStatusChanged jd %v", utils.Format4Output(status, true))
err := partner.CurOrderManager.OnOrderStatusChanged(AppKey2OrgCode(msg.AppKey), status)
retVal = jdapi.Err2CallbackResponse(err, status.VendorStatus)
@@ -205,7 +202,8 @@ func (c *PurchaseHandler) getOrder(a *jdapi.API, orderID string) (order *model.G
if err == nil {
order = c.Map2Order(orderMap)
if configs, err := dao.QueryConfigs(dao.GetDB(), "jdStorePageCookie", model.ConfigTypeCookie, ""); err == nil {
a.SetJdCookie(configs[0].Value)
//a.SetJdCookie(configs[0].Value)
a.SetCookieWithStr(configs[0].Value)
}
realMobile, err = a.GetRealMobile4Order(orderID, order.VendorStoreID)
if err == nil && realMobile != "" {