Merge branch 'master' into learningCenter

# Conflicts:
#	Class/ClientViewController.m
#	Class/ClientdetailsViewController.m
#	Class/OrderdetailsViewController.m
#	Lighting/OppleMain.storyboard
#	Tools/BaseViewController.h

Class/CardBeenUseViewController.m

@@ -36,8 +36,8 @@
     if (!_requestModel) {
         _requestModel = [[RsJingDongECardRequest alloc]init];
         DataPage *page = [[DataPage alloc]init];
-        page.page = 0;
-        page.rows = 10;
+        page.page = ZERO;
+        page.rows = KROWS;
         page.order = @"desc";
         _requestModel.guideIdEquals = [Shoppersmanager manager].Shoppers.employee.fid;
         _requestModel.stateEquals = self.cardState;
@@ -72,7 +72,7 @@
 {
     WS(weakSelf);
     MjRefreshHeaderCustom *headerRefresh = [MjRefreshHeaderCustom headerWithRefreshingBlock:^{
-        weakSelf.requestModel.page.page = 0;
+        weakSelf.requestModel.page.page = ZERO;
         [weakSelf.beenUseCardCollectionView.mj_footer resetNoMoreData];
         [weakSelf getCardDatasAction:YES];
     }];
@@ -81,7 +81,7 @@
     self.beenUseCardCollectionView.mj_header = headerRefresh;
     
     MJRefreshAutoNormalFooter *footer = [MJRefreshAutoNormalFooter footerWithRefreshingBlock:^{
-        if (++ weakSelf.requestModel.page.page >= weakSelf.totalPage) {
+        if (++ weakSelf.requestModel.page.page > weakSelf.totalPage) {
             [weakSelf.beenUseCardCollectionView.mj_footer endRefreshingWithNoMoreData];
         }else
         {

Class/CardDontUseViewController.m

@@ -43,7 +43,7 @@
         _requestModel = [[RsJingDongECardRequest alloc]init];
         DataPage *page = [[DataPage alloc]init];
         page.page = ZERO;
-        page.rows = 10;
+        page.rows = KROWS;
         page.order = @"desc";
         _requestModel.guideIdEquals = [Shoppersmanager manager].Shoppers.employee.fid;
         _requestModel.stateEquals = DISPENSED;
@@ -90,7 +90,7 @@
 {
     WS(weakSelf);
     MjRefreshHeaderCustom *headerRefresh = [MjRefreshHeaderCustom headerWithRefreshingBlock:^{
-        weakSelf.requestModel.page.page = 0;
+        weakSelf.requestModel.page.page = ZERO;
         [weakSelf.dontUseCardCollectionView.mj_footer resetNoMoreData];
         [weakSelf getCardDatasAction:YES];
     }];
@@ -99,7 +99,7 @@
     self.dontUseCardCollectionView.mj_header = headerRefresh;
     
     MJRefreshAutoNormalFooter *footer = [MJRefreshAutoNormalFooter footerWithRefreshingBlock:^{
-        if (++ weakSelf.requestModel.page.page >= weakSelf.totalPage) {
+        if (++ weakSelf.requestModel.page.page > weakSelf.totalPage) {
             [weakSelf.dontUseCardCollectionView.mj_footer endRefreshingWithNoMoreData];
         }else
         {

Class/CardViewController.m

@@ -31,8 +31,8 @@
     if (!_requestModel) {
         _requestModel = [[RsJingDongECardRequest alloc]init];
         DataPage *page = [[DataPage alloc]init];
-        page.page = 0;
-        page.rows = 10;
+        page.page = ZERO;
+        page.rows = KROWS;
         _requestModel.guideIdEquals = [Shoppersmanager manager].Shoppers.employee.fid;
         _requestModel.page = page;
     }

Class/LuckyDrawDetailsViewController.m

@@ -39,8 +39,8 @@
         _drawModel = [[RsLotteryRequest alloc]init];
         _drawModel.winnerIdEquals = [Shoppersmanager manager].Shoppers.employee.fid;
         DataPage *page = [[DataPage alloc]init];
-        page.rows = 10;
-        page.page = ZERO;
+        page.rows = KROWS;
+        page.page = ONE;
         page.order = SORTDIRECTION_DESC;
         _drawModel.page = page;
         switch (self.drawValue) {
@@ -105,7 +105,7 @@
 {
     WS(weakSelf);
     MjRefreshHeaderCustom *headerRefresh = [MjRefreshHeaderCustom headerWithRefreshingBlock:^{
-        weakSelf.drawModel.page.page = 0;
+        weakSelf.drawModel.page.page = ONE;
         [weakSelf.drawDetailsTableView.mj_footer resetNoMoreData];
         [weakSelf getDrawDatas:YES];
     }];
@@ -113,7 +113,7 @@
     headerRefresh.lastUpdatedTimeLabel.hidden = YES;
     self.drawDetailsTableView.mj_header = headerRefresh;
     MJRefreshAutoNormalFooter *footer = [MJRefreshAutoNormalFooter footerWithRefreshingBlock:^{
-        if (++ weakSelf.drawModel.page.page >= weakSelf.totalPage) {
+        if (++ weakSelf.drawModel.page.page > weakSelf.totalPage) {
             [weakSelf.drawDetailsTableView.mj_footer endRefreshingWithNoMoreData];
         }else
         {
@@ -143,6 +143,7 @@
             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"]];

Class/LuckyDrawModel.h

@@ -29,6 +29,7 @@
 /// 优先
 @property (nonatomic,copy) NSString *priority;
 
+
 @end
 
 

Class/OrderdetailsViewController.m

@@ -260,13 +260,19 @@ NSString *const PROMOTIONALSTRING = @"促销信息";
                         deductionModel.type = @"deductionAction";
                         [weakSelf.promotionalArray addObject:deductionModel];
                         
-                    }else if (![BaseViewController isBlankString:[oldPromotion.jdecardDenomation stringValue]]) {
+                    } else if (![BaseViewController isBlankString:[oldPromotion.jdecardDenomation stringValue]]) {
                         /// 判断京东E卡
                         PromotionalDeductionModel *model = [[PromotionalDeductionModel alloc]init];
                         model.total = [oldPromotion.jdecardDenomation integerValue];
                         model.body = GUIDE;
                         model.type = JDECardAction;
                         [weakSelf.luckyDrawAndJDECardArray addObject:model];
+        
+                    } else if (![BaseViewController isBlankString:[oldPromotion.redPackageCount stringValue]]) {
+                        /// 导购抽奖数
+                        LuckyDrawModel *model = [[LuckyDrawModel alloc]init];
+                        model.body = GUIDE;
+                        [weakSelf.luckyDrawAndJDECardArray addObject:model];
                     }
                 }
             }
@@ -335,24 +341,23 @@ NSString *const PROMOTIONALSTRING = @"促销信息";
         }
         /// 默认弹出支付框
         if (weakSelf.isShowPayButton && [weakSelf.orderDetails.order.orderState isEqualToString:NOTPAY]) {
-            
-            if (weakSelf.luckyDrawAndJDECardArray.count) {
-                for (id object in weakSelf.luckyDrawAndJDECardArray) {
+            /// 找出客户抽奖
+            for (int i=0;i<weakSelf.luckyDrawAndJDECardArray.count;i++) {
+                id object = weakSelf.luckyDrawAndJDECardArray[i];
                 if ([object isKindOfClass:[LuckyDrawModel class]] && !resultModel) {
-                        [weakSelf queryConsumerLuckyDrawChance:object];
-                    }else {
-                        [weakSelf payButtonClickAction];
-                    }
-                    /// 区分导购抽奖和消费者抽奖
-                    if ([object isKindOfClass:[LuckyDrawModel class]]) {
-                        LuckyDrawModel *model = object;
+                    LuckyDrawModel *model = (LuckyDrawModel *)object;
                     if ([model.body isEqualToString:CONSUMER]) {
+                        [weakSelf queryConsumerLuckyDrawChance:model];
                         break;
                     }
                 }
+                /// 有促销无抽奖情况
+                if (i == weakSelf.luckyDrawAndJDECardArray.count-1) {
+                    [weakSelf payButtonClickAction];
                 }
-            }else {
-                /// 无促销的情况
+            }
+            /// 无促销情况
+            if (!weakSelf.luckyDrawAndJDECardArray.count) {
                 [weakSelf payButtonClickAction];
             }
         }
@@ -365,10 +370,11 @@ NSString *const PROMOTIONALSTRING = @"促销信息";
 
 
 #pragma mark - 卡劵领取成功
-- (void)rebateApplySuccess
+- (void)rebateApplySuccess:(NSString *)message
 {
     RebateSuccessTableViewController *success = [[[self class] getMainStoryboardClass] instantiateViewControllerWithIdentifier:@"RebateSuccessTableViewController"];
     success.titleArray = @[@"卡劵已发放到你的账户",@"查看账户",@"我知道了"];
+
     [success setClickEvent:^(NSIndexPath *indexPath) {
         if (indexPath.row == 1) {
             /// 我知道了
@@ -477,7 +483,6 @@ NSString *const PROMOTIONALSTRING = @"促销信息";
 - (void)queryConsumerLuckyDrawChance:(LuckyDrawModel *)model
 {
     WS(weakSelf);
-    if ([model.body isEqualToString:CONSUMER]) {
     UIAlertController *alertControl = [UIAlertController alertControllerWithTitle:nil message:@"恭喜您获得一次大转盘抽奖机会!" preferredStyle:UIAlertControllerStyleAlert];
     [alertControl addAction:[UIAlertAction actionWithTitle:@"马上参与" style:UIAlertActionStyleDefault handler:^(UIAlertAction * _Nonnull action) {
         [weakSelf showLuckyDrawControl:model.lottery.uuid andOrderNumber:weakSelf.orderCode luckyDrawFinish:^(NSDictionary *dict) {
@@ -496,7 +501,6 @@ NSString *const PROMOTIONALSTRING = @"促销信息";
         }];
     }]];
     [self presentViewController:alertControl animated:YES completion:nil];
-    }
 }
 
 #pragma mark - 查询导购抽奖机会
@@ -531,16 +535,18 @@ NSString *const PROMOTIONALSTRING = @"促销信息";
     ///支付成功
     WS(weakSelf);
     [settlement setPaySuccessReturnBlock:^{
-        /// 支付完成后若导购有抽奖机会需要提示导购
-        [weakSelf queryGuideLuckyDrawChanceisTrue:^{
-            [[NSNotificationCenter defaultCenter] postNotificationName:PROMPTDRAWINFORMATION object:@(1)];
-        }];
+
+        if (weakSelf.DelecteAndPayButtonBlock) {
+            weakSelf.DelecteAndPayButtonBlock(_cellindex,PAYSUCCESS);
+        }
         [weakSelf SuccessMBProgressView:@"支付成功"];
         weakSelf.isShowPayButton = NO;
         weakSelf.isUserInteractionEnabled = NO;
         weakSelf.isShowHeaderView = YES;
         [weakSelf CreateTableviewHeaderView];
         weakSelf.orderDetailsTableview.tableFooterView = nil;
+        static BOOL isJDEcard = NO;//促销中是否有京东E卡；
+        static BOOL isGuideDraw = NO;//促销中是否有导购抽奖机会
         /// 刷新数据成功
         [weakSelf getOrderDetailsData:^{
             /// 先判断促销中有无E卡，有则认为发放成功
@@ -548,14 +554,26 @@ NSString *const PROMOTIONALSTRING = @"促销信息";
                 if ([object isKindOfClass:[PromotionalDeductionModel class]]) {
                     PromotionalDeductionModel *model = (PromotionalDeductionModel *)object;
                     if ([model.body isEqualToString:GUIDE] && [model.type isEqualToString:JDECardAction]) {
-                        [weakSelf rebateApplySuccess];break;
+                        isJDEcard = YES;break;
                     }
                 }
             }
+            /// 查询导购抽奖机会
+            [weakSelf queryGuideLuckyDrawChanceisTrue:^{
+                isGuideDraw = YES;
+            }];
+            /// 弹出框
+            if (isJDEcard && isGuideDraw) {
+                [weakSelf rebateApplySuccess:@"京东E卡、抽奖机会已放到你的账户"];
+            }else if (isJDEcard && !isGuideDraw) {
+                [weakSelf rebateApplySuccess:@"京东E卡已放到你的账户"];
+            }else if (!isJDEcard && isGuideDraw) {
+                [weakSelf rebateApplySuccess:@"抽奖机会已放到你的账户"];
+            }
+            /// 初始化判断
+            isGuideDraw = NO;
+            isJDEcard  = NO;
         }];
-        if (weakSelf.DelecteAndPayButtonBlock) {
-            weakSelf.DelecteAndPayButtonBlock(_cellindex,PAYSUCCESS);
-        }
     }];
 }
 

Class/PaymentsViewController.m

@@ -40,7 +40,7 @@
     if (!_model) {
         _model = [[RsCommissionRequest alloc]init];
         DataPage *page = [[DataPage alloc]init];
-        page.page = ZERO;
+        page.page = ONE;
         page.rows = KROWS;
         _model.page = page;
         _model.emploreeId = [Shoppersmanager manager].Shoppers.employee.fid;
@@ -74,7 +74,7 @@
 {
     WS(weakSelf);
     MjRefreshHeaderCustom *headerRefresh = [MjRefreshHeaderCustom headerWithRefreshingBlock:^{
-        weakSelf.model.page.page = 0;
+        weakSelf.model.page.page = ONE;
         [weakSelf.paymentsTableView.mj_footer resetNoMoreData];
         [weakSelf getDatasAction:YES];
     }];

Class/ProductLibraryViewController.m

@@ -201,7 +201,7 @@
 #pragma mark -布局
 - (void)uiConfigAction
 {
-    self.indexPage = 1;
+    self.indexPage = ONE;
     self.selectedIndex = 9999;//无任何意义
     self.productCollectionLayout.itemSize = CGSizeMake((ScreenWidth-100)/3, (ScreenWidth-100)/3);
     self.productCollectionLayout.sectionInset = UIEdgeInsetsMake(20, 30, 20, 30);
@@ -226,10 +226,10 @@
         {
             //分页数据
             DataPage *Newpage = [[DataPage alloc]init];
-            Newpage.page = 1;
+            Newpage.page = ONE;
             Newpage.rows = KROWS;
             weakSelf.condtionModel.page = Newpage;
-            weakSelf.indexPage = 1;
+            weakSelf.indexPage = ONE;
             //搜索
             if (_selectedCode) {
                 switch (weakSelf.selectedIndex) {

Class/SettlementViewController.m

@@ -387,7 +387,6 @@
     }
     [self CreateMBProgressHUDLoding];
     WS(weakSelf);
-    NSLog(@"%@",[order toDictionary]);
     [[NetworkRequestClassManager Manager] NetworkRequestWithURL:SERVERREQUESTURL(CONFIRMPAY) WithCallClass:weakSelf WithRequestType:0 WithParameter:order WithReturnValueBlock:^(id returnValue) {
         
         [weakSelf RemoveMBProgressHUDLoding];

Class/Shoppingcart/GenerateOrdersViewController.m

@@ -407,7 +407,6 @@
                 order.orderdetailList = (NSArray<TOOrderdetailEntity> *)goodidArr;
                 [self CreateMBProgressHUDLoding];
                 WS(weakSelf);
-                NSLog(@"%@",[order toDictionary]);
                 [[NetworkRequestClassManager Manager] NetworkRequestWithURL:SERVERREQUESTURL(CREATEORDER) WithCallClass:weakSelf WithRequestType:0 WithParameter:order WithReturnValueBlock:^(id returnValue) {
                     [weakSelf RemoveMBProgressHUDLoding];
                     if ([returnValue[@"code"] isEqualToNumber:@0]) {

Class/WithdrawalViewController.m

@@ -39,7 +39,7 @@
     if (!_model) {
         _model = [[RsApplyBillRequest alloc]init];
         DataPage *page = [[DataPage alloc]init];
-        page.page = ZERO;
+        page.page = ONE;
         page.rows = KROWS;
         _model.page = page;
         _model.employeeId = [Shoppersmanager manager].Shoppers.employee.fid;
@@ -73,7 +73,7 @@
 {
     WS(weakSelf);
     MjRefreshHeaderCustom *headerRefresh = [MjRefreshHeaderCustom headerWithRefreshingBlock:^{
-        weakSelf.model.page.page = 0;
+        weakSelf.model.page.page = ONE;
         [weakSelf.withdrawalTableView.mj_footer resetNoMoreData];
         [weakSelf getDatasAction:YES];
     }];

Lighting.xcodeproj/xcshareddata/xcschemes/Lighting.xcscheme

@@ -42,7 +42,7 @@
       </AdditionalOptions>
    </TestAction>
    <LaunchAction
-      buildConfiguration = "Debug"
+      buildConfiguration = "Release"
       selectedDebuggerIdentifier = "Xcode.DebuggerFoundation.Debugger.LLDB"
       selectedLauncherIdentifier = "Xcode.DebuggerFoundation.Launcher.LLDB"
       launchStyle = "0"

Lighting/Info.plist

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

Tools/BaseViewController.h

@@ -79,8 +79,6 @@
  */
 - (void)SHOWPrompttext:(NSString *)Text;
 
-
-
 /**
  *  显示提示图片、文本
  */

Tools/NetworkRequestClassManager.m

@@ -48,7 +48,7 @@ static NetworkRequestClassManager *manager = nil;
     AFHTTPSessionManager *manager = [AFHTTPSessionManager manager];
     manager.responseSerializer = [AFJSONResponseSerializer serializer];
     manager.requestSerializer = [AFJSONRequestSerializer serializer];
-    manager.requestSerializer.timeoutInterval = 10.0f;
+    manager.requestSerializer.timeoutInterval = 60.0f;
     [manager.requestSerializer setValue:@"application/json;charset=utf-8" forHTTPHeaderField: @"Content-Type"];
     return manager;
 }

Tools/PrefixHeader.pch

@@ -44,6 +44,18 @@
 // Include any system framework and library headers here that should be included in all compilation units.
 // You will also need to set the Prefix Header build setting of one or more of your targets to reference this file.
 
+/**
+ *  禁止所有的打印,打包时使用
+ */
+//#ifdef DEBUG
+//#define NSLog(...) NSLog(__VA_ARGS__)
+//#define debugMethod() NSLog(@"%s", __func__)
+//#else
+//#define NSLog(...)
+//#define debugMethod()
+//#endif
+
+
 /**
  *  AppDelegate代理
  */

Tools/UIView+cornerRadius.h

@@ -15,6 +15,15 @@
  */
 @property (nonatomic, assign) IBInspectable CGFloat cornerRadius;
 
-
+@property (assign) CGFloat x;
+@property (assign) CGFloat y;
+@property (assign) CGFloat width;
+@property (assign) CGFloat height;
+@property (assign) CGSize size;
+@property (assign) CGPoint origin;
+@property (assign) CGFloat left;
+@property (assign) CGFloat right;
+@property (assign) CGFloat top;
+@property (assign) CGFloat bottom;
 
 @end

Tools/UIView+cornerRadius.m

@@ -21,6 +21,111 @@
     return self.layer.cornerRadius;
 }
 
+- (CGFloat) x {
+    return self.frame.origin.x;
+}
+
+- (void) setX:(CGFloat)x {
+    CGRect nframe = self.frame;
+    
+    nframe.origin.x = x;
+    
+    self.frame = nframe;
+}
+
+- (CGFloat) y {
+    return self.frame.origin.y;
+}
+
+- (void) setY:(CGFloat)y {
+    CGRect nframe = self.frame;
+    
+    nframe.origin.y = y;
+    
+    self.frame = nframe;
+}
+
+// Retrieve and set height, width
+- (CGFloat) width {
+    return self.frame.size.width;
+}
+
+- (void) setWidth:(CGFloat)width {
+    CGRect nframe = self.frame;
+    
+    nframe.size.width = width;
+    
+    self.frame = nframe;
+}
+
+- (CGFloat) height {
+    return self.frame.size.height;
+}
+
+- (void) setHeight:(CGFloat)height {
+    CGRect nframe = self.frame;
+    
+    nframe.size.height = height;
+    
+    self.frame = nframe;
+}
+
+// Retrieve and set the origin, size
+- (CGPoint) origin {
+    return self.frame.origin;
+}
+
+- (void) setOrigin:(CGPoint)aPoint {
+    CGRect nframe = self.frame;
+    
+    nframe.origin = aPoint;
+    
+    self.frame = nframe;
+}
+
+- (CGSize) size {
+    return self.frame.size;
+}
+
+- (void) setSize:(CGSize)aSize {
+    CGRect nframe = self.frame;
+    
+    nframe.size = aSize;
+    
+    self.frame = nframe;
+}
+
+- (CGFloat) left {
+    return self.x;
+}
+
+- (void) setLeft:(CGFloat)left {
+    self.x = left;
+}
+
+- (CGFloat) right {
+    return CGRectGetMaxX(self.frame);
+}
+
+- (void) setRight:(CGFloat)right {
+    self.x = right - self.width;
+}
+
+- (CGFloat) top {
+    return self.y;
+}
+
+- (void) setTop:(CGFloat)top {
+    self.y = top;
+}
+
+- (CGFloat) bottom {
+    return CGRectGetMaxY(self.frame);
+}
+
+- (void) setBottom:(CGFloat)bottom {
+    self.y = bottom - self.height;
+}
 
 
 

Tools/opple_objc_json_client.h

@@ -2177,6 +2177,12 @@ extern NSString * const SORTDIRECTION_DESC;
  *
  */
 @property (nonatomic, strong) NSNumber *jdecardDenomation;
+
+
+/**
+ 红包数
+ */
+@property (nonatomic,strong) NSNumber *redPackageCount;
 @end /* interface TOOrderPromotionEntity */
 
 

Tools/opple_objc_json_client.m

@@ -819,6 +819,7 @@ NSString * const SORTDIRECTION_DESC = @"desc";
 @synthesize wxcardDenomation;
 @synthesize wxcardRealDeduction;
 @synthesize jdecardDenomation;
+@synthesize redPackageCount;
 
 +(BOOL)propertyIsOptional:(NSString*)propertyName
 {