1
This commit is contained in:
@@ -112,18 +112,7 @@ func (p *PurchaseHandler) getOrder(vendorOrgCode, vendorOrderID, vendorStoreID s
|
||||
} else {
|
||||
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)
|
||||
|
||||
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.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(vendorStoreID)].ServiceStatus {
|
||||
case 1: // 1:关闭
|
||||
order.DeliveryType = model.OrderDeliveryTypeStoreSelf
|
||||
case 2: // 开启
|
||||
order.DeliveryType = model.OrderDeliveryTypePlatform
|
||||
}
|
||||
}
|
||||
|
||||
// 预订单还是快速达
|
||||
localStore, err := dao.GetStoreDetailByVendorStoreID(dao.GetDB(), vendorStoreIdRelly, model.VendorIDDD, vendorOrgCode)
|
||||
if err != nil || localStore == nil || localStore.ID == 0 {
|
||||
|
||||
Reference in New Issue
Block a user