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

address

Browse Source
This commit is contained in:
苏尹岚
2020-11-05 16:00:27 +08:00
parent 0bc79ac9ba
commit 40fd3e6d2c
1 changed files with 12 additions and 13 deletions
Download Patch File Download Diff File Expand all files Collapse all files

25
business/jxstore/cms/job.go
View File

@@ -636,29 +636,28 @@ func SendJdDelivery(ctx *jxcontext.Context, dOrder *model.DeliveryOrder) (errCod
if receiveDeliveryList[0].ParentCode == 650000 || receiveDeliveryList[0].ParentCode == 540000 {
dOrder.PayPrice = 4500
}
modifyAddress := func(deliveryAddress *dao.UserDeliveryAddressEx) {
deliveryAddress.Address = deliveryAddress.DistrictName + deliveryAddress.Address
deliveryAddress.Address = deliveryAddress.CityName + 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
}
sendProvinceName := ""
receiveProvinceName := ""
if place1, err := dao.GetPlaceByCode(db, sendDeliveryList[0].CityCode); err == nil {
if place2, err2 := dao.GetPlaceByCode(db, place1.ParentCode); err2 == nil {
sendProvinceName = place2.Name
}
}
if place1, err := dao.GetPlaceByCode(db, receiveDeliveryList[0].CityCode); err == nil {
if place2, err2 := dao.GetPlaceByCode(db, place1.ParentCode); err2 == nil {
receiveProvinceName = place2.Name
}
}
modifyAddress(sendDeliveryList[0])
modifyAddress(receiveDeliveryList[0])
dao.WrapAddIDCULEntity(dOrder, ctx.GetUserName())
if vendorWaybillID, err := api.JdEclpAPI.WaybillReceive(&jdeclpapi.WaybillReceiveParam{
SalePlat: jdeclpapi.SalePlatSourceDelivery,
CustomerCode: jdeclpapi.CustomerCode,
OrderID: utils.Int64ToStr(jxutils.GenOrderNo()),
SenderName: sendDeliveryList[0].ConsigneeName,
SenderAddress: sendDeliveryList[0].Address + sendDeliveryList[0].DetailAddress,
SenderAddress: sendProvinceName + sendDeliveryList[0].CityName + sendDeliveryList[0].DistrictName + sendDeliveryList[0].Address + sendDeliveryList[0].DetailAddress,
SenderTel: sendDeliveryList[0].ConsigneeMobile,
ReceiveName: receiveDeliveryList[0].ConsigneeName,
ReceiveAddress: receiveDeliveryList[0].Address + receiveDeliveryList[0].DetailAddress,
ReceiveAddress: receiveProvinceName + receiveDeliveryList[0].CityName + receiveDeliveryList[0].DistrictName + receiveDeliveryList[0].Address + receiveDeliveryList[0].DetailAddress,
ReceiveTel: receiveDeliveryList[0].ConsigneeMobile,
Weight: dOrder.Weight,
Vloumn: dOrder.Vloumn,