From 02ad4203130b6150545feb7657b5176140b48f72 Mon Sep 17 00:00:00 2001 From: =?UTF-8?q?=E9=82=B9=E5=AE=97=E6=A5=A0?= Date: Fri, 9 May 2025 14:57:37 +0800 Subject: [PATCH] 1 --- business/partner/purchase/jd/sku2.go | 4 ++-- business/partner/purchase/mtwm/order_afs.go | 4 ++-- 2 files changed, 4 insertions(+), 4 deletions(-) diff --git a/business/partner/purchase/jd/sku2.go b/business/partner/purchase/jd/sku2.go index ad5d35122..b1c07a568 100644 --- a/business/partner/purchase/jd/sku2.go +++ b/business/partner/purchase/jd/sku2.go @@ -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) } - if sku.SkuVendorMapCatID != "" { + if sku.SkuVendorMapCatID != "" && sku.SkuVendorMapCatID != "0" { param.CategoryID = utils.Str2Int64(sku.SkuVendorMapCatID) } else if sku.VendorVendorCatID != 0 { 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 { 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_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}) } } diff --git a/business/partner/purchase/mtwm/order_afs.go b/business/partner/purchase/mtwm/order_afs.go index da8c5208e..4c59c6228 100644 --- a/business/partner/purchase/mtwm/order_afs.go +++ b/business/partner/purchase/mtwm/order_afs.go @@ -100,6 +100,7 @@ func (c *PurchaseHandler) onAfsOrderMsg(msg *mtwmapi.CallbackMsg) (retVal *mtwma ReasonImgList: utils.LimitUTF8StringLen(strings.Join(refundData.PictureList, ","), 1024), RefundType: model.AfsTypePartRefund, VendorOrgCode: msg.AppID, + AfsFinishedAt: time.Now(), //RefundMoney: , // FreightUserMoney: afsInfo.OrderFreightMoney, // AfsFreightMoney: afsInfo.AfsFreight, @@ -149,18 +150,17 @@ func (c *PurchaseHandler) onAfsOrderMsg(msg *mtwmapi.CallbackMsg) (retVal *mtwma afsOrder.ReasonType = model.AfsReasonNotOthers afsOrder.ReasonDesc = utils.LimitUTF8StringLen(refundData.Reason, 1024) afsOrder.ReasonImgList = utils.LimitUTF8StringLen(strings.Join(refundData.PictureList, ","), 1024) + afsOrder.AfsFinishedAt = time.Now() } } if afsOrder != nil { //直接就来一个新的售后单，并且还是售后完成的 if orderStatus.Status == model.AfsOrderStatusFinished { - afsOrder.AfsFinishedAt = afsOrder.AfsCreatedAt afsOrder.Status = model.AfsOrderStatusFinished } // 补丁,这种类型的退款申请,不会在推送退款成功消息,直接将售后单标记为完成 if strings.Contains(afsOrder.ReasonDesc, "商家开通极速退款服务，用户申请系统自动通过") { - afsOrder.AfsFinishedAt = time.Now() afsOrder.Status = model.AfsOrderStatusFinished } if refundData.NotifyType == mtwmapi.MsgTypeOrderAgree && msg.Cmd == mtwmapi.MsgTypeOrderRefund {