From e1e471d33431a945c96ef7a858cebbe76dbe4083 Mon Sep 17 00:00:00 2001
From: =?UTF-8?q?=E8=8B=8F=E5=B0=B9=E5=B2=9A?= <770236076@qq.com>
Date: Wed, 17 Jun 2020 16:10:47 +0800
Subject: [PATCH] =?UTF-8?q?=E6=89=8B=E5=8A=A8=E6=8B=89=E5=8F=96=E4=BA=AC?=
 =?UTF-8?q?=E4=B8=9C=E5=95=86=E5=9F=8E=E8=AE=A2=E5=8D=95?=
MIME-Version: 1.0
Content-Type: text/plain; charset=UTF-8
Content-Transfer-Encoding: 8bit

---
 business/jxstore/event/event.go       |  9 +++++++++
 business/jxstore/misc/misc.go         |  2 +-
 controllers/jx_order.go               | 15 +++++++++++++++
 routers/commentsRouter_controllers.go |  9 +++++++++
 4 files changed, 34 insertions(+), 1 deletion(-)

diff --git a/business/jxstore/event/event.go b/business/jxstore/event/event.go
index 7dc392dde..8eb899bea 100644
--- a/business/jxstore/event/event.go
+++ b/business/jxstore/event/event.go
@@ -210,6 +210,15 @@ func GetCheckVendorCookie(ctx *jxcontext.Context, vendorIDs []int, isAuto bool)
 						errMsg += fmt.Sprintf(" 京东page账号:的Cookie无效了！", vv)
 						flag = true
 					}
+				case model.VendorIDJDShop:
+					_, err := api.JdShopAPI.OrderDetail("124350112427")
+					if err != nil {
+						if strings.Contains(err.Error(), "登录") {
+							errMsg += fmt.Sprintf("京东商城:[%v]的Cookie无效了！", vv)
+							flag = true
+						}
+						globals.SugarLogger.Debugf("cookieCheck", err)
+					}
 				}
 				cc.VendorID = v
 				cc.VendorOrgCode = vv
diff --git a/business/jxstore/misc/misc.go b/business/jxstore/misc/misc.go
index 73c2e6e49..8e90fa105 100644
--- a/business/jxstore/misc/misc.go
+++ b/business/jxstore/misc/misc.go
@@ -205,7 +205,7 @@ func Init() {
 			cms.AutoFocusStoreSkusForTopSkus(jxcontext.AdminCtx, true, true)
 		}, createStorePriceTimeList)
 		ScheduleTimerFunc("GetCheckVendorCookie", func() {
-			event.GetCheckVendorCookie(jxcontext.AdminCtx, []int{model.VendorIDEBAI, model.VendorIDJD, model.VendorIDMTWM, model.VendorIDMTPS}, true)
+			event.GetCheckVendorCookie(jxcontext.AdminCtx, []int{model.VendorIDEBAI, model.VendorIDJD, model.VendorIDMTWM, model.VendorIDMTPS, model.VendorIDJDShop}, true)
 		}, checkCookieList)
 		ScheduleTimerFunc("SendSeckillSkusCountMsg", func() {
 			cms.SendSeckillSkusCountMsg(jxcontext.AdminCtx, []int{model.VendorIDEBAI, model.VendorIDJD, model.VendorIDMTWM}, false, true)
diff --git a/controllers/jx_order.go b/controllers/jx_order.go
index 640f07f68..a4d044b51 100644
--- a/controllers/jx_order.go
+++ b/controllers/jx_order.go
@@ -1088,3 +1088,18 @@ func (c *OrderController) SendJdwlForJdsOrder() {
 		return retVal, "", err
 	})
 }
+
+// @Title 手动拉取京东商城订单
+// @Description 手动拉取京东商城订单
+// @Param	token			header		string	true	"认证token"
+// @Param	fromTime		formData	string	true	"订单起始时间"
+// @Param	toTime			formData	string	true	"订单结束时间"
+// @Success 200 {object} controllers.CallResult
+// @Failure 200 {object} controllers.CallResult
+// @router /SaveJdsOrders [post]
+func (c *OrderController) SaveJdsOrders() {
+	c.callSaveJdsOrders(func(params *tOrderSaveJdsOrdersParams) (retVal interface{}, errCode string, err error) {
+		err = orderman.SaveJdsOrders(params.Ctx, utils.Str2Time(params.FromTime), utils.Str2Time(params.ToTime))
+		return retVal, "", err
+	})
+}
diff --git a/routers/commentsRouter_controllers.go b/routers/commentsRouter_controllers.go
index ae65b47ac..869d0f9b1 100644
--- a/routers/commentsRouter_controllers.go
+++ b/routers/commentsRouter_controllers.go
@@ -1224,6 +1224,15 @@ func init() {
             Filters: nil,
             Params: nil})
 
+    beego.GlobalControllerRouter["git.rosy.net.cn/jx-callback/controllers:OrderController"] = append(beego.GlobalControllerRouter["git.rosy.net.cn/jx-callback/controllers:OrderController"],
+        beego.ControllerComments{
+            Method: "SaveJdsOrders",
+            Router: `/SaveJdsOrders`,
+            AllowHTTPMethods: []string{"post"},
+            MethodParams: param.Make(),
+            Filters: nil,
+            Params: nil})
+
     beego.GlobalControllerRouter["git.rosy.net.cn/jx-callback/controllers:OrderController"] = append(beego.GlobalControllerRouter["git.rosy.net.cn/jx-callback/controllers:OrderController"],
         beego.ControllerComments{
             Method: "SelfDelivered",