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

kuaidi xianzhi

Browse Source
This commit is contained in:
苏尹岚
2020-11-10 09:14:35 +08:00
parent 90b6fcf597
commit 380554ac2b
1 changed files with 6 additions and 5 deletions
Download Patch File Download Diff File Expand all files Collapse all files

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

@@ -644,11 +644,11 @@ func SendJdDelivery(ctx *jxcontext.Context, dOrder *model.DeliveryOrder) (errCod
} }
//内蒙古海南统一35 //内蒙古海南统一35
//新疆西藏统一45 //新疆西藏统一45
if receiveDeliveryList[0].ParentCode == 150000 || receiveDeliveryList[0].ParentCode == 460000 { if receiveDeliveryList[0].ParentCode == 150000 || receiveDeliveryList[0].ParentCode == 460000 ||
dOrder.PayPrice = 3500 receiveDeliveryList[0].ParentCode == 650000 || receiveDeliveryList[0].ParentCode == 540000 ||
} sendDeliveryList[0].ParentCode == 150000 || sendDeliveryList[0].ParentCode == 460000 ||
if receiveDeliveryList[0].ParentCode == 650000 || receiveDeliveryList[0].ParentCode == 540000 { sendDeliveryList[0].ParentCode == 650000 || sendDeliveryList[0].ParentCode == 540000 {
dOrder.PayPrice = 4500 return errCode, fmt.Errorf("暂不支持该地区的快递业务！")
} }
sendProvinceName := "" sendProvinceName := ""
receiveProvinceName := "" receiveProvinceName := ""
@@ -754,6 +754,7 @@ func CancelJdDelivery(ctx *jxcontext.Context, vendorWaybillID, reason string) (e
}() }()
if _, err = dao.UpdateEntity(db, dOrder, "Status", "OrderFinishedAt", "Comment"); err != nil { if _, err = dao.UpdateEntity(db, dOrder, "Status", "OrderFinishedAt", "Comment"); err != nil {
dao.Rollback(db) dao.Rollback(db)
return
} }
if err = financial.AddIncomeUpdateAccount(db, userBill, model.BillTypeSpJob, dOrder.PayPrice); err != nil { if err = financial.AddIncomeUpdateAccount(db, userBill, model.BillTypeSpJob, dOrder.PayPrice); err != nil {
dao.Rollback(db) dao.Rollback(db)