From 65b4e2bcb8f25f677465b5e19d35f194a41818e1 Mon Sep 17 00:00:00 2001 From: gazebo Date: Sun, 23 Dec 2018 12:21:37 +0800 Subject: [PATCH] - handle jd order have illegal skuIdIsv value(more than max int32) --- business/jxcallback/orderman/order.go | 10 ++++++++-- business/partner/purchase/jd/order_legacy_comment.go | 2 +- 2 files changed, 9 insertions(+), 3 deletions(-) diff --git a/business/jxcallback/orderman/order.go b/business/jxcallback/orderman/order.go index b34f436c3..d31df8b6f 100644 --- a/business/jxcallback/orderman/order.go +++ b/business/jxcallback/orderman/order.go @@ -2,6 +2,7 @@ package orderman import ( "fmt" + "math" "time" "git.rosy.net.cn/baseapi" @@ -170,12 +171,17 @@ func (c *OrderManager) saveOrder(order *model.GoodsOrder, isAdjust bool, db orm. params := []interface{}{} for _, sku := range order.Skus { sql += "(?, ?, ?, ?, ?, ?, ?, ?, ?, ?, ?, ?, ?)," - params = append(params, sku.VendorOrderID, sku.VendorID, sku.Count, sku.VendorSkuID, sku.SkuID, sku.JxSkuID, sku.SkuName, + // 有时不是通过京西平台建立的SKU，不范围要超过 + skuID := 0 + if sku.SkuID < math.MaxInt32 { + skuID = sku.SkuID + } + params = append(params, sku.VendorOrderID, sku.VendorID, sku.Count, sku.VendorSkuID, skuID, sku.JxSkuID, sku.SkuName, sku.ShopPrice, sku.SalePrice, sku.Weight, sku.SkuType, sku.PromotionType, order.OrderCreatedAt) } sql = sql[:len(sql)-1] + ";" if _, err = db.Raw(sql, params...).Exec(); err != nil { - baseapi.SugarLogger.Infof("saveOrder insert order:%v, order_sku error:%v", order, err) + baseapi.SugarLogger.Warnf("saveOrder insert order:%v, order_sku error:%v", order, err) } else { db.Commit() } diff --git a/business/partner/purchase/jd/order_legacy_comment.go b/business/partner/purchase/jd/order_legacy_comment.go index 628aa02cf..5aa6a8e62 100644 --- a/business/partner/purchase/jd/order_legacy_comment.go +++ b/business/partner/purchase/jd/order_legacy_comment.go @@ -117,7 +117,7 @@ func (c *PurchaseHandler) onOrderComment(msg *jdapi.CallbackOrderMsg) (err error comment.UpdatedVendertags = string(utils.MustMarshal(result["venderTags"])) comment.Status = COMMENT_RESOLVED } - if score <= JX_BAD_COMMENTS_MAX_LEVEL { + if score <= JX_BAD_COMMENTS_MAX_LEVEL && comment.Jxstoreid != "" { if globals.ReallyCallPlatformAPI { weixinmsg.PushJDBadCommentToWeiXin(comment) }