From 6081ec223b0e574ccecb36e4de52ce364b16172f Mon Sep 17 00:00:00 2001
From: =?UTF-8?q?=E9=82=B9=E5=AE=97=E6=A5=A0?= <zouzongnan1995@icloud.com>
Date: Wed, 1 Mar 2023 14:02:37 +0800
Subject: [PATCH] 1

---
 business/jxcallback/orderman/order.go          | 3 +++
 business/jxcallback/scheduler/defsch/defsch.go | 3 ++-
 business/model/dao/dao_order.go                | 1 -
 business/model/dao/thing_map.go                | 2 +-
 business/partner/delivery/rider.go             | 3 ++-
 5 files changed, 8 insertions(+), 4 deletions(-)

diff --git a/business/jxcallback/orderman/order.go b/business/jxcallback/orderman/order.go
index 332434066..535c8cd89 100644
--- a/business/jxcallback/orderman/order.go
+++ b/business/jxcallback/orderman/order.go
@@ -248,6 +248,9 @@ func (c *OrderManager) OnOrderStatusChanged(vendorOrgCode string, orderStatus *m
 					}
 				}
 			}
+			// 刷新订单结束时间
+			order.OrderFinishedAt = time.Now()
+			dao.UpdateEntity(db, order, "OrderFinishedAt")
 		} else if orderStatus.Status == model.OrderStatusCanceled {
 			//如果取消订单则要把库存加回去
 			if order, err2 := c.LoadOrder(orderStatus.VendorOrderID, orderStatus.VendorID); err2 == nil {
diff --git a/business/jxcallback/scheduler/defsch/defsch.go b/business/jxcallback/scheduler/defsch/defsch.go
index b0e06ba64..128b0f34b 100644
--- a/business/jxcallback/scheduler/defsch/defsch.go
+++ b/business/jxcallback/scheduler/defsch/defsch.go
@@ -799,7 +799,8 @@ func (s *DefScheduler) OnWaybillStatusChanged(bill *model.Waybill, isPending boo
 				// 	}
 				// 将订单修改为完成状态
 				order.Status = model.OrderStatusFinished
-				partner.CurOrderManager.UpdateOrderFields(order, []string{"status"})
+				order.OrderFinishedAt = time.Now()
+				partner.CurOrderManager.UpdateOrderFields(order, []string{"status", "OrderFinishedAt"})
 			default:
 				s.resetTimer(savedOrderInfo, bill, isPending)
 			}
diff --git a/business/model/dao/dao_order.go b/business/model/dao/dao_order.go
index ab24053ae..da4f0504e 100644
--- a/business/model/dao/dao_order.go
+++ b/business/model/dao/dao_order.go
@@ -377,7 +377,6 @@ func GetAfsOrderSkuInfo(db *DaoDB, vendorOrderID, afsOrderID string, vendorID in
 }
 
 func GetStoreOrderSkuList(db *DaoDB, storeIDs []int, finishedAtBegin, finishedAtEnd time.Time, statusList []int, isFinish bool, isService int) (skuList []*OrderSkuWithActualPayPrice, err error) {
-	// order_finished_at
 	sql := `
 	SELECT t1.*,
 	IF(t2.jx_store_id > 0, t2.jx_store_id, t2.store_id) store_id, t2.status, t2.actual_pay_price, t2.distance_freight_money, t2.waybill_tip_money, t2.new_earning_price,
diff --git a/business/model/dao/thing_map.go b/business/model/dao/thing_map.go
index 2eafc33c1..e4150734b 100644
--- a/business/model/dao/thing_map.go
+++ b/business/model/dao/thing_map.go
@@ -83,7 +83,7 @@ func GetThingToTiktokMapList(db *DaoDB, vendorId int, thingId int64, vendorOrgCo
 
 // DeleteThingToTiktokMapList 删除同步关联关系
 func DeleteThingToTiktokMapList(vendorId int, vendorThingId string, skuId int) error {
-	sql := ` DELETE FROM thing_map t1 WHERE vendor_thing_id = ? AND vendor_id = ? AND thing_id = ? `
+	sql := ` DELETE FROM thing_map t1 WHERE t1.vendor_thing_id = ? AND t1.vendor_id = ? AND t1.thing_id = ? `
 	param := []interface{}{vendorThingId, vendorId, skuId}
 	_, err := ExecuteSQL(GetDB(), sql, param...)
 	return err
diff --git a/business/partner/delivery/rider.go b/business/partner/delivery/rider.go
index c31533239..d3f1d61bf 100644
--- a/business/partner/delivery/rider.go
+++ b/business/partner/delivery/rider.go
@@ -323,7 +323,8 @@ func UpdateFakeWayBillToTiktok() {
 
 }
 
-// AutoSettingFakeDelivery 自动设置骑手,推送假订单
+//
+//// AutoSettingFakeDelivery 自动设置骑手, 推送假订单
 //func AutoSettingFakeDelivery() {
 //	db := dao.GetDB()
 //	// 查询需要刷单的门店