修改项说明：优化转盘界面，转盘旋转后，未结束之前，禁止退出

Class/OrderdetailsViewController.m

@@ -280,6 +280,7 @@ NSString *const PROMOTIONALSTRING = @"促销信息";
                         goods.name = oldPromotion.goodsName;
                         goodsModel.goods = goods;
                         goodsModel.isSelected = YES;
+                        goodsModel.priority = oldPromotion.prority;
                         [weakSelf.promotionInformationArray addObject:goodsModel];
                         
                     } else if (![BaseViewController isBlankString:[oldPromotion.promotionMoney stringValue]]) {
@@ -291,32 +292,37 @@ NSString *const PROMOTIONALSTRING = @"促销信息";
                         deductionModel.total = [oldPromotion.promotionMoney integerValue];
                         deductionModel.isSelected = YES;
                         deductionModel.type = @"deductionAction";
+                        deductionModel.priority = oldPromotion.prority;
                         [weakSelf.promotionInformationArray addObject:deductionModel];
                         
                     } else if (![BaseViewController isBlankString:[oldPromotion.jdecardDenomation stringValue]]) {
                         // 京东E卡
-                        PromotionJDECardModel *model = [[PromotionJDECardModel alloc]init];
-                        model.total = [oldPromotion.jdecardDenomation integerValue];
-                        model.body = GUIDE;
-                        model.type = JDECardAction;
-                        [weakSelf.guidePromotionArray addObject:model];
+                        PromotionJDECardModel *jdECardModel = [[PromotionJDECardModel alloc]init];
+                        jdECardModel.total = [oldPromotion.jdecardDenomation integerValue];
+                        jdECardModel.body = GUIDE;
+                        jdECardModel.type = JDECardAction;
+                        jdECardModel.priority = oldPromotion.prority;
+                        [weakSelf.guidePromotionArray addObject:jdECardModel];
         
                     } else if (![BaseViewController isBlankString:[oldPromotion.redPackageCount stringValue]]) {
                         // 导购抽奖数
-                        PromotionLuckyDrawModel *model = [[PromotionLuckyDrawModel alloc]init];
-                        model.body = GUIDE;
-                        [weakSelf.guidePromotionArray addObject:model];
+                        PromotionLuckyDrawModel *guideDrawModel = [[PromotionLuckyDrawModel alloc]init];
+                        guideDrawModel.body = GUIDE;
+                        guideDrawModel.priority = oldPromotion.prority;
+                        [weakSelf.guidePromotionArray addObject:guideDrawModel];
                     } else if (![BaseViewController isBlankString:[oldPromotion.discountRate stringValue]]) {
                         // 抽奖折扣
-                        PromotionLuckyDrawModel *model = [[PromotionLuckyDrawModel alloc]init];
-                        model.descriptionString = [oldPromotion.discountRate stringValue];
-                        model.body = CONSUMER;
-                        [weakSelf.promotionInformationArray addObject:model];
+                        PromotionLuckyDrawModel *drawResultModel = [[PromotionLuckyDrawModel alloc]init];
+                        drawResultModel.descriptionString = [oldPromotion.discountRate stringValue];
+                        drawResultModel.body = CONSUMER;
+                        drawResultModel.priority = oldPromotion.prority;
+                        [weakSelf.promotionInformationArray addObject:drawResultModel];
                     } else if (![BaseViewController isBlankString:oldPromotion.wxcardNumber]) {
                         // 微信卡劵
-                        PromotionWeChatCardModel *model = [[PromotionWeChatCardModel alloc]init];
-                        model.total = [oldPromotion.wxcardDenomation integerValue];
-                        [weakSelf.promotionInformationArray addObject:model];
+                        PromotionWeChatCardModel *weChatModel = [[PromotionWeChatCardModel alloc]init];
+                        weChatModel.total = [oldPromotion.wxcardDenomation integerValue];
+                        weChatModel.priority = oldPromotion.prority;
+                        [weakSelf.promotionInformationArray addObject:weChatModel];
                         self.weChatModel.wxcardNumber = oldPromotion.wxcardNumber;
                         self.weChatModel.wxcardDenomation = [oldPromotion.wxcardDenomation integerValue];
                     }
@@ -523,7 +529,7 @@ NSString *const PROMOTIONALSTRING = @"促销信息";
                 [weakSelf.promotionInformationArray removeObject:model];break;
             }
         }
