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

This commit is contained in:
richboo111
2023-02-02 17:20:20 +08:00
3 changed files with 15 additions and 6 deletions

View File

@@ -113,7 +113,17 @@ func (p *PurchaseHandler) getOrder(vendorOrgCode, vendorOrderID, vendorStoreID s
order.OrderFinishedAt = utils.DefaultTimeValue
}
//order.DeliveryType = model.OrderDeliveryTypeStoreSelf
order.DeliveryType = model.OrderDeliveryTypePlatform
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 {