aa

business/jxcallback/scheduler/defsch/defsch.go

@@ -836,11 +836,11 @@ func (s *DefScheduler) createWaybillOn3rdProviders(savedOrderInfo *WatchOrderInf
 					if storeDetail.OpenTime1 != 0 && storeDetail.CloseTime1 != 0 {
 						time1 := jxutils.JxOperationTime2TimeByDate(storeDetail.OpenTime1, time.Now())
 						time2 := jxutils.JxOperationTime2TimeByDate(storeDetail.CloseTime1, time.Now())
-						if time.Now().Sub(time1) < 0 || time.Now().Sub(time2) > 0 {
+						if time.Now().Sub(time1) < 0 || time.Now().Sub(time2.Add(30*time.Minute)) > 0 {
 							if storeDetail.OpenTime2 != 0 && storeDetail.CloseTime2 != 0 {
 								time3 := jxutils.JxOperationTime2TimeByDate(storeDetail.OpenTime2, time.Now())
 								time4 := jxutils.JxOperationTime2TimeByDate(storeDetail.CloseTime2, time.Now())
-								if time.Now().Sub(time3) < 0 || time.Now().Sub(time4) > 0 {
+								if time.Now().Sub(time3) < 0 || time.Now().Sub(time4.Add(30*time.Minute)) > 0 {
 									err = fmt.Errorf("不在门店营业时间范围内！")
 								}
 							} else {

business/partner/purchase/ebai/store.go

@@ -96,6 +96,34 @@ var (
 			BusinessFormID: 1917869373,
 			BrandName:      "京西菜市",
 		},
+		EbaiSupplierIDgy: &tEbaiSupplierInfo{
+			SupplierID: EbaiSupplierIDgy,
+			Logo:       "https://fuss10.elemecdn.com/1/34/c6d76d8e3aa86cf214e6bff5514c1jpeg.jpeg",
+			Categorys: []map[string]interface{}{
+				map[string]interface{}{
+					"category1": 277,
+					"category2": 180,
+				},
+				map[string]interface{}{
+					"category1": 277,
+					"category2": 184,
+				},
+				map[string]interface{}{
+					"category1": 277,
+					"category2": 183,
+				},
+				map[string]interface{}{
+					"category1": 277,
+					"category2": 181,
+				},
+				map[string]interface{}{
+					"category1": 277,
+					"category2": 182,
+				},
+			},
+			BusinessFormID: 1917869373,
+			BrandName:      "京西果园",
+		},
 	}
 )