From 4ff3de2ef939dcb80f3e71203a6fb0a9e57bc082 Mon Sep 17 00:00:00 2001
From: =?UTF-8?q?=E8=8B=8F=E5=B0=B9=E5=B2=9A?= <770236076@qq.com>
Date: Mon, 2 Dec 2019 18:14:52 +0800
Subject: [PATCH] =?UTF-8?q?=E6=96=B0=E5=A2=9E=E5=88=A4=E6=96=AD=E6=98=AF?=
=?UTF-8?q?=E5=90=A6=E6=98=AF=E5=95=86=E5=AE=B6=E7=AE=A1=E7=90=86=E5=91=98?=
MIME-Version: 1.0
Content-Type: text/plain; charset=UTF-8
Content-Transfer-Encoding: 8bit
---
platformapi/jdapi/store_page.go | 37 +++++++++++++++++++++-------
platformapi/jdapi/store_page_test.go | 5 ++++
2 files changed, 33 insertions(+), 9 deletions(-)
diff --git a/platformapi/jdapi/store_page.go b/platformapi/jdapi/store_page.go
index e1addabb..be99493f 100644
--- a/platformapi/jdapi/store_page.go
+++ b/platformapi/jdapi/store_page.go
@@ -261,13 +261,14 @@ var (
pageExceedLimitCodes = map[string]int{
"403": 1,
}
- pageCanRetryCodes = map[string]int{}
- regexpTable = regexp.MustCompile(`
`)
- regexpTd = regexp.MustCompile(`([0-9].*) | `)
- regexpJDUserPage = regexp.MustCompile(`共([\s\S].*)页/([\s\S].*)条记录`)
- regexpJDTr = regexp.MustCompile(`([\s\S]*?)
`)
- regexpJDUserInfo = regexp.MustCompile(`([\s\S]*?) | `)
- regexpJDUserID = regexp.MustCompile(`value="(.*)"`)
+ pageCanRetryCodes = map[string]int{}
+ regexpTable = regexp.MustCompile(``)
+ regexpTd = regexp.MustCompile(`([0-9].*) | `)
+ regexpJDUserPage = regexp.MustCompile(`共([\s\S].*)页/([\s\S].*)条记录`)
+ regexpJDTr = regexp.MustCompile(`([\s\S]*?)
`)
+ regexpJDUserInfo = regexp.MustCompile(`([\s\S]*?) | `)
+ regexpJDUserID = regexp.MustCompile(`value="(.*)"`)
+ regexpJDUserIsManager = regexp.MustCompile(``)
)
const (
@@ -280,8 +281,6 @@ const (
JdUserRoleJHYName = "【通用】拣货员"
JdUserRolesName = "多角色"
JdUserNoRole = "无角色"
- JdUserManager = "jd_jxcs1223"
- JdUserManagerGy = "jd_jxgy"
)
func (a *API) SetJdCookie(cookieValue string) {
@@ -674,3 +673,23 @@ func (a *API) UpdateJdUserRoles(id int64, roleIDs []string) (err error) {
_, err = a.AccessStorePage(url, jdParams, true)
return err
}
+
+// 查询用户是否是商家管理员接口
+// https://login-o2o.jddj.com/jpuser/store/474147?isShow=1
+func (a *API) IsJdManagerUser(id int64) (isManager bool, err error) {
+ url := "https://login-o2o.jddj.com/jpuser/store/" + utils.Int64ToStr(id)
+ jdParams := map[string]interface{}{
+ "isShow": 1,
+ }
+ body, err := a.AccessStorePage2(url, jdParams, false, "")
+ if err != nil {
+ return isManager, err
+ }
+ bodyStr := body.(string)
+ listmask := regexpJDUserIsManager.FindString(bodyStr)
+ if listmask == "" {
+ return false, err
+ } else {
+ return true, err
+ }
+}
diff --git a/platformapi/jdapi/store_page_test.go b/platformapi/jdapi/store_page_test.go
index 1bf32c74..52b91671 100644
--- a/platformapi/jdapi/store_page_test.go
+++ b/platformapi/jdapi/store_page_test.go
@@ -213,3 +213,8 @@ func TestPrivilegeUpdateJdUserStatus(t *testing.T) {
func TestUpdateJdUserRoles(t *testing.T) {
api.UpdateJdUserRoles(346568, []string{"28926", "28924"})
}
+
+func TestIsJdManagerUser(t *testing.T) {
+ aa, _ := api.IsJdManagerUser(334683)
+ fmt.Println(aa)
+}