JCQ 2022/04/06 暂时注释 打开后会执行每10s处理一次消息 xuhang

business/partner/purchase/jdshop/callback.go

@@ -74,8 +74,11 @@ func OnCallbackMsg(msg *jdshopapi.CallBackResult) (err error) {
 }
 
 func SaveJdsOrders(msg *jdshopapi.CallBackResult) (err error) {
+	if msg.OrderState == "TRADE_CANCELED" {
+		return nil
+	} //清洗脏数据 部分数据按照
 	order, err := result2Orders(msg)
-	if err != nil || order == nil {
+	if err != nil && order == nil {
 		return err
 	}
 	globals.SugarLogger.Debugf("SaveJdsOrders : %v", utils.Format4Output(order, false))

business/partner/purchase/jdshop/callback_test.go

@@ -27,3 +27,8 @@ func TestSaveJdsOrders(t *testing.T) {
 	}
 	fmt.Println("测试2")
 }
+
+func TestDecrypt(t *testing.T) {
+	InitKey()
+	fmt.Println(Decrypt("dGeoMeGNcXeT8iCHn3hTrCFYY8qfMnOptNcMFzAJA2/Dx/CPiZ526ec0NN0kWKs4+HwEGCLu9hAB9D0MIf8UB6q4G8IVgD3oXlOb89CFgGe0yO1HA9j51ESPFXh8=", "1"))
+}

business/partner/purchase/jdshop/key.go

@@ -4,15 +4,14 @@ import (
 	"encoding/base64"
 	"encoding/hex"
 	"encoding/json"
+	"git.rosy.net.cn/baseapi/platformapi/jdshopapi"
 
 	"git.rosy.net.cn/jx-callback/globals"
-
-	"git.rosy.net.cn/jx-callback/globals/api"
 )
 
 var (
-	KeyList []*Key
-	// KeyList2 []*Key
+	KeyList  []*Key
+	KeyList2 []*Key
 )
 
 type Key struct {
@@ -27,7 +26,8 @@ type Key struct {
 }
 
 func InitKey() {
-	keyResult, err := api.JdShopAPI.KeyGet()
+	newapi := jdshopapi.New("37d36b62c0d14bd4b872f948b335c95czinj", "E1D746D42474D5F1F1A10CECE75D99F6", "efa7e1d1a22640fa990e6cf164b28608")
+	keyResult, err := newapi.KeyGet()
 	if err != nil {
 		return
 	}
@@ -37,24 +37,31 @@ func InitKey() {
 		err = json.Unmarshal(data, &vv)
 		KeyList = append(KeyList, vv)
 	}
-	// keyResult2, err := api.JdShop2API.KeyGet()
-	// if err != nil {
-	// 	return
-	// }
-	// for _, v := range keyResult2.Response.ServiceKeyList[0].Keys {
-	// 	data, _ := json.Marshal(v)
-	// 	vv := &Key{}
-	// 	err = json.Unmarshal(data, &vv)
-	// 	KeyList2 = append(KeyList2, vv)
-	// }
+	keyResult2, err := jdshopapi.New("f9c5ce9a5ce24218936924f7c4864cc9owe1", "E1D746D42474D5F1F1A10CECE75D99F6", "efa7e1d1a22640fa990e6cf164b28608").KeyGet()
+	if err != nil {
+		return
+	}
+	for _, v := range keyResult2.Response.ServiceKeyList[0].Keys {
+		data, _ := json.Marshal(v)
+		vv := &Key{}
+		err = json.Unmarshal(data, &vv)
+		KeyList2 = append(KeyList2, vv)
+	}
 	globals.SugarLogger.Debugf("jdshop key refreshed..")
 }
 
 func GetKey(keySign, vendorOrgCode string) (key string) {
-	// if vendorOrgCode == "1" {
-	for _, v := range KeyList {
-		data, _ := base64.StdEncoding.DecodeString(v.ID)
-		if keySign == hex.EncodeToString(data) {
+	if vendorOrgCode == "1" {
+		for _, v := range KeyList {
+			data, _ := base64.StdEncoding.DecodeString(v.ID)
+			if keySign == hex.EncodeToString(data) {
+				return v.KeyString
+			}
+		}
+	} else {
+		for _, v := range KeyList2 {
+			//data, _ := base64.StdEncoding.DecodeString(v.ID)
+			//if keySign == hex.EncodeToString(data) {
 			return v.KeyString
 		}
 	}