From 6b919197892d15edf3590af0fd4ee63c25922143 Mon Sep 17 00:00:00 2001
From: =?UTF-8?q?=E8=8B=8F=E5=B0=B9=E5=B2=9A?= <770236076@qq.com>
Date: Thu, 19 Nov 2020 09:22:53 +0800
Subject: [PATCH] =?UTF-8?q?=E8=AE=A2=E5=8D=95=E5=8F=91=E4=B8=89=E6=96=B9?=
MIME-Version: 1.0
Content-Type: text/plain; charset=UTF-8
Content-Transfer-Encoding: 8bit

---
 .../jxcallback/scheduler/defsch/defsch.go     | 37 +++++++++++--------
 business/jxstore/tempop/tempop.go             | 29 +++++++++++++++
 2 files changed, 51 insertions(+), 15 deletions(-)

diff --git a/business/jxcallback/scheduler/defsch/defsch.go b/business/jxcallback/scheduler/defsch/defsch.go
index f153779f3..945c9fd16 100644
--- a/business/jxcallback/scheduler/defsch/defsch.go
+++ b/business/jxcallback/scheduler/defsch/defsch.go
@@ -808,31 +808,38 @@ func (s *DefScheduler) createWaybillOn3rdProviders(savedOrderInfo *WatchOrderInf
 				}
 				//2020-11-16 预计收益-配送费 > 0 再发
 				for _, vendorID := range waybillVendorIDs {
+					var fee int64
 					handler := partner.GetDeliveryPlatformFromVendorID(vendorID)
 					if deliveryFeeInfo, err := handler.Handler.GetWaybillFee(order); err == nil {
 						if income-deliveryFeeInfo.DeliveryFee <= 0 {
 							excludeVendorIDs = append(excludeVendorIDs, vendorID)
 						}
+						fee = deliveryFeeInfo.DeliveryFee
 					}
+					globals.SugarLogger.Debugf("count order income, vendorID: %v, income :%v , deliveryFee : %v", vendorID, income, fee)
 				}
 
-				if savedOrderInfo != nil {
-					//TODO 2020-07-21 发单时间要在门店的营业时间内
-					if savedOrderInfo.storeDetail != nil {
-						if savedOrderInfo.storeDetail.OpenTime1 != 0 && savedOrderInfo.storeDetail.CloseTime1 != 0 {
-							time1 := jxutils.JxOperationTime2TimeByDate(savedOrderInfo.storeDetail.OpenTime1, time.Now())
-							time2 := jxutils.JxOperationTime2TimeByDate(savedOrderInfo.storeDetail.CloseTime1, time.Now())
-							globals.SugarLogger.Debugf("三方运单不在门店营业时间范围 ：time1 %v ,time2 %v", time1, time2)
-							if time.Now().Sub(time1) < 0 || time.Now().Sub(time2) > 0 {
-								if savedOrderInfo.storeDetail.OpenTime2 != 0 && savedOrderInfo.storeDetail.CloseTime2 != 0 {
-									time3 := jxutils.JxOperationTime2TimeByDate(savedOrderInfo.storeDetail.OpenTime2, time.Now())
-									time4 := jxutils.JxOperationTime2TimeByDate(savedOrderInfo.storeDetail.CloseTime2, time.Now())
-									if time.Now().Sub(time3) < 0 || time.Now().Sub(time4) > 0 {
-										err = fmt.Errorf("不在门店营业时间范围内！")
-									}
-								} else {
+				//TODO 2020-07-21 发单时间要在门店的营业时间内
+				var storeDetail *dao.StoreDetail
+				if savedOrderInfo.storeDetail != nil {
+					storeDetail = savedOrderInfo.storeDetail
+				} else {
+					storeDetail, err = dao.GetStoreDetail(dao.GetDB(), jxutils.GetSaleStoreIDFromOrder(order), order.VendorID, "")
+				}
+				if storeDetail != nil {
+					globals.SugarLogger.Debugf("三方运单门店营业时间范围 ：time1 %v ,time2 %v", storeDetail.OpenTime1, storeDetail.CloseTime1)
+					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 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 {
 									err = fmt.Errorf("不在门店营业时间范围内！")
 								}
+							} else {
+								err = fmt.Errorf("不在门店营业时间范围内！")
 							}
 						}
 					}
diff --git a/business/jxstore/tempop/tempop.go b/business/jxstore/tempop/tempop.go
index 0e162ce69..f5840690b 100644
--- a/business/jxstore/tempop/tempop.go
+++ b/business/jxstore/tempop/tempop.go
@@ -1727,6 +1727,35 @@ func UploadJdsImage(ctx *jxcontext.Context) (err error) {
 		}
 		dao.WrapAddIDCULDEntity(storeMap, "jxadmin")
 		err = dao.CreateEntity(db, storeMap)
+
+		if shopDetailResult, err := api.JdShop2API.ShopDetail(utils.Str2Int(vendorStoreID)); err == nil {
+			err = api.JdShop2API.UpdateBasic(&jdshopapi.UpdateBasicParam{
+				StoreID:            utils.Str2Int(vendorStoreID),
+				StoreName:          shopDetailResult.StoreName,
+				CategoryID2:        62,
+				Coordinate:         shopDetailResult.Coordinate,
+				BussinessBeginTime: shopDetailResult.BussinessBeginTime,
+				BussinessEndTime:   shopDetailResult.BussinessEndTime,
+				ImgURL:             shopDetailResult.ImgURL,
+				StorePhone:         shopDetailResult.StorePhone,
+				AddName:            shopDetailResult.AddName,
+				AddCode1:           shopDetailResult.AddCode1,
+				AddCode2:           shopDetailResult.AddCode2,
+				AddCode3:           shopDetailResult.AddCode3,
+				CategoryID1:        34,
+				QualificationRequests: []*jdshopapi.QualificationRequests{
+					&jdshopapi.QualificationRequests{
+						QualificationID:   41,
+						QualificationName: "营业执照",
+						QualificationNo:   "11111",
+						QualificationURL:  "jfs/t1/148622/37/14846/10266/5fb4e3e2Ef2f61870/a7cfba9c1513d95e.png",
+						StartTime:         "2020-11-04 00:00:00",
+						EndingTime:        "2020-11-06 23:59:59",
+						Time:              []string{"2020-11-04 00:00:00", "2020-11-06 23:59:59"},
+					},
+				},
+			})
+		}
 		break
 	}
 	return err