From 7a6e9d8ed718ac2925a5189eede977798537be83 Mon Sep 17 00:00:00 2001
From: =?UTF-8?q?=E9=82=B9=E5=AE=97=E6=A5=A0?= <zouzongnan1995@icloud.com>
Date: Mon, 10 Apr 2023 14:19:50 +0800
Subject: [PATCH] 1

---
 business/model/const.go                         |  2 +-
 business/partner/purchase/tiktok_store/order.go |  3 +--
 conf/app.conf                                   | 16 ++++++++--------
 3 files changed, 10 insertions(+), 11 deletions(-)

diff --git a/business/model/const.go b/business/model/const.go
index 49b457930..151f5e790 100644
--- a/business/model/const.go
+++ b/business/model/const.go
@@ -567,7 +567,7 @@ func IsWaybillFinalStatus(status int) bool {
 const (
 	JXC4AppId         = "wx4b5930c13f8b1170"   // 京西菜市appId type=weixinmini
 	JXC4BusinessAppId = "wx08a5c2a8581414ff"   // 京西商家appId type=weixinmini
-	JXC4TiktokAppId   = "tta6a1d01c399f264201" // 抖音appID
+	JXC4TiktokAppId   = "ttaceeda5333d7a7ab01" // 抖音appID
 
 	JXC4ClientAppID = "wxf3657c94aa01a3f0" //京西菜市客户端APP ID type="weixinapp"
 
diff --git a/business/partner/purchase/tiktok_store/order.go b/business/partner/purchase/tiktok_store/order.go
index f715b6b6c..e9d78fc8a 100644
--- a/business/partner/purchase/tiktok_store/order.go
+++ b/business/partner/purchase/tiktok_store/order.go
@@ -218,8 +218,7 @@ func (p *PurchaseHandler) getOrder(vendorOrgCode, vendorOrderID, vendorStoreID s
 	}
 
 	// 用户保密信息脱敏
-	name, tel, address, err := api.OrderUserInfoDecrypt(vendorOrderID, result.EncryptPostReceiver, result.EncryptPostTel, result.PostAddr.EncryptDetail)
-	globals.SugarLogger.Debugf("===========err OrderUserInfoDecrypt :%v", err)
+	name, tel, address, _ := api.OrderUserInfoDecrypt(vendorOrderID, result.EncryptPostReceiver, result.EncryptPostTel, result.PostAddr.EncryptDetail)
 	order.ConsigneeName = name
 	order.ConsigneeMobile = tel
 	order.ConsigneeAddress = fmt.Sprintf("%s%s%s%s%s", result.PostAddr.Province.Name, result.PostAddr.City.Name, result.PostAddr.Town.Name, result.PostAddr.Street.Name, address)
diff --git a/conf/app.conf b/conf/app.conf
index 5d82c1268..a76323c04 100644
--- a/conf/app.conf
+++ b/conf/app.conf
@@ -234,8 +234,8 @@ dbConnectStr = "root:WebServer@1@tcp(127.0.0.1:3306)/jxd_dev_0?charset=utf8mb4&l
 getWeixinTokenURL = "http://www.jxc4.com/v2/sys/GetWXToken"
 getYLYTokenURL = "http://www.jxc4.com/v2/sys/GetYLYToken"
 
-tiktokAppKey = "tta6a1d01c399f264201"
-tiktokAppSecret = "5c08a0465cf0f996af254a03b6c2548defef87ad"
+tiktokAppKey = "ttaceeda5333d7a7ab01"
+tiktokAppSecret = "9285b20dce3c46179204a5aa4d92ca96ee1ed5c9"
 
 tiktokJXDJKey="ttaceeda5333d7a7ab01" #京西到家抖音小程序
 TiktokJXDJApiID="ttaceeda5333d7a7ab01"
@@ -374,8 +374,8 @@ uuOpenID="8d8464e7c9354c1e88a3f5afa2a7922e"
 jxPrintAppID = "1000"
 jxPrintAppKey = "rfBd56ti2SMtYvSg"
 
-tiktokAppKey = "tta6a1d01c399f264201"
-tiktokAppSecret = "5c08a0465cf0f996af254a03b6c2548defef87ad"
+tiktokAppKey = "ttaceeda5333d7a7ab01"
+tiktokAppSecret = "9285b20dce3c46179204a5aa4d92ca96ee1ed5c9"
 
 tiktokJXDJKey="ttaceeda5333d7a7ab01" #京西到家抖音小程序
 TiktokJXDJApiID="ttaceeda5333d7a7ab01"
@@ -498,8 +498,8 @@ jxPrintAppID = "1000"
 jxPrintAppKey = "rfBd56ti2SMtYvSg"
 
 storeName = "京西果园"
-tiktokAppKey = "tta6a1d01c399f264201"
-tiktokAppSecret = "5c08a0465cf0f996af254a03b6c2548defef87ad"
+tiktokAppKey = "ttaceeda5333d7a7ab01"
+tiktokAppSecret = "9285b20dce3c46179204a5aa4d92ca96ee1ed5c9"
 
 tiktokJXDJKey="ttaceeda5333d7a7ab01" #京西到家抖音小程序
 TiktokJXDJApiID="ttaceeda5333d7a7ab01"
@@ -700,8 +700,8 @@ uuOpenID="8d8464e7c9354c1e88a3f5afa2a7922e"
 jxPrintAppID = "1000"
 jxPrintAppKey = "rfBd56ti2SMtYvSg"
 
-tiktokAppKey = "tta6a1d01c399f264201"
-tiktokAppSecret = "5c08a0465cf0f996af254a03b6c2548defef87ad"
+tiktokAppKey = "ttaceeda5333d7a7ab01"
+tiktokAppSecret = "9285b20dce3c46179204a5aa4d92ca96ee1ed5c9"
 
 tiktokJXDJKey="ttaceeda5333d7a7ab01" #京西到家抖音小程序
 TiktokJXDJApiID="ttaceeda5333d7a7ab01"