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

Merge branch 'jdshop' of https://e.coding.net/rosydev/jx-callback into jdshop

Browse Source
This commit is contained in:
richboo111
2022-10-28 16:57:16 +08:00
parent 62fa2a3ee1 3283b3d72c
commit 2bd7f9aaf9
2 changed files with 19 additions and 9 deletions
Download Patch File Download Diff File Expand all files Collapse all files

4
business/jxcallback/scheduler/defsch/defsch.go
View File

@@ -519,10 +519,6 @@ func (s *DefScheduler) OnWaybillStatusChanged(bill *model.Waybill, isPending boo
//} //}
// 暂时只处理抖音平台,抖音暂无配送,只要是抖音订单,三方配送压单了,直接通知送出 // 暂时只处理抖音平台,抖音暂无配送,只要是抖音订单,三方配送压单了,直接通知送出
if order.VendorID == model.VendorIDDD && bill.Status == model.WaybillStatusNew {
s.SelfDeliverDelivering(order, "自配送中")
}
if bill.Status == model.WaybillStatusNew { if bill.Status == model.WaybillStatusNew {
s.addWaybill2Map(savedOrderInfo, bill) s.addWaybill2Map(savedOrderInfo, bill)
if !isPending { if !isPending {

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

@@ -602,7 +602,7 @@ func (c *PurchaseHandler) Swtich2SelfDelivered(order *model.GoodsOrder, userName
// SelfDeliverDelivering 订单在自配送中,表示三方品牌接单,通知抖音已经发货了 // SelfDeliverDelivering 订单在自配送中,表示三方品牌接单,通知抖音已经发货了
func (c *PurchaseHandler) SelfDeliverDelivering(order *model.GoodsOrder, userName string) (err error) { func (c *PurchaseHandler) SelfDeliverDelivering(order *model.GoodsOrder, userName string) (err error) {
return getAPI(order.VendorOrgCode, jxutils.GetSaleStoreIDFromOrder(order), "").OrderDelivering(&order_logisticsAdd_request.OrderLogisticsAddParam{ param := &order_logisticsAdd_request.OrderLogisticsAddParam{
OrderId: order.VendorOrderID, OrderId: order.VendorOrderID,
Company: "", Company: "",
CompanyCode: "chengdouruoxi", CompanyCode: "chengdouruoxi",
@@ -612,7 +612,9 @@ func (c *PurchaseHandler) SelfDeliverDelivering(order *model.GoodsOrder, userNam
SerialNumberList: nil, SerialNumberList: nil,
AddressId: 0, AddressId: 0,
StoreId: utils.Str2Int64(order.VendorStoreID), StoreId: utils.Str2Int64(order.VendorStoreID),
}) }
globals.SugarLogger.Debugf("=============%s", utils.Format4Output(param, false))
return getAPI(order.VendorOrgCode, jxutils.GetSaleStoreIDFromOrder(order), "").OrderDelivering(param)
} }
// SelfDeliverDelivered 自配搜完成(暂无) // SelfDeliverDelivered 自配搜完成(暂无)
@@ -662,9 +664,21 @@ func (c *PurchaseHandler) CancelOrder(ctx *jxcontext.Context, order *model.Goods
for _, v := range order.Skus { for _, v := range order.Skus {
count += v.Count count += v.Count
} }
if _, err = getAPI(order.VendorOrgCode, 0, "").ApplyMarketAfterSale(utils.Str2Int64(order.VendorOrderID), int64(count), 3); err == nil { api := getAPI(order.VendorOrgCode, 0, "")
// 调用开放平台接口取消订单，不推送取消订单消息和退款消息。 // 获取订单详情
c.postFakeMsg(order.VendorOrderID, tiktokShop.CallbackCancelOrderMsgTagId, utils.Int2Str(tiktokShop.CreateOrderStatusCancel), order.VendorOrgCode) orderDetail, err := api.GetTiktokOrderDetail(order.VendorOrderID)
if err != nil {
return err
}
for _, v := range orderDetail.SkuOrderList {
_, err = api.ApplyMarketAfterSale(utils.Str2Int64(v.OrderId), v.ItemNum, 3)
}
// 调用开放平台接口取消订单，不推送取消订单消息和退款消息。
c.postFakeMsg(order.VendorOrderID, tiktokShop.CallbackCancelOrderMsgTagId, utils.Int2Str(tiktokShop.CreateOrderStatusCancel), order.VendorOrgCode)
if err != nil {
return errors.New(err.Error() + "-" + "系统退单错误请多次退单/联系管理员/前往抖店平台退单")
} }
return err return err
} }