1'

business/partner/delivery/fn/waybill.go

@@ -210,6 +210,17 @@ func OnWaybillMsg(msg *fnpsapi.OrderStatusNottify, resultParam *fnpsapi.ShortSta
 	if err := utils.Map2StructByJson(msg.Param, cc, true); err != nil {
 		return fnpsapi.Err2CallbackResponse(err, "")
 	}
+	// 多次取消,只处理第一次
+	if cc.OrderStatus == fnpsapi.OrderStatusAcceptCacle {
+		bill, err := partner.CurOrderManager.LoadWaybill(utils.Int64ToStr(cc.OrderId), model.VendorIDFengNiao)
+		if err != nil {
+			return fnpsapi.Err2CallbackResponse(err, "")
+		}
+		if bill.Status == model.OrderStatusCanceled {
+			return fnpsapi.Err2CallbackResponse(nil, "")
+		}
+	}
+
 	var good *model.GoodsOrder
 	sql := `SELECT * FROM goods_order WHERE vendor_order_id = ? ORDER BY order_created_at DESC  LIMIT 1 OFFSET 0`
 	sqlParams := []interface{}{cc.PartnerOrderCode}
@@ -256,6 +267,7 @@ func OnWaybillMsg(msg *fnpsapi.OrderStatusNottify, resultParam *fnpsapi.ShortSta
 		order.Status = model.WaybillStatusDelivered
 	case fnpsapi.OrderStatusAcceptCacle: // 4取消订单
 		order.Status = model.WaybillStatusCanceled
+		order.VendorStatus = utils.Int2Str(fnpsapi.OrderStatusAcceptCacle)
 	case fnpsapi.OrderStatusException: // 5 异常
 		order.Status = model.WaybillStatusDeliverFailed // 22
 	default: