This commit is contained in:
邹宗楠
2023-07-06 17:27:42 +08:00
parent e9f253d90f
commit 2c1be52d37

View File

@@ -71,22 +71,25 @@ func (c *PurchaseHandler) onAfsOrderMsg(status string, msg interface{}) (retVal
var err error var err error
var db = dao.GetDB() var db = dao.GetDB()
orderStatus := c.callbackAfsMsg2Status(status, msg) orderStatus := c.callbackAfsMsg2Status(status, msg)
needCallNew := orderStatus.Status == model.AfsOrderStatusWait4Approve || orderStatus.Status == model.AfsOrderStatusNew //needCallNew := orderStatus.Status == model.AfsOrderStatusWait4Approve || orderStatus.Status == model.AfsOrderStatusNew
if !needCallNew { //if !needCallNew {
_, err := partner.CurOrderManager.LoadAfsOrder(orderStatus.VendorOrderID, orderStatus.VendorID) // _, err := partner.CurOrderManager.LoadAfsOrder(orderStatus.VendorOrderID, orderStatus.VendorID)
if err != nil { // if err != nil {
if dao.IsNoRowsError(err) { // if dao.IsNoRowsError(err) {
needCallNew = true // needCallNew = true
} else { // } else {
return tao_vegetable.CallBackResultInfo(err) // return tao_vegetable.CallBackResultInfo(err)
} // }
} // }
} //}
if needCallNew && orderStatus.Status == model.AfsOrderStatusOnSaleAfs { //if needCallNew && orderStatus.Status == model.AfsOrderStatusOnSaleAfs {
needCallNew = false // needCallNew = false
} //}
// 用户取消售后
switch status {
case tao_vegetable.OrderStatusApplyAfs:
if needCallNew {
refundData := msg.(*tao_vegetable.UserApplyRefundCallBack) refundData := msg.(*tao_vegetable.UserApplyRefundCallBack)
var afsOrder *model.AfsOrder var afsOrder *model.AfsOrder
var api = getAPI("", 0, refundData.StoreId) var api = getAPI("", 0, refundData.StoreId)
@@ -182,9 +185,6 @@ func (c *PurchaseHandler) onAfsOrderMsg(status string, msg interface{}) (retVal
} }
err = partner.CurOrderManager.OnAfsOrderNew(afsOrder, orderStatus) err = partner.CurOrderManager.OnAfsOrderNew(afsOrder, orderStatus)
} }
} else {
// 用户取消售后
switch status {
case tao_vegetable.OrderStatusCancelAfs: case tao_vegetable.OrderStatusCancelAfs:
// 删除售后单 // 删除售后单
afsOrder, err := dao.GetAfsOrders(db, model.VendorIDTaoVegetable, orderStatus.RefVendorOrderID, orderStatus.VendorOrderID) afsOrder, err := dao.GetAfsOrders(db, model.VendorIDTaoVegetable, orderStatus.RefVendorOrderID, orderStatus.VendorOrderID)
@@ -324,8 +324,7 @@ func (c *PurchaseHandler) onAfsOrderMsg(status string, msg interface{}) (retVal
// 取消三方运单 // 取消三方运单
} }
} }
}
globals.SugarLogger.Debugf("=============errr : %v", err)
return tao_vegetable.CallBackResultInfo(err) return tao_vegetable.CallBackResultInfo(err)
} }