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

京西商城订单随意取消

Browse Source
This commit is contained in:
gazebo
2020-02-11 17:28:53 +08:00
parent 3cc6db8f0f
commit f77849d08a
1 changed files with 10 additions and 6 deletions
Download Patch File Download Diff File Expand all files Collapse all files

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

@@ -551,11 +551,11 @@ func SelfDeliverDelivered(order *model.GoodsOrder, userName string) (err error)
} }
func CancelOrder(ctx *jxcontext.Context, order *model.GoodsOrder, reason string) (err error) { func CancelOrder(ctx *jxcontext.Context, order *model.GoodsOrder, reason string) (err error) {
if order.Status < model.OrderStatusDelivering { if true { //order.Status < model.OrderStatusDelivering {
errList := errlist.New()
db := dao.GetDB() db := dao.GetDB()
payList, err2 := dao.GetOrderPayList(db, order.VendorOrderID, jxutils.GetPossibleVendorIDFromVendorOrderID(order.VendorOrderID)) payList, err2 := dao.GetOrderPayList(db, order.VendorOrderID, jxutils.GetPossibleVendorIDFromVendorOrderID(order.VendorOrderID))
if err = err2; err == nil { if err = err2; err == nil {
errList := errlist.New()
for _, orderPay := range payList { for _, orderPay := range payList {
if orderPay.Status == model.PayStatusYes { if orderPay.Status == model.PayStatusYes {
// refundID := utils.Int64ToStr(GenRefundID(order)) // refundID := utils.Int64ToStr(GenRefundID(order))
@@ -573,11 +573,15 @@ func CancelOrder(ctx *jxcontext.Context, order *model.GoodsOrder, reason string)
errList.AddErr(err2) errList.AddErr(err2)
} }
} }
if errList.GetErrListAsOne() == nil { } else if dao.IsNoRowsError(err) {
errList.AddErr(changeOrderStatus(order.VendorOrderID, model.OrderStatusCanceled, reason)) err = nil
} } else {
err = errList.GetErrListAsOne() errList.AddErr(err)
} }
if errList.GetErrListAsOne() == nil {
errList.AddErr(changeOrderStatus(order.VendorOrderID, model.OrderStatusCanceled, reason))
}
err = errList.GetErrListAsOne()
} else { } else {
err = fmt.Errorf("当前订单状态:%s不允许取消", model.OrderStatusName[order.Status]) err = fmt.Errorf("当前订单状态:%s不允许取消", model.OrderStatusName[order.Status])
} }