diff --git a/Car.xcodeproj/project.pbxproj b/Car.xcodeproj/project.pbxproj
index 7f4ef7c87790adef62419cf3de378384057bc2f1..a9395f2c4de063aecb027a1228545806b18eee2e 100644
--- a/Car.xcodeproj/project.pbxproj
+++ b/Car.xcodeproj/project.pbxproj
@@ -747,7 +747,7 @@
TargetAttributes = {
8F97C2B71E0CC4BE00D8A57D = {
CreatedOnToolsVersion = 8.1;
- DevelopmentTeam = 3KJ9G3LC6T;
+ DevelopmentTeam = W54V2VB863;
ProvisioningStyle = Automatic;
SystemCapabilities = {
com.apple.BackgroundModes = {
@@ -1190,7 +1190,7 @@
ASSETCATALOG_COMPILER_APPICON_NAME = AppIcon;
CODE_SIGN_ENTITLEMENTS = Car/Car.entitlements;
"CODE_SIGN_IDENTITY[sdk=iphoneos*]" = "iPhone Developer";
- DEVELOPMENT_TEAM = 3KJ9G3LC6T;
+ DEVELOPMENT_TEAM = W54V2VB863;
ENABLE_BITCODE = NO;
GCC_PRECOMPILE_PREFIX_HEADER = YES;
GCC_PREFIX_HEADER = "$(SRCROOT)/Car/PrefixHeader.pch";
@@ -1215,7 +1215,7 @@
ASSETCATALOG_COMPILER_APPICON_NAME = AppIcon;
CODE_SIGN_ENTITLEMENTS = Car/Car.entitlements;
"CODE_SIGN_IDENTITY[sdk=iphoneos*]" = "iPhone Developer";
- DEVELOPMENT_TEAM = 3KJ9G3LC6T;
+ DEVELOPMENT_TEAM = W54V2VB863;
ENABLE_BITCODE = NO;
GCC_PRECOMPILE_PREFIX_HEADER = YES;
GCC_PREFIX_HEADER = "$(SRCROOT)/Car/PrefixHeader.pch";
diff --git a/Car.xcworkspace/xcshareddata/Car.xcscmblueprint b/Car.xcworkspace/xcshareddata/Car.xcscmblueprint
index d13782adf930cbce30d7148d6b2d7046610ec1e9..54e46395d071af0967cb3f987b2de0cbb4774121 100644
--- a/Car.xcworkspace/xcshareddata/Car.xcscmblueprint
+++ b/Car.xcworkspace/xcshareddata/Car.xcscmblueprint
@@ -1,14 +1,18 @@
{
- "DVTSourceControlWorkspaceBlueprintPrimaryRemoteRepositoryKey" : "CCB994511D801CFFA86E69F5D0AA8EF5AA775988",
+ "DVTSourceControlWorkspaceBlueprintPrimaryRemoteRepositoryKey" : "CCB994511D801CFFA86E69F5D0AA8EF5AA775988+++AB9EE55",
"DVTSourceControlWorkspaceBlueprintWorkingCopyRepositoryLocationsKey" : {
},
"DVTSourceControlWorkspaceBlueprintWorkingCopyStatesKey" : {
- "CCB994511D801CFFA86E69F5D0AA8EF5AA775988" : 9223372036854775807
+ "CCB994511D801CFFA86E69F5D0AA8EF5AA775988+++AB9EE55" : 9223372036854775807,
+ "CCB994511D801CFFA86E69F5D0AA8EF5AA775988+++DD23581" : 9223372036854775807,
+ "CCB994511D801CFFA86E69F5D0AA8EF5AA775988+++955043B" : 9223372036854775807
},
"DVTSourceControlWorkspaceBlueprintIdentifierKey" : "36A2090F-1BB5-40BC-8821-A6A9123ACECC",
"DVTSourceControlWorkspaceBlueprintWorkingCopyPathsKey" : {
- "CCB994511D801CFFA86E69F5D0AA8EF5AA775988" : "Car-iOS\/"
+ "CCB994511D801CFFA86E69F5D0AA8EF5AA775988+++AB9EE55" : "Car-Customer\/",
+ "CCB994511D801CFFA86E69F5D0AA8EF5AA775988+++DD23581" : "Car-iOS\/",
+ "CCB994511D801CFFA86E69F5D0AA8EF5AA775988+++955043B" : "Car-iOS\/"
},
"DVTSourceControlWorkspaceBlueprintNameKey" : "Car",
"DVTSourceControlWorkspaceBlueprintVersion" : 204,
@@ -17,12 +21,17 @@
{
"DVTSourceControlWorkspaceBlueprintRemoteRepositoryURLKey" : "git.oschina.net:gomore\/Car-iOS-Merchant.git",
"DVTSourceControlWorkspaceBlueprintRemoteRepositorySystemKey" : "com.apple.dt.Xcode.sourcecontrol.Git",
- "DVTSourceControlWorkspaceBlueprintRemoteRepositoryIdentifierKey" : "CCB994511D801CFFA86E69F5D0AA8EF5AA775988"
+ "DVTSourceControlWorkspaceBlueprintRemoteRepositoryIdentifierKey" : "CCB994511D801CFFA86E69F5D0AA8EF5AA775988+++955043B"
+ },
+ {
+ "DVTSourceControlWorkspaceBlueprintRemoteRepositoryURLKey" : "git.oschina.net:gomore\/Car-iOS-Merchant.git",
+ "DVTSourceControlWorkspaceBlueprintRemoteRepositorySystemKey" : "com.apple.dt.Xcode.sourcecontrol.Git",
+ "DVTSourceControlWorkspaceBlueprintRemoteRepositoryIdentifierKey" : "CCB994511D801CFFA86E69F5D0AA8EF5AA775988+++AB9EE55"
},
{
"DVTSourceControlWorkspaceBlueprintRemoteRepositoryURLKey" : "https:\/\/git.oschina.net\/gomore\/Car-iOS.git",
"DVTSourceControlWorkspaceBlueprintRemoteRepositorySystemKey" : "com.apple.dt.Xcode.sourcecontrol.Git",
- "DVTSourceControlWorkspaceBlueprintRemoteRepositoryIdentifierKey" : "CCB994511D801CFFA86E69F5D0AA8EF5AA775988"
+ "DVTSourceControlWorkspaceBlueprintRemoteRepositoryIdentifierKey" : "CCB994511D801CFFA86E69F5D0AA8EF5AA775988+++DD23581"
}
]
}
\ No newline at end of file
diff --git a/Car/CodeClass/LeftView/ViewControllers/CardViewController.m b/Car/CodeClass/LeftView/ViewControllers/CardViewController.m
index ab0f66ef5face3faab65fba760682574c439bc3e..dbd10a3d06c9e2bdcd3ac919c2fd99c89f4ebd7d 100644
--- a/Car/CodeClass/LeftView/ViewControllers/CardViewController.m
+++ b/Car/CodeClass/LeftView/ViewControllers/CardViewController.m
@@ -113,8 +113,8 @@
[MBProgressHUD j_loading];
param.checkDate = [[NSDate date] httpParameterString];
- param.checkManId = kUser.fid;
- param.checkManName = kUser.realName;
+ param.checkManId = kGlobal.loginResult.merchantUser.fid;
+ param.checkManName = kGlobal.loginResult.merchantUser.realName;
param.checkKey = self.card.checkKey;
WS(weakSelf);
[kHttp POST:kCheckTicketUrl parameters:[param toDictionary] complete:^(id _Nullable response, NSError * _Nullable error) {
diff --git a/Car/CodeClass/LeftView/ViewControllers/LeftTableViewController.m b/Car/CodeClass/LeftView/ViewControllers/LeftTableViewController.m
index 9003809478a864e87480a97f4bbc5273d6f2b72a..0899e19ef2b860becc1cfcbe3796e1bd76d669da 100644
--- a/Car/CodeClass/LeftView/ViewControllers/LeftTableViewController.m
+++ b/Car/CodeClass/LeftView/ViewControllers/LeftTableViewController.m
@@ -32,7 +32,7 @@
}
- (void)configUIWithAcct {
- self.labelName.text = kUser.realName;
+ self.labelName.text = kGlobal.loginResult.merchantUser.realName;
self.labelScore.text = nil;
}
diff --git a/Car/CodeClass/Login/ViewControllers/LoginViewController.m b/Car/CodeClass/Login/ViewControllers/LoginViewController.m
index c662f787b3a176948f669c8d45b3b361e88dda66..ffaad41db8b8039dbb50073b77f9885a79cb0209 100644
--- a/Car/CodeClass/Login/ViewControllers/LoginViewController.m
+++ b/Car/CodeClass/Login/ViewControllers/LoginViewController.m
@@ -99,9 +99,11 @@
andMainView:mainNaVC
andRightView:nil
andBackgroundImage:[UIImage imageNamed:@"side_bg"]];
+ GlobalInstance *gl = [GlobalInstance shareInstance];
+ NSError *err = nil;
kGlobal.loginResult =
[[MerchantLoginResult alloc] initWithDictionary:response[@"data"]
- error:nil];
+ error:&err];
kGlobal.sideSlipVC = sideVC;
kGlobal.mainNaVC = mainNaVC;
kGlobal.userName = weakSelf.textFieldUser.text;
diff --git a/Car/CodeClass/Main/ViewControllers/MainViewController.m b/Car/CodeClass/Main/ViewControllers/MainViewController.m
index c02d2791ee375b4d14e0566f8c5938826a7a5c24..f943305f29dc7a857f99014c6f4760332f9bf05f 100644
--- a/Car/CodeClass/Main/ViewControllers/MainViewController.m
+++ b/Car/CodeClass/Main/ViewControllers/MainViewController.m
@@ -140,8 +140,8 @@
order.field = @"payTime";
order.direction = @"desc";
_param.orders = (NSArray<QueryOrder> *) @[ order ];
-// _param.merchantId = kUser.fid;
-// _param.state = @"paid, invalid";
+ _param.merchantId = kUser.fid;
+ _param.state = @"checked";
_param.beginDate = [[[NSDate date] yearMonthDayString] stringByAppendingString:@" 00:00:00"];
_param.endDate = [[[NSDate date] yearMonthDayString] stringByAppendingString:@" 23:59:59"];
}
diff --git a/Car/car_objc_json_client.m b/Car/car_objc_json_client.m
index 852f898f97d91703935a1d7f999e4bde1a830c70..63a3f5090c39217a34dadb7ddbc42570f30f2b4d 100755
--- a/Car/car_objc_json_client.m
+++ b/Car/car_objc_json_client.m
@@ -710,7 +710,7 @@ NSString * const QUERYORDERDIRECTION_DESC = @"desc";
{
return [[JSONKeyMapper alloc] initWithDictionary:@{
@"description": @"fdescription",
- }];
+ @"id":@"fid"}];
}
diff --git a/Car/tools/GlobalInstance.h b/Car/tools/GlobalInstance.h
index af940db6a25e4fa35ab87a2b004cea901215b365..3495cf214fbe47f6e1379f437c791addc409eba6 100644
--- a/Car/tools/GlobalInstance.h
+++ b/Car/tools/GlobalInstance.h
@@ -11,7 +11,7 @@
#import "WWSideslipViewController.h"
#import "MainViewController.h"
#define kGlobal [GlobalInstance shareInstance]
-#define kUser kGlobal.loginResult.merchantUser
+#define kUser kGlobal.loginResult.merchant
@interface GlobalInstance : NSObject
{