Merge branch 'master' into learningCenter

Class/CustomerOrderViewController.m

@@ -201,6 +201,7 @@
     OrderdetailsViewController *orderdetails = [[[self class] getMainStoryboardClass] instantiateViewControllerWithIdentifier:@"orderdetails"];
     TOOrderEntity *model = (TOOrderEntity *)[[self.datasArray objectAtIndex_opple:indexPath.row] order];
     orderdetails.orderCode = model.orderNumber;
+    orderdetails.consumerID = model.consumerId;
     if ([model.orderState isEqualToString:@"006"] || [model.orderState isEqualToString:@"002"] || [model.orderState isEqualToString:@"003"]) {
         orderdetails.isShowPrintButton = YES;
         orderdetails.isShowPayButton = NO;

Class/LuckyDrawDetailsViewController.m

@@ -143,7 +143,6 @@
             RsLotteryResponse *drawRecord = [[RsLotteryResponse alloc]initWithDictionary:returnValue[@"data"] error:nil];
             [weakSelf.datasArray addObjectsFromArray:drawRecord.list];
             weakSelf.totalPage = [returnValue[@"data"][@"totalpages"] integerValue];
-            NSLog(@"%ld",weakSelf.datasArray.count);
             [weakSelf.drawDetailsTableView reloadData];
         }else {
             [weakSelf SHOWPrompttext:returnValue[@"message"]];
@@ -185,7 +184,7 @@
     }
     UsedDrawTableViewCell *cell = [tableView dequeueReusableCellWithIdentifier:@"UsedDrawTableViewCell" forIndexPath:indexPath];
     cell.orderNumber.text = drawEntity.draw.orderNumber;
-    cell.drawTimeLabel.text = drawEntity.draw.createDate;
+    cell.drawTimeLabel.text = drawEntity.draw.drawDate;
     cell.trophyLabel.text = drawEntity.draw.awardDescription;
     if (self.drawValue == 0) {
         cell.drawTimeLabel.hidden = YES;

Class/OrderdetailsViewController.h

@@ -66,6 +66,11 @@
  */
 @property (nonatomic,assign) BOOL isUserInteractionEnabled;
 
+/**
+ 消费者ID
+ */
+@property (nonatomic,copy) NSString *consumerID;
+
 
 
 

Class/OrderdetailsViewController.m

@@ -288,14 +288,14 @@ NSString *const PROMOTIONALSTRING = @"促销信息";
         }];
     }
     /// 查询客户订单抽奖状态
-    static RsAwardDraw *resultModel = nil;
+    __block RsAwardDraw *resultModel = nil;
     dispatch_group_enter(group);
     RsLotteryRequest *queryDrawState = [[RsLotteryRequest alloc]init];
     /// 判断订单是否支付
     if (!self.isShowPayButton) {
        queryDrawState.orderNumberEquals = self.orderCode;
     }
-    queryDrawState.winnerIdEquals = [Customermanager manager].model.fid;
+    queryDrawState.winnerIdEquals = self.consumerID?self.consumerID:[Customermanager manager].model.fid;
     queryDrawState.stateEquals = self.isShowPayButton?ACCOMPLISHED:USED;
     DataPage *page = [[DataPage alloc]init];
     page.page = ZERO;
@@ -306,17 +306,13 @@ NSString *const PROMOTIONALSTRING = @"促销信息";
         if ([returnValue[@"code"] isEqualToNumber:@0]) {
             NSDictionary *dict = [returnValue[@"data"][@"list"] firstObject];
             resultModel = [[RsAwardDraw alloc]initWithDictionary:dict error:nil];
-        }else {
-            resultModel = nil;
         }
         
     } WithErrorCodeBlock:^(id errorCodeValue) {
-        resultModel = nil;
         dispatch_group_leave(group);
         [weakSelf RemoveMBProgressHUDLoding];
         [weakSelf ErrorMBProgressView:NETWORK];
     } WithFailureBlock:^(NSError *error) {
-        resultModel = nil;
         dispatch_group_leave(group);
         [weakSelf RemoveMBProgressHUDLoding];
         [weakSelf ErrorMBProgressView:error.localizedDescription];
@@ -545,8 +541,8 @@ NSString *const PROMOTIONALSTRING = @"促销信息";
         weakSelf.isShowHeaderView = YES;
         [weakSelf CreateTableviewHeaderView];
         weakSelf.orderDetailsTableview.tableFooterView = nil;
-        static BOOL isJDEcard = NO;//促销中是否有京东E卡；
-        static BOOL isGuideDraw = NO;//促销中是否有导购抽奖机会
+        __block BOOL isJDEcard = NO;//促销中是否有京东E卡；
+        __block BOOL isGuideDraw = NO;//促销中是否有导购抽奖机会
         /// 刷新数据成功
         [weakSelf getOrderDetailsData:^{
             /// 先判断促销中有无E卡，有则认为发放成功
@@ -570,9 +566,6 @@ NSString *const PROMOTIONALSTRING = @"促销信息";
             }else if (!isJDEcard && isGuideDraw) {
                 [weakSelf rebateApplySuccess:@"抽奖机会已放到你的账户"];
             }
-            /// 初始化判断
-            isGuideDraw = NO;
-            isJDEcard  = NO;
         }];
     }];
 }

Lighting/Info.plist

@@ -15,7 +15,7 @@
 	<key>CFBundleName</key>
 	<string>欧立方</string>
 	<key>CFBundleShortVersionString</key>
-	<string>1.2.1</string>
+	<string>1.2.2</string>
 	<key>CFBundleURLTypes</key>
 	<array>
 		<dict>