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-11-01 09:56:57 +08:00
parent 1a2be86da9 123d9e4a35
commit 927c61c956
3 changed files with 51 additions and 22 deletions
Download Patch File Download Diff File Expand all files Collapse all files

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

@@ -183,13 +183,15 @@ func (p *PurchaseHandler) getOrder(vendorOrgCode, vendorOrderID, vendorStoreID s
return nil, nil, err
}
// 订单不在门店营业时间来的订单,
openTime := localStore.OpenTime1 // 门店开始营业时间
closeTime := localStore.CloseTime1 // 门店结束营业时间
if localStore.CloseTime2 != 0 {
closeTime = localStore.CloseTime2
}
h, m, _ := utils.Timestamp2Time(result.CreateTime).Clock()
if utils.Str2Int16(fmt.Sprintf("%d%d", h, m)) >= openTime && utils.Str2Int16(fmt.Sprintf("%d%d", h, m)) < closeTime && localStore.Status == model.StoreStatusOpened {
//openTime := localStore.OpenTime1 // 门店开始营业时间
//closeTime := localStore.CloseTime1 // 门店结束营业时间
//if localStore.CloseTime2 != 0 {
// closeTime = localStore.CloseTime2
//}
latestReceiptTime := utils.Timestamp2Time(result.LatestReceiptTime)
//h, m, _ := latestReceiptTime.Clock()
if latestReceiptTime.Day() != time.Now().Day() /*&& utils.Str2Int16(fmt.Sprintf("%d%d", h, m)) >= openTime && utils.Str2Int16(fmt.Sprintf("%d%d", h, m)) < closeTime && localStore.Status == model.StoreStatusOpened*/ {
order.BusinessType = model.BusinessTypeImmediate
} else {
order.BusinessType = model.BusinessTypeDingshida
@@ -577,7 +579,8 @@ func (c *PurchaseHandler) CanSwitch2SelfDeliver(order *model.GoodsOrder) (isCan
// Swtich2SelfDeliver 抖音转自送的时候就是通知抖音发货了
func (c *PurchaseHandler) Swtich2SelfDeliver(order *model.GoodsOrder, userName string) (err error) {
return getAPI(order.VendorOrgCode, jxutils.GetSaleStoreIDFromOrder(order), "").OrderDelivering(&order_logisticsAdd_request.OrderLogisticsAddParam{
api := getAPI(order.VendorOrgCode, jxutils.GetSaleStoreIDFromOrder(order), "")
err = api.OrderDelivering(&order_logisticsAdd_request.OrderLogisticsAddParam{
OrderId: order.VendorOrderID,
Company: "",
CompanyCode: "chengdouruoxi",
@@ -588,6 +591,16 @@ func (c *PurchaseHandler) Swtich2SelfDeliver(order *model.GoodsOrder, userName s
AddressId: 0,
StoreId: utils.Str2Int64(order.VendorStoreID),
})
if err != nil {
return err
}
// 呼叫骑手
err = c.GetOrderRider(order.VendorOrgCode, order.VendorStoreID, map[string]interface{}{
"third_carrier_order_id": order.VendorOrderID,
"opcode": tiktokShop.TiktokLogisticsStatusCALLRIDER,
"logistics_context": "商家呼叫骑手",
})
return err
}
// Swtich2SelfDelivered 暂无自送完成
@@ -613,7 +626,11 @@ func (c *PurchaseHandler) SelfDeliverDelivering(order *model.GoodsOrder, userNam
AddressId: 0,
StoreId: utils.Str2Int64(order.VendorStoreID),
}
return getAPI(order.VendorOrgCode, jxutils.GetSaleStoreIDFromOrder(order), "").OrderDelivering(param)
err = getAPI(order.VendorOrgCode, jxutils.GetSaleStoreIDFromOrder(order), "").OrderDelivering(param)
if err != nil {
return err
}
return err
}
// SelfDeliverDelivered 自配搜完成(暂无)