From 7fa1fade3bb318152290f69851f51be31b233d91 Mon Sep 17 00:00:00 2001
From: =?UTF-8?q?=E9=82=B9=E5=AE=97=E6=A5=A0?= <zouzongnan1995@icloud.com>
Date: Mon, 16 Oct 2023 09:35:06 +0800
Subject: [PATCH] 1

---
 business/jxcallback/orderman/order_comment.go          | 5 -----
 business/jxcallback/scheduler/defsch/defsch_ext.go     | 8 +++++---
 business/partner/purchase/tao_vegetable/order_utils.go | 6 +++++-
 3 files changed, 10 insertions(+), 9 deletions(-)

diff --git a/business/jxcallback/orderman/order_comment.go b/business/jxcallback/orderman/order_comment.go
index f3d06e4ec..5079e84d6 100644
--- a/business/jxcallback/orderman/order_comment.go
+++ b/business/jxcallback/orderman/order_comment.go
@@ -2,8 +2,6 @@ package orderman
 
 import (
 	"encoding/json"
-	"git.rosy.net.cn/baseapi/platformapi/dingdingapi"
-	"git.rosy.net.cn/jx-callback/business/jxutils/ddmsg"
 	"math/rand"
 	"time"
 
@@ -84,9 +82,6 @@ func (c *OrderManager) OnOrderComments(orderCommentList []*model.OrderComment) (
 			if dao.IsNoRowsError(err) {
 				err = nil
 				isNewComment = true
-				if orderComment.StoreID == 669247 {
-					ddmsg.SendUserMessage(dingdingapi.MsgTyeText, "2452A93EEB9111EC9B06525400E86DC0", "自动好评回复orderCommentList:", utils.Format4Output(orderCommentList[0], false))
-				}
 				if orderComment.IsReplied == 0 && time.Now().Sub(orderComment.CommentCreatedAt) < time.Duration(orderComment.ModifyDuration)*time.Hour {
 					if storeDetail, err2 := dao.GetStoreDetail(db, orderComment.StoreID, orderComment.VendorID, ""); err2 == nil {
 						if storeDetail.AutoReplyType == model.AutoReplyAll || orderComment.Score > JX_BAD_COMMENTS_MAX_LEVEL && storeDetail.AutoReplyType == model.AutoReplyGoodComment {
diff --git a/business/jxcallback/scheduler/defsch/defsch_ext.go b/business/jxcallback/scheduler/defsch/defsch_ext.go
index 6e364b402..c3e7bf2c3 100644
--- a/business/jxcallback/scheduler/defsch/defsch_ext.go
+++ b/business/jxcallback/scheduler/defsch/defsch_ext.go
@@ -112,9 +112,11 @@ func (s *DefScheduler) SelfDeliveringAndUpdateStatus(ctx *jxcontext.Context, ven
 					VendorOrgCode:     order.VendorOrgCode,
 				}
 				err = dao.CreateEntity(dao.GetDB(), bill)
-				order.VendorWaybillID = order.VendorOrderID
-				order.WaybillVendorID = model.VendorJXFakeWL
-				dao.UpdateEntity(dao.GetDB(), order, "VendorWaybillID", "WaybillVendorID")
+				//if order.VendorID == model.VendorIDTaoVegetable {
+				//	order.VendorWaybillID = order.VendorOrderID
+				//	order.WaybillVendorID = model.VendorJXFakeWL
+				//	dao.UpdateEntity(dao.GetDB(), order, "VendorWaybillID", "WaybillVendorID")
+				//}
 			}
 			return err
 		}()
diff --git a/business/partner/purchase/tao_vegetable/order_utils.go b/business/partner/purchase/tao_vegetable/order_utils.go
index 6dd5d5466..c4c3212da 100644
--- a/business/partner/purchase/tao_vegetable/order_utils.go
+++ b/business/partner/purchase/tao_vegetable/order_utils.go
@@ -64,7 +64,11 @@ func OrderStatusChangeDelivery(order *model.GoodsOrder, orderStatus string) *req
 		BizOrderId: utils.Int64ToPointer(utils.Str2Int64(order.VendorOrderID)),
 		Status:     utils.String2Pointer(orderStatus),
 	}
-	bill, _ := partner.CurOrderManager.LoadWaybill(order.VendorWaybillID, order.WaybillVendorID)
+	var bill *model.Waybill
+	bill, _ = partner.CurOrderManager.LoadWaybill(order.VendorWaybillID, order.WaybillVendorID)
+	if bill == nil {
+		bill, _ = partner.CurOrderManager.LoadWaybill(order.VendorOrderID, model.VendorJXFakeWL)
+	}
 	storeDetail, _ := dao.GetStoreDetail(dao.GetDB(), order.JxStoreID, model.VendorIDTaoVegetable, "")
 	if bill != nil {
 		if bill.CourierName == "" && bill.CourierMobile == "" {