1
This commit is contained in:
@@ -104,7 +104,7 @@ func (c *OrderManager) OnOrderComments(orderCommentList []*model.OrderComment) (
|
|||||||
comment2.VendorOrderId = orderComment.VendorOrderID2
|
comment2.VendorOrderId = orderComment.VendorOrderID2
|
||||||
|
|
||||||
var order *model.GoodsOrder
|
var order *model.GoodsOrder
|
||||||
if orderComment.VendorID == model.VendorIDMTWM {
|
if orderComment.VendorID == model.VendorIDMTWM && orderComment.VendorOrderID2 != "" {
|
||||||
order, _ = partner.CurOrderManager.LoadOrder(orderComment.VendorOrderID2, orderComment.VendorID)
|
order, _ = partner.CurOrderManager.LoadOrder(orderComment.VendorOrderID2, orderComment.VendorID)
|
||||||
} else {
|
} else {
|
||||||
order, _ = partner.CurOrderManager.LoadOrder(orderComment.VendorOrderID, orderComment.VendorID)
|
order, _ = partner.CurOrderManager.LoadOrder(orderComment.VendorOrderID, orderComment.VendorID)
|
||||||
@@ -160,7 +160,7 @@ func (c *OrderManager) OnOrderComments(orderCommentList []*model.OrderComment) (
|
|||||||
comment3.Vendertags = comment2.UpdatedVendertags
|
comment3.Vendertags = comment2.UpdatedVendertags
|
||||||
|
|
||||||
var order *model.GoodsOrder
|
var order *model.GoodsOrder
|
||||||
if orderComment.VendorID == model.VendorIDMTWM {
|
if orderComment.VendorID == model.VendorIDMTWM && orderComment.VendorOrderID2 != "" {
|
||||||
order, _ = partner.CurOrderManager.LoadOrder(orderComment.VendorOrderID2, orderComment.VendorID)
|
order, _ = partner.CurOrderManager.LoadOrder(orderComment.VendorOrderID2, orderComment.VendorID)
|
||||||
} else {
|
} else {
|
||||||
order, _ = partner.CurOrderManager.LoadOrder(orderComment.VendorOrderID, orderComment.VendorID)
|
order, _ = partner.CurOrderManager.LoadOrder(orderComment.VendorOrderID, orderComment.VendorID)
|
||||||
|
|||||||
@@ -1,8 +1,6 @@
|
|||||||
package dao
|
package dao
|
||||||
|
|
||||||
import (
|
import (
|
||||||
"git.rosy.net.cn/baseapi/utils"
|
|
||||||
"git.rosy.net.cn/jx-callback/globals"
|
|
||||||
"git.rosy.net.cn/jx-print/dao"
|
"git.rosy.net.cn/jx-print/dao"
|
||||||
"time"
|
"time"
|
||||||
)
|
)
|
||||||
@@ -20,14 +18,11 @@ func GetBadCommentOrderId(jxStoreId int, startTime, endTime time.Time, foodNameL
|
|||||||
foodNameList,
|
foodNameList,
|
||||||
})
|
})
|
||||||
|
|
||||||
globals.SugarLogger.Debugf("===========foodNameList := %s", utils.Format4Output(foodNameList, false))
|
|
||||||
commentOrder := make([]*badCommentOrder, 0, 0)
|
commentOrder := make([]*badCommentOrder, 0, 0)
|
||||||
if err := GetRows(GetDB(), &commentOrder, sql, sqlParams...); err != nil {
|
if err := GetRows(GetDB(), &commentOrder, sql, sqlParams...); err != nil {
|
||||||
globals.SugarLogger.Debugf("===========err := %v", err)
|
|
||||||
return "", err
|
return "", err
|
||||||
}
|
}
|
||||||
|
|
||||||
globals.SugarLogger.Debugf("===========commentOrder := %s", utils.Format4Output(commentOrder, false))
|
|
||||||
// 全等于的话就是目标订单
|
// 全等于的话就是目标订单
|
||||||
for _, v := range commentOrder {
|
for _, v := range commentOrder {
|
||||||
if v.Count == len(foodNameList) {
|
if v.Count == len(foodNameList) {
|
||||||
|
|||||||
@@ -57,6 +57,9 @@ func (c *PurchaseHandler) RefreshComment(fromTime, toTime time.Time) (err error)
|
|||||||
storeID := batchItemList[0].(int)
|
storeID := batchItemList[0].(int)
|
||||||
|
|
||||||
storeDetail, _ := dao.GetStoreDetail(dao.GetDB(), storeID, model.VendorIDMTWM, "")
|
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)
|
commentList, _ := getAPI(storeDetail.VendorOrgCode, storeID, storeDetail.VendorStoreID).CommentQuery(storeDetail.VendorStoreID, startDateStr, endDateStr, 0, 0, mtwmapi.CommentReplyStatusNotReplied)
|
||||||
var orderCommentList []*model.OrderComment
|
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)
|
vendorOrderID, _ := dao.GetBadCommentOrderId(storeDetail.ID, startTime, endTime, foodNameList)
|
||||||
if vendorOrderID != "" {
|
if vendorOrderID != "" {
|
||||||
globals.SugarLogger.Debugf("==================vendorOrderID := %s", vendorOrderID)
|
|
||||||
orderComment.VendorOrderID2 = vendorOrderID
|
orderComment.VendorOrderID2 = vendorOrderID
|
||||||
}
|
}
|
||||||
}
|
}
|
||||||
|
|||||||
Reference in New Issue
Block a user