Commit 343cac3a authored by Achilles's avatar Achilles

当前用户为商铺时, 查询账单时添加商铺code参数。

parent 61b2b1c9
...@@ -9,6 +9,7 @@ ...@@ -9,6 +9,7 @@
#import "VankeSettlementListAPI.h" #import "VankeSettlementListAPI.h"
#import "VankeConfig.h" #import "VankeConfig.h"
#import "VankeUtil.h" #import "VankeUtil.h"
#import "VankeCommonModel.h"
@implementation VankeSettlementListAPI @implementation VankeSettlementListAPI
...@@ -34,6 +35,12 @@ ...@@ -34,6 +35,12 @@
if (![VankeUtil isBlankString:_shopLike]) { if (![VankeUtil isBlankString:_shopLike]) {
request.PARAM(@"shopLike", _shopLike); request.PARAM(@"shopLike", _shopLike);
} }
if ([[VankeCommonModel sharedInstance] curUserIsTenant]) {
User *curUser = [[VankeCommonModel sharedInstance] currentUser];
request.PARAM(@"tenantEquals", curUser.code);
}
request.TIMEOUT(10); request.TIMEOUT(10);
} }
else if (self.succeed) else if (self.succeed)
......
...@@ -96,7 +96,7 @@ ...@@ -96,7 +96,7 @@
#pragma mark LoginResponseData #pragma mark LoginResponseData
NSString *const USER_POSITION_HQ = @"hq"; // 用户职位: 集团 NSString *const USER_POSITION_HQ = @"hq"; // 用户职位: 集团
NSString *const USER_POSITION_STORE = @"store"; // 用户职位: 场用户 NSString *const USER_POSITION_STORE = @"store"; // 用户职位: 场用户
NSString *const USER_POSITION_TENANT = @"tenant"; // 用户职位: 商户用户 NSString *const USER_POSITION_TENANT = @"tenant"; // 用户职位: 商户用户
@implementation LoginResponseData @implementation LoginResponseData
......
...@@ -64,7 +64,20 @@ AS_SINGLETON(VankeCommonModel) ...@@ -64,7 +64,20 @@ AS_SINGLETON(VankeCommonModel)
*/ */
- (NSString*) currentUserPwd; - (NSString*) currentUserPwd;
/**
* 是否为商铺用户
*/
-(BOOL) curUserIsTenant;
/**
* 是否为集团用户
*/
-(BOOL) curUserIsHQ;
/**
* 是否为商场用户
*/
-(BOOL) curUserIsStore;
@end @end
......
...@@ -76,4 +76,19 @@ DEF_SINGLETON(VankeCommonModel) ...@@ -76,4 +76,19 @@ DEF_SINGLETON(VankeCommonModel)
return [self keychainRead:KEY_CURRENT_USER_PWD]; return [self keychainRead:KEY_CURRENT_USER_PWD];
} }
-(BOOL) curUserIsTenant {
LoginResponseData *loginInfo = [self getLoginInfo];
return [USER_POSITION_TENANT eq: loginInfo.position];
}
-(BOOL) curUserIsHQ {
LoginResponseData *loginInfo = [self getLoginInfo];
return [USER_POSITION_HQ eq: loginInfo.position];
}
-(BOOL) curUserIsStore {
LoginResponseData *loginInfo = [self getLoginInfo];
return [USER_POSITION_STORE eq: loginInfo.position];
}
@end @end
...@@ -115,8 +115,7 @@ ON_NOTIFICATION3( VankeLoginBoard_iPhone, SUCC_LOGIN, notification ) ...@@ -115,8 +115,7 @@ ON_NOTIFICATION3( VankeLoginBoard_iPhone, SUCC_LOGIN, notification )
[UIView setAnimationDelegate:self]; [UIView setAnimationDelegate:self];
[UIView commitAnimations]; [UIView commitAnimations];
LoginResponseData *loginInfo = [[VankeCommonModel sharedInstance] getLoginInfo]; isTenant = [[VankeCommonModel sharedInstance] curUserIsTenant];
isTenant = [USER_POSITION_TENANT eq: loginInfo.position];
if (isTenant) { if (isTenant) {
_tenantTabbar = [VankeTenantTabBoard_iPhone cell]; _tenantTabbar = [VankeTenantTabBoard_iPhone cell];
[self.view addSubview:_tenantTabbar]; [self.view addSubview:_tenantTabbar];
......
Markdown is supported
0% or
You are about to add 0 people to the discussion. Proceed with caution.
Finish editing this message first!
Please register or to comment