From 32e20e59e7238c65700cdbd1ca0062178b83db04 Mon Sep 17 00:00:00 2001
From: =?UTF-8?q?=E8=8B=8F=E5=B0=B9=E5=B2=9A?= <770236076@qq.com>
Date: Tue, 24 Mar 2020 15:34:30 +0800
Subject: [PATCH 1/2] =?UTF-8?q?=E8=B6=85=E6=97=B6=E4=BB=A3=E4=BB=98?=
 =?UTF-8?q?=E6=AC=BE=E4=BA=AC=E8=A5=BF=E8=AE=A2=E5=8D=95=E5=8F=96=E6=B6=88?=
 =?UTF-8?q?=E4=BF=AE=E6=94=B9?=
MIME-Version: 1.0
Content-Type: text/plain; charset=UTF-8
Content-Transfer-Encoding: 8bit

---
 business/partner/purchase/jx/localjx/order.go | 2 +-
 1 file changed, 1 insertion(+), 1 deletion(-)

diff --git a/business/partner/purchase/jx/localjx/order.go b/business/partner/purchase/jx/localjx/order.go
index 4e1f43fd9..9c1eb3da3 100644
--- a/business/partner/purchase/jx/localjx/order.go
+++ b/business/partner/purchase/jx/localjx/order.go
@@ -1196,7 +1196,7 @@ func CancelPayTimeOutOrder(ctx *jxcontext.Context) (err error) {
 	err = dao.GetRows(db, &orders, sql, sqlParams)
 	for _, v := range orders {
 		if v.OrderCreatedAt.Add(PayWaitingTime).Before(time.Now()) {
-			err2 := CancelOrder(ctx, v, autoCancelOrderReason)
+			err2 := changeOrderStatus(v.VendorOrderID, model.OrderStatusCanceled, autoCancelOrderReason)
 			err = err2
 		}
 	}

From 3e50b2fdf75313a36ebe30504ed718fd7b7f845d 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, 25 Mar 2020 12:00:21 +0800
Subject: [PATCH 2/2] =?UTF-8?q?=E4=BA=AC=E4=B8=9C=E7=89=A9=E6=B5=81token?=
 =?UTF-8?q?=E4=BF=AE=E6=94=B9?=
MIME-Version: 1.0
Content-Type: text/plain; charset=UTF-8
Content-Transfer-Encoding: 8bit

---
 conf/app.conf | 6 +++---
 1 file changed, 3 insertions(+), 3 deletions(-)

diff --git a/conf/app.conf b/conf/app.conf
index 711141e95..81beb4852 100644
--- a/conf/app.conf
+++ b/conf/app.conf
@@ -170,7 +170,7 @@ jd2Token  = "29e0e567-c475-433a-aff0-37176ee8d8a7"
 jd2AppKey = "7fb947624ff847ae94ff2f068cc99652"
 jd2Secret = "1097abd7ef09427099b4922784af123a"
 
-jdEclpAccessToken = "7e9c1a5fe4ac4ea48c3c572d488e60b8hnwz"
+jdEclpAccessToken = "bcb6201b5b3c45a0976dcda5e2dea8aejiwm"
 jdEclpAppKey = "0D397F05CF11C51BCDCC81744680EBC3"
 jdEclpAppSecret = "f16a5e57ff4f4f428b702c40d2d4b933"
 
@@ -286,7 +286,7 @@ dingdingCallbackURL = "http://callback-jxgy.jxc4.com/dingding/msg"
 getWeixinTokenURL = "http://www.jxc4.com/v2/sys/GetWXToken"
 getYLYTokenURL = "http://www.jxc4.com/v2/sys/GetYLYToken"
 
-jdEclpAccessToken = "7e9c1a5fe4ac4ea48c3c572d488e60b8hnwz"
+jdEclpAccessToken = "bcb6201b5b3c45a0976dcda5e2dea8aejiwm"
 jdEclpAppKey = "0D397F05CF11C51BCDCC81744680EBC3"
 jdEclpAppSecret = "f16a5e57ff4f4f428b702c40d2d4b933"
 
@@ -380,7 +380,7 @@ jd2Token  = "29e0e567-c475-433a-aff0-37176ee8d8a7"
 jd2AppKey = "7fb947624ff847ae94ff2f068cc99652"
 jd2Secret = "1097abd7ef09427099b4922784af123a"
 
-jdEclpAccessToken = "7e9c1a5fe4ac4ea48c3c572d488e60b8hnwz"
+jdEclpAccessToken = "bcb6201b5b3c45a0976dcda5e2dea8aejiwm"
 jdEclpAppKey = "0D397F05CF11C51BCDCC81744680EBC3"
 jdEclpAppSecret = "f16a5e57ff4f4f428b702c40d2d4b933"