liulei/jx-callback
1
0
Fork 0
Code Issues Pull Requests Actions Packages Projects Releases Wiki Activity

物料订单地址优化，增加省市等

Browse Source
This commit is contained in:
苏尹岚
2020-03-23 10:26:24 +08:00
parent a8bdd93727
commit 3a7a4ccce0
1 changed files with 21 additions and 0 deletions
Download Patch File Download Diff File Expand all files Collapse all files

21
business/partner/purchase/jx/localjx/order.go
View File

@@ -775,6 +775,7 @@ func jxOrder2GoodsOrder(ctx *jxcontext.Context, jxOrder *JxOrderInfo, deliveryAd
order.FromStoreID = jxOrder.FromStoreID order.FromStoreID = jxOrder.FromStoreID
order.WaybillVendorID = model.VendorIDJDWL order.WaybillVendorID = model.VendorIDJDWL
order.DeliveryFlag = model.OrderDeliveryFlagMaskScheduleDisabled order.DeliveryFlag = model.OrderDeliveryFlagMaskScheduleDisabled
order.ConsigneeAddress = deliveryAddress.Address
order.Flag = 1 order.Flag = 1
} }
return order, err return order, err
@@ -888,6 +889,7 @@ func orderSolutionForWuLiao(order *model.GoodsOrder) (err error) {
} }
//分包后的子订单ID默认是后面加两位（目前的规则），要改的话要注意取消订单那的判断 //分包后的子订单ID默认是后面加两位（目前的规则），要改的话要注意取消订单那的判断
outJxOrder.OrderID = utils.Str2Int64(order.VendorOrderID)*100 + int64(k+1) outJxOrder.OrderID = utils.Str2Int64(order.VendorOrderID)*100 + int64(k+1)
checkMatterDeliveryAddress(deliveryAddress)
order2, err2 := jxOrder2GoodsOrder(jxcontext.AdminCtx, outJxOrder, deliveryAddress, order.UserID) order2, err2 := jxOrder2GoodsOrder(jxcontext.AdminCtx, outJxOrder, deliveryAddress, order.UserID)
if err = err2; err == nil { if err = err2; err == nil {
order2.AddressID = order.AddressID order2.AddressID = order.AddressID
@@ -1492,3 +1494,22 @@ func buildOutOrderSkus(weightp *JxSkuInfo2, outOrder *JxOrderInfo) {
outOrder.Skus = append(outOrder.Skus, jxOrderChange(weightp)) outOrder.Skus = append(outOrder.Skus, jxOrderChange(weightp))
} }
} }
func checkMatterDeliveryAddress(deliveryAddress *dao.UserDeliveryAddressEx) {
var (
db = dao.GetDB()
)
if !strings.Contains(deliveryAddress.Address, "区") {
deliveryAddress.Address = deliveryAddress.DistrictName + deliveryAddress.Address
}
if !strings.Contains(deliveryAddress.Address, "市") {
deliveryAddress.Address = deliveryAddress.CityName + deliveryAddress.Address
}
if !strings.Contains(deliveryAddress.Address, "省") {
if place1, err := dao.GetPlaceByCode(db, deliveryAddress.CityCode); err == nil {
if place2, err2 := dao.GetPlaceByCode(db, place1.ParentCode); err2 == nil {
deliveryAddress.Address = place2.Name + deliveryAddress.Address
}
}
}
}