From df043e1df0b7da6ed411c962adb69480d8ed06c7 Mon Sep 17 00:00:00 2001 From: =?UTF-8?q?=E9=82=B9=E5=AE=97=E6=A5=A0?= Date: Thu, 18 Jul 2024 11:04:19 +0800 Subject: [PATCH] 1 --- business/jxcallback/orderman/order_comment.go | 4 ++-- business/model/dao/dao_order_sku_financial.go | 7 +------ business/partner/purchase/mtwm/order_comment.go | 4 +++- 3 files changed, 6 insertions(+), 9 deletions(-) diff --git a/business/jxcallback/orderman/order_comment.go b/business/jxcallback/orderman/order_comment.go index f3ccc2b6e..1537ca2d4 100644 --- a/business/jxcallback/orderman/order_comment.go +++ b/business/jxcallback/orderman/order_comment.go @@ -104,7 +104,7 @@ func (c *OrderManager) OnOrderComments(orderCommentList []*model.OrderComment) ( comment2.VendorOrderId = orderComment.VendorOrderID2 var order *model.GoodsOrder - if orderComment.VendorID == model.VendorIDMTWM { + if orderComment.VendorID == model.VendorIDMTWM && orderComment.VendorOrderID2 != "" { order, _ = partner.CurOrderManager.LoadOrder(orderComment.VendorOrderID2, orderComment.VendorID) } else { order, _ = partner.CurOrderManager.LoadOrder(orderComment.VendorOrderID, orderComment.VendorID) @@ -160,7 +160,7 @@ func (c *OrderManager) OnOrderComments(orderCommentList []*model.OrderComment) ( comment3.Vendertags = comment2.UpdatedVendertags var order *model.GoodsOrder - if orderComment.VendorID == model.VendorIDMTWM { + if orderComment.VendorID == model.VendorIDMTWM && orderComment.VendorOrderID2 != "" { order, _ = partner.CurOrderManager.LoadOrder(orderComment.VendorOrderID2, orderComment.VendorID) } else { order, _ = partner.CurOrderManager.LoadOrder(orderComment.VendorOrderID, orderComment.VendorID) diff --git a/business/model/dao/dao_order_sku_financial.go b/business/model/dao/dao_order_sku_financial.go index 7726b7d4f..7abbd82a2 100644 --- a/business/model/dao/dao_order_sku_financial.go +++ b/business/model/dao/dao_order_sku_financial.go @@ -1,8 +1,6 @@ package dao import ( - "git.rosy.net.cn/baseapi/utils" - "git.rosy.net.cn/jx-callback/globals" "git.rosy.net.cn/jx-print/dao" "time" ) @@ -12,7 +10,7 @@ func GetBadCommentOrderId(jxStoreId int, startTime, endTime time.Time, foodNameL sqlParams := []interface{}{} sql := ` SELECT count(vendor_order_id) count,vendor_order_id FROM - order_sku_financial WHERE jx_store_id = ? AND created_at >= ? AND created_at <= ? AND name IN (` + dao.GenQuestionMarks(len(foodNameList)) + `) GROUP BY vendor_order_id LIMIT 0, 1000` + order_sku_financial WHERE jx_store_id = ? AND created_at >= ? AND created_at <= ? AND name IN (` + dao.GenQuestionMarks(len(foodNameList)) + `) GROUP BY vendor_order_id LIMIT 0, 1000` sqlParams = append(sqlParams, []interface{}{ jxStoreId, endTime, @@ -20,14 +18,11 @@ func GetBadCommentOrderId(jxStoreId int, startTime, endTime time.Time, foodNameL foodNameList, }) - globals.SugarLogger.Debugf("===========foodNameList := %s", utils.Format4Output(foodNameList, false)) commentOrder := make([]*badCommentOrder, 0, 0) if err := GetRows(GetDB(), &commentOrder, sql, sqlParams...); err != nil { - globals.SugarLogger.Debugf("===========err := %v", err) return "", err } - globals.SugarLogger.Debugf("===========commentOrder := %s", utils.Format4Output(commentOrder, false)) // 全等于的话就是目标订单 for _, v := range commentOrder { if v.Count == len(foodNameList) { diff --git a/business/partner/purchase/mtwm/order_comment.go b/business/partner/purchase/mtwm/order_comment.go index d532dddae..218401be4 100644 --- a/business/partner/purchase/mtwm/order_comment.go +++ b/business/partner/purchase/mtwm/order_comment.go @@ -57,6 +57,9 @@ func (c *PurchaseHandler) RefreshComment(fromTime, toTime time.Time) (err error) storeID := batchItemList[0].(int) storeDetail, _ := dao.GetStoreDetail(dao.GetDB(), storeID, model.VendorIDMTWM, "") + if storeDetail.VendorStoreID == "" { + return nil, nil + } // 查询门店差评 commentList, _ := getAPI(storeDetail.VendorOrgCode, storeID, storeDetail.VendorStoreID).CommentQuery(storeDetail.VendorStoreID, startDateStr, endDateStr, 0, 0, mtwmapi.CommentReplyStatusNotReplied) var orderCommentList []*model.OrderComment @@ -99,7 +102,6 @@ func (c *PurchaseHandler) RefreshComment(fromTime, toTime time.Time) (err error) } vendorOrderID, _ := dao.GetBadCommentOrderId(storeDetail.ID, startTime, endTime, foodNameList) if vendorOrderID != "" { - globals.SugarLogger.Debugf("==================vendorOrderID := %s", vendorOrderID) orderComment.VendorOrderID2 = vendorOrderID } }