1
This commit is contained in:
@@ -224,67 +224,70 @@ func (c *PurchaseHandler) onAfsOrderMsg(status string, msg interface{}) (retVal
|
|||||||
return tao_vegetable.CallBackResultInfo(err)
|
return tao_vegetable.CallBackResultInfo(err)
|
||||||
}
|
}
|
||||||
|
|
||||||
afsOrder = &model.AfsOrder{
|
for _, v := range onSaleMsg.PartCancelRequest.SubOrders {
|
||||||
VendorID: model.VendorIDTaoVegetable,
|
afsOrder = &model.AfsOrder{
|
||||||
AfsOrderID: onSaleMsg.PartCancelRequest.IdempotentId,
|
VendorID: model.VendorIDTaoVegetable,
|
||||||
VendorOrderID: orderStatus.RefVendorOrderID,
|
AfsOrderID: utils.Int64ToStr(v.BizSubOrderId),
|
||||||
VendorStoreID: onSaleMsg.PartCancelRequest.StoreId,
|
VendorOrderID: orderStatus.RefVendorOrderID,
|
||||||
StoreID: 0,
|
VendorStoreID: onSaleMsg.PartCancelRequest.StoreId,
|
||||||
AfsCreatedAt: orderStatus.StatusTime,
|
StoreID: 0,
|
||||||
VendorAppealType: status, // 原始售后方式
|
AfsCreatedAt: orderStatus.StatusTime,
|
||||||
AppealType: model.AfsAppealTypeUserCancel, // 淘宝这个接口下发的只有用户取消
|
VendorAppealType: status, // 原始售后方式
|
||||||
VendorReasonType: tao_vegetable.OrderStatusOnSaleCancel,
|
AppealType: model.AfsAppealTypeUserCancel, // 淘宝这个接口下发的只有用户取消
|
||||||
ReasonType: 0,
|
VendorReasonType: tao_vegetable.OrderStatusOnSaleCancel,
|
||||||
ReasonDesc: "售中取消:订单未打包,或者长时间为送到!响应成功直接退款",
|
ReasonType: 0,
|
||||||
VendorOrgCode: api.GetVendorOrgCode(),
|
ReasonDesc: "售中取消:订单未打包,或者长时间为送到!响应成功直接退款",
|
||||||
}
|
VendorOrgCode: api.GetVendorOrgCode(),
|
||||||
afsOrder.FreightUserMoney = 0 // 订单运费
|
}
|
||||||
afsOrder.AfsFreightMoney = 0 // 暂时未发现退货取件费用
|
afsOrder.FreightUserMoney = 0 // 订单运费
|
||||||
afsOrder.BoxMoney = 0 // 餐盒费
|
afsOrder.AfsFreightMoney = 0 // 暂时未发现退货取件费用
|
||||||
afsOrder.TongchengFreightMoney = 0 // 同城配送费
|
afsOrder.BoxMoney = 0 // 餐盒费
|
||||||
afsOrder.SkuBoxMoney = 0 // 商品包装费
|
afsOrder.TongchengFreightMoney = 0 // 同城配送费
|
||||||
afsOrder.VendorStatus = orderStatus.VendorStatus // 退货状态
|
afsOrder.SkuBoxMoney = 0 // 商品包装费
|
||||||
|
afsOrder.VendorStatus = orderStatus.VendorStatus // 退货状态
|
||||||
|
|
||||||
ifAfsTypeFullRefund := false
|
ifAfsTypeFullRefund := false
|
||||||
var refundFee int64 = 0
|
var refundFee int64 = 0
|
||||||
for _, v := range *orderDetail.SubOrderResponseList {
|
for _, v := range *orderDetail.SubOrderResponseList {
|
||||||
for _, v2 := range onSaleMsg.PartCancelRequest.SubOrders {
|
for _, v2 := range onSaleMsg.PartCancelRequest.SubOrders {
|
||||||
if *v.BizSubOrderId == v2.BizSubOrderId {
|
if *v.BizSubOrderId == v2.BizSubOrderId {
|
||||||
orderSku := &model.OrderSkuFinancial{
|
orderSku := &model.OrderSkuFinancial{
|
||||||
Count: utils.Float64TwoInt(*v.BuySaleQuantity),
|
Count: utils.Float64TwoInt(*v.BuySaleQuantity),
|
||||||
VendorSkuID: *v.SkuCode,
|
VendorSkuID: *v.SkuCode,
|
||||||
SkuID: utils.Str2Int(*v.SkuCode),
|
SkuID: utils.Str2Int(*v.SkuCode),
|
||||||
Name: *v.SkuName,
|
Name: *v.SkuName,
|
||||||
UserMoney: *v.OriginalFee,
|
UserMoney: *v.OriginalFee,
|
||||||
PmSkuSubsidyMoney: *v.DiscountPlatformFee, // 平台补贴商品
|
PmSkuSubsidyMoney: *v.DiscountPlatformFee, // 平台补贴商品
|
||||||
VendorOrderID: orderStatus.VendorOrderID,
|
VendorOrderID: orderStatus.VendorOrderID,
|
||||||
VendorSubOrderID: *v.OutSubOrderId,
|
VendorSubOrderID: *v.OutSubOrderId,
|
||||||
|
}
|
||||||
|
afsOrder.PmSkuSubsidyMoney += orderSku.PmSkuSubsidyMoney
|
||||||
|
afsOrder.Skus = append(afsOrder.Skus, orderSku)
|
||||||
|
refundFee += *v.OriginalFee
|
||||||
}
|
}
|
||||||
afsOrder.PmSkuSubsidyMoney += orderSku.PmSkuSubsidyMoney
|
|
||||||
afsOrder.Skus = append(afsOrder.Skus, orderSku)
|
|
||||||
refundFee += *v.OriginalFee
|
|
||||||
}
|
}
|
||||||
}
|
}
|
||||||
}
|
if len(onSaleMsg.PartCancelRequest.SubOrders) == len(*orderDetail.SubOrderResponseList) {
|
||||||
if len(onSaleMsg.PartCancelRequest.SubOrders) == len(*orderDetail.SubOrderResponseList) {
|
ifAfsTypeFullRefund = true
|
||||||
ifAfsTypeFullRefund = true
|
}
|
||||||
|
|
||||||
|
afsOrder.SkuUserMoney += refundFee
|
||||||
|
if ifAfsTypeFullRefund { // 全退
|
||||||
|
afsOrder.RefundType = model.AfsTypeFullRefund
|
||||||
|
afsOrder.SkuUserMoney += *orderDetail.PostFee
|
||||||
|
afsOrder.Skus[len(afsOrder.Skus)-1].UserMoney += *orderDetail.PostFee
|
||||||
|
} else {
|
||||||
|
afsOrder.RefundType = model.AfsTypePartRefund
|
||||||
|
}
|
||||||
|
|
||||||
|
if afsOrder != nil {
|
||||||
|
//直接就来一个新的售后单,并且还是售后完成的
|
||||||
|
afsOrder.AfsFinishedAt = afsOrder.AfsCreatedAt
|
||||||
|
afsOrder.Flag = model.AfsOrderFlagAgreeUserRefund
|
||||||
|
err = partner.CurOrderManager.OnAfsOrderNew(afsOrder, orderStatus)
|
||||||
|
}
|
||||||
}
|
}
|
||||||
|
|
||||||
afsOrder.SkuUserMoney += refundFee
|
|
||||||
if ifAfsTypeFullRefund { // 全退
|
|
||||||
afsOrder.RefundType = model.AfsTypeFullRefund
|
|
||||||
afsOrder.SkuUserMoney += *orderDetail.PostFee
|
|
||||||
afsOrder.Skus[len(afsOrder.Skus)-1].UserMoney += *orderDetail.PostFee
|
|
||||||
} else {
|
|
||||||
afsOrder.RefundType = model.AfsTypePartRefund
|
|
||||||
}
|
|
||||||
|
|
||||||
if afsOrder != nil {
|
|
||||||
//直接就来一个新的售后单,并且还是售后完成的
|
|
||||||
afsOrder.AfsFinishedAt = afsOrder.AfsCreatedAt
|
|
||||||
afsOrder.Flag = model.AfsOrderFlagAgreeUserRefund
|
|
||||||
err = partner.CurOrderManager.OnAfsOrderNew(afsOrder, orderStatus)
|
|
||||||
}
|
|
||||||
case tao_vegetable.OrderStatusRefundSuccess:
|
case tao_vegetable.OrderStatusRefundSuccess:
|
||||||
globals.SugarLogger.Debugf("=========售后成功: %s", utils.Format4Output(msg, false))
|
globals.SugarLogger.Debugf("=========售后成功: %s", utils.Format4Output(msg, false))
|
||||||
// 用户退款成功回调,缺货拣货时,送达回触发.此时并没有售后单
|
// 用户退款成功回调,缺货拣货时,送达回触发.此时并没有售后单
|
||||||
@@ -292,8 +295,6 @@ func (c *PurchaseHandler) onAfsOrderMsg(status string, msg interface{}) (retVal
|
|||||||
refundSuccess := msg.(*tao_vegetable.RefundOrderFinish)
|
refundSuccess := msg.(*tao_vegetable.RefundOrderFinish)
|
||||||
var afsOrder *model.AfsOrder
|
var afsOrder *model.AfsOrder
|
||||||
var api = getAPI("", 0, refundSuccess.StoreId)
|
var api = getAPI("", 0, refundSuccess.StoreId)
|
||||||
var isCreate = true
|
|
||||||
var outMainRefundIds = make(map[string]int64, 0)
|
|
||||||
detail, err := api.QueryAfsOrderDetail(&request591.AlibabaWdkOrderRefundGetRequest{
|
detail, err := api.QueryAfsOrderDetail(&request591.AlibabaWdkOrderRefundGetRequest{
|
||||||
OrderFrom: utils.Int64ToPointer(tao_vegetable.ChannelCome),
|
OrderFrom: utils.Int64ToPointer(tao_vegetable.ChannelCome),
|
||||||
ShopId: nil,
|
ShopId: nil,
|
||||||
@@ -303,84 +304,70 @@ func (c *PurchaseHandler) onAfsOrderMsg(status string, msg interface{}) (retVal
|
|||||||
if err != nil {
|
if err != nil {
|
||||||
return tao_vegetable.CallBackResultInfo(err)
|
return tao_vegetable.CallBackResultInfo(err)
|
||||||
}
|
}
|
||||||
finalList, _ := dao.GetOrderRefundSkuList(db, []string{refundSuccess.OutMainRefundId})
|
|
||||||
if len(finalList) != model.NO {
|
for _, v := range *detail.Orders {
|
||||||
for _, f := range finalList {
|
afs, _ := partner.CurOrderManager.LoadAfsOrder(utils.Int64ToStr(*v.OriginOrderId), model.VendorIDTaoVegetable)
|
||||||
for _, a := range *detail.Orders {
|
if afs != nil {
|
||||||
if f.SkuID == utils.Str2Int(*a.ItemCode) {
|
afsOrder = &model.AfsOrder{
|
||||||
isCreate = false // 本地已经存在了记录
|
VendorID: model.VendorIDTaoVegetable,
|
||||||
outMainRefundIds[*a.OutMainRefundId] = *a.RefundAmount
|
AfsOrderID: utils.Int64ToStr(*v.OriginOrderId),
|
||||||
|
VendorOrderID: orderStatus.RefVendorOrderID,
|
||||||
|
VendorOrderID2: refundSuccess.BizSubRefundId,
|
||||||
|
VendorStoreID: refundSuccess.StoreId,
|
||||||
|
StoreID: 0,
|
||||||
|
AfsCreatedAt: orderStatus.StatusTime,
|
||||||
|
VendorAppealType: status, // 原始售后方式
|
||||||
|
AppealType: model.AfsAppealTypeUserCancel, // 淘宝这个接口下发的只有用户取消
|
||||||
|
VendorReasonType: tao_vegetable.OrderStatusOnSaleCancel,
|
||||||
|
ReasonType: 0,
|
||||||
|
ReasonDesc: "缺货调整,退款成功通知",
|
||||||
|
VendorOrgCode: api.GetVendorOrgCode(),
|
||||||
|
}
|
||||||
|
afsOrder.FreightUserMoney = 0 // 订单运费
|
||||||
|
afsOrder.AfsFreightMoney = 0 // 暂时未发现退货取件费用
|
||||||
|
afsOrder.BoxMoney = 0 // 餐盒费
|
||||||
|
afsOrder.TongchengFreightMoney = 0 // 同城配送费
|
||||||
|
afsOrder.SkuBoxMoney = 0 // 商品包装费
|
||||||
|
afsOrder.VendorStatus = orderStatus.VendorStatus // 退货状态
|
||||||
|
|
||||||
|
for _, v := range *scarceGoods {
|
||||||
|
var refundFee int64 = 0
|
||||||
|
skuDetail := tao_vegetable.GoodsScarceRefund{}
|
||||||
|
if err := json.Unmarshal([]byte(*v.Attributes), &skuDetail); err != nil {
|
||||||
|
return tao_vegetable.CallBackResultInfo(err)
|
||||||
|
}
|
||||||
|
|
||||||
|
orderSku := &model.OrderSkuFinancial{
|
||||||
|
Count: utils.Float64TwoInt(utils.Str2Float64(*v.RefundQuantity)),
|
||||||
|
VendorSkuID: *v.SkuCode,
|
||||||
|
SkuID: utils.Str2Int(*v.SkuCode),
|
||||||
|
Name: skuDetail.SkuName,
|
||||||
|
UserMoney: *v.RefundAmount,
|
||||||
|
PmSkuSubsidyMoney: 0, // 平台补贴商品
|
||||||
|
VendorOrderID: orderStatus.VendorOrderID,
|
||||||
|
VendorSubOrderID: *v.OutOrderId,
|
||||||
|
}
|
||||||
|
afsOrder.PmSkuSubsidyMoney += orderSku.PmSkuSubsidyMoney
|
||||||
|
afsOrder.Skus = append(afsOrder.Skus, orderSku)
|
||||||
|
refundFee += *v.RefundAmount
|
||||||
|
|
||||||
|
afsOrder.SkuUserMoney += refundFee
|
||||||
|
afsOrder.RefundType = model.AfsTypePartRefund
|
||||||
|
if afsOrder != nil {
|
||||||
|
//直接就来一个新的售后单,并且还是售后完成的
|
||||||
|
afsOrder.AfsFinishedAt = afsOrder.AfsCreatedAt
|
||||||
|
afsOrder.Flag = model.AfsOrderFlagAgreeUserRefund
|
||||||
|
err = partner.CurOrderManager.OnAfsOrderNew(afsOrder, orderStatus)
|
||||||
}
|
}
|
||||||
}
|
}
|
||||||
}
|
} else {
|
||||||
}
|
|
||||||
|
|
||||||
// 本地已经存在了售后记录,直接修改售后状态,否则创建售后记录
|
|
||||||
if !isCreate {
|
|
||||||
for afsOrderId, afsMoney := range outMainRefundIds {
|
|
||||||
afs, _ := partner.CurOrderManager.LoadAfsOrder(afsOrderId, model.VendorIDTaoVegetable)
|
|
||||||
afs.VendorOrderID2 = refundSuccess.BizSubRefundId
|
afs.VendorOrderID2 = refundSuccess.BizSubRefundId
|
||||||
afs.AfsFinishedAt = time.Now()
|
afs.AfsFinishedAt = time.Now()
|
||||||
afs.Status = model.AfsOrderStatusFinished
|
afs.Status = model.AfsOrderStatusFinished
|
||||||
afs.AfsTotalShopMoney = afsMoney
|
afs.AfsTotalShopMoney = *v.RefundAmount
|
||||||
dao.UpdateEntity(db, afs, "VendorOrderID2", "AfsFinishedAt", "Status", "AfsTotalShopMoney")
|
dao.UpdateEntity(db, afs, "VendorOrderID2", "AfsFinishedAt", "Status", "AfsTotalShopMoney")
|
||||||
}
|
}
|
||||||
} else {
|
|
||||||
afsOrder = &model.AfsOrder{
|
|
||||||
VendorID: model.VendorIDTaoVegetable,
|
|
||||||
AfsOrderID: refundSuccess.OutMainRefundId,
|
|
||||||
VendorOrderID: orderStatus.RefVendorOrderID,
|
|
||||||
VendorOrderID2: refundSuccess.BizSubRefundId,
|
|
||||||
VendorStoreID: refundSuccess.StoreId,
|
|
||||||
StoreID: 0,
|
|
||||||
AfsCreatedAt: orderStatus.StatusTime,
|
|
||||||
VendorAppealType: status, // 原始售后方式
|
|
||||||
AppealType: model.AfsAppealTypeUserCancel, // 淘宝这个接口下发的只有用户取消
|
|
||||||
VendorReasonType: tao_vegetable.OrderStatusOnSaleCancel,
|
|
||||||
ReasonType: 0,
|
|
||||||
ReasonDesc: "缺货调整,退款成功通知",
|
|
||||||
VendorOrgCode: api.GetVendorOrgCode(),
|
|
||||||
}
|
|
||||||
afsOrder.FreightUserMoney = 0 // 订单运费
|
|
||||||
afsOrder.AfsFreightMoney = 0 // 暂时未发现退货取件费用
|
|
||||||
afsOrder.BoxMoney = 0 // 餐盒费
|
|
||||||
afsOrder.TongchengFreightMoney = 0 // 同城配送费
|
|
||||||
afsOrder.SkuBoxMoney = 0 // 商品包装费
|
|
||||||
afsOrder.VendorStatus = orderStatus.VendorStatus // 退货状态
|
|
||||||
|
|
||||||
for _, v := range *scarceGoods {
|
|
||||||
var refundFee int64 = 0
|
|
||||||
skuDetail := tao_vegetable.GoodsScarceRefund{}
|
|
||||||
if err := json.Unmarshal([]byte(*v.Attributes), &skuDetail); err != nil {
|
|
||||||
return tao_vegetable.CallBackResultInfo(err)
|
|
||||||
}
|
|
||||||
|
|
||||||
orderSku := &model.OrderSkuFinancial{
|
|
||||||
Count: utils.Float64TwoInt(utils.Str2Float64(*v.RefundQuantity)),
|
|
||||||
VendorSkuID: *v.SkuCode,
|
|
||||||
SkuID: utils.Str2Int(*v.SkuCode),
|
|
||||||
Name: skuDetail.SkuName,
|
|
||||||
UserMoney: *v.RefundAmount,
|
|
||||||
PmSkuSubsidyMoney: 0, // 平台补贴商品
|
|
||||||
VendorOrderID: orderStatus.VendorOrderID,
|
|
||||||
VendorSubOrderID: *v.OutOrderId,
|
|
||||||
}
|
|
||||||
afsOrder.PmSkuSubsidyMoney += orderSku.PmSkuSubsidyMoney
|
|
||||||
afsOrder.Skus = append(afsOrder.Skus, orderSku)
|
|
||||||
refundFee += *v.RefundAmount
|
|
||||||
|
|
||||||
afsOrder.SkuUserMoney += refundFee
|
|
||||||
afsOrder.RefundType = model.AfsTypePartRefund
|
|
||||||
if afsOrder != nil {
|
|
||||||
//直接就来一个新的售后单,并且还是售后完成的
|
|
||||||
afsOrder.AfsFinishedAt = afsOrder.AfsCreatedAt
|
|
||||||
afsOrder.Flag = model.AfsOrderFlagAgreeUserRefund
|
|
||||||
err = partner.CurOrderManager.OnAfsOrderNew(afsOrder, orderStatus)
|
|
||||||
}
|
|
||||||
}
|
|
||||||
|
|
||||||
}
|
}
|
||||||
|
|
||||||
}
|
}
|
||||||
default:
|
default:
|
||||||
|
|
||||||
|
|||||||
Reference in New Issue
Block a user