添加现金红包拒绝原因

Class/Experiencecentre/Controller/ShareGoodsViewController.xib

-<?xml version="1.0" encoding="UTF-8" standalone="no"?>
-<document type="com.apple.InterfaceBuilder3.CocoaTouch.XIB" version="3.0" toolsVersion="9531" systemVersion="15G31" targetRuntime="iOS.CocoaTouch" propertyAccessControl="none" useAutolayout="YES" useTraitCollections="YES">
+<?xml version="1.0" encoding="UTF-8"?>
+<document type="com.apple.InterfaceBuilder3.CocoaTouch.XIB" version="3.0" toolsVersion="12120" systemVersion="16E195" targetRuntime="iOS.CocoaTouch" propertyAccessControl="none" useAutolayout="YES" useTraitCollections="YES" colorMatched="YES">
+    <device id="retina4_7" orientation="portrait">
+        <adaptation id="fullscreen"/>
+    </device>
     <dependencies>
-        <plugIn identifier="com.apple.InterfaceBuilder.IBCocoaTouchPlugin" version="9529"/>
+        <plugIn identifier="com.apple.InterfaceBuilder.IBCocoaTouchPlugin" version="12088"/>
+        <capability name="documents saved in the Xcode 8 format" minToolsVersion="8.0"/>
     </dependencies>
     <objects>
         <placeholder placeholderIdentifier="IBFilesOwner" id="-1" userLabel="File's Owner" customClass="ShareGoodsViewController">
@@ -20,7 +24,7 @@
                     <inset key="titleEdgeInsets" minX="-59" minY="61" maxX="0.0" maxY="0.0"/>
                     <inset key="imageEdgeInsets" minX="11" minY="-22" maxX="0.0" maxY="0.0"/>
                     <state key="normal" title="微信" image="wechat">
-                        <color key="titleColor" white="0.33333333333333331" alpha="1" colorSpace="calibratedWhite"/>
+                        <color key="titleColor" red="0.33333333333333331" green="0.33333333333333331" blue="0.33333333333333331" alpha="1" colorSpace="custom" customColorSpace="sRGB"/>
                     </state>
                     <connections>
                         <action selector="ShareWeiChatAntWeiboAction:" destination="-1" eventType="touchUpInside" id="oQJ-kM-Ca6"/>
@@ -32,7 +36,7 @@
                     <inset key="titleEdgeInsets" minX="-59" minY="61" maxX="0.0" maxY="0.0"/>
                     <inset key="imageEdgeInsets" minX="11" minY="-22" maxX="0.0" maxY="0.0"/>
                     <state key="normal" title="微博" image="weibo">
-                        <color key="titleColor" white="0.33333333333333331" alpha="1" colorSpace="calibratedWhite"/>
+                        <color key="titleColor" red="0.33333333333333331" green="0.33333333333333331" blue="0.33333333333333331" alpha="1" colorSpace="custom" customColorSpace="sRGB"/>
                     </state>
                     <connections>
                         <action selector="ShareWeiChatAntWeiboAction:" destination="-1" eventType="touchUpInside" id="uFH-1Q-GMU"/>
@@ -44,14 +48,14 @@
                     <inset key="titleEdgeInsets" minX="-59" minY="61" maxX="0.0" maxY="0.0"/>
                     <inset key="imageEdgeInsets" minX="11" minY="-22" maxX="0.0" maxY="0.0"/>
                     <state key="normal" title="微信朋友圈" image="Friends-Circle">
-                        <color key="titleColor" white="0.33333333333333331" alpha="1" colorSpace="calibratedWhite"/>
+                        <color key="titleColor" red="0.33333333333333331" green="0.33333333333333331" blue="0.33333333333333331" alpha="1" colorSpace="custom" customColorSpace="sRGB"/>
                     </state>
                     <connections>
                         <action selector="ShareWeiChatAntWeiboAction:" destination="-1" eventType="touchUpInside" id="IEt-es-A3G"/>
                     </connections>
                 </button>
             </subviews>
-            <color key="backgroundColor" white="1" alpha="1" colorSpace="custom" customColorSpace="calibratedWhite"/>
+            <color key="backgroundColor" red="1" green="1" blue="1" alpha="1" colorSpace="custom" customColorSpace="sRGB"/>
             <constraints>
                 <constraint firstItem="rpz-DZ-thX" firstAttribute="top" secondItem="i5M-Pr-FkT" secondAttribute="top" constant="20" id="2DR-cN-FHA"/>
                 <constraint firstItem="nwv-gn-bLJ" firstAttribute="height" secondItem="rpz-DZ-thX" secondAttribute="height" id="5z1-k0-fZq"/>

