This commit is contained in:
邹宗楠
2022-10-28 19:30:01 +08:00
parent 7c56405f7e
commit 853a2712dc
6 changed files with 1 additions and 15 deletions

View File

@@ -275,7 +275,6 @@ func (c *PurchaseHandler) onOrderMsg(msgId, orderId string, msg interface{}) (re
// 组装订单状态变化
status, appOrgCode := c.callbackMsg2Status(msgId, orderId, msg)
globals.SugarLogger.Debugf("==========-2%s,%d", utils.Format4Output(status, false), appOrgCode)
// 校验重复消息
if partner.CurOrderManager.GetStatusDuplicatedCount(status) > 0 {
return tiktokShop.Err2CallbackResponse(nil, "")
@@ -283,19 +282,14 @@ func (c *PurchaseHandler) onOrderMsg(msgId, orderId string, msg interface{}) (re
// 已经支付的订单,当做新订单创建在平台内部 -----------------
if msgId == tiktokShop.CallbackPayOrderMsgTagId {
globals.SugarLogger.Debugf("==========-1%d,%s", appOrgCode, orderId)
order, err := c.GetOrder(utils.Int64ToStr(appOrgCode), orderId, "") // 获取平台订单详情,制作本地订单
globals.SugarLogger.Debugf("==========0%s", utils.Format4Output(order, false))
globals.SugarLogger.Debugf("==========5%s", err)
if err != nil {
return tiktokShop.Err2CallbackResponse(err, "")
}
if err := partner.CurOrderManager.OnOrderNew(order, status); err != nil {
return tiktokShop.Err2CallbackResponse(err, "")
}
globals.SugarLogger.Debugf("==========1%s", utils.Format4Output(order, false))
orderMap, err := c.getOrderMap("", orderId, "")
globals.SugarLogger.Debugf("==========2%s", utils.Format4Output(orderMap, false))
utils.CallFuncAsync(func() {
switch msgId {
case tiktokShop.CallbackPayOrderMsgTagId:
@@ -360,7 +354,6 @@ func (c *PurchaseHandler) callbackMsg2Status(msgId, orderId string, msg interfac
case tiktokShop.CallbackPayOrderMsgTagId:
orderMsg := tiktokShop.PayOrderData{}
if err := utils.Map2StructByJson(msg, &orderMsg, false); err != nil {
globals.SugarLogger.Debugf("==========-Map2StructByJson:%s", err)
return nil, 0
}
orderStatus.VendorOrderID = utils.Int64ToStr(orderMsg.PId)
@@ -619,7 +612,6 @@ func (c *PurchaseHandler) SelfDeliverDelivering(order *model.GoodsOrder, userNam
AddressId: 0,
StoreId: utils.Str2Int64(order.VendorStoreID),
}
globals.SugarLogger.Debugf("=============%s", utils.Format4Output(param, false))
return getAPI(order.VendorOrgCode, jxutils.GetSaleStoreIDFromOrder(order), "").OrderDelivering(param)
}