no message

yinqiaojuan
1 parent 67915edf
Showing 7 changed files with 346 additions and 60 deletions
CNLiveMyOrder/Classes/Controller/CNLiveMineOrderController.m
CNLiveMyOrder/Classes/Controller/CNLiveOrderDetailController.m
CNLiveMyOrder/Classes/View/CNLiveMineOrderView.h
CNLiveMyOrder/Classes/View/CNLiveOrderEventHandle.h
CNLiveMyOrder/Classes/View/CNLiveOrderEventHandle.m
CNLiveMyOrder/Classes/View/CNLiveOrderListCommonView.h
CNLiveMyOrder/Classes/View/CNLiveOrderListCommonView.m
@@ -159,13 +159,43 @@
         break;
     }
 }
+#pragma mark -Cell被点击
 - (void)cellDidSelected {
     __weak typeof(self) weakSelf = self;
     CNLiveOrderDetailController *vc = [[CNLiveOrderDetailController alloc]init];
-    self.allTblView.orderDetaielCellDidSelectedBlock = ^(NSIndexPath * _Nonnull indexPath, NSString * _Nonnull orderId) {
-        vc.orderId = orderId;
-        [weakSelf.navigationController pushViewController:vc animated:NO];
-    };
+    switch (_curSeleIndex) {
+        case 0:{
+            self.allTblView.orderDetaielCellDidSelectedBlock = ^(NSIndexPath * _Nonnull indexPath, NSString * _Nonnull orderId) {
+                vc.orderId = orderId;
+                [weakSelf.navigationController pushViewController:vc animated:NO];
+            };
+        }
+            break;
+        case 1:{
+            self.payTblView.orderDetaielCellDidSelectedBlock = ^(NSIndexPath * _Nonnull indexPath, NSString * _Nonnull orderId) {
+                vc.orderId = orderId;
+                [weakSelf.navigationController pushViewController:vc animated:NO];
+            };
+        }
+            break;
+        case 2:{
+            self.goodsTblView.orderDetaielCellDidSelectedBlock = ^(NSIndexPath * _Nonnull indexPath, NSString * _Nonnull orderId) {
+                vc.orderId = orderId;
+                [weakSelf.navigationController pushViewController:vc animated:NO];
+            };
+        }
+          break;
+        case 3:{
+            self.payTblView.orderDetaielCellDidSelectedBlock = ^(NSIndexPath * _Nonnull indexPath, NSString * _Nonnull orderId) {
+                vc.orderId = orderId;
+                [weakSelf.navigationController pushViewController:vc animated:NO];
+            };
+        }
+        break;
+        default:
+            break;
+    }
+    
 }
 #pragma mark - Lazy
 - (CNLiveSegmentView *)segmentView{
@@ -446,7 +446,6 @@
                             @"orderId":self.orderId?self.orderId:@"",
                             @"sid":@"10511059"
                             };
