From bfd1f84e5fd02850f1d87575abdbc71d86cf6b36 Mon Sep 17 00:00:00 2001
From: =?UTF-8?q?=E9=82=B9=E5=AE=97=E6=A5=A0?= <zouzongnan1995@icloud.com>
Date: Tue, 12 Dec 2023 10:07:47 +0800
Subject: [PATCH] 1

---
 business/jxcallback/orderman/order.go         |  2 +-
 business/jxstore/misc/misc.go                 | 12 +++++++++--
 .../partner/purchase/tiktok_store/order.go    | 20 +++++++++----------
 3 files changed, 21 insertions(+), 13 deletions(-)

diff --git a/business/jxcallback/orderman/order.go b/business/jxcallback/orderman/order.go
index f02ff1c40..77b672070 100644
--- a/business/jxcallback/orderman/order.go
+++ b/business/jxcallback/orderman/order.go
@@ -2658,7 +2658,7 @@ func UpdateTiktokShopTotalMoney() {
 	var goodsOrders []*model.GoodsOrder
 
 	sql := `SELECT g.* FROM goods_order g WHERE g.order_created_at >= ? AND g.status = ? AND g.vendor_id = ? AND total_shop_money = ?  ORDER BY g.order_created_at desc`
-	orderCreateTime := time.Now().AddDate(0, 0, -15)
+	orderCreateTime := time.Now().AddDate(0, 0, -50)
 	param := []interface{}{orderCreateTime, model.OrderStatusFinished, model.VendorIDDD, model.NO}
 	if err := dao.GetRows(db, &goodsOrders, sql, param...); err != nil {
 		globals.SugarLogger.Debugf("Update GoodsOrder Total shop money err %s", err)
diff --git a/business/jxstore/misc/misc.go b/business/jxstore/misc/misc.go
index d26a8bb5f..4a71ae913 100644
--- a/business/jxstore/misc/misc.go
+++ b/business/jxstore/misc/misc.go
@@ -194,8 +194,16 @@ func Init() {
 		ScheduleTimerFunc("UpdateTiktokShopTotalMoney", func() {
 			orderman.UpdateTiktokShopTotalMoney()
 		}, []string{
-			"16:30:00",
-			"09:53:00",
+			"03:00:00",
+			"05:00:00",
+			"07:00:00",
+			"09:00:00",
+			"11:00:00",
+			"14:00:00",
+			"16:00:00",
+			"19:00:00",
+			"21:00:00",
+			"01:00:00",
 		})
 		/// 更新淘鲜达结算信息
 		ScheduleTimerFunc("UpdateTaoTotalMoney", func() {
diff --git a/business/partner/purchase/tiktok_store/order.go b/business/partner/purchase/tiktok_store/order.go
index 88d623af8..d01a15039 100644
--- a/business/partner/purchase/tiktok_store/order.go
+++ b/business/partner/purchase/tiktok_store/order.go
@@ -135,16 +135,16 @@ func (p *PurchaseHandler) getOrder(vendorOrgCode, vendorOrderID, vendorStoreID s
 	if len(result.SkuOrderList) > 0 {
 		for _, extra := range result.SkuOrderList {
 			sku := &model.OrderSku{
-				VendorOrderID:  extra.ParentOrderId,
-				VendorID:       model.VendorIDDD,
-				StoreSubID:     0,
-				StoreSubName:   "",
-				Count:          int(extra.ItemNum),
-				VendorSkuID:    utils.Int64ToStr(extra.SkuId),
-				SkuID:          utils.Str2Int(extra.OutSkuId),
-				JxSkuID:        utils.Str2Int(extra.OutSkuId),
-				SkuName:        extra.ProductName,
-				ShopPrice:      extra.OriginAmount,
+				VendorOrderID: extra.ParentOrderId,
+				VendorID:      model.VendorIDDD,
+				StoreSubID:    0,
+				StoreSubName:  "",
+				Count:         int(extra.ItemNum),
+				VendorSkuID:   utils.Int64ToStr(extra.SkuId),
+				SkuID:         utils.Str2Int(extra.OutSkuId),
+				JxSkuID:       utils.Str2Int(extra.OutSkuId),
+				SkuName:       extra.ProductName,
+				//ShopPrice:      extra.OriginAmount, 京西价
 				VendorPrice:    extra.OrderAmount / extra.ItemNum,
 				SalePrice:      extra.OriginAmount,
 				EarningPrice:   0,