liulei/jx-callback
1
0
Fork 0
Code Issues Pull Requests Actions Packages Projects Releases Wiki Activity

1

Browse Source
This commit is contained in:
邹宗楠
2022-10-12 17:29:00 +08:00
parent 238fcb9af4
commit 740783c419
5 changed files with 49 additions and 44 deletions
Download Patch File Download Diff File Expand all files Collapse all files

50
business/partner/purchase/tiktok_store/order.go
View File

@@ -40,8 +40,8 @@ var (
var (
VendorStatus2StatusMap = map[string]int{
utils.Int2Str(tiktokShop.CreateOrderStatusWaitPay): model.OrderStatusWait4Pay, // 1待支付
utils.Int2Str(tiktokShop.CreateOrderStatusStockUp): model.OrderStatusAccepted, // 2备货中
utils.Int2Str(tiktokShop.CreateOrderStatusDelivery): model.OrderStatusDelivering, // 3发货
utils.Int2Str(tiktokShop.CreateOrderStatusStockUp): model.OrderStatusDelivering, // 2备货中(部分发货)
utils.Int2Str(tiktokShop.CreateOrderStatusDelivery): model.OrderStatusDelivering, // 3发货(发货完成)
utils.Int2Str(tiktokShop.CreateOrderStatusCancel): model.OrderStatusCanceled, // 4取消
utils.Int2Str(tiktokShop.CreateOrderStatusOver): model.OrderStatusFinished, // 5完成
utils.Int2Str(tiktokShop.CreateOrderStatusBeginRefund): model.OrderStatusApplyCancel, // 21发货前退款完成
@@ -79,6 +79,7 @@ func (p *PurchaseHandler) getOrder(vendorOrgCode, vendorOrderID, vendorStoreID s
if err != nil {
return nil, nil, err
}
globals.SugarLogger.Debugf("======orderDetail:%s", utils.Format4Output(result, false))
orderMap = result
order = &model.GoodsOrder{
VendorOrderID: result.OrderId,
@@ -99,7 +100,7 @@ func (p *PurchaseHandler) getOrder(vendorOrgCode, vendorOrderID, vendorStoreID s
StatusTime: getTimeFromTimestamp(result.CreateTime),
OrderCreatedAt: getTimeFromTimestamp(result.CreateTime),
OriginalData: string(utils.MustMarshal(result)),
ActualPayPrice: jxutils.StandardPrice2Int(utils.MustInterface2Float64(result.PayAmount)),
ActualPayPrice: result.PayAmount,
BaseFreightMoney: result.PostAmount,
InvoiceTitle: "",
InvoiceTaxerID: "",
@@ -123,7 +124,9 @@ func (p *PurchaseHandler) getOrder(vendorOrgCode, vendorOrderID, vendorStoreID s
order.BusinessType = model.BusinessTypeDingshida
}
order.VendorUserID = result.UserIdInfo.IdCardNo
if result.UserIdInfo != nil {
order.VendorUserID = result.UserIdInfo.IdCardNo
}
originalLng := utils.MustInterface2Float64(result.UserCoordinate.UserCoordinateLongitude)
originalLat := utils.MustInterface2Float64(result.UserCoordinate.UserCoordinateLatitude)
order.ConsigneeLng = jxutils.StandardCoordinate2Int(originalLng)
@@ -222,7 +225,8 @@ func (c *PurchaseHandler) onOrderMsg(msgId, orderId string, msg interface{}) (re
var err error
// 处理售后单
if c.isAfsMsg(msgId) {
return c.OnAfsOrderMsg(msgId, orderId, msg)
response = c.OnAfsOrderMsg(msgId, orderId, msg)
return response
}
// 待支付订单将不做处理/支付订单待处理(抖音风控)
@@ -247,15 +251,15 @@ func (c *PurchaseHandler) onOrderMsg(msgId, orderId string, msg interface{}) (re
return tiktokShop.Err2CallbackResponse(nil, "")
}
// 已经支付的订单,当做新订单创建在平台内部
// 已经支付的订单,当做新订单创建在平台内部 -----------------
if msgId == tiktokShop.CallbackPayOrderMsgTagId {
order, err := c.GetOrder(utils.Int64ToStr(appOrgCode), orderId, "") // 获取平台订单详情,制作本地订单
if err != nil {
return tiktokShop.Err2CallbackResponse(err, "")
}
status2, _ := c.callbackMsg2Status(msgId, orderId, msg)
if err := partner.CurOrderManager.OnOrderNew(order, status2); err != nil {
//status2, _ := c.callbackMsg2Status(msgId, orderId, msg)
if err := partner.CurOrderManager.OnOrderNew(order, status); err != nil {
return tiktokShop.Err2CallbackResponse(err, "")
}
@@ -332,23 +336,23 @@ func (c *PurchaseHandler) callbackMsg2Status(msgId, orderId string, msg interfac
orderStatus.Status = vendorStatusToLocalStatus(orderMsg.OrderStatus)
orderStatus.Remark = "101-支付回调"
shopId = orderMsg.ShopId
case tiktokShop.CallbackWaitOrderMsgTagId:
return nil, 0 // 支付订单风控消息不处理
//orderMsg := msg.(*tiktokShop.WaitOrderData)
//orderStatus.VendorOrderID = utils.Int64ToStr(orderMsg.PId)
//orderStatus.VendorStatus = utils.Int64ToStr(orderMsg.OrderStatus)
//orderStatus.StatusTime = utils.Timestamp2Time(orderMsg.PayTime)
//orderStatus.Status = vendorStatusToLocalStatus(orderMsg.OrderStatus)
//orderStatus.Remark = "110-订单支付待处理:风控"
//case tiktokShop.CallbackWaitOrderMsgTagId:
// return nil, 0 // 支付订单风控消息不处理
//orderMsg := msg.(*tiktokShop.WaitOrderData)
//orderStatus.VendorOrderID = utils.Int64ToStr(orderMsg.PId)
//orderStatus.VendorStatus = utils.Int64ToStr(orderMsg.OrderStatus)
//orderStatus.StatusTime = utils.Timestamp2Time(orderMsg.PayTime)
//orderStatus.Status = vendorStatusToLocalStatus(orderMsg.OrderStatus)
//orderStatus.Remark = "110-订单支付待处理:风控"
case tiktokShop.CallbackPartGoodsMsgTagId:
orderMsg := tiktokShop.SomeSendOrderData{}
if err := utils.Map2StructByJson(msg, &orderMsg, false); err != nil {
return nil, 0
}
orderStatus.VendorOrderID = utils.Int64ToStr(orderMsg.PId)
orderStatus.VendorStatus = utils.Int64ToStr(orderMsg.OrderStatus)
orderStatus.VendorStatus = utils.Int64ToStr(orderMsg.OrderStatus) // 2
orderStatus.StatusTime = utils.Timestamp2Time(orderMsg.UpdateTime)
orderStatus.Status = vendorStatusToLocalStatus(orderMsg.OrderStatus)
orderStatus.Status = model.OrderStatusAdjust // vendorStatusToLocalStatus(orderMsg.OrderStatus)
orderStatus.Remark = "108-卖家部分发货"
shopId = orderMsg.ShopId
case tiktokShop.CallbackPartAllGoodsMsgTagId:
@@ -357,9 +361,9 @@ func (c *PurchaseHandler) callbackMsg2Status(msgId, orderId string, msg interfac
return nil, 0
}
orderStatus.VendorOrderID = utils.Int64ToStr(orderMsg.PId)
orderStatus.VendorStatus = utils.Int64ToStr(orderMsg.OrderStatus)
orderStatus.VendorStatus = utils.Int64ToStr(orderMsg.OrderStatus) // 3
orderStatus.StatusTime = utils.Timestamp2Time(orderMsg.UpdateTime)
orderStatus.Status = vendorStatusToLocalStatus(orderMsg.OrderStatus)
orderStatus.Status = model.OrderStatusAdjust // vendorStatusToLocalStatus(orderMsg.OrderStatus)
orderStatus.Remark = "102-卖家发货完成"
shopId = orderMsg.ShopId
case tiktokShop.CallbackCancelOrderMsgTagId:
@@ -373,7 +377,7 @@ func (c *PurchaseHandler) callbackMsg2Status(msgId, orderId string, msg interfac
orderStatus.Status = vendorStatusToLocalStatus(orderMsg.OrderStatus)
orderStatus.Remark = "106-取消订单"
shopId = orderMsg.ShopId
case tiktokShop.CallbackSuccessOrderMsgTagId:
case tiktokShop.CallbackSuccessOrderMsgTagId: // 交易完成
orderMsg := tiktokShop.SuccessOrderData{}
if err := utils.Map2StructByJson(msg, &orderMsg, false); err != nil {
return nil, 0
@@ -382,7 +386,7 @@ func (c *PurchaseHandler) callbackMsg2Status(msgId, orderId string, msg interfac
orderStatus.VendorStatus = utils.Int64ToStr(orderMsg.OrderStatus)
orderStatus.StatusTime = utils.Timestamp2Time(orderMsg.CompleteTime)
orderStatus.Status = vendorStatusToLocalStatus(orderMsg.OrderStatus)
orderStatus.Remark = "103-确认收货"
orderStatus.Remark = "103-确认收货/交易完成"
shopId = orderMsg.ShopId
case tiktokShop.CallbackWayBillChangeOrderMsgTagId:
orderMsg := tiktokShop.WayBillChangeData{}
@@ -450,7 +454,7 @@ func (c *PurchaseHandler) callbackMsg2Status(msgId, orderId string, msg interfac
orderStatus.Status = model.OrderStatusUnknown
orderStatus.Remark = "126-预约发货:"
shopId = orderMsg.ShopId
case fakeFinishedPickup: // 应为需要同步京东,美团拣货功能制作的假拣货,抖音不存在拣货
case tiktokShop.CallbackWaitOrderMsgTagId: // 应为需要同步京东,美团拣货功能制作的假拣货,抖音不存在拣货
orderMsg := tiktokShop.FakePickUpGoodsData{}
if err := utils.Map2StructByJson(msg, &orderMsg, false); err != nil {
return nil, 0