From b41cedd314123938c8cea42fd68ac2f290029cd7 Mon Sep 17 00:00:00 2001
From: gazebo <gazeboxu@gmail.com>
Date: Thu, 6 Jun 2019 16:11:08 +0800
Subject: [PATCH] =?UTF-8?q?-=20=E4=BA=AC=E4=B8=9C=E9=97=A8=E5=BA=97?=
 =?UTF-8?q?=E5=95=86=E5=93=81=E6=93=8D=E4=BD=9CuserPin=E9=83=BD=E7=94=A8ut?=
 =?UTF-8?q?ils.GetAPIOperator=E4=BF=AE=E9=A5=B0?=
MIME-Version: 1.0
Content-Type: text/plain; charset=UTF-8
Content-Transfer-Encoding: 8bit

---
 platformapi/jdapi/promotion_order.go | 6 +++---
 platformapi/jdapi/store_sku.go       | 6 +++---
 utils/utils.go                       | 6 +++++-
 3 files changed, 11 insertions(+), 7 deletions(-)

diff --git a/platformapi/jdapi/promotion_order.go b/platformapi/jdapi/promotion_order.go
index c250068e..35f179f3 100644
--- a/platformapi/jdapi/promotion_order.go
+++ b/platformapi/jdapi/promotion_order.go
@@ -121,7 +121,7 @@ func (a *API) OrderDiscountSubmitActivity(actInfo *OrderDiscountActivity) (activ
 func (a *API) OrderDiscountQuerySubmitActivityResult(activityID int64) (response *ActivityOpQueryResultResponse, err error) {
 	result, err := a.AccessAPINoPage("orderdiscount/querySubmitActivityResult", map[string]interface{}{
 		"activityId": activityID,
-		"operator":   "jxc4",
+		"operator":   utils.APIPin,
 		"traceId":    utils.GetUUID(),
 	}, nil, nil, genNoPageResultParser("code", "detail", "result", "0"))
 	if err == nil {
@@ -136,7 +136,7 @@ func (a *API) OrderDiscountQueryActivityInfo(activityID int64) (response *Activi
 	result, err := a.AccessAPINoPage("orderdiscount/queryActivityInfo", map[string]interface{}{
 		"activityId": activityID,
 		"sourceFrom": 3,
-		"operator":   "",
+		"operator":   utils.APIPin,
 		"traceId":    "",
 		"version":    "",
 	}, nil, nil, genNoPageResultParser("code", "detail", "result", "0"))
@@ -154,7 +154,7 @@ func (a *API) OrderDiscountCancelActivity(activityID int64, operator, traceID st
 	}
 	_, err = a.AccessAPINoPage("orderdiscount/cancelActivity", map[string]interface{}{
 		"activityId": activityID,
-		"operator":   operator,
+		"operator":   utils.GetAPIOperator(operator),
 		"traceId":    traceID,
 	}, nil, nil, nil)
 	return err
diff --git a/platformapi/jdapi/store_sku.go b/platformapi/jdapi/store_sku.go
index f8648a8a..98a269ca 100644
--- a/platformapi/jdapi/store_sku.go
+++ b/platformapi/jdapi/store_sku.go
@@ -137,7 +137,7 @@ func (a *API) BatchUpdateCurrentQtys(outStationNo, stationNo string, skuStockLis
 	}
 	jdParams := map[string]interface{}{
 		"skuStockList": skuStockList,
-		"userPin":      userPin,
+		"userPin":      utils.GetAPIOperator(userPin),
 	}
 	if outStationNo != "" {
 		jdParams["outStationNo"] = outStationNo
@@ -189,7 +189,7 @@ func (a *API) BatchUpdateVendibility(outStationNo, stationNo string, stockVendib
 	}
 	jdParams := map[string]interface{}{
 		"stockVendibilityList": stockVendibilityList,
-		"userPin":              userPin,
+		"userPin":              utils.GetAPIOperator(userPin),
 	}
 	if outStationNo != "" {
 		jdParams["outStationNo"] = outStationNo
@@ -223,7 +223,7 @@ func (a *API) QueryStockCenter(outStationNo string, skuIds []*SkuIdEntity, userP
 	jdParams := map[string]interface{}{
 		"outStationNo": outStationNo,
 		"skuIds":       skuIds,
-		"userPin":      userPin,
+		"userPin":      utils.GetAPIOperator(userPin),
 	}
 	result, err := a.AccessAPINoPage("stock/queryStockCenter", jdParams, nil, nil, genNoPageResultParser("retCode", "retMsg", "data", "0"))
 	if err == nil && result != nil {
diff --git a/utils/utils.go b/utils/utils.go
index 9e680d7c..d3a91485 100644
--- a/utils/utils.go
+++ b/utils/utils.go
@@ -14,6 +14,10 @@ import (
 	uuid "github.com/satori/go.uuid"
 )
 
+const (
+	APIPin = "jxadmin"
+)
+
 func DictKeysMan(data interface{}, keysToRemove []string, keysToKeep []string) interface{} {
 	if data == nil || (keysToKeep == nil && keysToRemove == nil) {
 		return data
@@ -101,7 +105,7 @@ func GetCurTimestamp() int64 {
 }
 
 func GetAPIOperator(userName string) string {
-	retVal := "jxadmin"
+	retVal := APIPin
 	if userName != "" {
 		retVal += "-" + userName
 	}