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

1

Browse Source
This commit is contained in:
邹宗楠
2025-05-09 14:57:37 +08:00
parent 7a5a2f3e85
commit 02ad420313
2 changed files with 4 additions and 4 deletions
Download Patch File Download Diff File Expand all files Collapse all files

4
business/partner/purchase/jd/sku2.go
View File

@@ -185,7 +185,7 @@ func skuInfo2Param(ctx *jxcontext.Context, sku *dao.StoreSkuSyncInfo) (param *jd
param.Images = jxutils.BatchString2Slice(sku.Img, sku.Img2, sku.Img3, sku.Img4, sku.Img5) param.Images = jxutils.BatchString2Slice(sku.Img, sku.Img2, sku.Img3, sku.Img4, sku.Img5)
} }
if sku.SkuVendorMapCatID != "" { if sku.SkuVendorMapCatID != "" && sku.SkuVendorMapCatID != "0" {
param.CategoryID = utils.Str2Int64(sku.SkuVendorMapCatID) param.CategoryID = utils.Str2Int64(sku.SkuVendorMapCatID)
} else if sku.VendorVendorCatID != 0 { } else if sku.VendorVendorCatID != 0 {
param.CategoryID = sku.VendorVendorCatID param.CategoryID = sku.VendorVendorCatID
@@ -196,7 +196,7 @@ func skuInfo2Param(ctx *jxcontext.Context, sku *dao.StoreSkuSyncInfo) (param *jd
if recommendCategory != nil && recommendCategory.CategoryId != model.NO { if recommendCategory != nil && recommendCategory.CategoryId != model.NO {
param.CategoryID = int64(recommendCategory.CategoryId) param.CategoryID = int64(recommendCategory.CategoryId)
dao.ExecuteSQL(dao.GetDB(), ` UPDATE sku_vendor_category_map SET vendor_category_id = ? WHERE name_id = ? AND vendor_id = ? `, []interface{}{recommendCategory.CategoryId, sku.NameID, sku.VendorID}...) dao.ExecuteSQL(dao.GetDB(), ` UPDATE sku_vendor_category_map SET vendor_category_id = ? WHERE name_id = ? AND vendor_id = ? `, []interface{}{recommendCategory.CategoryId, sku.NameID, sku.VendorID}...)
dao.ExecuteSQL(dao.GetDB(), ` UPDATE sku_category SET jd_category_id = ? WHERE id = ? `, []interface{}{recommendCategory.CategoryId, sku.LocalCategoryId}...) //dao.ExecuteSQL(dao.GetDB(), ` UPDATE sku_category SET jd_category_id = ? WHERE id = ? `, []interface{}{recommendCategory.CategoryId, sku.LocalCategoryId}...)
dao.ExecuteSQL(dao.GetDB(), ` UPDATE sku_name SET jd_category_id = ? WHERE id = ? `, []interface{}{recommendCategory.CategoryId, sku.NameID}) dao.ExecuteSQL(dao.GetDB(), ` UPDATE sku_name SET jd_category_id = ? WHERE id = ? `, []interface{}{recommendCategory.CategoryId, sku.NameID})
} }
} }

4
business/partner/purchase/mtwm/order_afs.go
View File

@@ -100,6 +100,7 @@ func (c *PurchaseHandler) onAfsOrderMsg(msg *mtwmapi.CallbackMsg) (retVal *mtwma
ReasonImgList: utils.LimitUTF8StringLen(strings.Join(refundData.PictureList, ","), 1024), ReasonImgList: utils.LimitUTF8StringLen(strings.Join(refundData.PictureList, ","), 1024),
RefundType: model.AfsTypePartRefund, RefundType: model.AfsTypePartRefund,
VendorOrgCode: msg.AppID, VendorOrgCode: msg.AppID,
AfsFinishedAt: time.Now(),
//RefundMoney: , //RefundMoney: ,
// FreightUserMoney: afsInfo.OrderFreightMoney, // FreightUserMoney: afsInfo.OrderFreightMoney,
// AfsFreightMoney: afsInfo.AfsFreight, // AfsFreightMoney: afsInfo.AfsFreight,
@@ -149,18 +150,17 @@ func (c *PurchaseHandler) onAfsOrderMsg(msg *mtwmapi.CallbackMsg) (retVal *mtwma
afsOrder.ReasonType = model.AfsReasonNotOthers afsOrder.ReasonType = model.AfsReasonNotOthers
afsOrder.ReasonDesc = utils.LimitUTF8StringLen(refundData.Reason, 1024) afsOrder.ReasonDesc = utils.LimitUTF8StringLen(refundData.Reason, 1024)
afsOrder.ReasonImgList = utils.LimitUTF8StringLen(strings.Join(refundData.PictureList, ","), 1024) afsOrder.ReasonImgList = utils.LimitUTF8StringLen(strings.Join(refundData.PictureList, ","), 1024)
afsOrder.AfsFinishedAt = time.Now()
} }
} }
if afsOrder != nil { if afsOrder != nil {
//直接就来一个新的售后单，并且还是售后完成的 //直接就来一个新的售后单，并且还是售后完成的
if orderStatus.Status == model.AfsOrderStatusFinished { if orderStatus.Status == model.AfsOrderStatusFinished {
afsOrder.AfsFinishedAt = afsOrder.AfsCreatedAt
afsOrder.Status = model.AfsOrderStatusFinished afsOrder.Status = model.AfsOrderStatusFinished
} }
// 补丁,这种类型的退款申请,不会在推送退款成功消息,直接将售后单标记为完成 // 补丁,这种类型的退款申请,不会在推送退款成功消息,直接将售后单标记为完成
if strings.Contains(afsOrder.ReasonDesc, "商家开通极速退款服务，用户申请系统自动通过") { if strings.Contains(afsOrder.ReasonDesc, "商家开通极速退款服务，用户申请系统自动通过") {
afsOrder.AfsFinishedAt = time.Now()
afsOrder.Status = model.AfsOrderStatusFinished afsOrder.Status = model.AfsOrderStatusFinished
} }
if refundData.NotifyType == mtwmapi.MsgTypeOrderAgree && msg.Cmd == mtwmapi.MsgTypeOrderRefund { if refundData.NotifyType == mtwmapi.MsgTypeOrderAgree && msg.Cmd == mtwmapi.MsgTypeOrderRefund {