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
2023-02-03 14:58:18 +08:00
parent 8822492924 a3179809a2
commit e7c8fb6870
1 changed files with 14 additions and 12 deletions
Download Patch File Download Diff File Expand all files Collapse all files

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

@@ -112,18 +112,7 @@ func (p *PurchaseHandler) getOrder(vendorOrgCode, vendorOrderID, vendorStoreID s
} else { } else {
order.OrderFinishedAt = utils.DefaultTimeValue order.OrderFinishedAt = utils.DefaultTimeValue
} }
//order.DeliveryType = model.OrderDeliveryTypeStoreSelf
autoTransport, err := GetStoreAutoCallRiderInfo(vendorOrgCode, []int64{utils.Str2Int64(vendorStoreID)})
if err != nil || len(autoTransport) == 0 {
order.DeliveryType = model.OrderDeliveryTypePlatform
} else {
switch autoTransport[utils.Str2Int64(vendorStoreID)].ServiceStatus {
case 1: // 1：关闭
order.DeliveryType = model.OrderDeliveryTypeStoreSelf
case 2: // 开启
order.DeliveryType = model.OrderDeliveryTypePlatform
}
}
order.Status = p.getStatusFromVendorStatus(result.OrderStatus) order.Status = p.getStatusFromVendorStatus(result.OrderStatus)
if result.UserIdInfo != nil { if result.UserIdInfo != nil {
@@ -186,6 +175,19 @@ func (p *PurchaseHandler) getOrder(vendorOrgCode, vendorOrderID, vendorStoreID s
} }
//order.TotalShopMoney = utils.Float64TwoInt64(float64(salePrice) * 0.95) // 抖音平台扣点金额0.05 //order.TotalShopMoney = utils.Float64TwoInt64(float64(salePrice) * 0.95) // 抖音平台扣点金额0.05
//order.DeliveryType = model.OrderDeliveryTypeStoreSelf
autoTransport, err := GetStoreAutoCallRiderInfo(vendorOrgCode, []int64{utils.Str2Int64(vendorStoreIdRelly)})
if err != nil || len(autoTransport) == 0 {
order.DeliveryType = model.OrderDeliveryTypePlatform
} else {
switch autoTransport[utils.Str2Int64(vendorStoreIdRelly)].ServiceStatus {
case 1: // 1：关闭
order.DeliveryType = model.OrderDeliveryTypeStoreSelf
case 2: // 开启
order.DeliveryType = model.OrderDeliveryTypePlatform
}
}
// 预订单还是快速达 // 预订单还是快速达
localStore, err := dao.GetStoreDetailByVendorStoreID(dao.GetDB(), vendorStoreIdRelly, model.VendorIDDD, vendorOrgCode) localStore, err := dao.GetStoreDetailByVendorStoreID(dao.GetDB(), vendorStoreIdRelly, model.VendorIDDD, vendorOrgCode)
if err != nil || localStore == nil || localStore.ID == 0 { if err != nil || localStore == nil || localStore.ID == 0 {