1
This commit is contained in:
@@ -260,9 +260,7 @@ func (p *PurchaseHandler) Map2Order(orderData map[string]interface{}) (order *mo
|
|||||||
|
|
||||||
VendorOrgCode: utils.Interface2String(result["source"]),
|
VendorOrgCode: utils.Interface2String(result["source"]),
|
||||||
}
|
}
|
||||||
globals.SugarLogger.Debugf("----------------1")
|
|
||||||
invoiceType, _ := utils.TryInterface2Int64(orderMap["invoice_type"])
|
invoiceType, _ := utils.TryInterface2Int64(orderMap["invoice_type"])
|
||||||
globals.SugarLogger.Debugf("----------------2")
|
|
||||||
switch invoiceType {
|
switch invoiceType {
|
||||||
case 2: // 纸质发票
|
case 2: // 纸质发票
|
||||||
order.InvoiceEmail += "(纸质发票)"
|
order.InvoiceEmail += "(纸质发票)"
|
||||||
@@ -289,6 +287,7 @@ func (p *PurchaseHandler) Map2Order(orderData map[string]interface{}) (order *mo
|
|||||||
if order.StoreID > math.MaxInt32 {
|
if order.StoreID > math.MaxInt32 {
|
||||||
order.StoreID = 0
|
order.StoreID = 0
|
||||||
}
|
}
|
||||||
|
globals.SugarLogger.Debugf("----------------4")
|
||||||
order.Status = p.getStatusFromVendorStatus(order.VendorStatus)
|
order.Status = p.getStatusFromVendorStatus(order.VendorStatus)
|
||||||
if order.Status >= model.OrderStatusEndBegin {
|
if order.Status >= model.OrderStatusEndBegin {
|
||||||
order.OrderFinishedAt = time.Now()
|
order.OrderFinishedAt = time.Now()
|
||||||
@@ -302,6 +301,7 @@ func (p *PurchaseHandler) Map2Order(orderData map[string]interface{}) (order *mo
|
|||||||
}
|
}
|
||||||
}
|
}
|
||||||
|
|
||||||
|
globals.SugarLogger.Debugf("----------------5")
|
||||||
deliveryGeo := userMap["coord_amap"].(map[string]interface{})
|
deliveryGeo := userMap["coord_amap"].(map[string]interface{})
|
||||||
originalLng := utils.Interface2Float64WithDefault(deliveryGeo["longitude"], 0.0) // 饿百的订单在过一段时间后,经纬度信息会变成字符串"**"
|
originalLng := utils.Interface2Float64WithDefault(deliveryGeo["longitude"], 0.0) // 饿百的订单在过一段时间后,经纬度信息会变成字符串"**"
|
||||||
originalLat := utils.Interface2Float64WithDefault(deliveryGeo["latitude"], 0.0)
|
originalLat := utils.Interface2Float64WithDefault(deliveryGeo["latitude"], 0.0)
|
||||||
@@ -315,6 +315,7 @@ func (p *PurchaseHandler) Map2Order(orderData map[string]interface{}) (order *mo
|
|||||||
order.ConsigneeLat = jxutils.StandardCoordinate2Int(originalLat)
|
order.ConsigneeLat = jxutils.StandardCoordinate2Int(originalLat)
|
||||||
|
|
||||||
products := result["products"].([]interface{})[0].([]interface{})
|
products := result["products"].([]interface{})[0].([]interface{})
|
||||||
|
globals.SugarLogger.Debugf("----------------6")
|
||||||
for _, product2 := range products {
|
for _, product2 := range products {
|
||||||
product := product2.(map[string]interface{})
|
product := product2.(map[string]interface{})
|
||||||
skuName := product["product_name"].(string)
|
skuName := product["product_name"].(string)
|
||||||
@@ -354,6 +355,7 @@ func (p *PurchaseHandler) Map2Order(orderData map[string]interface{}) (order *mo
|
|||||||
// }
|
// }
|
||||||
order.Skus = append(order.Skus, sku)
|
order.Skus = append(order.Skus, sku)
|
||||||
}
|
}
|
||||||
|
globals.SugarLogger.Debugf("----------------7")
|
||||||
giftSkus, discountMoney := getZengSkus(vendorOrderID, orderData)
|
giftSkus, discountMoney := getZengSkus(vendorOrderID, orderData)
|
||||||
order.DiscountMoney = discountMoney
|
order.DiscountMoney = discountMoney
|
||||||
order.Skus = append(order.Skus, giftSkus...)
|
order.Skus = append(order.Skus, giftSkus...)
|
||||||
@@ -362,6 +364,7 @@ func (p *PurchaseHandler) Map2Order(orderData map[string]interface{}) (order *mo
|
|||||||
store, _ := dao.GetStoreDetail(dao.GetDB(), order.JxStoreID, order.VendorID, order.VendorOrgCode)
|
store, _ := dao.GetStoreDetail(dao.GetDB(), order.JxStoreID, order.VendorID, order.VendorOrgCode)
|
||||||
order.PackagePrice = store.PackageSetting
|
order.PackagePrice = store.PackageSetting
|
||||||
jxutils.RefreshOrderSkuRelated(order)
|
jxutils.RefreshOrderSkuRelated(order)
|
||||||
|
globals.SugarLogger.Debugf("----------------8")
|
||||||
return order
|
return order
|
||||||
}
|
}
|
||||||
|
|
||||||
|
|||||||
Reference in New Issue
Block a user