diff --git a/business/jxstore/cms/user2.go b/business/jxstore/cms/user2.go index d6344c663..76462ee67 100644 --- a/business/jxstore/cms/user2.go +++ b/business/jxstore/cms/user2.go @@ -159,7 +159,8 @@ func init() { func RegisterUserWithMobile(ctx *jxcontext.Context, user *model.User, mobileVerifyCode string, inAuthInfo, manTokenInfo *auth2.AuthInfo) (outAuthInfo *auth2.AuthInfo, err error) { var mobileAuth *auth2.AuthInfo fakeMobile := false - user.Type = model.UserTypeConsumer | model.UserTypeStoreBoss // 先不区分商户与消息者 + //user.Type = model.UserTypeConsumer | model.UserTypeStoreBoss // 先不区分商户与消息者 + user.Type = model.UserTypeConsumer // 注册用户全是1(消费者) createName := ctx.GetRealRemoteIP() authType := auth2.AuthTypeMobile if manTokenInfo != nil && mobileVerifyCode == "" { diff --git a/business/partner/delivery/mtps/waybill_test.go b/business/partner/delivery/mtps/waybill_test.go index 6e20137c3..ca3b16b1b 100644 --- a/business/partner/delivery/mtps/waybill_test.go +++ b/business/partner/delivery/mtps/waybill_test.go @@ -1,6 +1,7 @@ package mtps import ( + "fmt" "testing" _ "git.rosy.net.cn/jx-callback/business/jxcallback/orderman" @@ -35,3 +36,6 @@ func TestCancelWaybill(t *testing.T) { } } +func Test11(t *testing.T) { + fmt.Println(1|2) +} \ No newline at end of file diff --git a/controllers/cms_store.go b/controllers/cms_store.go index ba75e49de..a91cd8e4d 100644 --- a/controllers/cms_store.go +++ b/controllers/cms_store.go @@ -727,7 +727,7 @@ func (c *StoreController) GetStoreCategoryMap() { return nil, "", err } - _, total, err := dao.GetUsers(dao.GetDB(), 0, "", []string{userAuth.UserID}, nil, nil, 0, 1) + _, total, err := dao.GetUsers(dao.GetDB(), 1, "", []string{userAuth.UserID}, nil, nil, 0, 1) //userRole, err := permission.GetUserRole(params.Ctx, userAuth.UserID) if err != nil { return nil, "", err