Class/MyClient/Controller/ClientViewController.m

@@ -97,6 +97,8 @@
 #pragma mark -布局
 - (void)uiConfigAction
 {
+    ToStoreAddress *storeAddress = [Shoppersmanager manager].storeAddress;
+    [self.locationButton setTitle:[NSString stringWithFormat:@"%@-%@-%@",storeAddress.province,storeAddress.city,storeAddress.country] forState:UIControlStateNormal];
     self.changePersonInformationButton.hidden = YES;
     self.informationTableview.tableFooterView = [UIView new];
 }

Class/MyClient/Orderdetails/controller/OrderdetailsViewController.m

@@ -240,7 +240,6 @@ NSString *const PROMOTIONALSTRING = @"促销信息";
                         PromotionalReadPacketModel *readPacketModel = [[PromotionalReadPacketModel alloc]initWithDictionary:dict error:nil];
                         [weakSelf getConsumerAllPromotion:readPacketModel withBody:readPacketModel.body];
                     }
-                    
                 }
             }else{
                 [XBLoadingView showHUDViewWithText:MESSAGE(returnValue)];
@@ -530,7 +529,7 @@ NSString *const PROMOTIONALSTRING = @"促销信息";
         
         [XBLoadingView hideHUDViewWithDefault];
         if (RESULT(returnValue)) {
-            weakSelf.weChatModel.wxcardDenomation = [RESPONSE(returnValue)[@"denomation"] integerValue];
+            weakSelf.weChatModel.wxcardDenomation = [RESPONSE(returnValue)[@"denomation"] floatValue];
             weakSelf.weChatModel.payNo = RESPONSE(returnValue)[@"payNo"];
             for (JSONModel *model in weakSelf.promotionInformationArray) {
                 if ([model isMemberOfClass:[PromotionWeChatCardModel class]]) {
@@ -543,7 +542,7 @@ NSString *const PROMOTIONALSTRING = @"促销信息";
                 NSString *string = [NSString stringWithFormat:@"微信卡劵(%f元)使用成功",weakSelf.weChatModel.wxcardDenomation];
                 ShowDefaultAlertView(nil, string, UIAlertControllerStyleAlert,nil,nil);
             }else {
-                ShowDefaultAlertView(nil, message, UIAlertControllerStyleAlert, nil, nil);
+                ShowAlertView(@"提示", message, @"我知道了", nil, UIAlertControllerStyleAlert, nil, nil);
             }
             [weakSelf promotionInformationExecutionOrder];
         }else{

Class/MyClient/Orderdetails/controller/PromotionChooseViewController.m

@@ -73,18 +73,7 @@
             for (int i=0;i<weakSelf.customPromotionDatas.count;i++) {
                 CustomPromotionModel *model2 = weakSelf.customPromotionDatas[i];
                 if (![model2.conflicts containsObject:model1.type] && ![model1.conflicts containsObject:model2.type]) {
-//                    for (int i=0;i<weakSelf.customPromotionDatas.count;i++) {
-//                        CustomPromotionModel *model3 = weakSelf.customPromotionDatas[i];
-//                        if ([model3.conflicts containsObject:model2.type]) {
-//                            break;
-//                        }
-//                        if (i == weakSelf.customPromotionDatas.count-1) {
-//                            model2.isSelected = YES;
-//                        }
-//                    }
                     model1.isSelected = YES;
-                }else{
-//                    model1.isSelected = NO;
                 }
             }
         }else {

Class/MyClient/Orderdetails/view/AllpriceTableViewCell.m

@@ -49,12 +49,12 @@
             //微信卡劵
         if ([model isMemberOfClass:[PromotionWeChatCardModel class]]) {
             PromotionWeChatCardModel *newWeChatModel = (PromotionWeChatCardModel *)model;
-            weChatPrice = @{@"price":[NSString stringWithFormat:@"%ld",self.weChatModel.wxcardDenomation],@"priority":@(newWeChatModel.priority)};
+            weChatPrice = @{@"price":[NSString stringWithFormat:@"%.2f",self.weChatModel.wxcardDenomation],@"priority":@(newWeChatModel.priority)};
 
         }else if ([model isMemberOfClass:[PromotionalDeductionModel class]]) {
             //抵扣
             PromotionalDeductionModel *deductionModel = (PromotionalDeductionModel *)model;
-            deductionPrice = @{@"price":[NSString stringWithFormat:@"%ld",deductionModel.total],@"priority":@(deductionModel.priority)};
+            deductionPrice = @{@"price":[NSString stringWithFormat:@"%.2f",deductionModel.total],@"priority":@(deductionModel.priority)};
 
         }else if ([model isMemberOfClass:[PromotionLuckyDrawModel class]]) {
             //抽奖
@@ -84,7 +84,7 @@
     if (drawPrice) {
         [array addObject:drawPrice];
     }
-    //安装权限降序排列
+    //按限降序排列
     NSArray *chooseArray = [array sortedArrayUsingComparator:^NSComparisonResult(NSDictionary *obj1, NSDictionary *obj2) {
         if ([obj1[@"priority"] integerValue] < [obj2[@"priority"] integerValue]) {
             return NSOrderedDescending;

Class/MyClient/Orderdetails/view/PromotionalTableViewCell.m

@@ -25,11 +25,11 @@
         //微信卡劵
     if ([promotionModel isMemberOfClass:[PromotionWeChatCardModel class]]) {
         PromotionWeChatCardModel *weChatModel = (PromotionWeChatCardModel *)promotionModel;
-        self.promotionalTitleLabel.text = [NSString stringWithFormat:@"微信卡劵: %ld",weChatModel.total];
+        self.promotionalTitleLabel.text = [NSString stringWithFormat:@"微信卡劵: %.2f",weChatModel.total];
     }else if ([promotionModel isMemberOfClass:[PromotionalDeductionModel class]]) {
         //抵扣
         PromotionalDeductionModel *deductionModel = (PromotionalDeductionModel *)promotionModel;
-        self.promotionalTitleLabel.text = [NSString stringWithFormat:@"抵扣金额: %ld元",deductionModel.total];
+        self.promotionalTitleLabel.text = [NSString stringWithFormat:@"抵扣金额: %.2f元",deductionModel.total];
     }else if ([promotionModel isMemberOfClass:[PromotionLuckyDrawModel class]]) {
         //抽奖
         self.promotionalTitleLabel.text = [NSString stringWithFormat:@"转盘抽奖: %@",self.model.descriptionString];

Class/XXuserController/CardStock/Cells/CardOrderInformationReusableView.h

@@ -21,7 +21,6 @@
 
 @property (nonatomic,weak) id<UploadReceiptsDelegate> delegate;
 
-
 /**
  section 下标
  */
@@ -32,6 +31,11 @@
  */
 @property (weak, nonatomic) IBOutlet UIButton *uploadReceiptsButton;
 
+/**
+ 拒绝原因
+ */
+@property (weak, nonatomic) IBOutlet UILabel *rejectNoteLabel;
+
 /**
  *  订单号
  */
@@ -47,7 +51,10 @@
  */
 @property (nonatomic,strong) GroupByOrderNumber *model;
 
-
+/**
+ 状态
+ */
+@property (nonatomic,copy) NSString *stateString;
 
 /**
  刷新数据

Class/XXuserController/CardStock/Cells/CardOrderInformationReusableView.m

@@ -25,6 +25,7 @@
     self.orderNumberLabel.text = _model.orderNumber;
     self.orderTimelabel.text = _model.orderTime;
     self.uploadReceiptsButton.hidden = [BaseViewController isBlankString:_model.orderReceiptUrl]?NO:YES;
+    self.rejectNoteLabel.hidden = YES;
 }
 
 
@@ -34,8 +35,15 @@
     self.delegate = delegate;
     self.orderNumberLabel.text = model.orderNumber;
     self.orderTimelabel.text = model.orderTime;
-    self.uploadReceiptsButton.hidden = [BaseViewController isBlankString:model.orderReceiptUrl]?NO:YES;
+    self.uploadReceiptsButton.hidden = ([self.stateString isEqualToString:STUDYTASKSTATE_REFUSE] || [self.stateString isEqualToString:STUDYTASKSTATE_USED])?YES:NO;
+    self.rejectNoteLabel.hidden = [self.stateString isEqualToString:STUDYTASKSTATE_REFUSE]?NO:YES;
+    NSString *noteString = [model.draws.firstObject remark];
+    self.rejectNoteLabel.text = [NSString stringWithFormat:@"拒绝原因：%@",noteString];
+
 }
 
 
+
+
+
 @end

Class/XXuserController/ReadPacket/ReadPacketViewController.m

@@ -132,6 +132,7 @@
 - (UICollectionReusableView *)collectionView:(UICollectionView *)collectionView viewForSupplementaryElementOfKind:(NSString *)kind atIndexPath:(NSIndexPath *)indexPath
 {
     CardOrderInformationReusableView *headerView = [collectionView dequeueReusableSupplementaryViewOfKind:UICollectionElementKindSectionHeader withReuseIdentifier:@"CardOrderInformationReusableView" forIndexPath:indexPath];
+    headerView.stateString = self.readPacketState;
     [headerView refreshHeaderView:self withEntity:self.readPacketArray[indexPath.section] withSectionIndex:indexPath.section];
     return headerView;
 }

Release-iphoneos/YXAlertController/YXAlertController.h

@@ -18,19 +18,17 @@
 /**
  默认提示选择框
  
- @param viewController 控制器对象
  @param title          提示标题
  @param message        提示说明
  @param style          风格
  @param completed      确定回调
  @param canceled       取消回调
  */
-extern void ShowDefaultAlertView(UIViewController *viewController,NSString *title,NSString *message,UIAlertControllerStyle style,void(^completed)(),void(^canceled)());
+extern void ShowDefaultAlertView(NSString *title,NSString *message,UIAlertControllerStyle style,void(^completed)(),void(^canceled)());
 
 /**
  提示选择框
  
- @param viewController 控制器对象
  @param title          提示标题
  @param message        提示说明
  @param cancelTitle    取消按钮
@@ -39,7 +37,7 @@ extern void ShowDefaultAlertView(UIViewController *viewController,NSString *titl
  @param completed      确定回调
  @param canceled       取消回调
  */
-extern void ShowAlertView(UIViewController *viewController,NSString *title,NSString *message,NSString *cancelTitle,NSString *DefaultTitle,UIAlertControllerStyle style,void(^completed)(),void(^canceled)());
+extern void ShowAlertView(NSString *title,NSString *message,NSString *cancelTitle,NSString *DefaultTitle,UIAlertControllerStyle style,void(^completed)(),void(^canceled)());
 
 
 @end

Tools/CYConst/CYConstManager.h

@@ -97,7 +97,7 @@ typedef NS_ENUM(NSInteger,COMMENT_PRAISE) {
 /**
  *  服务器开发地址
  */
-//#define SERVERREQUESTURL(URL)  [NSString stringWithFormat:@"http://gomoredev:8082/opple-web/app%@",URL]
+#define SERVERREQUESTURL(URL)  [NSString stringWithFormat:@"http://gomoredev:8082/opple-web/app%@",URL]
 //外网http://debenson.picp.io/opple-web/
 
 /**
@@ -113,7 +113,7 @@ typedef NS_ENUM(NSInteger,COMMENT_PRAISE) {
 //**
 // *  服务器正式地址
 // */
-#define SERVERREQUESTURL(URL)  [NSString stringWithFormat:@"http://dg.opple.com/opple-web/app%@",URL]
+//#define SERVERREQUESTURL(URL)  [NSString stringWithFormat:@"http://dg.opple.com/opple-web/app%@",URL]
 
 
 /*****************************************接口地址*****************************************/

Tools/CYConst/CYConstManager.m

@@ -575,11 +575,11 @@ NSString *const GUIDE = @"guide";
  */
 NSString *const CONSUMER = @"consumer";
 
-/**
+/**discountAction
  *  折扣金额
  */
 NSString *const deductionAction = @"deductionAction";
-
+//discount
 /**
  * 现金红包
  */
@@ -636,7 +636,7 @@ NSString *const CANCEL = @"005";
 NSString *const COMPLETED = @"006";
 
 /**
- *  已抽奖未使用
+ *  已抽奖
  */
 NSString *const ACCOMPLISHED = @"accomplished";
 

Tools/Jastor/opple_objc_json_client.h

@@ -4902,6 +4902,9 @@ extern NSString * const GRADEMETHOD_MANUL;
  *
  */
 @property (nonatomic, copy) NSString *updateName;
+
+@property (nonatomic, copy) NSString *remark;
+
 /**
  * 方法: 取得java.lang.String
  *

Tools/PreviewPDF/CustomWKWebViewController.m

@@ -92,7 +92,7 @@
     }
 }
 
-#pragma mark - 添加删除按钮
+#pragma mark - 添加关闭按钮
 - (void)addDismissButton
 {
     self.dismissButton = [UIButton buttonWithType:UIButtonTypeCustom];