-        [weakSelf.orderDetailsTableview reloadData];
+        [weakSelf promotionInformationExecutionOrder];
     }];
     dispatch_async(dispatch_get_main_queue(), ^{
         [weakSelf presentViewController:scanVC animated:YES completion:nil];
@@ -538,16 +544,20 @@ NSString *const PROMOTIONALSTRING = @"促销信息";
     [[NetworkRequestClassManager Manager] NetworkWithDictionaryRequestWithURL:[NSString stringWithFormat:USEWECHATCARD,number,orderNumber,orderTotal] WithCallClass:weakSelf WithRequestType:ZERO WithParameter:nil WithReturnValueBlock:^(id returnValue) {
         
         [weakSelf RemoveMBProgressHUDLoding];
-        NSLog(@"%@",returnValue);
         if ([returnValue[@"code"] isEqualToNumber:@0]) {
             weakSelf.weChatModel.wxcardDenomation = [returnValue[@"data"][@"denomation"] integerValue];
             weakSelf.weChatModel.payNo = returnValue[@"data"][@"payNo"];
-            [weakSelf SHOWPrompttext:@"微信卡劵使用成功" ComcpleteBlock:^{
-                [weakSelf promotionInformationExecutionOrder];
-            }];
+            for (JSONModel *model in weakSelf.promotionInformationArray) {
+                if ([model isMemberOfClass:[PromotionWeChatCardModel class]]) {
+                    PromotionWeChatCardModel *weChatModel = (PromotionWeChatCardModel *)model;
+                    weChatModel.total = weakSelf.weChatModel.wxcardDenomation;break;
+                }
+            }
+            [weakSelf SHOWPrompttext:@"微信卡劵使用成功" ComcpleteBlock:nil];
         }else{
             [weakSelf ErrorMBProgressView:returnValue[@"msg"]];
         }
+        [weakSelf promotionInformationExecutionOrder];
         
     } WithErrorCodeBlock:^(id errorCodeValue) {
         [weakSelf RemoveMBProgressHUDLoding];
@@ -689,17 +699,11 @@ NSString *const PROMOTIONALSTRING = @"促销信息";
     }else {
         [self promptCustomerTitle:@"马上参与" withMessage:@"恭喜您获得一次大转盘抽奖机会!" finish:^{
             [weakSelf showLuckyDrawControl:model.lottery.uuid andOrderNumber:weakSelf.orderCode luckyDrawFinish:^(NSDictionary *dict) {
-                id json = [NSJSONSerialization JSONObjectWithData:[dict[@"body"] dataUsingEncoding:NSUTF8StringEncoding] options:NSJSONReadingMutableContainers error:nil];
-                if (json) {
-                    if ([json isKindOfClass:[NSDictionary class]]) {
-                        
-                        weakSelf.customerDrawModel = [[PromotionLuckDrawResultModel alloc]initWithDictionary:json error:nil];
-                        if ([BaseViewController isBlankString:weakSelf.customerDrawModel.awardId]) {
-                            [weakSelf SHOWPrompttext:@"未中奖"];
-                        }else {
-                            [weakSelf SHOWPrompttext:[NSString stringWithFormat:@"恭喜你获得了 %@",weakSelf.customerDrawModel.descriptionString]];
-                        }
-                    }
+                weakSelf.customerDrawModel = [[PromotionLuckDrawResultModel alloc]initWithDictionary:dict error:nil];
+                if ([BaseViewController isBlankString:weakSelf.customerDrawModel.awardId]) {
+                    [weakSelf SHOWPrompttext:@"未中奖"];
+                }else {
+                    [weakSelf SHOWPrompttext:[NSString stringWithFormat:@"恭喜你获得了 %@",weakSelf.customerDrawModel.descriptionString]];
                 }
             }];
         }];

Class/PromotionalTableViewCell.h

@@ -28,4 +28,6 @@
  */
 @property (nonatomic,copy) PromotionLuckDrawResultModel *model;
 
+
+
 @end

Class/SettlementViewController.m

@@ -367,36 +367,7 @@
     order.orderNumber =  self.orderCode;
     order.fnewstate =  PAYSUCCESS;
     order.oldstate =  NOTPAY;
-    // 查询是否有赠送商品促销
     order.realAmount = [NSNumber numberWithFloat:[[self.goodsAllPrice.text substringFromIndex:1] floatValue]];
-    NSMutableArray *goodsArray = [NSMutableArray array];
-    for (id object in self.consumerPromotionalArray) {
-        if ([object isKindOfClass:[PromotionalGoodsModel class]]) {
-            PromotionalGoodsModel *model = (PromotionalGoodsModel *)object;
-            if (model.isSelected) {
-                PromotionGoods *goods = [[PromotionGoods alloc]init];
-                UCN *goodDetails = [[UCN alloc]init];
-                goodDetails.code = model.goods.code;
-                goodDetails.uuid = model.goods.uuid;
-                goodDetails.name = model.goods.name;
-                goods.goods = goodDetails;
-                goods.promotionNumber = [NSNumber numberWithInteger:model.count];
-                [goodsArray addObject:goods];
-            }
-        }
-    }
-    order.promotionGoods = (NSArray<PromotionGoods> *)goodsArray;
-    // 抵扣金额
-    CGFloat promotionMoney = 0;
-    for (id object in self.consumerPromotionalArray) {
-        if ([object isKindOfClass:[PromotionalDeductionModel class]]) {
-            PromotionalDeductionModel *model = (PromotionalDeductionModel *)object;
-            if (model.isSelected) {
-                promotionMoney += model.total;
-            }
-        }
-    }
-    order.promotionMoney = @(promotionMoney);
     // 查询是否有京东E卡促销、是否有导购抽奖
     NSInteger totalNumber = 0;
     for (id object in self.guidePromotionArray) {
@@ -414,20 +385,55 @@
         }
     }
     order.jdCardDenomation = totalNumber;
-    // 查询是否有消费者抽奖
+    // 查询是否有消费者抽奖促销、微信卡劵促销、抵扣金额、商品促销
+    CGFloat promotionMoney = 0;
+    NSInteger deductionPrority = 0;//抵扣优先级
+    NSInteger goodsPrority = 0;//商品促销优先级
+    NSMutableArray *goodsArray = [NSMutableArray array];
     for (id object in self.consumerPromotionalArray) {
         if ([object isKindOfClass:[PromotionLuckyDrawModel class]]) {
             PromotionLuckyDrawModel *model = (PromotionLuckyDrawModel *)object;
             if ([model.body isEqualToString:CONSUMER]) {
                 order.drawId = self.resultModel.drawId;
+                order.drawPrority = model.priority;
             }
         }
+        if ([object isKindOfClass:[PromotionWeChatCardModel class]]) {
+            PromotionWeChatCardModel *model = (PromotionWeChatCardModel *)object;
+            if ([model.body isEqualToString:CONSUMER]) {
+                if (![[self class] isBlankString:self.weChatModel.wxcardNumber]) {
+                    order.wxcardNumber = self.weChatModel.wxcardNumber;
+                    order.wxcardDenomation = [NSNumber numberWithInteger:self.weChatModel.wxcardDenomation];
+                    order.wxCardPrority = model.priority;
+                }
+            }
+        }
+        if ([object isKindOfClass:[PromotionalDeductionModel class]]) {
+            PromotionalDeductionModel *model = (PromotionalDeductionModel *)object;
+            if (model.isSelected) {
+                promotionMoney += model.total;
+                deductionPrority = model.priority;
+            }
+        }
+        if ([object isKindOfClass:[PromotionalGoodsModel class]]) {
+            PromotionalGoodsModel *model = (PromotionalGoodsModel *)object;
+            if (model.isSelected) {
+                PromotionGoods *goods = [[PromotionGoods alloc]init];
+                UCN *goodDetails = [[UCN alloc]init];
+                goodDetails.code = model.goods.code;
+                goodDetails.uuid = model.goods.uuid;
+                goodDetails.name = model.goods.name;
+                goods.goods = goodDetails;
+                goods.promotionNumber = [NSNumber numberWithInteger:model.count];
+                [goodsArray addObject:goods];
+            }
+            goodsPrority = model.priority;
+        }
     }
-    // 查询是否有微信卡劵促销
-    if (![[self class] isBlankString:self.weChatModel.wxcardNumber]) {
-        order.wxcardNumber = self.weChatModel.wxcardNumber;
-        order.wxcardDenomation = [NSNumber numberWithInteger:self.weChatModel.wxcardDenomation];
-    }
+    order.promotionMoney = @(promotionMoney);
+    order.deductionPrority = deductionPrority;
+    order.promotionGoods = (NSArray<PromotionGoods> *)goodsArray;
+    order.goodsPrority = goodsPrority;
     //支付类型
     if (self.payTreasureButton.selected) {
        order.payType =  @"005";

Tools/CustomWKWebViewController.m

@@ -12,6 +12,7 @@
 
 @property (nonatomic,strong) WKWebView *webView;
 @property (nonatomic,strong) WKWebViewConfiguration *config;
+@property (nonatomic,strong) UIButton *dismissButton;
 
 @end
 
@@ -56,15 +57,15 @@
 #pragma mark - 添加删除按钮
 - (void)addDismissButton
 {
-    UIButton *dismissButton = [UIButton buttonWithType:UIButtonTypeCustom];
-    [self.view addSubview:dismissButton];
-    [dismissButton mas_makeConstraints:^(MASConstraintMaker *make) {
+    self.dismissButton = [UIButton buttonWithType:UIButtonTypeCustom];
+    [self.view addSubview:self.dismissButton];
+    [self.dismissButton mas_makeConstraints:^(MASConstraintMaker *make) {
         make.left.mas_equalTo(40);
         make.top.mas_equalTo(40);
         make.size.mas_equalTo(CGSizeMake(50, 50));
     }];
-    [dismissButton setBackgroundImage:TCImage(@"1") forState:UIControlStateNormal];
-    [dismissButton addTarget:self action:@selector(dismissButtonClick) forControlEvents:UIControlEventTouchUpInside];
+    [self.dismissButton setBackgroundImage:TCImage(@"1") forState:UIControlStateNormal];
+    [self.dismissButton addTarget:self action:@selector(dismissButtonClick) forControlEvents:UIControlEventTouchUpInside];
 }
 
 #pragma mark - WKScriptMessageHandler
@@ -73,8 +74,19 @@
     if ([message.name isEqualToString:@"AppModel"]) {
         // 打印所传过来的参数，只支持NSNumber, NSString, NSDate, NSArray,
         // NSDictionary, and NSNull类型
-        if (self.luckyDrawFinishBlock) {
-            self.luckyDrawFinishBlock(message.body);
+       id json = [NSJSONSerialization JSONObjectWithData:[message.body[@"body"] dataUsingEncoding:NSUTF8StringEncoding] options:NSJSONReadingMutableContainers error:nil];
+        if (json) {
+            if ([json isKindOfClass:[NSDictionary class]]) {
+                NSDictionary *resultDict = (NSDictionary *)json;
+                if ([[resultDict allKeys] containsObject:@"click"]) {
+                    self.dismissButton.enabled = NO;
+                }else {
+                    self.dismissButton.enabled = YES;
+                    if (self.luckyDrawFinishBlock) {
+                        self.luckyDrawFinishBlock(resultDict);
+                    }
+                }
+            }
         }
     }
 }

Tools/QRViewController.m

@@ -117,10 +117,12 @@
 
 - (void)pop:(UIButton *)button {
     
-    if (self.cancelScanBlock) {
-        self.cancelScanBlock();
-    }
-    [self dismissViewControllerAnimated:YES completion:nil];
+
+    [self dismissViewControllerAnimated:YES completion:^{
+        if (self.cancelScanBlock) {
+            self.cancelScanBlock();
+        }
+    }];
 }
 
 #pragma mark - Public Method

Tools/opple_objc_json_client.h

@@ -812,6 +812,43 @@ extern NSString * const SORTDIRECTION_DESC;
  */
 @property (nonatomic, strong) NSNumber *wxcardDenomation;
 
+/**
+ * 抵扣优先级
+ *
+ *
+ */
+@property (nonatomic, assign) NSInteger deductionPrority;
+/**
+ * 赠送商品优��级
+ *
+ *
+ */
+@property (nonatomic, assign) NSInteger goodsPrority;
+/**
+ * 京东E卡优先级
+ *
+ *
+ */
+@property (nonatomic, assign) NSInteger JDEcardsPrority;
+/**
+ * 消费者抽奖结果优先级
+ *
+ *
+ */
+@property (nonatomic, assign) NSInteger drawPrority;
+/**
+ * 导购抽奖主题优先级
+ *
+ *
+ */
+@property (nonatomic, assign) NSInteger lotteryPrority;
+/**
+ * 微信卡券优先级
+ *
+ *
+ */
+@property (nonatomic, assign) NSInteger wxCardPrority;
+
 @end /* interface OrderPayRequest */
 
 
@@ -2197,6 +2234,13 @@ extern NSString * const SORTDIRECTION_DESC;
  红包数
  */
 @property (nonatomic,strong) NSNumber *redPackageCount;
+
+/**
+ * 方法: 取得优先级
+ *
+ *
+ */
+@property (nonatomic, assign) NSInteger prority;
 @end /* interface TOOrderPromotionEntity */
 
 

Tools/opple_objc_json_client.m

@@ -269,6 +269,11 @@
 @synthesize promotionMoney;
 @synthesize wxcardNumber;
 @synthesize wxcardDenomation;
+@synthesize deductionPrority;
+@synthesize goodsPrority;
+@synthesize JDEcardsPrority;
+@synthesize drawPrority;
+@synthesize lotteryPrority;
 
 +(BOOL)propertyIsOptional:(NSString*)propertyName
 {
@@ -822,6 +827,7 @@ NSString * const SORTDIRECTION_DESC = @"desc";
 @synthesize wxcardRealDeduction;
 @synthesize jdecardDenomation;
 @synthesize redPackageCount;
+@synthesize prority;
 
 +(BOOL)propertyIsOptional:(NSString*)propertyName
 {