From d45626a64a588469a2f5896b5576b726859a9036 Mon Sep 17 00:00:00 2001
From: =?UTF-8?q?=E9=82=B9=E5=AE=97=E6=A5=A0?= <zouzongnan1995@icloud.com>
Date: Fri, 4 Aug 2023 12:49:46 +0800
Subject: [PATCH] 1

---
 .../jxcallback/scheduler/defsch/defsch_afs.go | 16 +++++++++++---
 business/jxstore/misc/misc.go                 | 22 +++----------------
 2 files changed, 16 insertions(+), 22 deletions(-)

diff --git a/business/jxcallback/scheduler/defsch/defsch_afs.go b/business/jxcallback/scheduler/defsch/defsch_afs.go
index a762a2935..4a7e855b3 100644
--- a/business/jxcallback/scheduler/defsch/defsch_afs.go
+++ b/business/jxcallback/scheduler/defsch/defsch_afs.go
@@ -32,9 +32,19 @@ func (s *DefScheduler) OnAfsOrderNew(order *model.AfsOrder, isPending bool) (err
 					}
 				}
 			}
-			msghub.OnNewWait4ApproveAfsOrder(order)
-			weixinmsg.NotifyAfsOrderStatus(order)
-			push.NotifyAfsOrder(order)
+
+			if order != nil && order.VendorID == model.VendorIDTaoVegetable {
+				result, _ := dao.GetAfsOrders(dao.GetDB(), model.VendorIDTaoVegetable, order.VendorOrderID, "")
+				if len(result) <= model.YES {
+					msghub.OnNewWait4ApproveAfsOrder(order)
+					weixinmsg.NotifyAfsOrderStatus(order)
+					push.NotifyAfsOrder(order)
+				}
+			} else {
+				msghub.OnNewWait4ApproveAfsOrder(order)
+				weixinmsg.NotifyAfsOrderStatus(order)
+				push.NotifyAfsOrder(order)
+			}
 
 			// 京西云打印机打印数据-如果门店使用京西打印机才使用如下代码块
 			store, err := dao.GetStoreDetail(dao.GetDB(), order.JxStoreID, order.VendorID, order.VendorOrgCode)
diff --git a/business/jxstore/misc/misc.go b/business/jxstore/misc/misc.go
index 67f114900..7a84496eb 100644
--- a/business/jxstore/misc/misc.go
+++ b/business/jxstore/misc/misc.go
@@ -2,6 +2,7 @@ package misc
 
 import (
 	"fmt"
+	"git.rosy.net.cn/jx-callback/business/jxutils/enterprise_msg"
 	"sync"
 	"time"
 
@@ -519,7 +520,7 @@ func Init() {
 				syncStoreSkuTao(hangzhou[0:50])
 			}, []string{
 				"10:05:00",
-				"12:05:00",
+				"12:55:00",
 				"14:05:00",
 				"16:05:00",
 				"18:05:00",
@@ -535,24 +536,6 @@ func Init() {
 			})
 		}
 
-		// 淘鲜达更新门店商品 ,接口收费暂不使用
-		//ScheduleTimerFunc("RefreshSyncSkuListTao", func() {
-		//	syncStoreSkuTao(hangzhou)
-		//}, []string{
-		//	"18:50:00",
-		//	"20:50:00",
-		//	"22:43:00",
-		//	"00:50:00",
-		//	"02:50:00",
-		//	"04:50:00",
-		//	"06:50:00",
-		//	"08:50:00",
-		//	"10:50:00",
-		//	"12:50:00",
-		//	"14:50:00",
-		//	"16:50:00",
-		//})
-
 		// 刷新抖音门店token
 		if beego.BConfig.RunMode != "jxgy" {
 			ScheduleTimerFuncByInterval(func() {
@@ -919,6 +902,7 @@ func syncStoreSkuTao(beijin []int) {
 				if err := ddmsg.SendUserMessage(dingdingapi.MsgTyeText, "2452A93EEB9111EC9B06525400E86DC0", "淘鲜达消息:", utils.Format4Output(beijin[syncLen:syncLen+5], false)); err != nil {
 					globals.SugarLogger.Debugf("SendUserMessage := %s", utils.Format4Output(err, false))
 				}
+				enterprise_msg.SendUserMessage("18981810340", "淘鲜达同步消息", utils.Format4Output(beijin[syncLen:syncLen+5], false), utils.Format4Output(beijin[syncLen:syncLen+5], false))
 				_, err = cms.CurVendorSync.SyncStoresSkus2(jxcontext.AdminCtx, nil, 0, db, []int{model.VendorIDTaoVegetable}, beijin[syncLen:syncLen+5], false, nil, nil, syncFlag, true, true)
 				errList.AddErr(err)
 			case 1: