修改项说明：

Class/GuideIntegralViewController.m

@@ -26,9 +26,15 @@
 - (void)getIntegralDataAction
 {
     WS(weakSelf);
-    [[NetworkRequestClassManager Manager] NetworkWithDictionaryRequestWithURL:SERVERREQUESTURL(INTEGRALQUERY) WithCallClass:weakSelf WithRequestType:ONE WithParameter:nil WithReturnValueBlock:^(id returnValue) {
+    NSString *url = [NSString stringWithFormat:SERVERREQUESTURL(INTEGRALQUERY),[Shoppersmanager manager].Shoppers.employee.fid];
+    [[NetworkRequestClassManager Manager] NetworkWithDictionaryRequestWithURL:url WithCallClass:weakSelf WithRequestType:ONE WithParameter:nil WithReturnValueBlock:^(id returnValue) {
         
         NSSLog(@"%@",returnValue);
+        if ([returnValue[@"code"] isEqualToNumber:@0]) {
+//            RsScoreDetails *integral = [RsScoreDetails alloc];
+        }else {
+            [weakSelf ErrorMBProgressView:returnValue[@"message"]];
+        }
         
     } WithErrorCodeBlock:^(id errorCodeValue) {
         

Class/OrderdetailsViewController.m

@@ -276,10 +276,10 @@ NSString *const PROMOTIONALSTRING = @"促销信息";
                         deductionModel.type = @"deductionAction";
                         [weakSelf.promotionInformationArray addObject:deductionModel];
                         
-                    } else if (![BaseViewController isBlankString:[oldPromotion.jdecardDenomation stringValue]]) {
+                    } else if (![BaseViewController isBlankString:[oldPromotion.JDEcardDenomation stringValue]]) {
                         // 京东E卡
                         PromotionJDECardModel *model = [[PromotionJDECardModel alloc]init];
-                        model.total = [oldPromotion.jdecardDenomation integerValue];
+                        model.total = [oldPromotion.JDEcardDenomation integerValue];
                         model.body = GUIDE;
                         model.type = JDECardAction;
                         [weakSelf.promotionInformationArray addObject:model];
@@ -552,7 +552,7 @@ NSString *const PROMOTIONALSTRING = @"促销信息";
             // 我知道了
         }else if (indexPath.row == 0)
         {
-            [[NSNotificationCenter defaultCenter] postNotificationName:OPENCONTROLLER object:@(3)];
+            SHARED_APPDELEGATE.tabBarController.selectedIndex = 3;
         }
     }];
     success.preferredContentSize = CGSizeMake(315, 320);

Class/Tabbar/CustomTabbarController.m

@@ -116,8 +116,6 @@
     [self.tabBar addSubview:self.toolview];
     //显示体验中心
     [[NSNotificationCenter defaultCenter] addObserver:self selector:@selector(ShowFollowHeart:) name:OPENFOLLOWHEARTVC object:nil];
-    //打开相应控制器
-    [[NSNotificationCenter defaultCenter] addObserver:self selector:@selector(openControllerWithIndex:) name:OPENCONTROLLER object:nil];
 }
 
 
@@ -125,8 +123,22 @@
 - (void)addViewcontroller
 {
     NSMutableArray *controllerArray = [NSMutableArray array];
-    UIStoryboard *storyboard = [UIStoryboard storyboardWithName:@"OppleMain" bundle:nil];
+    UIStoryboard *storyboard = nil;
     for (int i=0; i<self.identifierArray.count; i++) {
+        
+        NSString *controllString = self.identifierArray[i];
+        // 公告
+        if ([controllString isEqualToString:@"AnnouncementViewController"]) {
+            storyboard = [BaseViewController getAnnouncementStoryboardClass];
+        }else if ([controllString isEqualToString:@"LearningCenterMainViewController"]) {
+            // 学习中心
+            storyboard = [BaseViewController getLearningCenterStoryboardClass];
+        }else if ([controllString isEqualToString:@"GuideIntegralViewController"]) {
+            // 积分
+            storyboard = [BaseViewController getGuideIntegralStoryboardClass];
+        }else {
+            storyboard = [BaseViewController getMainStoryboardClass];
+        }
         BaseViewController *control = [storyboard instantiateViewControllerWithIdentifier:self.identifierArray[i]];
         UINavigationController *nav = [[UINavigationController alloc]initWithRootViewController:control];
         [self.vcArray addObject:nav];
@@ -134,6 +146,7 @@
     }
     self.viewControllers = self.vcArray;
     SHARED_APPDELEGATE.allControllerArray = controllerArray;
+    SHARED_APPDELEGATE.tabBarController = self;
     self.selectedIndex = 2;
 }
 
@@ -164,9 +177,17 @@
             
             break;
             
-            //某某用户
+            //公告
         case 101:
             
+        {
+            self.selectedIndex = 5;
+        }
+            break;
+            
+            //某某用户
+        case 102:
+            
         {
             UserViewController *userVC = [[UserViewController alloc]init];
             userVC.delegate = self;
@@ -181,14 +202,14 @@
             break;
             
             //我的客户
-        case 102:
+        case 103:
             
             self.selectedIndex = 2;
             
             break;
             
             //购物车
-        case 103:
+        case 104:
             
             //必须设置当前客户才能跳转到购物车
             if (![Shoppersmanager manager].currentCustomer) {
@@ -233,7 +254,6 @@
 }
 
 
-
 #pragma mark -取消按钮
 - (void)cancelButtonClick
 {
@@ -344,12 +364,5 @@
     }
 }
 
-#pragma mark - 打开相应的控制器
-- (void)openControllerWithIndex:(NSNotification *)sender
-{
-    NSInteger index = [sender.object integerValue];
-    [self dismissViewControllerAnimated:NO completion:nil];
-    self.selectedIndex = index;
-}
 
 @end

Lighting.xcodeproj/project.pbxproj

@@ -776,12 +776,8 @@
 				2921F2FB1DB5E75300D6439B /* PromotionalGoodsModel.m */,
 				2921F3011DB5EBD600D6439B /* PromotionalDeductionModel.h */,
 				2921F3021DB5EBD600D6439B /* PromotionalDeductionModel.m */,
-				2986B9951DE1D30600F4A1CF /* PromotionChooseNavigationController.h */,
-				2986B9961DE1D30600F4A1CF /* PromotionChooseNavigationController.m */,
 				2986B9971DE1D30600F4A1CF /* PromotionChooseTableViewCell.h */,
 				2986B9981DE1D30600F4A1CF /* PromotionChooseTableViewCell.m */,
-				2986B9991DE1D30600F4A1CF /* PromotionChooseViewController.h */,
-				2986B99A1DE1D30600F4A1CF /* PromotionChooseViewController.m */,
 				2986B99B1DE1D30600F4A1CF /* PromotionJDECardModel.h */,
 				2986B99C1DE1D30600F4A1CF /* PromotionJDECardModel.m */,
 				2986B99D1DE1D30600F4A1CF /* PromotionLuckDrawResultModel.h */,
@@ -1370,6 +1366,10 @@
 				2994C0141CFBE793005A80AF /* PayViewController.xib */,
 				2903F93B1DBE57F4003CC6B1 /* JDEcardViewController.h */,
 				2903F93C1DBE57F4003CC6B1 /* JDEcardViewController.m */,
+				2986B9951DE1D30600F4A1CF /* PromotionChooseNavigationController.h */,
+				2986B9961DE1D30600F4A1CF /* PromotionChooseNavigationController.m */,
+				2986B9991DE1D30600F4A1CF /* PromotionChooseViewController.h */,
+				2986B99A1DE1D30600F4A1CF /* PromotionChooseViewController.m */,
 				29A8D3951CD85A3C004D558F /* Clientdetails */,
 			);
 			name = controller;

Tools/opple_objc_json_client.m

 
 #import "opple_objc_json_client.h"
 
-@implementation RsApplyBillRequest
-@synthesize employeeId;
-@synthesize page;
+@implementation EarningsResponse
+@synthesize accountTotal;
+@synthesize yesterdayEarnings;
+@synthesize historyEarning;
+@synthesize applytotal;
 
 +(BOOL)propertyIsOptional:(NSString*)propertyName
 {
@@ -13,8 +15,8 @@
 
 @end
 
-@implementation RsCommissionRequest
-@synthesize emploreeId;
+@implementation RsApplyBillRequest
+@synthesize employeeId;
 @synthesize page;
 
 +(BOOL)propertyIsOptional:(NSString*)propertyName
@@ -25,12 +27,9 @@
 
 @end
 
-@implementation DataPage
-@synthesize total;
+@implementation RsCommissionRequest
+@synthesize emploreeId;
 @synthesize page;
-@synthesize rows;
-@synthesize sort;
-@synthesize order;
 
 +(BOOL)propertyIsOptional:(NSString*)propertyName
 {
@@ -40,11 +39,9 @@
 
 @end
 
-@implementation PageRows
-@synthesize page;
-@synthesize rows;
-@synthesize total;
-@synthesize totalpages;
+@implementation ExceptionCode
+@synthesize code;
+@synthesize message;
 
 +(BOOL)propertyIsOptional:(NSString*)propertyName
 {
@@ -65,6 +62,22 @@
 }
 
 
+@end
+
+@implementation ConsumerQueryCondition
+@synthesize resellerCodeEquals;
+@synthesize nameEquals;
+@synthesize mobileEquals;
+@synthesize createTimeBegin;
+@synthesize createTimeEnd;
+@synthesize page;
+
++(BOOL)propertyIsOptional:(NSString*)propertyName
+{
+    return YES;
+}
+
+
 @end
 
 @implementation LoginInfo
@@ -621,10 +634,23 @@
 
 @end
 
-@implementation TOPrizeBillDetailsEntity
+@implementation TOPrizeBillEntity
 @synthesize fid;
-@synthesize bill;
-@synthesize prize;
+@synthesize orderNumber;
+@synthesize createName;
+@synthesize createBy;
+@synthesize createDate;
+@synthesize updateName;
+@synthesize updateBy;
+@synthesize updateDate;
+@synthesize billnumber;
+@synthesize state;
+@synthesize receiver;
+@synthesize mobilephone;
+@synthesize receiveAddress;
+@synthesize employee;
+@synthesize logisticsCompany;
+@synthesize trackingNumber;
 
 +(BOOL)propertyIsOptional:(NSString*)propertyName
 {
@@ -772,17 +798,10 @@ NSString * const SORTDIRECTION_DESC = @"desc";
 
 @end
 
-@implementation TOPrizeEntity
+@implementation TOPrizeBillDetailsEntity
 @synthesize fid;
-@synthesize picture;
-@synthesize createName;
-@synthesize createBy;
-@synthesize updateName;
-@synthesize updateBy;
-@synthesize code;
-@synthesize name;
-@synthesize createDate;
-@synthesize updateDate;
+@synthesize bill;
+@synthesize prize;
 
 +(BOOL)propertyIsOptional:(NSString*)propertyName
 {
@@ -820,7 +839,8 @@ NSString * const SORTDIRECTION_DESC = @"desc";
 @synthesize wxcardNumber;
 @synthesize wxcardDenomation;
 @synthesize wxcardRealDeduction;
-@synthesize jdecardDenomation;
+@synthesize JDEcardDenomation;
+@synthesize redPackageNumber;
 @synthesize redPackageCount;
 
 +(BOOL)propertyIsOptional:(NSString*)propertyName
@@ -867,7 +887,6 @@ NSString * const SORTDIRECTION_DESC = @"desc";
 @synthesize resellerName;
 @synthesize oldPrice;
 
-
 +(BOOL)propertyIsOptional:(NSString*)propertyName
 {
     return YES;
@@ -1264,13 +1283,9 @@ NSString * const SORTDIRECTION_DESC = @"desc";
 
 @end
 
-@implementation ConsumerQueryCondition
-@synthesize resellerCodeEquals;
-@synthesize nameEquals;
-@synthesize mobileEquals;
-@synthesize createTimeBegin;
-@synthesize createTimeEnd;
-@synthesize page;
+@implementation FunctionInfo
+@synthesize userName;
+@synthesize functionName;
 
 +(BOOL)propertyIsOptional:(NSString*)propertyName
 {
@@ -1280,9 +1295,11 @@ NSString * const SORTDIRECTION_DESC = @"desc";
 
 @end
 
-@implementation ExceptionCode
-@synthesize code;
-@synthesize message;
+@implementation PageRows
+@synthesize page;
+@synthesize rows;
+@synthesize total;
+@synthesize totalpages;
 
 +(BOOL)propertyIsOptional:(NSString*)propertyName
 {
@@ -1292,11 +1309,12 @@ NSString * const SORTDIRECTION_DESC = @"desc";
 
 @end
 
-@implementation EarningsResponse
-@synthesize accountTotal;
-@synthesize yesterdayEarnings;
-@synthesize historyEarning;
-@synthesize applytotal;
+@implementation DataPage
+@synthesize total;
+@synthesize page;
+@synthesize rows;
+@synthesize sort;
+@synthesize order;
 
 +(BOOL)propertyIsOptional:(NSString*)propertyName
 {
@@ -1317,8 +1335,13 @@ NSString * const SORTDIRECTION_DESC = @"desc";
 
 @end
 
-@implementation RsJingDongECardResponse
-@synthesize list;
+@implementation AfficheCondition
+@synthesize page;
+@synthesize userIdEquals;
+@synthesize dayCountEquals;
+@synthesize afficheTypeEuals;
+@synthesize order;
+@synthesize sort;
 
 +(BOOL)propertyIsOptional:(NSString*)propertyName
 {
@@ -1328,7 +1351,7 @@ NSString * const SORTDIRECTION_DESC = @"desc";
 
 @end
 
-@implementation RsSimpleJingDongECardResponse
+@implementation RsJingDongECardResponse
 @synthesize list;
 
 +(BOOL)propertyIsOptional:(NSString*)propertyName
@@ -1339,18 +1362,9 @@ NSString * const SORTDIRECTION_DESC = @"desc";
 
 @end
 
-@implementation TSBaseUser
-@synthesize departid;
-@synthesize signature;
-@synthesize browser;
-@synthesize userKey;
-@synthesize status;
-@synthesize activitiSync;
-@synthesize password;
-@synthesize userName;
-@synthesize realName;
-@synthesize currentDepart;
-@synthesize userOrgList;
+@implementation RsAwardDraw
+@synthesize draw;
+@synthesize award;
 
 +(BOOL)propertyIsOptional:(NSString*)propertyName
 {
@@ -1385,6 +1399,27 @@ NSString * const SORTDIRECTION_DESC = @"desc";
 }
 
 
+@end
+
+@implementation TSBaseUser
+@synthesize departid;
+@synthesize signature;
+@synthesize browser;
+@synthesize userKey;
+@synthesize status;
+@synthesize activitiSync;
+@synthesize password;
+@synthesize userName;
+@synthesize realName;
+@synthesize currentDepart;
+@synthesize userOrgList;
+
++(BOOL)propertyIsOptional:(NSString*)propertyName
+{
+    return YES;
+}
+
+
 @end
 
 @implementation TSUserOrg
@@ -1443,9 +1478,8 @@ NSString * const SORTDIRECTION_DESC = @"desc";
 
 @end
 
-@implementation RsAwardDraw
-@synthesize draw;
-@synthesize award;
+@implementation RsSimpleJingDongECardResponse
+@synthesize list;
 
 +(BOOL)propertyIsOptional:(NSString*)propertyName
 {