对账

Car Release.plist

@@ -17,7 +17,7 @@
 	<key>CFBundlePackageType</key>
 	<string>APPL</string>
 	<key>CFBundleShortVersionString</key>
-	<string>1.0.2</string>
+	<string>1.0.4</string>
 	<key>CFBundleURLTypes</key>
 	<array>
 		<dict>
@@ -30,7 +30,7 @@
 		</dict>
 	</array>
 	<key>CFBundleVersion</key>
-	<string>1.0.2</string>
+	<string>1.0.4</string>
 	<key>LSApplicationQueriesSchemes</key>
 	<array>
 		<string>wechat</string>

Car.xcodeproj/project.pbxproj

@@ -812,7 +812,7 @@
 				TargetAttributes = {
 					8F97C2B71E0CC4BE00D8A57D = {
 						CreatedOnToolsVersion = 8.1;
-						DevelopmentTeam = W54V2VB863;
+						DevelopmentTeam = 3KJ9G3LC6T;
 						ProvisioningStyle = Automatic;
 						SystemCapabilities = {
 							com.apple.BackgroundModes = {
@@ -836,7 +836,7 @@
 						TestTargetID = 8F97C2B71E0CC4BE00D8A57D;
 					};
 					8FFE3DDA1E14AC6700BEB6A6 = {
-						DevelopmentTeam = W54V2VB863;
+						DevelopmentTeam = 3KJ9G3LC6T;
 					};
 				};
 			};
@@ -1264,7 +1264,7 @@
 			buildSettings = {
 				ASSETCATALOG_COMPILER_APPICON_NAME = AppIcon;
 				CODE_SIGN_ENTITLEMENTS = Car/Car.entitlements;
-				DEVELOPMENT_TEAM = W54V2VB863;
+				DEVELOPMENT_TEAM = 3KJ9G3LC6T;
 				ENABLE_BITCODE = NO;
 				GCC_PRECOMPILE_PREFIX_HEADER = YES;
 				GCC_PREFIX_HEADER = "$(SRCROOT)/Car/PrefixHeader.pch";
@@ -1276,7 +1276,7 @@
 				INFOPLIST_FILE = Car/Info.plist;
 				IPHONEOS_DEPLOYMENT_TARGET = 8.0;
 				LD_RUNPATH_SEARCH_PATHS = "$(inherited) @executable_path/Frameworks";
-				PRODUCT_BUNDLE_IDENTIFIER = com.gomore.car;
+				PRODUCT_BUNDLE_IDENTIFIER = com.czt.car;
 				PRODUCT_NAME = "$(TARGET_NAME)";
 				USER_HEADER_SEARCH_PATHS = "$(SRCROOT)/**";
 			};
@@ -1288,7 +1288,7 @@
 			buildSettings = {
 				ASSETCATALOG_COMPILER_APPICON_NAME = AppIcon;
 				CODE_SIGN_ENTITLEMENTS = Car/Car.entitlements;
-				DEVELOPMENT_TEAM = W54V2VB863;
+				DEVELOPMENT_TEAM = 3KJ9G3LC6T;
 				ENABLE_BITCODE = NO;
 				GCC_PRECOMPILE_PREFIX_HEADER = YES;
 				GCC_PREFIX_HEADER = "$(SRCROOT)/Car/PrefixHeader.pch";
@@ -1300,7 +1300,7 @@
 				INFOPLIST_FILE = Car/Info.plist;
 				IPHONEOS_DEPLOYMENT_TARGET = 8.0;
 				LD_RUNPATH_SEARCH_PATHS = "$(inherited) @executable_path/Frameworks";
-				PRODUCT_BUNDLE_IDENTIFIER = com.gomore.car;
+				PRODUCT_BUNDLE_IDENTIFIER = com.czt.car;
 				PRODUCT_NAME = "$(TARGET_NAME)";
 				USER_HEADER_SEARCH_PATHS = "$(SRCROOT)/**";
 			};
@@ -1376,7 +1376,7 @@
 			buildSettings = {
 				ASSETCATALOG_COMPILER_APPICON_NAME = AppIcon;
 				CODE_SIGN_ENTITLEMENTS = Car/Car.entitlements;
-				DEVELOPMENT_TEAM = W54V2VB863;
+				DEVELOPMENT_TEAM = 3KJ9G3LC6T;
 				ENABLE_BITCODE = NO;
 				GCC_PRECOMPILE_PREFIX_HEADER = YES;
 				GCC_PREFIX_HEADER = "$(SRCROOT)/Car/PrefixHeader.pch";
@@ -1387,7 +1387,7 @@
 				INFOPLIST_FILE = "$(SRCROOT)/Car Release.plist";
 				IPHONEOS_DEPLOYMENT_TARGET = 8.0;
 				LD_RUNPATH_SEARCH_PATHS = "$(inherited) @executable_path/Frameworks";
-				PRODUCT_BUNDLE_IDENTIFIER = com.gomore.car;
+				PRODUCT_BUNDLE_IDENTIFIER = com.czt.car;
 				PRODUCT_NAME = "$(TARGET_NAME)";
 				USER_HEADER_SEARCH_PATHS = "$(SRCROOT)/**";
 			};
@@ -1399,7 +1399,7 @@
 			buildSettings = {
 				ASSETCATALOG_COMPILER_APPICON_NAME = AppIcon;
 				CODE_SIGN_ENTITLEMENTS = Car/Car.entitlements;
-				DEVELOPMENT_TEAM = W54V2VB863;
+				DEVELOPMENT_TEAM = 3KJ9G3LC6T;
 				ENABLE_BITCODE = NO;
 				GCC_PRECOMPILE_PREFIX_HEADER = YES;
 				GCC_PREFIX_HEADER = "$(SRCROOT)/Car/PrefixHeader.pch";
@@ -1410,7 +1410,7 @@
 				INFOPLIST_FILE = "$(SRCROOT)/Car Release.plist";
 				IPHONEOS_DEPLOYMENT_TARGET = 8.0;
 				LD_RUNPATH_SEARCH_PATHS = "$(inherited) @executable_path/Frameworks";
-				PRODUCT_BUNDLE_IDENTIFIER = com.gomore.car;
+				PRODUCT_BUNDLE_IDENTIFIER = com.czt.car;
 				PRODUCT_NAME = "$(TARGET_NAME)";
 				USER_HEADER_SEARCH_PATHS = "$(SRCROOT)/**";
 			};

Car/Assets.xcassets/main/radious_select.imageset/Contents.json

+{
+  "images" : [
+    {
+      "idiom" : "universal",
+      "filename" : "radious_select.png",
+      "scale" : "1x"
+    },
+    {
+      "idiom" : "universal",
+      "filename" : "radious_select@2x.png",
+      "scale" : "2x"
+    },
+    {
+      "idiom" : "universal",
+      "filename" : "radious_select@3x.png",
+      "scale" : "3x"
+    }
+  ],
+  "info" : {
+    "version" : 1,
+    "author" : "xcode"
+  }
+}
\ No newline at end of file

Car/Assets.xcassets/main/radious_unselect.imageset/Contents.json

+{
+  "images" : [
+    {
+      "idiom" : "universal",
+      "filename" : "radious_unselect.png",
+      "scale" : "1x"
+    },
+    {
+      "idiom" : "universal",
+      "filename" : "radious_unselect@2x.png",
+      "scale" : "2x"
+    },
+    {
+      "idiom" : "universal",
+      "filename" : "radious_unselect@3x.png",
+      "scale" : "3x"
+    }
+  ],
+  "info" : {
+    "version" : 1,
+    "author" : "xcode"
+  }
+}
\ No newline at end of file

Car/CodeClass/Account/ViewConstrollers/AccountRecordViewController.m

@@ -24,6 +24,7 @@
 - (void)httpRequest {
     WS(weakSelf);
     [MBProgressHUD j_loading];
+
     [kHttp POST:kUserCashRecord parameters:[self.param toDictionary] complete:^(id  _Nullable response, NSError * _Nullable error) {
         [MBProgressHUD j_hideLoadingView];
         if (kRsSuccess(response)) {
@@ -59,7 +60,9 @@
         order.direction = @"desc";
         _param.orders = (NSArray<QueryOrder> *)@[order];
         _param.userId = kUser.fid;
+        _param.pageSize = self.pageSize;
     }
+        _param.pageNumber = self.page;
     return _param;
 }
 

Car/CodeClass/Account/ViewConstrollers/AccountViewController.m

@@ -122,6 +122,12 @@
         } break;
         case AccountViewControllerTypeBinding: {
             WS(weakSelf);
+            kCanNotBeNil(self.textFieldScore.text, @"请输入提现工分！");
+            
+            if ([self.textFieldScore.text doubleValue] > [self.labelValidScore.text doubleValue]) {
+                [MBProgressHUD j_error:@"可用工分不足！" complete:nil];
+                break;
+            }
             [self alertTitle:@"确认提交？"
                          msg:nil
                     okAction:^(UIAlertAction *_Nullable action) {
@@ -176,9 +182,10 @@
                             @"unionId":uid};
     WS(weakSelf);
     [kHttp POST:kModifyUserWxUid parameters:param complete:^(id  _Nullable response, NSError * _Nullable error) {
-        if (kRsMsg(response)) {
+        if (kRsSuccess(response)) {
             [MBProgressHUD j_success:@"绑定成功！" complete:^{
                 kUser.wxOpenId = response[@"data"];
+                weakSelf.type = AccountViewControllerTypeBinding;
                 [weakSelf isBinding];
             }];
         }else{
@@ -190,7 +197,6 @@
 - (void)httpSubmit {
     [MBProgressHUD j_loading];
     WS(weakSelf);
-    kCanNotBeNil(self.textFieldScore.text, @"请输入要兑换的工分数！");
     [kHttp POST:kCashApply
         parameters:[self.param toDictionary]
           complete:^(id _Nullable response, NSError *_Nullable error) {
@@ -214,7 +220,7 @@
               if (kRsSuccess(response)) {
                   StationUserAcctEntity *acc = [[StationUserAcctEntity alloc] initWithDictionary:response[@"data"] error:nil];
                   weakSelf.labelTotalScore.text = [NSString stringWithFormat:@"%@", acc.balance];
-                  weakSelf.labelValidScore.text = [NSString stringWithFormat:@"%@", acc.drawBalance];
+                  weakSelf.labelValidScore.text = [NSString stringWithFormat:@"%@", acc.drawBalance ? acc.drawBalance : @"0"];
               }
           }];
 }

Car/CodeClass/Main/Cells/OrderListTableViewCell.h

@@ -14,6 +14,7 @@
 @property (weak, nonatomic) IBOutlet UILabel *labelOil;
 @property (weak, nonatomic) IBOutlet UILabel *labelBillNumber;
 @property (weak, nonatomic) IBOutlet UILabel *labelPrice;
+@property (weak, nonatomic) IBOutlet UIButton *btnIsChecked;
 
-- (void)configCellArray:(NSMutableArray *)array indexPath:(NSIndexPath *)indexPath;
+- (void)configCellArray:(NSMutableArray *)array indexPath:(NSIndexPath *)indexPath isShow:(BOOL)isShow isAll:(BOOL)isAll;
 @end

Car/CodeClass/Main/Cells/OrderListTableViewCell.m

@@ -8,20 +8,42 @@
 
 #import "OrderListTableViewCell.h"
 #import "OrderListModel.h"
+
+
+@interface OrderListTableViewCell ()
+@property (strong, nonatomic) OrderListModel *model;
+@end
 @implementation OrderListTableViewCell
 
 - (void)awakeFromNib {
     [super awakeFromNib];
+    [self.btnIsChecked setBackgroundImage:[UIImage imageNamed:@"radious_select"] forState:UIControlStateDisabled | UIControlStateSelected];
     // Initialization code
 }
 
-- (void)configCellArray:(NSMutableArray *)array indexPath:(NSIndexPath *)indexPath {
+- (void)configCellArray:(NSMutableArray *)array indexPath:(NSIndexPath *)indexPath isShow:(BOOL)isShow isAll:(BOOL)isAll{
     OrderListModel *model = array[indexPath.row];
+    self.model = model;
     self.labelTime.text = model.payTime;
-  self.labelStation.text = [NSString stringWithFormat:@"%@ - %@",model.stationName, model.stationUserName];
-  self.labelOil.text = [NSString stringWithFormat:@"%@ - %@",model.gasItemName, model.oilGunName];
+    self.labelStation.text = [NSString stringWithFormat:@"%@ - %@", model.stationName, model.stationUserName];
+    self.labelOil.text = [NSString stringWithFormat:@"%@ - %@", model.gasItemName, model.oilGunName];
     self.labelBillNumber.text = model.billNumber;
     self.labelPrice.text = [CalculateHelper getMoneyStringFrom:model.realPayTotal];
+    
+    self.btnIsChecked.selected = model.isSelected;
+    
+    if ([model.checkState isEqualToString:@"checked"]) {
+        self.btnIsChecked.enabled = NO;
+    } else {
+        self.btnIsChecked.enabled = YES;
+    }
+    
+    self.btnIsChecked.hidden = !isShow;
+}
+- (IBAction)actionCheck:(UIButton *)sender {
+    sender.selected = !sender.isSelected;
+    self.model.isSelected = sender.isSelected;
+    [[NSNotificationCenter defaultCenter] postNotificationName:kNotiSelectBill object:self.model];
 }
 
 - (void)setSelected:(BOOL)selected animated:(BOOL)animated {

Car/CodeClass/Main/Models/OrderListModel.h

@@ -27,4 +27,6 @@
 
 @property (strong, nonatomic) NSString *printStateString;
 
+@property (nonatomic, assign) BOOL isSelected;
+
 @end

Car/CodeClass/Main/Models/OrderListModel.m

@@ -11,6 +11,18 @@
 @implementation OrderListModel
 
 
+- (instancetype)initWithDictionary:(NSDictionary *)dict error:(NSError *__autoreleasing *)err {
+    self = [super initWithDictionary:dict error:err];
+    if (self) {
+        if ([self.checkState isEqualToString:@"checked"]) {
+            self.isSelected = YES;
+        }else{
+            self.isSelected = NO;
+        }
+    }
+    return self;
+}
+
 - (NSString *)paymentString {
   if (!_paymentString) {
     if ([self.payMethod isEqualToString:@"weixin_pub"]) {

Car/CodeClass/Main/ViewControllers/MainViewController.m

@@ -15,6 +15,13 @@
 @interface MainViewController ()
 @property (strong, nonatomic) OrderListFilterViewController *filterVC;
 @property (strong, nonatomic) OrderQueryDefintion *param;
+@property (weak, nonatomic) IBOutlet NSLayoutConstraint *constraintTop;
+@property (weak, nonatomic) IBOutlet UIButton *btnSelectAll;
+@property (weak, nonatomic) IBOutlet UIButton *btnCheck;
+@property (strong, nonatomic) NSMutableArray *arrBillIdToCheck;
+@property (weak, nonatomic) IBOutlet UILabel *labelCount;
+@property (weak, nonatomic) IBOutlet UILabel *labelAmount;
+@property (strong, nonatomic) TradeStatisticsResult *total;
 @end
 
 @implementation MainViewController
@@ -22,6 +29,9 @@
 - (void)viewDidLoad {
     [super viewDidLoad];
     [self httpRequest];
+    self.constraintTop.constant = 0;
+    [self.view layoutIfNeeded];
+    [[NSNotificationCenter defaultCenter] addObserver:self selector:@selector(actionNoti:) name:kNotiSelectBill object:nil];
 }
 
 - (void)viewWillAppear:(BOOL)animated {
@@ -35,17 +45,23 @@
     NSDictionary *param = [self.param toDictionary];
     [MBProgressHUD j_loading:@"加载中…"];
     WS(weakSelf);
-  [kHttp POST:kOrderQueryUrl parameters:param complete:^(id  _Nullable response, NSError * _Nullable error) {
+    [kHttp POST:kOrderQueryUrl
+        parameters:param
+          complete:^(id _Nullable response, NSError *_Nullable error) {
               [MBProgressHUD j_hideLoadingView];
 
               if (kRsSuccess(response)) {
+                  weakSelf.total = [[TradeStatisticsResult alloc] initWithDictionary:response[@"data"][@"total"] error:nil];
                   for (NSDictionary *dict in response[@"data"][@"records"]) {
                       OrderListModel *model = [[OrderListModel alloc] initWithDictionary:dict error:nil];
+                      if (weakSelf.btnSelectAll.isSelected) {
+                          model.isSelected = YES;
+                      }
                       [weakSelf.arrData addObject:model];
                   }
                   [weakSelf listTableViewReloadData];
 
-    }else{
+              } else {
                   kShowRsMsg(response);
                   [weakSelf.tableView j_endRefresh];
                   if (self.page > 0) {
@@ -67,16 +83,22 @@
 - (UITableViewCell *)tableView:(UITableView *)tableView cellForRowAtIndexPath:(NSIndexPath *)indexPath {
 
     OrderListTableViewCell *cell = [tableView dequeueReusableCellWithIdentifier:@"OrderListTableViewCell" forIndexPath:indexPath];
-  [cell configCellArray:self.arrData indexPath:indexPath];
+    [cell configCellArray:self.arrData indexPath:indexPath isShow:self.btnCheck.isSelected isAll:self.btnSelectAll.selected];
     return cell;
 }
 
 - (void)tableView:(UITableView *)tableView didSelectRowAtIndexPath:(NSIndexPath *)indexPath {
+    
+    
     [super tableView:tableView didSelectRowAtIndexPath:indexPath];
+    
     kDebugIndex(indexPath);
 }
 
 - (void)listDidSelect:(id)model {
+    if (self.btnCheck.isSelected) {
+        return;
+    }
     OrderDetailViewController *detailVC = [OrderDetailViewController viewControllerWithStoryBoardType:STORYBOARD_TYPE_MAIN];
     detailVC.model = model;
     [self.navigationController pushViewController:detailVC animated:YES];
@@ -86,7 +108,7 @@
 - (IBAction)actionLeft:(UIBarButtonItem *)sender {
     if (kGlobal.sideSlipVC.isShowLeft) {
         [kGlobal.sideSlipVC showMainView];
-  }else{
+    } else {
         [kGlobal.sideSlipVC showLeftView];
     }
 }
@@ -94,12 +116,94 @@
 - (IBAction)actionRight:(id)sender {
     if (self.filterVC.isOpen) {
         [self.filterVC hideFilterView];
-  }else{
+    } else {
         self.filterVC.view.frame = self.view.bounds;
         [self.view addSubview:self.filterVC.view];
         [self.filterVC showFilterView];
     }
 }
+- (IBAction)actionCheck:(UIButton *)sender {
+    
+    if (!sender.isSelected) {
+        sender.selected = YES;
+        [self.tableView reloadData];
+        self.constraintTop.constant = 44;
+        [UIView animateWithDuration:0.3
+                         animations:^{
+                             [self.view layoutIfNeeded];
+                         }];
+    }else{
+        if (self.arrBillIdToCheck.count == 0) {
+            [MBProgressHUD j_error:@"请选择对账的单据！" complete:nil];
+            return;
+        }
+        
+        [self httpCheckBill];
+        
+    }
+    
+}
+
+
+/**
+ 全选操作
+
+ @param isAll 是否全选
+ */
+- (void)configSelectData:(BOOL)isAll {
+    for (OrderListModel *model in self.arrData) {
+        if (![model.checkState isEqualToString:@"checked"]) {
+            model.isSelected = isAll;
+        }
+    }
+    [self.tableView reloadData];
+}
+
+- (void)setTotal:(TradeStatisticsResult *)total {
+    _total = total;
+    self.labelCount.text = [NSString stringWithFormat:@"%lld",total.orderCount];
+    self.labelAmount.text = [NSString stringWithFormat:@"￥ %.2f", total.totalAmount ? total.totalAmount : 0];
+}
+
+
+- (IBAction)actionSelectAll:(UIButton *)sender {
+    sender.selected = !sender.isSelected;
+    [self configSelectData:sender.isSelected];
+}
+
+- (IBAction)actionCancelCheck:(id)sender {
+    self.constraintTop.constant = 0;
+    [UIView animateWithDuration:0.3
+                     animations:^{
+                         [self.view layoutIfNeeded];
+                     }];
+    self.btnCheck.selected = NO;
+    [self.tableView reloadData];
+}
+
+- (void)actionNoti:(NSNotification *)noti {
+    
+    NSLog(@"%@",noti);
+    OrderListModel *model = noti.object;
+    if (model.isSelected) {
+        [self.arrBillIdToCheck addObject:model.fid];
+    }else{
+        [self.arrBillIdToCheck removeObject:model.fid];
+    }
+    
+    self.btnSelectAll.selected = [self configIsAll];
+}
+
+- (BOOL)configIsAll {
+    for (OrderListModel *model in self.arrData) {
+        if (![model.checkState isEqualToString:@"checked"]) {
+            if (!model.isSelected) {
+                return NO;
+            }
+        }
+    }
+    return YES;
+}
 
 - (void)showShadow {
     self.shadow.hidden = NO;
@@ -109,6 +213,22 @@
     self.shadow.hidden = YES;
 }
 
+- (void)httpCheckBill {
+    CheckOrderRequest *request = [[CheckOrderRequest alloc] init];
+    request.userId = kUser.fid;
+    request.orderIds = self.arrBillIdToCheck;
+    WS(weakSelf);
+    [kHttp POST:kUrlCheck parameters:request.toDictionary complete:^(id  _Nullable response, NSError * _Nullable error) {
+        if (kRsSuccess(response)) {
+            [MBProgressHUD j_success:@"对账成功！" complete:nil];
+            [weakSelf actionCancelCheck:nil];
+            [weakSelf.arrBillIdToCheck removeAllObjects];
+        } else {
+            kShowRsMsg(response);
+        }
+    }];
+}
+
 #pragma mark - lazy
 - (OrderListFilterViewController *)filterVC {
     if (!_filterVC) {
@@ -129,13 +249,23 @@
         QueryOrder *order = [[QueryOrder alloc] init];
         order.field = @"payTime";
         order.direction = @"desc";
-    _param.orders = (NSArray<QueryOrder> *)@[order];
+        _param.orders = (NSArray<QueryOrder> *) @[ order ];
         _param.userId = kUser.fid;
-    _param.state = @"paid";
+        _param.state = @"paid, invalid";
+        _param.beginDate = [[[NSDate date] yearMonthDayString] stringByAppendingString:@" 00:00:00"];
+        _param.endDate = [[[NSDate date] yearMonthDayString] stringByAppendingString:@" 23:59:59"];
     }
     return _param;
 }
 
+- (NSMutableArray *)arrBillIdToCheck {
+    if (!_arrBillIdToCheck) {
+        _arrBillIdToCheck = [NSMutableArray array];
+    }
+    
+    return _arrBillIdToCheck;
+}
+
 - (UIView *)shadow {
     if (!_shadow) {
         _shadow = [[UIView alloc] initWithFrame:self.view.bounds];

Car/CodeClass/Main/ViewControllers/OrderListFilterViewController.m

@@ -9,7 +9,7 @@
 #import "OrderListFilterViewController.h"
 
 @interface OrderListFilterViewController ()
-@property(weak, nonatomic) IBOutlet NSLayoutConstraint *constraintHeight;
+@property (weak, nonatomic) IBOutlet NSLayoutConstraint *constraintHeight;
 
 /**
  阴影
@@ -27,16 +27,16 @@
 @property (weak, nonatomic) IBOutlet UITextField *textFieldBillNumber;
 
 /**
- 日期
+ 日期开始时间
  */
 @property (weak, nonatomic) IBOutlet DateTextField *textFieldDate;
+@property (weak, nonatomic) IBOutlet DateTextField *textFieldEndDate;
 
 /**
  加油员
  */
 @property (weak, nonatomic) IBOutlet UITextField *textFieldStationUser;
 
-
 @end
 
 @implementation OrderListFilterViewController
@@ -46,6 +46,7 @@
     self.view.backgroundColor = [UIColor clearColor];
     // Do any additional setup after loading the view.
     self.textFieldDate.type = DateTextFieldYearMonthDay;
+    self.textFieldEndDate.type = DateTextFieldYearMonthDay;
 }
 
 - (IBAction)actionBac:(id)sender {
@@ -55,8 +56,8 @@
 - (void)configParam {
     self.param.billNumberLike = self.textFieldBillNumber.text;
     self.param.userNameLike = self.textFieldStationUser.text;
-  self.param.endDate = kIf(self.textFieldDate.text.length > 0, [self.textFieldDate.text stringByAppendingString:@" 23:59:59"], nil);
-  
+    self.param.beginDate = kIf(self.textFieldDate.text.length > 0, [self.textFieldDate.text stringByAppendingString:@" 00:00:00"], nil);
+    self.param.endDate = kIf(self.textFieldEndDate.text.length > 0, [self.textFieldEndDate.text stringByAppendingString:@" 23:59:59"], nil);
 }
 
 #pragma mark - actions
@@ -84,6 +85,40 @@
     }
 }
 
+- (IBAction)actionChooseIsChecked:(UIButton *)sender {
+    UIAlertController *alert = [UIAlertController alertControllerWithTitle:@"请选择" message:nil preferredStyle:UIAlertControllerStyleAlert];
+    WS(weakSelf);
+    UIAlertAction *actionAll = [UIAlertAction actionWithTitle:@"全部"
+                                                        style:(UIAlertActionStyleDefault)
+                                                      handler:^(UIAlertAction *_Nonnull action) {
+                                                          [sender setTitle:@"全部" forState:UIControlStateNormal];
+                                                          weakSelf.param.checkState = nil;
+                                                      }];
+    [alert addAction:actionAll];
+
+    UIAlertAction *actionChecked = [UIAlertAction actionWithTitle:@"已对账"
+                                                            style:(UIAlertActionStyleDefault)
+                                                          handler:^(UIAlertAction *_Nonnull action) {
+                                                              [sender setTitle:@"已对账" forState:UIControlStateNormal];
+                                                              weakSelf.param.checkState = @"checked";
+                                                          }];
+
+    [alert addAction:actionChecked];
+
+    UIAlertAction *actionUnchecked = [UIAlertAction actionWithTitle:@"未对账"
+                                                              style:(UIAlertActionStyleDefault)
+                                                            handler:^(UIAlertAction *_Nonnull action) {
+                                                                [sender setTitle:@"未对账" forState:UIControlStateNormal];
+                                                                weakSelf.param.checkState = @"unchecked";
+                                                            }];
+    [alert addAction:actionUnchecked];
+    
+    UIAlertAction *actionCancel = [UIAlertAction actionWithTitle:@"取消" style:UIAlertActionStyleDestructive handler:nil];
+    [alert addAction:actionCancel];
+
+    [self presentViewController:alert animated:YES completion:nil];
+}
+
 - (void)hideFilterView {
     HIDE_KEYBOARD;
     self.isOpen = NO;
@@ -104,7 +139,7 @@
 
 - (void)showFilterView {
     self.isOpen = YES;
-  self.constraintHeight.constant = 220;
+    self.constraintHeight.constant = 320;
     [UIView animateWithDuration:0.7
                           delay:0
          usingSpringWithDamping:0.9

Car/Info.plist

@@ -17,7 +17,7 @@
 	<key>CFBundlePackageType</key>
 	<string>APPL</string>
 	<key>CFBundleShortVersionString</key>
-	<string>1.0.0</string>
+	<string>1.0.3</string>
 	<key>CFBundleURLTypes</key>
 	<array>
 		<dict>
@@ -30,7 +30,7 @@
 		</dict>
 	</array>
 	<key>CFBundleVersion</key>
-	<string>1.0.0</string>
+	<string>1.0.3</string>
 	<key>LSApplicationQueriesSchemes</key>
 	<array>
 		<string>wechat</string>

Car/PrefixHeader.pch

@@ -17,7 +17,7 @@
 //主题色
 #define kMainColor kMainOrangeColor
 
-
+static NSString *const kNotiSelectBill = @"kNotiSelectBill";
 
 #ifdef DEBUG
 #define CLog(format, ...)                                                      \

Car/URL.h

@@ -11,7 +11,7 @@
 
 #ifdef test
 static NSString *const VersionName = @"车族通测试版";
-static NSString *const BASE_IP = @"http://test.gomoretech.com";
+static NSString *const BASE_IP = @"http://cartest.gomoretech.com";
 #else
 static NSString *const VersionName = @"车族通正式版";
 static NSString *const BASE_IP = @"http://whcar.gomoretech.com";
@@ -42,5 +42,6 @@ static NSString *const kUserCashRecord = @"cash/query";
 static NSString *const kCashApply = @"cash/apply";
 //绑定用户微信unionId
 static NSString *const kModifyUserWxUid = @"stationUser/save/openId";
+static NSString *const kUrlCheck = @"order/check";
 
 #endif /* URL_h */

Car/car_objc_json_client.m

@@ -92,6 +92,18 @@ NSString * const QUERYORDERDIRECTION_DESC = @"desc";
 }
 
 
+@end
+
+@implementation CheckOrderRequest
+@synthesize userId;
+@synthesize orderIds;
+
++(BOOL)propertyIsOptional:(NSString*)propertyName
+{
+    return YES;
+}
+
+
 @end
 
 @implementation ResetPasswordRequest
@@ -239,6 +251,44 @@ NSString * const QUERYORDERDIRECTION_DESC = @"desc";
 }
 
 
+@end
+
+@implementation CouponStockEntity
+@synthesize fid;
+@synthesize createName;
+@synthesize createBy;
+@synthesize createDate;
+@synthesize updateName;
+@synthesize updateBy;
+@synthesize updateDate;
+@synthesize sysOrgCode;
+@synthesize sysCompanyCode;
+@synthesize couponNumber;
+@synthesize name;
+@synthesize type;
+@synthesize total;
+@synthesize realToal;
+@synthesize state;
+@synthesize memberId;
+@synthesize memberName;
+@synthesize orderNumber;
+@synthesize validBeginDate;
+@synthesize validEndDate;
+
++(BOOL)propertyIsOptional:(NSString*)propertyName
+{
+    return YES;
+}
+
+
++(JSONKeyMapper*)keyMapper
+{
+    return [[JSONKeyMapper alloc] initWithDictionary:@{
+                                                       @"id": @"fid",
+                                                       }];
+}
+
+
 @end
 
 @implementation GasItemEntity
@@ -386,6 +436,7 @@ NSString * const QUERYORDERDIRECTION_DESC = @"desc";
 @synthesize invoiceId;
 @synthesize alipayBuyerId;
 @synthesize alipaybuyerLogonId;
+@synthesize checkState;
 
 +(BOOL)propertyIsOptional:(NSString*)propertyName
 {
@@ -791,10 +842,10 @@ NSString * const QUERYORDERDIRECTION_DESC = @"desc";
 @end
 
 @implementation AjaxJson
+@synthesize msg;
 @synthesize attributes;
-@synthesize obj;
 @synthesize success;
-@synthesize msg;
+@synthesize obj;
 
 +(BOOL)propertyIsOptional:(NSString*)propertyName
 {
@@ -1049,6 +1100,40 @@ NSString * const QUERYORDERDIRECTION_DESC = @"desc";
 }
 
 
+@end
+
+@implementation CouponEntity
+@synthesize fid;
+@synthesize createName;
+@synthesize createBy;
+@synthesize createDate;
+@synthesize updateName;
+@synthesize updateBy;
+@synthesize updateDate;
+@synthesize sysOrgCode;
+@synthesize sysCompanyCode;
+@synthesize name;
+@synthesize type;
+@synthesize total;
+@synthesize realTotal;
+@synthesize state;
+@synthesize probability;
+@synthesize validateDays;
+
++(BOOL)propertyIsOptional:(NSString*)propertyName
+{
+    return YES;
+}
+
+
++(JSONKeyMapper*)keyMapper
+{
+    return [[JSONKeyMapper alloc] initWithDictionary:@{
+                                                       @"id": @"fid",
+                                                       }];
+}
+
+
 @end
 
 @implementation DrawCashBillEntity
@@ -1144,6 +1229,18 @@ NSString * const QUERYORDERDIRECTION_DESC = @"desc";
 }
 
 
+@end
+
+@implementation TradeStatisticsResult
+@synthesize orderCount;
+@synthesize totalAmount;
+
++(BOOL)propertyIsOptional:(NSString*)propertyName
+{
+    return YES;
+}
+
+
 @end
 
 @implementation LoginResult
@@ -1224,17 +1321,7 @@ NSString * const QUERYORDERDIRECTION_DESC = @"desc";
 
 @implementation OrderQueryResult
 @synthesize records;
-
-+(BOOL)propertyIsOptional:(NSString*)propertyName
-{
-    return YES;
-}
-
-
-@end
-
-@implementation WithdrawQueryResult
-@synthesize records;
+@synthesize total;
 
 +(BOOL)propertyIsOptional:(NSString*)propertyName
 {
@@ -1264,6 +1351,29 @@ NSString * const QUERYORDERDIRECTION_DESC = @"desc";
 }
 
 
+@end
+
+@implementation TSBaseUser
+@synthesize userType;
+@synthesize departid;
+@synthesize signature;
+@synthesize browser;
+@synthesize userKey;
+@synthesize status;
+@synthesize activitiSync;
+@synthesize password;
+@synthesize userName;
+@synthesize realName;
+@synthesize currentDepart;
+@synthesize userOrgList;
+@synthesize deleteFlag;
+
++(BOOL)propertyIsOptional:(NSString*)propertyName
+{
+    return YES;
+}
+
+
 @end
 
 @implementation TSDepart
@@ -1293,20 +1403,8 @@ NSString * const QUERYORDERDIRECTION_DESC = @"desc";
 
 @end
 
-@implementation TSBaseUser
-@synthesize userType;
-@synthesize departid;
-@synthesize signature;
-@synthesize browser;
-@synthesize userKey;
-@synthesize status;
-@synthesize activitiSync;
-@synthesize password;
-@synthesize userName;
-@synthesize realName;
-@synthesize currentDepart;
-@synthesize userOrgList;
-@synthesize deleteFlag;
+@implementation WithdrawQueryResult
+@synthesize records;
 
 +(BOOL)propertyIsOptional:(NSString*)propertyName
 {
@@ -1326,21 +1424,6 @@ NSString * const QUERYORDERDIRECTION_DESC = @"desc";
 }
 
 
-@end
-
-@implementation OrderQueryDefintion
-@synthesize userId;
-@synthesize userNameLike;
-@synthesize billNumberLike;
-@synthesize endDate;
-@synthesize state;
-
-+(BOOL)propertyIsOptional:(NSString*)propertyName
-{
-    return YES;
-}
-
-
 @end
 
 @implementation WxMassBillEntity
@@ -1382,6 +1465,23 @@ NSString * const QUERYORDERDIRECTION_DESC = @"desc";
 }
 
 
+@end
+
+@implementation OrderQueryDefintion
+@synthesize userId;
+@synthesize userNameLike;
+@synthesize billNumberLike;
+@synthesize endDate;
+@synthesize state;
+@synthesize beginDate;
+@synthesize checkState;
+
++(BOOL)propertyIsOptional:(NSString*)propertyName
+{
+    return YES;
+}
+
+
 @end
 
 @implementation WithdrawQueryDefintion