-    
     [CNLiveNetworking requestNetworkWithMethod:CNLiveRequestMethodPOST URLString:CNOrderCheckUrl Param:param CacheType:CNLiveNetworkCacheTypeNetworkOnly CompletionBlock:^(NSURLSessionTask *requestTask, id responseObject, NSError *error) {
         NSLog(@"打印这个页面%@-----%@",responseObject, error);
         [QMUITips hideAllToastInView:self.view animated:YES];
@@ -1019,7 +1018,6 @@
 - (void)didReceiveMemoryWarning {
     [super didReceiveMemoryWarning];
-    // Dispose of any resources that can be recreated.
 }
@@ -96,7 +96,6 @@ typedef void(^DarenHomeBlock)(CNLiveOrderList *list);
 typedef void(^CNOrderFuncViewBlock)(CNLiveMineOrderButtonItemType tag);
 @interface CNLiveFuncView : UIView
-    
 @property (nonatomic, strong) NSArray<CNLiveMineOrderButtonItem *> *funcItems;
 @property (nonatomic, strong) CNOrderFuncViewBlock funcBlock;
 @end
@@ -28,11 +28,11 @@ NS_ASSUME_NONNULL_BEGIN
 /**
  *  联系达人
  */
-+ (void)contactUser:(CNLiveOrderList *)orderList pop:(BOOL)pop;
++ (void)contactUser:(CNLiveOrderList *)orderList pop:(BOOL)pop jumpBlock:(void(^)(BOOL isPop))jumpBlock;
 /**
  *  退款详情
  */
-+ (void)refundDetail:(CNLiveOrderList *)orderList;
++ (void)refundDetail:(CNLiveOrderList *)orderList jumpBlock:(void(^)(NSString *orderId))jumpBlock;
 /**
  *  订单详情
  */
@@ -44,7 +44,7 @@ NS_ASSUME_NONNULL_BEGIN
 /**
  *  申请退款
  */
-+ (void)applyForRefund:(CNLiveOrderList *)orderList;
++ (void)applyForRefund:(CNLiveOrderList *)orderList jumpBlock:(void (^)(CNLiveOrderList *orderList))jumpBlock;
 /**
  *  确认收货
  */
@@ -62,13 +62,13 @@ NS_ASSUME_NONNULL_BEGIN
  */
 + (void)confirmOrder:(CNLiveOrderList *)orderList superView:(UIView *)view complete:(void(^)(BOOL ret))complete;
 /**
- *  评论订单
+ *  评价订单
  */
-+ (void)evaluateOrder:(CNLiveOrderList *)orderList;
++ (void)evaluateOrder:(CNLiveOrderList *)orderList jumpBlock:(void (^)(CNLiveOrderList *orderList))jumpBlock;
 /**
  *  达人主页
  */
-+ (void)darenHome:(CNLiveOrderList *)orderList;
++ (void)darenHome:(CNLiveOrderList *)orderList jumpBlock:(void (^)(NSString *userId))jumpBlock;
 /**
  *  去支付
@@ -12,22 +12,13 @@
 #import "DSAddressModel.h"
 #import <CNLiveRequestBastKit/CNLiveNetworking.h>
 #import "CNLiveEnvironmentConfiguration.h"
+#import "CNUserInfoManager.h"
 @implementation CNLiveOrderEventHandle
-
-//订单详情
-+ (void)orderDetail:(CNLiveOrderList *)orderList orderBlock:(void (^)(NSString * _Nonnull))orderBlock{
-    CNLiveOrderListOrderItem *item = orderList.orderItem;
-    
-    if (orderBlock) {
-        orderBlock(item.orderId);
-    }
-}
-+(void)submitOrder:(CNLiveOrderList *)orderList address:(DSAddressModel *)model superView:(UIView *)view complete:(void (^)(BOOL))complete {
-    [QMUITips showLoadingInView:view];
+#pragma mark -提交订单
++ (void)submitOrder:(CNLiveOrderList *)orderList address:(DSAddressModel *)model superView:(UIView *)view complete:(void (^)(BOOL))complete {
+     [QMUITips showLoadingInView:view];
     CNLiveOrderListOrderItem *orderItem = orderList.orderItem;
-    
     NSMutableArray *jsonArr = [[NSMutableArray alloc] init];
-    
     for (CNLiveEditGoodsModel *goodsModel in orderList.orderItem.goodsInfo) {
         NSDictionary *goodsDic = @{@"price":[NSString stringWithFormat:@"%.2f",goodsModel.price],
@@ -37,9 +28,7 @@
                                    };
         [jsonArr addObject:goodsDic];
     }
-    
     NSString *jsonStr = [jsonArr mj_JSONString];
-    
     NSDictionary *param = @{@"orderId":orderItem.orderId,
                             @"category":orderItem.category,
                             @"fee":[NSString stringWithFormat:@"%.2f", orderItem.fee],
@@ -50,9 +39,23 @@
                             @"goodsInfo":jsonStr
                             };
     [CNLiveNetworking requestNetworkWithMethod:CNLiveRequestMethodPOST URLString:CNOrderModifyUrl Param:param CacheType:CNLiveNetworkCacheTypeNetworkOnly CompletionBlock:^(NSURLSessionTask *requestTask, id responseObject, NSError *error) {
-        
+        [QMUITips hideAllToastInView:view animated:YES];
+        if (!error) {
+            [QMUITips showSucceed:@"提交成功" inView:view hideAfterDelay:1.5];
+            dispatch_after(dispatch_time(DISPATCH_TIME_NOW, (int64_t)(1.5 * NSEC_PER_SEC)), dispatch_get_main_queue(), ^{
+                if (complete) {
+                    complete(YES);
+                }
+            });
+            
+        } else {
+            [QMUITips showError:error.localizedDescription inView:view hideAfterDelay:1.5];
+        }
     }];
+    
+
 }
+#pragma mark -删除订单
 + (void)deleteOrder:(CNLiveOrderList *)orderList itemId:(NSString *)itemId superView:(UIView *)view complete:(void (^)(BOOL))complete {
     [QMUITips showLoadingInView:view];
@@ -61,15 +64,247 @@
     NSDictionary *param = @{@"appId":AppId,
                             @"plat":@"i",
                             @"sid":@"10511059",
-                            @"orderId":orderItem.orderId ?: @""};
+                            @"orderId":orderItem.orderId ?: @""
+                            };
     NSMutableDictionary *newParam = [[NSMutableDictionary alloc] initWithDictionary:param];
     if (itemId) {
         [newParam setObject:itemId forKey:@"itemId"];
     }
     [CNLiveNetworking requestNetworkWithMethod:CNLiveRequestMethodPOST URLString:CNDeleteOrderUrl Param:param CacheType:CNLiveNetworkCacheTypeNetworkOnly CompletionBlock:^(NSURLSessionTask *requestTask, id responseObject, NSError *error) {
+        if (error) {
+            [QMUITips showError:error.localizedDescription inView:view hideAfterDelay:1.5];
+            //            [QMUITips showError:@"删除失败" inView:view hideAfterDelay:1.5];
+            if (complete) {
+                complete(NO);
+            }
+        } else {
+            
+            [QMUITips showSucceed:@"删除成功" inView:view hideAfterDelay:1.5];
+            dispatch_after(dispatch_time(DISPATCH_TIME_NOW, (int64_t)(1.5 * NSEC_PER_SEC)), dispatch_get_main_queue(), ^{
+                if (complete) {
+                    complete(YES);
+                }
+            });
+        }
+    }];
+}
+#pragma mark - 催单
++ (void)reminderOrder:(CNLiveOrderList *)orderList superView:(UIView *)view complete:(void (^)(NSString *))complete {
+    [QMUITips showLoadingInView:view];
+    CNLiveOrderListOrderItem *orderItem = orderList.orderItem;
+    CNLiveOrderListIconBean *user = orderList.iconBean;
+    NSDictionary *param = @{@"appId":AppId,
+                            @"plat":@"i",
+                            @"sid":@"10511059",
+                            @"nickName":CNUserShareModel.nickname ?: @"",
+                            @"darenId":user.userId ?: @"",
+                            @"orderId":orderItem.orderId ?: @""
+                            };
+#ifdef Environment_ON
+#else
+    param = @{@"appId":AppId,
+              @"plat":@"i",
+              @"test":@"0",
+              @"sid":@"10511059",
+              @"nickName":CNUserShareModel.nickname ?: @"",
+              @"darenId":user.userId ?: @"",
+              @"orderId":orderItem.orderId ?: @""
+              };
+#endif
+    [CNLiveNetworking setupShowDataResult:NO];
+    [CNLiveNetworking setAllowRequestDefaultArgument:YES];
+    [CNLiveNetworking requestNetworkWithMethod:CNLiveRequestMethodPOST URLString:CNRemindOrderUrl Param:param CacheType:CNLiveNetworkCacheTypeNetworkOnly CompletionBlock:^(NSURLSessionTask *requestTask, id responseObject, NSError *error) {
+        NSDictionary *data = [responseObject objectForKey:@"data"];
+        NSString *errMessage =[responseObject objectForKey:@"errorMessage"];
+        NSString *errorCode = [NSString stringWithFormat:@"%@",[responseObject objectForKey:@"errorCode"]];
+        if (error) {
+            
+            if ((orderItem.status == 5 || orderItem.status == 10) && error.code == 45000) {
+                
+                if (complete) {
+                    complete(@"已经多次提醒达人发货");
+                }
+            } else if (orderItem.status == 6) {
+                if (complete) {
+                    complete(@"您的订单目前处于正常配送中，请耐心等待，保持电话畅通，感谢您的谅解与支持");
+                }
+            } else {
+                if (complete) {
+                    complete(error.domain);
+                }
+            }
+            
+        } else {
+            if ([errorCode isEqualToString:@"0"]) {
+                if (complete) {
+                    complete(@"催单成功");
+                }
+            }
+        }
+    }];
+}
+#pragma mark -联系达人
++ (void)contactUser:(CNLiveOrderList *)orderList pop:(BOOL)pop jumpBlock:(void (^)(BOOL))jumpBlock {
+    if (pop) {
+        if (jumpBlock) {
+            jumpBlock (YES);
+        }
+        return;
+    }
+    CNLiveOrderListIconBean *user = orderList.iconBean;
+#pragma mark - TODO 这个地方需要聊天
+//    IMAUser *imUser = [[IMAUser alloc] initWith:user.userId nikeName:user.nickName icon:user.image];
+//    CNChatViewController *chatVC = [[CNChatViewController alloc] initWithUser:imUser];
+//    chatVC.isDaren = YES;
+    if (jumpBlock) {
+        jumpBlock(NO);
+    }
+}
+#pragma mark -退款详情
++ (void)refundDetail:(CNLiveOrderList *)orderList jumpBlock:(void (^)(NSString * _Nonnull))jumpBlock {
+        CNLiveOrderListOrderItem *item = orderList.orderItem;
+    if (jumpBlock) {
+        jumpBlock(item.orderId);
+    }
+}
+#pragma mark -订单详情
++ (void)orderDetail:(CNLiveOrderList *)orderList orderBlock:(void (^)(NSString * _Nonnull))orderBlock{
+    CNLiveOrderListOrderItem *item = orderList.orderItem;
+    
+    if (orderBlock) {
+        orderBlock(item.orderId);
+    }
+}
+#pragma mark -申请退款
++ (void)applyForRefund:(CNLiveOrderList *)orderList jumpBlock:(void (^)(CNLiveOrderList * _Nonnull))jumpBlock {
+    if (jumpBlock) {
+        jumpBlock (orderList);
+    }
+}
+#pragma mark -确认退货
++ (void)confirmRecv:(CNLiveOrderList *)orderList itemId:(NSString *)itemId superView:(UIView *)view complete:(void (^)(BOOL))complete {
+     [QMUITips showLoadingInView:view];
+     CNLiveOrderListOrderItem *orderItem = orderList.orderItem;
+    NSDictionary *param = @{@"appId":AppId,
+                            @"plat":@"i",
+                            @"sid":@"10511059",
+                            @"orderId":orderItem.orderId ?: @""
+                            };
+    NSMutableDictionary *newParam = [[NSMutableDictionary alloc] initWithDictionary:param];
+    if (itemId) {
+        [newParam setObject:itemId forKey:@"itemId"];
+    }
+    [CNLiveNetworking requestNetworkWithMethod:CNLiveRequestMethodPOST URLString:CNConfirmRecvUrl Param:param CacheType:CNLiveNetworkCacheTypeNetworkOnly CompletionBlock:^(NSURLSessionTask *requestTask, id responseObject, NSError *error) {
+        [QMUITips hideAllToastInView:view animated:YES];
+        if (!error) {
+            [QMUITips showSucceed:@"确认收货成功" inView:view hideAfterDelay:1.5];
+            dispatch_after(dispatch_time(DISPATCH_TIME_NOW, (int64_t)(1.5 * NSEC_PER_SEC)), dispatch_get_main_queue(), ^{
+                if (complete) {
+                    complete(YES);
+                }
+            });
+            
+        } else {
+            [QMUITips showError:error.localizedDescription inView:view hideAfterDelay:1.5];
+            if (complete) {
+                complete(NO);
+            }
+        }
+    }];
+}
+#pragma mark - 取消订单
++ (void)cancelOrder:(CNLiveOrderList *)orderList superView:(UIView *)view complete:(void (^)(BOOL))complete {
+     [QMUITips showLoadingInView:view];
+    CNLiveOrderListOrderItem *orderItem = orderList.orderItem;
+    NSDictionary *param = @{@"appId":AppId,
+                            @"plat":@"i",
+                            @"sid":@"10511059",
+                            @"orderId":orderItem.orderId ?: @""
+                            };
+    [CNLiveNetworking requestNetworkWithMethod:CNLiveRequestMethodPOST URLString:CNOrderCancelUrl Param:param CacheType:CNLiveNetworkCacheTypeNetworkOnly CompletionBlock:^(NSURLSessionTask *requestTask, id responseObject, NSError *error) {
+        [QMUITips hideAllToastInView:view animated:YES];
+        if (error) {
+            [QMUITips showError:error.localizedDescription inView:view hideAfterDelay:1.5];
+            if (complete) {
+                complete(NO);
+            }
+        } else {
+            [QMUITips showSucceed:@"取消成功" inView:view hideAfterDelay:1.5];
+            if (complete) {
+                complete(YES);
+            }
+        }
+    }];
+}
+#pragma mark - 订单信息有误
++ (void)orderError:(CNLiveOrderList *)orderList superView:(UIView *)view complete:(void (^)(BOOL))complete {
+    [QMUITips showLoadingInView:view];
+    CNLiveOrderListOrderItem *orderItem = orderList.orderItem;
+    NSDictionary *param = @{@"appId":AppId,
+                            @"plat":@"i",
+                            @"sid":@"10511059",
+                            @"orderId":orderItem.orderId ?: @""
+                            };
+    [CNLiveNetworking requestNetworkWithMethod:CNLiveRequestMethodPOST URLString:CNOrderErrorUrl Param:param CacheType:CNLiveNetworkCacheTypeNetworkOnly CompletionBlock:^(NSURLSessionTask *requestTask, id responseObject, NSError *error) {
+         [QMUITips hideAllToastInView:view animated:YES];
+        if (!error) {
+            
+            if (complete) {
+                complete(YES);
+            }
+            
+        } else {
+            [QMUITips showError:error.localizedDescription inView:view hideAfterDelay:1.5];
+            if (complete) {
+                complete(NO);
+            }
+        }
+    }];
+}
+#pragma mark -确认订单
++ (void)confirmOrder:(CNLiveOrderList *)orderList superView:(UIView *)view complete:(void (^)(BOOL))complete {
+    [QMUITips showLoadingInView:view];
+    CNLiveOrderListOrderItem *orderItem = orderList.orderItem;
+    NSDictionary *param = @{@"appId":AppId,
+                            @"plat":@"i",
+                            @"sid":@"10511059",
+                            @"orderId":orderItem.orderId
+                            };
+    [CNLiveNetworking requestNetworkWithMethod:CNLiveRequestMethodPOST URLString:CNOrderConfirmUrl Param:param CacheType:CNLiveNetworkCacheTypeNetworkOnly CompletionBlock:^(NSURLSessionTask *requestTask, id responseObject, NSError *error) {
+        [QMUITips hideAllToastInView:view animated:YES];
+        if (!error) {
+            if (complete) {
+                complete(YES);
+            }
+        } else {
+            [QMUITips showError:error.localizedDescription inView:view hideAfterDelay:1.5];
+            if (complete) {
+                complete(NO);
+            }
+        }
     }];
 }
+#pragma mark -评价订单
++ (void)evaluateOrder:(CNLiveOrderList *)orderList jumpBlock:(void (^)(CNLiveOrderList * _Nonnull))jumpBlock {
+    if (jumpBlock) {
+        jumpBlock(orderList);
+    }
+}
+#pragma mark -跳转达人主页
++ (void)darenHome:(CNLiveOrderList *)orderList jumpBlock:(void (^)(NSString * _Nonnull))jumpBlock {
+    CNLiveOrderListIconBean *user = orderList.iconBean;
+    NSString *userId = user.userId;
+    if (jumpBlock) {
+        jumpBlock (userId);
+    }
+}
+#pragma mark -去支付
++ (void)pay:(CNLiveOrderList *)orderList payBlock:(PayBlock)block {
+    
+}
+
+
 @end
@@ -6,11 +6,17 @@
 //
 #import <UIKit/UIKit.h>
+#import "CNLiveOrderList.h"
 NS_ASSUME_NONNULL_BEGIN
 @interface CNLiveOrderListCommonView : UIView
     //订单状态 0-全部，1-代付款，2-待收货，3-待评价，4-全部退款 ,5退款中
 - (instancetype)initWithFrame:(CGRect)frame orderStatus:(NSString *)status;
 @property (nonatomic, copy) void (^orderDetaielCellDidSelectedBlock) (NSIndexPath *indexPath,NSString *orderId); //cell被选中
+@property (nonatomic, copy) void (^evaluateOrderBlock)(CNLiveOrderList *orderModel); //评价订单跳转
+@property (nonatomic, copy) void (^contactUserBlock) (BOOL isPop); //联系达人跳转
+@property (nonatomic, copy) void (^applyForRefundBlock)(CNLiveOrderList *orderList); //申请退款
+@property (nonatomic, copy) void (^refundDetailBlock)(NSString *orderId); //退款详情
+
 - (void)refreshData;
 @end
@@ -67,47 +67,47 @@
         if (!error) {
             if (refresh) {
-                _page = 1;
-                [self.listArr removeAllObjects];
-                [self.tableView.mj_header endRefreshing];
+                weakSelf.page = 1;
+                [weakSelf.listArr removeAllObjects];
+                [weakSelf.tableView.mj_header endRefreshing];
             } else {
-                [self.tableView.mj_footer endRefreshing];
+                [weakSelf.tableView.mj_footer endRefreshing];
             }
             CNLiveOrderModel *model = [CNLiveOrderModel mj_objectWithKeyValues:[responseObject objectForKey:@"data"]];
-            _next = model.hasNext;
-            _tableView.mj_footer.hidden = !_next;
+            weakSelf.next = model.hasNext;
+            weakSelf.tableView.mj_footer.hidden = !_next;
             if (model.orderList.count == 0) {
                 //noData
-                [self.tableView addSubview:self.noDataView];
+                [weakSelf.tableView addSubview:self.noDataView];
             } else {
-                [self.noDataView removeFromSuperview];
+                [weakSelf.noDataView removeFromSuperview];
                 for (CNLiveOrderList *orderList in model.orderList) {
-                    [_listArr addObject:orderList];
+                    [weakSelf.listArr addObject:orderList];
                 }
             }
-            [self.tableView reloadData];
+            [weakSelf.tableView reloadData];
         } else {
             [QMUITips showError:error.localizedDescription inView:self hideAfterDelay:1.5];
             if (refresh) {
-                [self.tableView.mj_header endRefreshing];
+                [weakSelf.tableView.mj_header endRefreshing];
             } else {
-                [self.tableView.mj_footer endRefreshing];
+                [weakSelf.tableView.mj_footer endRefreshing];
             }
             if (error.code == -1009) {
-                [self showErrorRetryType:RetryTypeNoNet];
+                [weakSelf showErrorRetryType:RetryTypeNoNet];
             } else {
-                [self showErrorRetryType:RetryTypeError];
+                [weakSelf showErrorRetryType:RetryTypeError];
             }
         }
@@ -170,21 +170,24 @@
 #pragma mark -
 #pragma mark - CNMineOrderTableViewCellDelegate
 - (void)cellWithOrderModel:(CNLiveOrderList *)model type:(CNLiveMineOrderButtonItemType)type {
-    
-    
     switch (type) {
         case CNLiveMineOrderButtonItemTypeCancel: {     //取消订单
-//            [CNLiveOrderEventHandle cancelOrder:model superView:self complete:^(BOOL ret) {
-//                if (ret) {
-//                    [self refreshData];
-//                }
-//            }];
+            [CNLiveOrderEventHandle cancelOrder:model superView:self complete:^(BOOL ret) {
+                if (ret) {
+                    [self refreshData];
+                }
+            }];
         }
         break;
         case CNLiveMineOrderButtonItemTypeEvaluate: {   //评价订单
 //            [CNLiveOrderEventHandle evaluateOrder:model];
+            [CNLiveOrderEventHandle evaluateOrder:model jumpBlock:^(CNLiveOrderList * _Nonnull orderList) {
+                if (self.evaluateOrderBlock) {
+                    self.evaluateOrderBlock(orderList);
+                }
+            }];
         }
         break;
@@ -202,11 +205,16 @@
         case CNLiveMineOrderButtonItemTypeContactDaRen: {   //联系达人
 //            [CNOrderEventHandle contactUser:model pop:NO];
+            [CNLiveOrderEventHandle contactUser:model pop:NO jumpBlock:^(BOOL isPop) {
+                if (self.contactUserBlock) {
+                    self.contactUserBlock(NO);
+                }
+            }];
         }
         break;
         case CNLiveMineOrderButtonItemTypePay: {    //去付款
-            weakself
+//            weakself
 //            [CNOrderEventHandle pay:model payBlock:^(int code) {
 //                if (code == 0) {
 //                    //支付成功
@@ -217,29 +225,39 @@
         break;
         case CNLiveMineOrderButtonItemTypeReminder: { //催单
-//            [CNOrderEventHandle reminderOrder:model superView:self complete:^(NSString *msg) {
-//                [[HUDHelper sharedInstance] tipMessage:msg];
-//            }];
+            [CNLiveOrderEventHandle reminderOrder:model superView:self complete:^(NSString *msg) {
+                [[HUDHelper sharedInstance] tipMessage:msg];
+            }];
         }
         break;
         case CNLiveMineOrderButtonItemTypeRefund: {     //申请退款
 //            [CNOrderEventHandle applyForRefund:model];
+            [CNLiveOrderEventHandle applyForRefund:model jumpBlock:^(CNLiveOrderList * _Nonnull orderList) {
+                if (self.applyForRefundBlock) {
+                    self.applyForRefundBlock(orderList);
+                }
+            }];
         }
         break;
         case CNLiveMineOrderButtonItemTypeRefundDetail: {   //退款详情
 //            [CNOrderEventHandle refundDetail:model];
+            [CNLiveOrderEventHandle refundDetail:model jumpBlock:^(NSString * _Nonnull orderId) {
+                if (self.refundDetailBlock) {
+                    self.refundDetailBlock(orderId);
+                }
+            }];
         }
         break;
         case CNLiveMineOrderButtonItemTypeConfirmReceipt: { //确认收货
-//            [CNOrderEventHandle confirmRecv:model itemId:nil superView:self complete:^(BOOL ret) {
-//                if (ret) {
-//                    [self refreshData];
-//                }
-//            }];
+            [CNLiveOrderEventHandle confirmRecv:model itemId:@"" superView:self complete:^(BOOL ret) {
+                if (ret) {
+                    [self refreshData];
+                }
+            }];
         }
         break;