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-27 18:54:58 +08:00
parent 51b9bda820
commit 3e71b3ed19
3 changed files with 38 additions and 22 deletions
Download Patch File Download Diff File Expand all files Collapse all files

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

@@ -103,7 +103,7 @@ func (p *PurchaseHandler) getOrder(vendorOrgCode, vendorOrderID, vendorStoreID s
InvoiceTaxerID: "",
InvoiceEmail: "",
VendorOrgCode: vendorOrgCode,
TotalShopMoney: utils.Float64TwoInt64(float64(result.PayAmount) * 0.95), // 抖音平台扣点金额0.05
TotalShopMoney: utils.Float64TwoInt64(float64(result.OrderAmount) * 0.95), // 抖音平台扣点金额0.05
}
// 本地获取订单记录
orderSeq, _ := dao.GetVendorOrderNumber(dao.GetDB(), model.VendorIDDD, order.VendorStoreID)
@@ -479,7 +479,7 @@ func (c *PurchaseHandler) callbackMsg2Status(msgId, orderId string, msg interfac
orderStatus.Status = model.OrderStatusUnknown
orderStatus.Remark = "126-预约发货:"
shopId = orderMsg.ShopId
case tiktokShop.CallbackWaitOrderMsgTagId: // 应为需要同步京东,美团拣货功能制作的假拣货,抖音不存在拣货
case FakeMsgType: // 应为需要同步京东,美团拣货功能制作的假拣货,抖音不存在拣货
orderMsg := tiktokShop.FakePickUpGoodsData{}
if err := utils.Map2StructByJson(msg, &orderMsg, false); err != nil {
return nil, 0
@@ -489,7 +489,7 @@ func (c *PurchaseHandler) callbackMsg2Status(msgId, orderId string, msg interfac
orderStatus.StatusTime = time.Now()
orderStatus.Status = model.OrderStatusFinishedPickup
orderStatus.Remark = "15-抖音假拣货:"
shopId = 0
shopId = orderMsg.ShopId
default:
return nil, 0
}
@@ -508,9 +508,14 @@ func vendorStatusToLocalStatus(vendorStatus int64) int {
return model.OrderStatusUnknown
}
func (c *PurchaseHandler) postFakeMsg(vendorOrderID, cmd, vendorStatus string) {
msg := &tiktokShop.FakePickUpGoodsData{PId: vendorOrderID, VendorStatus: vendorStatus}
func (c *PurchaseHandler) postFakeMsg(vendorOrderID, cmd, VendorStatus, appOrgCode string) {
// c.postFakeMsg(order.VendorOrderID, FakeMsgType, fakeFinishedPickup)
msg := &tiktokShop.FakePickUpGoodsData{
PId: vendorOrderID,
VendorStatus: VendorStatus,
Cmd: cmd,
ShopId: utils.Str2Int64(appOrgCode),
}
utils.CallFuncAsync(func() {
c.onOrderMsg(cmd, vendorOrderID, msg)
})
@@ -547,7 +552,7 @@ func (c *PurchaseHandler) PickupGoods(order *model.GoodsOrder, isSelfDelivery bo
// err = getAPI(order.VendorOrgCode, jxutils.GetSaleStoreIDFromOrder(order), "").PreparationMealComplete(utils.Str2Int64(order.VendorOrderID))
// }
//}
c.postFakeMsg(order.VendorOrderID, FakeMsgType, fakeFinishedPickup)
c.postFakeMsg(order.VendorOrderID, FakeMsgType, fakeFinishedPickup, order.VendorOrgCode)
return nil
}
@@ -568,12 +573,19 @@ func (c *PurchaseHandler) CanSwitch2SelfDeliver(order *model.GoodsOrder) (isCan
return order.BusinessType != model.BusinessTypeDingshida, nil
}
// Swtich2SelfDeliver 暂无转自送
// Swtich2SelfDeliver 抖音转自送的时候就是通知抖音发货了
func (c *PurchaseHandler) Swtich2SelfDeliver(order *model.GoodsOrder, userName string) (err error) {
//if globals.EnableMtwmStoreWrite {
// err = getAPI(order.VendorOrgCode, jxutils.GetSaleStoreIDFromOrder(order), "").OrderLogisticsChange2Self(utils.Str2Int64(order.VendorOrderID))
//}
return err
return getAPI(order.VendorOrgCode, jxutils.GetSaleStoreIDFromOrder(order), "").OrderDelivering(&order_logisticsAdd_request.OrderLogisticsAddParam{
OrderId: order.VendorOrderID,
Company: "",
CompanyCode: "chengdouruoxi",
LogisticsCode: order.VendorWaybillID,
IsRefundReject: false,
IsRejectRefund: false,
SerialNumberList: nil,
AddressId: 0,
StoreId: utils.Str2Int64(order.VendorStoreID),
})
}
// Swtich2SelfDelivered 暂无自送完成
@@ -642,12 +654,10 @@ func (c *PurchaseHandler) AgreeOrRefuseCancel(ctx *jxcontext.Context, order *mod
// CancelOrder 取消订单 (抖音商家无法发起退单操作,商家联系不到客户取消订单/拒收/缺货)
func (c *PurchaseHandler) CancelOrder(ctx *jxcontext.Context, order *model.GoodsOrder, reason string) (err error) {
if globals.EnableDdStoreWrite {
return errors.New("抖音商家无法发起退单操作")
//if err = getAPI(order.VendorOrgCode, jxutils.GetSaleStoreIDFromOrder(order), "").OrderCancel(utils.Str2Int64(order.VendorOrderID), reason, mtwmapi.CancelReasonOther); err == nil {
// // 调用开放平台接口取消订单，不推送取消订单消息和退款消息。
// c.postFakeMsg(order.VendorOrderID, tiktokShop.CallbackCancelOrderMsgTagId, utils.Int2Str(tiktokShop.CreateOrderStatusCancel))
//}
// 售后原因枚举 MissGram = 1缺重，必传克数、金额； MissItem = 2缺货，只支持整单退； RefuseSign = 3 拒收，支持按件数退，金额由抖音计算
if _, err = getAPI(order.VendorOrgCode, 0, "").ApplyMarketAfterSale(utils.Str2Int64(order.VendorOrderID), 3); err == nil {
// 调用开放平台接口取消订单，不推送取消订单消息和退款消息。
c.postFakeMsg(order.VendorOrderID, tiktokShop.CallbackCancelOrderMsgTagId, utils.Int2Str(tiktokShop.CreateOrderStatusCancel), order.VendorOrgCode)
}
return err
}