Skip to content

O
Opple-iOS
Commit 8c2af504 authored by 曹云霄's avatar 曹云霄
Browse files
Options

修改项说明：完成积分相应模块开发，等待后台接口

parent cc1064c8
Show whitespace changes
Inline Side-by-side
Showing with 1047 additions and 349 deletions
Class/ApplyPrizeViewController.m
View file @ 8c2af504
...@@ -177,7 +177,9 @@ ...@@ -177,7 +177,9 @@
NSMutableArray *array = [NSMutableArray array]; NSMutableArray *array = [NSMutableArray array];
for (PrizeListModel *model in self.selectArray) { for (PrizeListModel *model in self.selectArray) {
TOPrizeBillDetailsEntity *entity = [[TOPrizeBillDetailsEntity alloc]init]; TOPrizeBillDetailsEntity *entity = [[TOPrizeBillDetailsEntity alloc]init];
entity.prize = model.fid; TOPrizeEntity *prize = [[TOPrizeEntity alloc]init];
prize.fid = model.fid;
entity.prize = prize;
[array addObject:entity]; [array addObject:entity];
} }
_prizeBill.details = (NSArray<TOPrizeBillDetailsEntity> *)array; _prizeBill.details = (NSArray<TOPrizeBillDetailsEntity> *)array;
......
Class/GiftInformationView.h 0 → 100644
View file @ 8c2af504
//
// GiftInformationView.h
// Lighting
//
// Created by 曹云霄 on 2016/11/29.
// Copyright © 2016年 上海勾芒科技有限公司. All rights reserved.
//
#import <UIKit/UIKit.h>
@interface GiftInformationView : UIView
/**
初始化礼品View
@return GiftInformationView
*/
- (instancetype)initWithializeGiftView:(NSString *)picture withGiftName:(NSString *)name;
@end
Class/GiftInformationView.m 0 → 100644
View file @ 8c2af504
//
// GiftInformationView.m
// Lighting
//
// Created by 曹云霄 on 2016/11/29.
// Copyright © 2016年 上海勾芒科技有限公司. All rights reserved.
//
#import "GiftInformationView.h"
@implementation GiftInformationView
/**
初始化礼品View
@return GiftInformationView
*/
- (instancetype)initWithializeGiftView:(NSString *)picture withGiftName:(NSString *)name
{
if (self = [super init]) {
//图片
UIImageView *giftImageView = [[UIImageView alloc]init];
[giftImageView sd_setImageWithURL:[NSURL URLWithString:picture] placeholderImage:REPLACEIMAGE];
[self addSubview:giftImageView];
//文字
UILabel *giftLabel = [[UILabel alloc]init];
giftLabel.text = name;
[self addSubview:giftLabel];
[giftImageView mas_makeConstraints:^(MASConstraintMaker *make) {
make.left.top.equalTo(self);
make.size.mas_equalTo(CGSizeMake(100, 100));
}];
[giftLabel mas_makeConstraints:^(MASConstraintMaker *make) {
make.left.equalTo(giftImageView.mas_right).offset(10);
make.top.equalTo(giftImageView).offset(10);
make.size.mas_equalTo(CGSizeMake(100, 30));
}];
}
return self;
}
@end
Class/IntegralDetailsViewController.m
View file @ 8c2af504
...@@ -194,6 +194,8 @@ ...@@ -194,6 +194,8 @@
case PrizeTableView: case PrizeTableView:
{ {
PrizeExchangeDetailsViewController *exchangeDetails = [[[self class] getGuideIntegralStoryboardClass] instantiateViewControllerWithIdentifier:@"PrizeExchangeDetailsViewController"]; PrizeExchangeDetailsViewController *exchangeDetails = [[[self class] getGuideIntegralStoryboardClass] instantiateViewControllerWithIdentifier:@"PrizeExchangeDetailsViewController"];
RsPrizeBill *bill = self.datasArray[indexPath.row];
exchangeDetails.isDelivery = ![bill.bill.state isEqualToString:TOPRIZEBILLENTITYSTATE_REQUESTED];
[self.navigationController pushViewController:exchangeDetails animated:YES]; [self.navigationController pushViewController:exchangeDetails animated:YES];
} }
break; break;
......
Class/LearningCenter/OnlineLearning/VideoDetailViewController.m
View file @ 8c2af504
...@@ -26,6 +26,7 @@ ...@@ -26,6 +26,7 @@
- (void)viewDidLoad { - (void)viewDidLoad {
[super viewDidLoad]; [super viewDidLoad];
[self addChildWebViewController];
[self setUpTableView]; [self setUpTableView];
} }
...@@ -44,7 +45,7 @@ ...@@ -44,7 +45,7 @@
webView.view.frame = CGRectMake(0, 0, ScreenWidth, contentHeight); webView.view.frame = CGRectMake(0, 0, ScreenWidth, contentHeight);
[weakSelf.studyItemDetailsTableView reloadData]; [weakSelf.studyItemDetailsTableView reloadData];
}]; }];
self.introductionHeight = 44;//默认值 self.introductionHeight = 100;//默认值
webView.view.frame = CGRectMake(0, 0, ScreenWidth, self.introductionHeight); webView.view.frame = CGRectMake(0, 0, ScreenWidth, self.introductionHeight);
[self addChildViewController:webView]; [self addChildViewController:webView];
} }
......
Class/LearningCenter/SkillsAssessment/EmigratedMainViewController.m
View file @ 8c2af504
...@@ -14,6 +14,11 @@ ...@@ -14,6 +14,11 @@
@property (nonatomic,strong) WYPopoverController *popover; @property (nonatomic,strong) WYPopoverController *popover;
/**
闯关数据
*/
@property (nonatomic,strong) PassLevelResponse *emigratedResponse;
@end @end
@implementation EmigratedMainViewController @implementation EmigratedMainViewController
...@@ -28,15 +33,29 @@ ...@@ -28,15 +33,29 @@
- (void)getThroughHistoryDatasAction - (void)getThroughHistoryDatasAction
{ {
WS(weakSelf); WS(weakSelf);
[[NetworkRequestClassManager Manager] NetworkRequestWithURL:SERVERREQUESTURL(THROUGHLIST) WithCallClass:weakSelf WithRequestType:ZERO WithParameter:nil WithReturnValueBlock:^(id returnValue) { PassLevelCondition *emigrated = [[PassLevelCondition alloc]init];
emigrated.employeeIdEquals = [Shoppersmanager manager].Shoppers.employee.fid;
emigrated.beginDateFrom = [[self class] getTimeby:-7];
emigrated.endDateTo = [[self class] getTimeby:0];
DataPage *page = [[DataPage alloc]init];
page.page = ONE;
page.rows = KROWS;
emigrated.page = page;
[self CreateMBProgressHUDLoding];
NSLog(@"%@",[emigrated toDictionary]);
[[NetworkRequestClassManager Manager] NetworkRequestWithURL:SERVERREQUESTURL(THROUGHLIST) WithCallClass:weakSelf WithRequestType:ZERO WithParameter:emigrated WithReturnValueBlock:^(id returnValue) {
NSLog(@"%@",returnValue);
if ([returnValue[@"code"] isEqualToNumber:@0]) {
weakSelf.emigratedResponse = [[PassLevelResponse alloc]initWithDictionary:returnValue[@"data"] error:nil];
}else {
[weakSelf RemoveMBProgressHUDLoding];
}
} WithErrorCodeBlock:^(id errorCodeValue) { } WithErrorCodeBlock:^(id errorCodeValue) {
[weakSelf ErrorMBProgressView:NETWORK];
} WithFailureBlock:^(NSError *error) { } WithFailureBlock:^(NSError *error) {
[weakSelf ErrorMBProgressView:error.localizedDescription];
}]; }];
} }
......
Class/OrderdetailsViewController.m
View file @ 8c2af504
...@@ -297,10 +297,10 @@ NSString *const PROMOTIONALSTRING = @"促销信息"; ...@@ -297,10 +297,10 @@ NSString *const PROMOTIONALSTRING = @"促销信息";
deductionModel.priority = oldPromotion.prority; deductionModel.priority = oldPromotion.prority;
[weakSelf.promotionInformationArray addObject:deductionModel]; [weakSelf.promotionInformationArray addObject:deductionModel];
} else if (![BaseViewController isBlankString:[oldPromotion.JDEcardDenomation stringValue]]) { } else if (![BaseViewController isBlankString:[oldPromotion.jdEcardDenomation stringValue]]) {
// 京东E卡 // 京东E卡
PromotionJDECardModel *jdECardModel = [[PromotionJDECardModel alloc]init]; PromotionJDECardModel *jdECardModel = [[PromotionJDECardModel alloc]init];
jdECardModel.total = [oldPromotion.JDEcardDenomation integerValue]; jdECardModel.total = [oldPromotion.jdEcardDenomation integerValue];
jdECardModel.body = GUIDE; jdECardModel.body = GUIDE;
jdECardModel.type = JDECardAction; jdECardModel.type = JDECardAction;
jdECardModel.priority = oldPromotion.prority; jdECardModel.priority = oldPromotion.prority;
......
Class/PrizeExchangeCourierTableViewCell.h
View file @ 8c2af504
...@@ -21,5 +21,8 @@ ...@@ -21,5 +21,8 @@
*/ */
@property (weak, nonatomic) IBOutlet UILabel *courierNumberLabel; @property (weak, nonatomic) IBOutlet UILabel *courierNumberLabel;
/**
数据源
*/
@property (nonatomic,strong) TOPrizeBillEntity *billEntity;
@end @end
Class/PrizeExchangeCourierTableViewCell.m
View file @ 8c2af504
...@@ -15,10 +15,10 @@ ...@@ -15,10 +15,10 @@
// Initialization code // Initialization code
} }
- (void)setSelected:(BOOL)selected animated:(BOOL)animated { - (void)setBillEntity:(TOPrizeBillEntity *)billEntity
[super setSelected:selected animated:animated]; {
_billEntity = billEntity;
// Configure the view for the selected state self.courierCompanyLabel.text = _billEntity.logisticsCompany;
self.courierNumberLabel.text = _billEntity.trackingNumber;
} }
@end @end
Class/PrizeExchangeDetailsViewController.m
View file @ 8c2af504
...@@ -13,6 +13,7 @@ ...@@ -13,6 +13,7 @@
#import "PrizeExchangeInformationTableViewCell.h" #import "PrizeExchangeInformationTableViewCell.h"
#import "PrizeExchangeConsigneeTableViewCell.h" #import "PrizeExchangeConsigneeTableViewCell.h"
#import "PrizeExchangeCourierTableViewCell.h" #import "PrizeExchangeCourierTableViewCell.h"
#import "prizeOrderDetailsModel.h"
@interface PrizeExchangeDetailsViewController ()<UITableViewDelegate,UITableViewDataSource> @interface PrizeExchangeDetailsViewController ()<UITableViewDelegate,UITableViewDataSource>
...@@ -20,7 +21,7 @@ ...@@ -20,7 +21,7 @@
/** /**
兑奖单详情 兑奖单详情
*/ */
@property (nonatomic,strong) RsPrizeBill *prizeBillResult; @property (nonatomic,strong) prizeOrderDetailsModel *prizeBillResult;
/** /**
section title Array section title Array
...@@ -55,7 +56,7 @@ ...@@ -55,7 +56,7 @@
[weakSelf RemoveMBProgressHUDLoding]; [weakSelf RemoveMBProgressHUDLoding];
if ([returnValue[@"code"] isEqualToNumber:@0]) { if ([returnValue[@"code"] isEqualToNumber:@0]) {
weakSelf.prizeBillResult = [[RsPrizeBill alloc]initWithDictionary:returnValue[@"data"] error:nil]; weakSelf.prizeBillResult = [[prizeOrderDetailsModel alloc]initWithDictionary:returnValue[@"data"] error:nil];
}else { }else {
[weakSelf ErrorMBProgressView:returnValue[@"message"]]; [weakSelf ErrorMBProgressView:returnValue[@"message"]];
} }
...@@ -88,12 +89,14 @@ ...@@ -88,12 +89,14 @@
case RewardInformation: case RewardInformation:
{ {
PrizeExchangeInformationTableViewCell *rewardCell = [tableView dequeueReusableCellWithIdentifier:@"PrizeExchangeInformationTableViewCell" forIndexPath:indexPath]; PrizeExchangeInformationTableViewCell *rewardCell = [tableView dequeueReusableCellWithIdentifier:@"PrizeExchangeInformationTableViewCell" forIndexPath:indexPath];
rewardCell.giftDetailsArray = self.prizeBillResult.details;
return rewardCell; return rewardCell;
} }
break; break;
case LogisticsInformation: case LogisticsInformation:
{ {
PrizeExchangeCourierTableViewCell *logisticsCell = [tableView dequeueReusableCellWithIdentifier:@"PrizeExchangeCourierTableViewCell" forIndexPath:indexPath]; PrizeExchangeCourierTableViewCell *logisticsCell = [tableView dequeueReusableCellWithIdentifier:@"PrizeExchangeCourierTableViewCell" forIndexPath:indexPath];
logisticsCell.billEntity = self.prizeBillResult.bill;
return logisticsCell; return logisticsCell;
} }
break; break;
...@@ -120,6 +123,29 @@ ...@@ -120,6 +123,29 @@
return headerView; return headerView;
} }
- (CGFloat)tableView:(UITableView *)tableView heightForRowAtIndexPath:(NSIndexPath *)indexPath
{
switch (indexPath.section) {
case ExchangeBillInformation:
case ReceivingInformation:
return 100;
break;
case RewardInformation:
{
return self.prizeBillResult.giftHeight;
}
break;
case LogisticsInformation:
{
return 60;
}
break;
default:
break;
}
return 0;
}
#pragma mark - lazy #pragma mark - lazy
- (NSMutableArray *)sectionTitleArray - (NSMutableArray *)sectionTitleArray
{ {
......
Class/PrizeExchangeInformationTableViewCell.h
View file @ 8c2af504
...@@ -10,4 +10,6 @@ ...@@ -10,4 +10,6 @@
@interface PrizeExchangeInformationTableViewCell : UITableViewCell @interface PrizeExchangeInformationTableViewCell : UITableViewCell
@property (nonatomic,strong) NSArray<TOPrizeBillDetailsEntity> *giftDetailsArray;
@end @end
Class/PrizeExchangeInformationTableViewCell.m
View file @ 8c2af504
...@@ -7,18 +7,31 @@ ...@@ -7,18 +7,31 @@
// //
#import "PrizeExchangeInformationTableViewCell.h" #import "PrizeExchangeInformationTableViewCell.h"
#import "GiftInformationView.h"
@implementation PrizeExchangeInformationTableViewCell @implementation PrizeExchangeInformationTableViewCell
- (void)awakeFromNib { - (void)awakeFromNib {
[super awakeFromNib]; [super awakeFromNib];
// Initialization code
} }
- (void)setSelected:(BOOL)selected animated:(BOOL)animated {
[super setSelected:selected animated:animated];
// Configure the view for the selected state - (void)setGiftDetailsArray:(NSArray<TOPrizeBillDetailsEntity> *)giftDetailsArray
{
for (UIView *view in self.contentView.subviews) {
[view removeFromSuperview];
}
_giftDetailsArray = giftDetailsArray;
CGFloat itemHeight = 100;
CGFloat tandemInterval = 20;
CGFloat horizontalInterval = 300;
for (int i=0; i<_giftDetailsArray.count; i++) {
TOPrizeBillDetailsEntity *entity = _giftDetailsArray[i];
GiftInformationView *giftView = [[GiftInformationView alloc] initWithializeGiftView:entity.prize.picture withGiftName:entity.prize.name];
giftView.frame = CGRectMake((i%2)*(itemHeight+horizontalInterval)+itemHeight/2, (i/2)*(itemHeight+tandemInterval)+tandemInterval, horizontalInterval, itemHeight);
[self.contentView addSubview:giftView];
}
} }
@end @end
Class/prizeOrderDetailsModel.h 0 → 100644
View file @ 8c2af504
//
// prizeOrderDetailsModel.h
// Lighting
//
// Created by 曹云霄 on 2016/11/29.
// Copyright © 2016年 上海勾芒科技有限公司. All rights reserved.
//
#import "opple_objc_json_client.h"
@interface prizeOrderDetailsModel : RsPrizeBill
/**
礼品高度
*/
@property (nonatomic,assign) CGFloat giftHeight;
@end
Class/prizeOrderDetailsModel.m 0 → 100644
View file @ 8c2af504
//
// prizeOrderDetailsModel.m
// Lighting
//
// Created by 曹云霄 on 2016/11/29.
// Copyright © 2016年 上海勾芒科技有限公司. All rights reserved.
//
#import "prizeOrderDetailsModel.h"
@implementation prizeOrderDetailsModel
- (CGFloat)giftHeight
{
if (!_giftHeight) {
_giftHeight = [self calculateGiftNeedHeight:self.details];
}
return _giftHeight;
}
#pragma mark - 计算礼品显示需要高度
- (CGFloat)calculateGiftNeedHeight:(NSArray<TOPrizeBillDetailsEntity *>*)gifts
{
CGFloat height = 0;
NSInteger count = gifts.count;
CGFloat itemHeight = 100;
CGFloat interval = 20;
if (count <= 2) {
height += itemHeight+interval *2;
}else if (count %2 == 0 || count%2 == 1){
if (count %2 == 1) {
count += 1;
}
height += (count/2)*itemHeight + ((count/2)+1)*interval;
}
return height;
}
@end
Lighting.xcodeproj/project.pbxproj
View file @ 8c2af504
...@@ -171,6 +171,8 @@ ...@@ -171,6 +171,8 @@
2999B12F1DE6CD730031F79E /* ForumViewController.m in Sources */ = {isa = PBXBuildFile; fileRef = 2999B12E1DE6CD730031F79E /* ForumViewController.m */; }; 2999B12F1DE6CD730031F79E /* ForumViewController.m in Sources */ = {isa = PBXBuildFile; fileRef = 2999B12E1DE6CD730031F79E /* ForumViewController.m */; };
299C7F5A1CE21FA800E7D7CB /* AddressViewController.m in Sources */ = {isa = PBXBuildFile; fileRef = 299C7F581CE21FA800E7D7CB /* AddressViewController.m */; }; 299C7F5A1CE21FA800E7D7CB /* AddressViewController.m in Sources */ = {isa = PBXBuildFile; fileRef = 299C7F581CE21FA800E7D7CB /* AddressViewController.m */; };
299C7F5B1CE21FA800E7D7CB /* AddressViewController.xib in Resources */ = {isa = PBXBuildFile; fileRef = 299C7F591CE21FA800E7D7CB /* AddressViewController.xib */; }; 299C7F5B1CE21FA800E7D7CB /* AddressViewController.xib in Resources */ = {isa = PBXBuildFile; fileRef = 299C7F591CE21FA800E7D7CB /* AddressViewController.xib */; };
29A7A6991DED154F00B04272 /* GiftInformationView.m in Sources */ = {isa = PBXBuildFile; fileRef = 29A7A6981DED154F00B04272 /* GiftInformationView.m */; };
29A7A69F1DED1A9600B04272 /* prizeOrderDetailsModel.m in Sources */ = {isa = PBXBuildFile; fileRef = 29A7A69E1DED1A9600B04272 /* prizeOrderDetailsModel.m */; };
29A8D3981CD85A58004D558F /* ClientdetailsViewController.m in Sources */ = {isa = PBXBuildFile; fileRef = 29A8D3971CD85A58004D558F /* ClientdetailsViewController.m */; }; 29A8D3981CD85A58004D558F /* ClientdetailsViewController.m in Sources */ = {isa = PBXBuildFile; fileRef = 29A8D3971CD85A58004D558F /* ClientdetailsViewController.m */; };
29A938221CDADE4700F21E54 /* ProductDetailsTableViewCell.m in Sources */ = {isa = PBXBuildFile; fileRef = 29A938211CDADE4700F21E54 /* ProductDetailsTableViewCell.m */; }; 29A938221CDADE4700F21E54 /* ProductDetailsTableViewCell.m in Sources */ = {isa = PBXBuildFile; fileRef = 29A938211CDADE4700F21E54 /* ProductDetailsTableViewCell.m */; };
29A938251CDAE31200F21E54 /* ProductDetailsHeaderView.m in Sources */ = {isa = PBXBuildFile; fileRef = 29A938241CDAE31200F21E54 /* ProductDetailsHeaderView.m */; }; 29A938251CDAE31200F21E54 /* ProductDetailsHeaderView.m in Sources */ = {isa = PBXBuildFile; fileRef = 29A938241CDAE31200F21E54 /* ProductDetailsHeaderView.m */; };
...@@ -568,6 +570,10 @@ ...@@ -568,6 +570,10 @@
299C7F571CE21FA800E7D7CB /* AddressViewController.h */ = {isa = PBXFileReference; fileEncoding = 4; lastKnownFileType = sourcecode.c.h; path = AddressViewController.h; sourceTree = "<group>"; }; 299C7F571CE21FA800E7D7CB /* AddressViewController.h */ = {isa = PBXFileReference; fileEncoding = 4; lastKnownFileType = sourcecode.c.h; path = AddressViewController.h; sourceTree = "<group>"; };
299C7F581CE21FA800E7D7CB /* AddressViewController.m */ = {isa = PBXFileReference; fileEncoding = 4; lastKnownFileType = sourcecode.c.objc; path = AddressViewController.m; sourceTree = "<group>"; }; 299C7F581CE21FA800E7D7CB /* AddressViewController.m */ = {isa = PBXFileReference; fileEncoding = 4; lastKnownFileType = sourcecode.c.objc; path = AddressViewController.m; sourceTree = "<group>"; };
299C7F591CE21FA800E7D7CB /* AddressViewController.xib */ = {isa = PBXFileReference; fileEncoding = 4; lastKnownFileType = file.xib; path = AddressViewController.xib; sourceTree = "<group>"; }; 299C7F591CE21FA800E7D7CB /* AddressViewController.xib */ = {isa = PBXFileReference; fileEncoding = 4; lastKnownFileType = file.xib; path = AddressViewController.xib; sourceTree = "<group>"; };
29A7A6971DED154F00B04272 /* GiftInformationView.h */ = {isa = PBXFileReference; fileEncoding = 4; lastKnownFileType = sourcecode.c.h; path = GiftInformationView.h; sourceTree = "<group>"; };
29A7A6981DED154F00B04272 /* GiftInformationView.m */ = {isa = PBXFileReference; fileEncoding = 4; lastKnownFileType = sourcecode.c.objc; path = GiftInformationView.m; sourceTree = "<group>"; };
29A7A69D1DED1A9600B04272 /* prizeOrderDetailsModel.h */ = {isa = PBXFileReference; fileEncoding = 4; lastKnownFileType = sourcecode.c.h; path = prizeOrderDetailsModel.h; sourceTree = "<group>"; };
29A7A69E1DED1A9600B04272 /* prizeOrderDetailsModel.m */ = {isa = PBXFileReference; fileEncoding = 4; lastKnownFileType = sourcecode.c.objc; path = prizeOrderDetailsModel.m; sourceTree = "<group>"; };
29A8D3961CD85A58004D558F /* ClientdetailsViewController.h */ = {isa = PBXFileReference; fileEncoding = 4; lastKnownFileType = sourcecode.c.h; path = ClientdetailsViewController.h; sourceTree = "<group>"; }; 29A8D3961CD85A58004D558F /* ClientdetailsViewController.h */ = {isa = PBXFileReference; fileEncoding = 4; lastKnownFileType = sourcecode.c.h; path = ClientdetailsViewController.h; sourceTree = "<group>"; };
29A8D3971CD85A58004D558F /* ClientdetailsViewController.m */ = {isa = PBXFileReference; fileEncoding = 4; lastKnownFileType = sourcecode.c.objc; path = ClientdetailsViewController.m; sourceTree = "<group>"; }; 29A8D3971CD85A58004D558F /* ClientdetailsViewController.m */ = {isa = PBXFileReference; fileEncoding = 4; lastKnownFileType = sourcecode.c.objc; path = ClientdetailsViewController.m; sourceTree = "<group>"; };
29A938201CDADE4700F21E54 /* ProductDetailsTableViewCell.h */ = {isa = PBXFileReference; fileEncoding = 4; lastKnownFileType = sourcecode.c.h; path = ProductDetailsTableViewCell.h; sourceTree = "<group>"; }; 29A938201CDADE4700F21E54 /* ProductDetailsTableViewCell.h */ = {isa = PBXFileReference; fileEncoding = 4; lastKnownFileType = sourcecode.c.h; path = ProductDetailsTableViewCell.h; sourceTree = "<group>"; };
...@@ -2038,6 +2044,8 @@ ...@@ -2038,6 +2044,8 @@
29E9445E1DE455AC007CD26C /* PrizeExchangeInformationTableViewCell.m */, 29E9445E1DE455AC007CD26C /* PrizeExchangeInformationTableViewCell.m */,
29837B4E1DE58BAD009CF614 /* PrizeExchangeCourierTableViewCell.h */, 29837B4E1DE58BAD009CF614 /* PrizeExchangeCourierTableViewCell.h */,
29837B4F1DE58BAE009CF614 /* PrizeExchangeCourierTableViewCell.m */, 29837B4F1DE58BAE009CF614 /* PrizeExchangeCourierTableViewCell.m */,
29A7A6971DED154F00B04272 /* GiftInformationView.h */,
29A7A6981DED154F00B04272 /* GiftInformationView.m */,
); );
name = Cells; name = Cells;
sourceTree = "<group>"; sourceTree = "<group>";
...@@ -2047,6 +2055,8 @@ ...@@ -2047,6 +2055,8 @@
children = ( children = (
29E9444B1DE40D5F007CD26C /* PrizeListModel.h */, 29E9444B1DE40D5F007CD26C /* PrizeListModel.h */,
29E9444C1DE40D5F007CD26C /* PrizeListModel.m */, 29E9444C1DE40D5F007CD26C /* PrizeListModel.m */,
29A7A69D1DED1A9600B04272 /* prizeOrderDetailsModel.h */,
29A7A69E1DED1A9600B04272 /* prizeOrderDetailsModel.m */,
); );
name = Models; name = Models;
sourceTree = "<group>"; sourceTree = "<group>";
...@@ -2478,6 +2488,7 @@ ...@@ -2478,6 +2488,7 @@
29B3EE711DCE16130065FCCF /* LuckyDrawViewController.m in Sources */, 29B3EE711DCE16130065FCCF /* LuckyDrawViewController.m in Sources */,
293164031DCE3F780075129D /* UsedDrawTableViewCell.m in Sources */, 293164031DCE3F780075129D /* UsedDrawTableViewCell.m in Sources */,
29360C2F1CDDC47E002A5D89 /* ScreeningView.m in Sources */, 29360C2F1CDDC47E002A5D89 /* ScreeningView.m in Sources */,
29A7A69F1DED1A9600B04272 /* prizeOrderDetailsModel.m in Sources */,
2985AEA21CE72F1500704C91 /* NSDictionary+ZXPUnicode.m in Sources */, 2985AEA21CE72F1500704C91 /* NSDictionary+ZXPUnicode.m in Sources */,
29498C601D053B7C004FA79B /* ShoppingBagTableViewCell.m in Sources */, 29498C601D053B7C004FA79B /* ShoppingBagTableViewCell.m in Sources */,
29BAA3AB1DC9FB5B00927D04 /* PromptTableViewCell.m in Sources */, 29BAA3AB1DC9FB5B00927D04 /* PromptTableViewCell.m in Sources */,
...@@ -2539,6 +2550,7 @@ ...@@ -2539,6 +2550,7 @@
298534601DD4B0290023BBAE /* AirPrintManager.m in Sources */, 298534601DD4B0290023BBAE /* AirPrintManager.m in Sources */,
29ABA6EA1DE686D5007D8012 /* WkWebViewViewController.m in Sources */, 29ABA6EA1DE686D5007D8012 /* WkWebViewViewController.m in Sources */,
2928F83B1CD0A0CE0036D761 /* CustomTabbarController.m in Sources */, 2928F83B1CD0A0CE0036D761 /* CustomTabbarController.m in Sources */,
29A7A6991DED154F00B04272 /* GiftInformationView.m in Sources */,
295DEA9C1DB70FB9006ED4A6 /* RightControlTableViewCell.m in Sources */, 295DEA9C1DB70FB9006ED4A6 /* RightControlTableViewCell.m in Sources */,
29A9DCAE1CEB643C00A7567A /* CustomWKWebViewController.m in Sources */, 29A9DCAE1CEB643C00A7567A /* CustomWKWebViewController.m in Sources */,
2940AE891DE7FCE4001164B0 /* VideoDetailViewController.m in Sources */, 2940AE891DE7FCE4001164B0 /* VideoDetailViewController.m in Sources */,
......
Lighting/GuideIntegral.storyboard
View file @ 8c2af504
...@@ -68,13 +68,13 @@ ...@@ -68,13 +68,13 @@
<nil key="highlightedColor"/> <nil key="highlightedColor"/>
</label> </label>
<label opaque="NO" userInteractionEnabled="NO" contentMode="left" horizontalHuggingPriority="251" verticalHuggingPriority="251" misplaced="YES" text="" textAlignment="natural" lineBreakMode="tailTruncation" baselineAdjustment="alignBaselines" adjustsFontSizeToFit="NO" id="0Eh-Eu-GWV"> <label opaque="NO" userInteractionEnabled="NO" contentMode="left" horizontalHuggingPriority="251" verticalHuggingPriority="251" misplaced="YES" text="" textAlignment="natural" lineBreakMode="tailTruncation" baselineAdjustment="alignBaselines" adjustsFontSizeToFit="NO" id="0Eh-Eu-GWV">
<frame key="frameInset" minX="28.52%" minY="64.71%" width="14.03%" height="22"/> <frame key="frameInset" minX="28.47%" minY="64.71%" width="14.08%" height="22"/>
<autoresizingMask key="autoresizingMask" flexibleMinX="YES" widthSizable="YES" flexibleMaxX="YES" flexibleMinY="YES" flexibleMaxY="YES"/> <autoresizingMask key="autoresizingMask" flexibleMinX="YES" widthSizable="YES" flexibleMaxX="YES" flexibleMinY="YES" flexibleMaxY="YES"/>
<fontDescription key="fontDescription" type="system" pointSize="17"/> <fontDescription key="fontDescription" type="system" pointSize="17"/>
<nil key="highlightedColor"/> <nil key="highlightedColor"/>
</label> </label>
<label opaque="NO" userInteractionEnabled="NO" contentMode="left" horizontalHuggingPriority="251" verticalHuggingPriority="251" misplaced="YES" text="季度积分排行" textAlignment="natural" lineBreakMode="tailTruncation" baselineAdjustment="alignBaselines" adjustsFontSizeToFit="NO" id="zzy-VB-gpq"> <label opaque="NO" userInteractionEnabled="NO" contentMode="left" horizontalHuggingPriority="251" verticalHuggingPriority="251" misplaced="YES" text="季度积分排行" textAlignment="natural" lineBreakMode="tailTruncation" baselineAdjustment="alignBaselines" adjustsFontSizeToFit="NO" id="zzy-VB-gpq">
<frame key="frameInset" minX="28.52%" minY="30.07%" width="9.32%" height="18.5"/> <frame key="frameInset" minX="28.47%" minY="30.07%" width="9.37%" height="18.5"/>
<autoresizingMask key="autoresizingMask" flexibleMinX="YES" widthSizable="YES" flexibleMaxX="YES" flexibleMinY="YES" flexibleMaxY="YES"/> <autoresizingMask key="autoresizingMask" flexibleMinX="YES" widthSizable="YES" flexibleMaxX="YES" flexibleMinY="YES" flexibleMaxY="YES"/>
<fontDescription key="fontDescription" type="system" pointSize="13"/> <fontDescription key="fontDescription" type="system" pointSize="13"/>
<color key="textColor" red="0.66666666669999997" green="0.66666666669999997" blue="0.66666666669999997" alpha="1" colorSpace="custom" customColorSpace="sRGB"/> <color key="textColor" red="0.66666666669999997" green="0.66666666669999997" blue="0.66666666669999997" alpha="1" colorSpace="custom" customColorSpace="sRGB"/>
...@@ -242,7 +242,7 @@ ...@@ -242,7 +242,7 @@
<autoresizingMask key="autoresizingMask" widthSizable="YES" heightSizable="YES"/> <autoresizingMask key="autoresizingMask" widthSizable="YES" heightSizable="YES"/>
<subviews> <subviews>
<tableView clipsSubviews="YES" contentMode="scaleToFill" misplaced="YES" alwaysBounceVertical="YES" dataMode="prototypes" style="plain" separatorStyle="default" rowHeight="106" sectionHeaderHeight="28" sectionFooterHeight="28" id="6OB-63-x5H"> <tableView clipsSubviews="YES" contentMode="scaleToFill" misplaced="YES" alwaysBounceVertical="YES" dataMode="prototypes" style="plain" separatorStyle="default" rowHeight="106" sectionHeaderHeight="28" sectionFooterHeight="28" id="6OB-63-x5H">
<frame key="frameInset" minX="-0.5" minY="63" maxX="1" maxY="0.5"/> <frame key="frameInset" minX="-1" minY="62.5" maxX="1.5" maxY="1"/>
<autoresizingMask key="autoresizingMask" widthSizable="YES" heightSizable="YES"/> <autoresizingMask key="autoresizingMask" widthSizable="YES" heightSizable="YES"/>
<color key="backgroundColor" white="1" alpha="1" colorSpace="calibratedWhite"/> <color key="backgroundColor" white="1" alpha="1" colorSpace="calibratedWhite"/>
<prototypes> <prototypes>
...@@ -396,7 +396,7 @@ ...@@ -396,7 +396,7 @@
<autoresizingMask key="autoresizingMask"/> <autoresizingMask key="autoresizingMask"/>
</tableViewCellContentView> </tableViewCellContentView>
</tableViewCell> </tableViewCell>
<tableViewCell clipsSubviews="YES" contentMode="scaleToFill" misplaced="YES" selectionStyle="default" indentationWidth="10" reuseIdentifier="PrizeExchangeCourierTableViewCell" rowHeight="60" id="NIn-Su-84l" customClass="PrizeExchangeCourierTableViewCell"> <tableViewCell clipsSubviews="YES" contentMode="scaleToFill" misplaced="YES" selectionStyle="none" indentationWidth="10" reuseIdentifier="PrizeExchangeCourierTableViewCell" rowHeight="60" id="NIn-Su-84l" customClass="PrizeExchangeCourierTableViewCell">
<rect key="frame" x="0.0" y="414" width="1023.5" height="60"/> <rect key="frame" x="0.0" y="414" width="1023.5" height="60"/>
<autoresizingMask key="autoresizingMask"/> <autoresizingMask key="autoresizingMask"/>
<tableViewCellContentView key="contentView" opaque="NO" clipsSubviews="YES" multipleTouchEnabled="YES" contentMode="center" tableViewCell="NIn-Su-84l" id="slW-As-u76"> <tableViewCellContentView key="contentView" opaque="NO" clipsSubviews="YES" multipleTouchEnabled="YES" contentMode="center" tableViewCell="NIn-Su-84l" id="slW-As-u76">
......
Tools/BaseViewController.h
View file @ 8c2af504
...@@ -161,6 +161,12 @@ ...@@ -161,6 +161,12 @@
*/ */
+ (BOOL)isBlankString:(NSString *)string; + (BOOL)isBlankString:(NSString *)string;
/**
* 获取当前时间之前或者之后的时间（之前传入负数）
*/
+ (NSString *)getTimeby:(NSInteger)day;
/** /**
选择框 选择框
......
Tools/BaseViewController.m
View file @ 8c2af504
...@@ -203,6 +203,24 @@ ...@@ -203,6 +203,24 @@
[hud hide:YES afterDelay:3.0f]; [hud hide:YES afterDelay:3.0f];
} }
#pragma mark - 获取当前时间之前或者之后的时间（之前传入负数）
+ (NSString *)getTimeby:(NSInteger)day
{
NSDate*nowDate = [NSDate date];
NSDate* theDate;
if(day!=0){
NSTimeInterval oneDay = 24*60*60*1; //1天的长度
theDate = [nowDate initWithTimeIntervalSinceNow: oneDay*day];
}else{
theDate = nowDate;
}
NSDateFormatter *date_formatter = [[NSDateFormatter alloc] init];
[date_formatter setDateFormat:@"yyyy-MM-dd 00:00:00"];
NSString *the_date_str = [date_formatter stringFromDate:theDate];
return the_date_str;
}
#pragma mark -渐隐提示框 #pragma mark -渐隐提示框
- (void)SHOWPrompttext:(NSString *)Text - (void)SHOWPrompttext:(NSString *)Text
......
Tools/opple_objc_json_client.h
View file @ 8c2af504
...@@ -3,6 +3,44 @@ ...@@ -3,6 +3,44 @@
#import "JSONModel.h" #import "JSONModel.h"
/**
* 评分方法。
*
* @author thor
*
*/
/**
* 自动
*/
extern NSString * const GRADEMETHOD_AUTO;
/**
* 人工
*/
extern NSString * const GRADEMETHOD_MANUL;
/**
* @author wolv
*
*/
/**
*
*/
extern NSString * const TOPRIZEBILLENTITYSTATE_REQUESTED;
/**
*
*/
extern NSString * const TOPRIZEBILLENTITYSTATE_SHIPPED;
/**
*
*/
extern NSString * const TOPRIZEBILLENTITYSTATE_DONE;
/** /**
* @Description: TODO(排序定义) * @Description: TODO(排序定义)
* asc 升序 * asc 升序
...@@ -22,21 +60,31 @@ extern NSString * const SORTDIRECTION_DESC; ...@@ -22,21 +60,31 @@ extern NSString * const SORTDIRECTION_DESC;
/** /**
* @author wolv * 题目类型。
*
* @author thor
* *
*/ */
/** /**
* * 单选题
*/ */
extern NSString * const TOPRIZEBILLENTITYSTATE_REQUESTED; extern NSString * const PASSLEVELTOPICTYPE_SINGLE;
/** /**
* * 多选题
*/ */
extern NSString * const TOPRIZEBILLENTITYSTATE_SHIPPED; extern NSString * const PASSLEVELTOPICTYPE_MULTIPLE;
/** /**
* * 判断题
*/ */
extern NSString * const TOPRIZEBILLENTITYSTATE_DONE; extern NSString * const PASSLEVELTOPICTYPE_TRUEORFALSE;
/**
* 填空题
*/
extern NSString * const PASSLEVELTOPICTYPE_GAPFILLING;
/**
* 简答题
*/
extern NSString * const PASSLEVELTOPICTYPE_SHORTANSWER;
...@@ -61,6 +109,7 @@ extern NSString * const TOPRIZEBILLENTITYSTATE_DONE; ...@@ -61,6 +109,7 @@ extern NSString * const TOPRIZEBILLENTITYSTATE_DONE;
@class OrderBill; @class OrderBill;
@class OrderPayRequest; @class OrderPayRequest;
@class PromotionGoods; @class PromotionGoods;
@class PassLevelCondition;
@class PrizeCondition; @class PrizeCondition;
@class RsPrizeBillResponse; @class RsPrizeBillResponse;
@class SceneCondition; @class SceneCondition;
...@@ -78,18 +127,21 @@ extern NSString * const TOPRIZEBILLENTITYSTATE_DONE; ...@@ -78,18 +127,21 @@ extern NSString * const TOPRIZEBILLENTITYSTATE_DONE;
@class TOJingdongEcardEntity; @class TOJingdongEcardEntity;
@class TODrawEntity; @class TODrawEntity;
@class TOOrderdetailEntity; @class TOOrderdetailEntity;
@class TOPositionEntity; @class TOPassLevelEntity;
@class TOPrizeBillEntity; @class TOPassLevelTopicOptionEntity;
@class TOPrizeEntity; @class TOPrizeBillDetailsEntity;
@class TOScoreRecordEntity; @class TOSceneEntity;
@class TOShopcartEntity; @class TOShippingAddrEntity;
@class UCN; @class TOStudyTypeEntity;
@class Action; @class Action;
@class IdEntity; @class IdEntity;
@class TOStudyTypeEntity; @class UCN;
@class TOShippingAddrEntity; @class TOShopcartEntity;
@class TOSceneEntity; @class TOScoreRecordEntity;
@class TOPrizeBillDetailsEntity; @class TOPrizeEntity;
@class TOPrizeBillEntity;
@class TOPositionEntity;
@class TOPassLevelTopicEntity;
@class TOOrderPromotionEntity; @class TOOrderPromotionEntity;
@class TOOrderEntity; @class TOOrderEntity;
@class TOAwardEntity; @class TOAwardEntity;
...@@ -123,8 +175,9 @@ extern NSString * const TOPRIZEBILLENTITYSTATE_DONE; ...@@ -123,8 +175,9 @@ extern NSString * const TOPRIZEBILLENTITYSTATE_DONE;
@class RsAwardDraw; @class RsAwardDraw;
@class TSUserOrg; @class TSUserOrg;
@class RsLotteryResponse; @class RsLotteryResponse;
@class SceneResponse; @class PassLevelResponse;
@class ShopCartResponse; @class ShopCartResponse;
@class SceneResponse;
@class PrizeResponse; @class PrizeResponse;
@class OrderResponse; @class OrderResponse;
@class RsSimpleJingDongECardResponse; @class RsSimpleJingDongECardResponse;
...@@ -155,6 +208,7 @@ extern NSString * const TOPRIZEBILLENTITYSTATE_DONE; ...@@ -155,6 +208,7 @@ extern NSString * const TOPRIZEBILLENTITYSTATE_DONE;
@protocol OrderBill @end @protocol OrderBill @end
@protocol OrderPayRequest @end @protocol OrderPayRequest @end
@protocol PromotionGoods @end @protocol PromotionGoods @end
@protocol PassLevelCondition @end
@protocol PrizeCondition @end @protocol PrizeCondition @end
@protocol RsPrizeBillResponse @end @protocol RsPrizeBillResponse @end
@protocol SceneCondition @end @protocol SceneCondition @end
...@@ -172,18 +226,21 @@ extern NSString * const TOPRIZEBILLENTITYSTATE_DONE; ...@@ -172,18 +226,21 @@ extern NSString * const TOPRIZEBILLENTITYSTATE_DONE;
@protocol TOJingdongEcardEntity @end @protocol TOJingdongEcardEntity @end
@protocol TODrawEntity @end @protocol TODrawEntity @end
@protocol TOOrderdetailEntity @end @protocol TOOrderdetailEntity @end
@protocol TOPositionEntity @end @protocol TOPassLevelEntity @end
@protocol TOPrizeBillEntity @end @protocol TOPassLevelTopicOptionEntity @end
@protocol TOPrizeEntity @end @protocol TOPrizeBillDetailsEntity @end
@protocol TOScoreRecordEntity @end @protocol TOSceneEntity @end
@protocol TOShopcartEntity @end @protocol TOShippingAddrEntity @end
@protocol UCN @end @protocol TOStudyTypeEntity @end
@protocol Action @end @protocol Action @end
@protocol IdEntity @end @protocol IdEntity @end
@protocol TOStudyTypeEntity @end @protocol UCN @end
@protocol TOShippingAddrEntity @end @protocol TOShopcartEntity @end
@protocol TOSceneEntity @end @protocol TOScoreRecordEntity @end
@protocol TOPrizeBillDetailsEntity @end @protocol TOPrizeEntity @end
@protocol TOPrizeBillEntity @end
@protocol TOPositionEntity @end
@protocol TOPassLevelTopicEntity @end
@protocol TOOrderPromotionEntity @end @protocol TOOrderPromotionEntity @end
@protocol TOOrderEntity @end @protocol TOOrderEntity @end
@protocol TOAwardEntity @end @protocol TOAwardEntity @end
...@@ -217,8 +274,9 @@ extern NSString * const TOPRIZEBILLENTITYSTATE_DONE; ...@@ -217,8 +274,9 @@ extern NSString * const TOPRIZEBILLENTITYSTATE_DONE;
@protocol RsAwardDraw @end @protocol RsAwardDraw @end
@protocol TSUserOrg @end @protocol TSUserOrg @end
@protocol RsLotteryResponse @end @protocol RsLotteryResponse @end
@protocol SceneResponse @end @protocol PassLevelResponse @end
@protocol ShopCartResponse @end @protocol ShopCartResponse @end
@protocol SceneResponse @end
@protocol PrizeResponse @end @protocol PrizeResponse @end
@protocol OrderResponse @end @protocol OrderResponse @end
@protocol RsSimpleJingDongECardResponse @end @protocol RsSimpleJingDongECardResponse @end
...@@ -969,6 +1027,50 @@ extern NSString * const TOPRIZEBILLENTITYSTATE_DONE; ...@@ -969,6 +1027,50 @@ extern NSString * const TOPRIZEBILLENTITYSTATE_DONE;
/**
* (no documentation provided)
*/
@interface PassLevelCondition : JSONModel
/**
* (no documentation provided)
*
*
*/
@property (nonatomic, copy) NSString *titleLike;
/**
* (no documentation provided)
*
*
*/
@property (nonatomic, copy) NSString *beginDateFrom;
/**
* (no documentation provided)
*
*
*/
@property (nonatomic, copy) NSString *endDateTo;
/**
* (no documentation provided)
*
*
*/
@property (nonatomic, assign) BOOL validEquals;
/**
* (no documentation provided)
*
*
*/
@property (nonatomic, copy) NSString *employeeIdEquals;
/**
* (no documentation provided)
*
*
*/
@property (nonatomic, strong) DataPage *page;
@end /* interface PassLevelCondition */
/** /**
* 奖品查询条件 * 奖品查询条件
...@@ -1293,6 +1395,12 @@ extern NSString * const TOPRIZEBILLENTITYSTATE_DONE; ...@@ -1293,6 +1395,12 @@ extern NSString * const TOPRIZEBILLENTITYSTATE_DONE;
* *
*/ */
@property (nonatomic, copy) NSString *entityId; @property (nonatomic, copy) NSString *entityId;
/**
* 播放时间
*
*
*/
@property (nonatomic, copy) NSString *playTime;
@end /* interface TOAttachmentEntity */ @end /* interface TOAttachmentEntity */
...@@ -1865,276 +1973,412 @@ extern NSString * const TOPRIZEBILLENTITYSTATE_DONE; ...@@ -1865,276 +1973,412 @@ extern NSString * const TOPRIZEBILLENTITYSTATE_DONE;
/** /**
* @Title: Entity * @Title: Entity
@Description: 经销商员工职位 @Description: 闯关
@author onlineGenerator @author onlineGenerator
@date 2016-05-02 17:39:21 @date 2016-11-13 20:47:10
@version V1.0 @version V1.0
*/ */
@interface TOPositionEntity : JSONModel @interface TOPassLevelEntity : JSONModel
/** /**
* 方法: 取得java.lang.String * 方法: 取得主键
* *
* *
*/ */
@property (nonatomic, copy) NSString *fid; @property (nonatomic, copy) NSString *fid;
/** /**
* 方法: 取得java.lang.String * 方法: 取得创建人名称
* *
* *
*/ */
@property (nonatomic, copy) NSString *code; @property (nonatomic, copy) NSString *createName;
/** /**
* 方法: 取得java.lang.String * 方法: 取得创建人登录名称
* *
* *
*/ */
@property (nonatomic, copy) NSString *name; @property (nonatomic, copy) NSString *createBy;
/** /**
* 方法: 取得java.math.BigDecimal * 方法: 取得创建日期
* *
* *
*/ */
@property (nonatomic, strong) NSNumber *commission; @property (nonatomic, copy) NSString *createDate;
/** /**
* (no documentation provided) * 方法: 取得更新人名称
* *
* *
*/ */
@property (nonatomic, strong) NSNumber *lowestDiscount; @property (nonatomic, copy) NSString *updateName;
/** /**
* 方法: 取得java.lang.String * 方法: 取得更新人登录名称
* *
* *
*/ */
@property (nonatomic, copy) NSString *resellerCode; @property (nonatomic, copy) NSString *updateBy;
@end /* interface TOPositionEntity */
/** /**
* 兑奖单实体 * 方法: 取得更新日期
*
@author wolv *
*/ */
@interface TOPrizeBillEntity : JSONModel @property (nonatomic, copy) NSString *updateDate;
/** /**
* * 方法: 取得所属部门
* *
* *
*/ */
@property (nonatomic, copy) NSString *fid; @property (nonatomic, copy) NSString *sysOrgCode;
/** /**
* * 方法: 取得开始时间
* *
* *
*/ */
@property (nonatomic, copy) NSString *createName; @property (nonatomic, copy) NSString *beginDate;
/** /**
* * 方法: 取得结束时间
* *
* *
*/ */
@property (nonatomic, copy) NSString *createBy; @property (nonatomic, copy) NSString *endDate;
/** /**
* * 方法: 取得及格分数线
* *
* *
*/ */
@property (nonatomic, copy) NSString *createDate; @property (nonatomic, assign) NSInteger passGrade;
/** /**
* * 标题
* *
* *
*/ */
@property (nonatomic, copy) NSString *updateName; @property (nonatomic, copy) NSString *title;
/** /**
* 方法: 取得评分方法
* *
* 取值: GRADEMETHOD_AUTO, GRADEMETHOD_MANUL,
*/
@property (nonatomic, copy) NSString *gradeMethod;
/**
* 方法: 取得积分
* *
* *
*/ */
@property (nonatomic, copy) NSString *updateBy; @property (nonatomic, strong) NSNumber *score;
/** /**
* * 是否生效
* *
* *
*/ */
@property (nonatomic, copy) NSString *updateDate; @property (nonatomic, assign) BOOL valid;
/** /**
* 闯关结果
* *
* *
*/
@property (nonatomic, copy) NSString *passResult;
/**
* 题目列表
* @see TOPassLevelTopicEntity
* *
*/ */
@property (nonatomic, copy) NSString *billnumber; @property (nonatomic, strong) NSArray<TOPassLevelTopicEntity> *topics;
@end /* interface TOPassLevelEntity */
/** /**
* @Title: Entity
@Description: 闯关题目选项
@author onlineGenerator
@date 2016-11-13 20:48:07
@version V1.0
*/
@interface TOPassLevelTopicOptionEntity : JSONModel
/**
* 方法: 取得主键
* *
* *
* 取值: TOPRIZEBILLENTITYSTATE_REQUESTED, TOPRIZEBILLENTITYSTATE_SHIPPED, TOPRIZEBILLENTITYSTATE_DONE,
*/ */
@property (nonatomic, copy) NSString *state; @property (nonatomic, copy) NSString *fid;
/** /**
* * 方法: 取得索引
* *
* *
*/ */
@property (nonatomic, copy) NSString *receiver; @property (nonatomic, assign) NSInteger findex;
/** /**
* * 方法: 取得取值
* *
* *
*/ */
@property (nonatomic, copy) NSString *mobilephone; @property (nonatomic, copy) NSString *value;
/** /**
* 方法: 取得标题
* *
* *
*/
@property (nonatomic, copy) NSString *name;
/**
* 方法: 取得题目id
*
* *
*/ */
@property (nonatomic, copy) NSString *receiveAddress; @property (nonatomic, copy) NSString *topicId;
@end /* interface TOPassLevelTopicOptionEntity */
/**
* 兑奖单奖品明细
@author wolv
*/
@interface TOPrizeBillDetailsEntity : JSONModel
/** /**
* *
* *
* *
*/ */
@property (nonatomic, copy) NSString *employee; @property (nonatomic, copy) NSString *fid;
/** /**
* *
* *
* *
*/ */
@property (nonatomic, copy) NSString *logisticsCompany; @property (nonatomic, copy) NSString *bill;
/** /**
* *
* *
* *
*/ */
@property (nonatomic, copy) NSString *trackingNumber; @property (nonatomic, strong) TOPrizeEntity *prize;
@end /* interface TOPrizeBillEntity */ @end /* interface TOPrizeBillDetailsEntity */
/** /**
* 奖品 * @Title: Entity
@Description: 场景
@author onlineGenerator
@date 2016-05-05 18:39:39
@version V1.0
@author wolv
*/ */
@interface TOPrizeEntity : JSONModel @interface TOSceneEntity : JSONModel
/** /**
* * 方法: 取得java.lang.String
* *
* *
*/ */
@property (nonatomic, copy) NSString *fid; @property (nonatomic, copy) NSString *fid;
/** /**
* * 方法: 取得java.lang.String
* *
* *
*/ */
@property (nonatomic, copy) NSString *picture; @property (nonatomic, copy) NSString *sceneCode;
/** /**
* * 方法: 取得java.lang.String
* *
* *
*/ */
@property (nonatomic, copy) NSString *createName; @property (nonatomic, copy) NSString *name;
/** /**
* 方法: 取得java.lang.String
* *
* *
*/
@property (nonatomic, copy) NSString *pricure;
/**
* 方法: 取得java.lang.String
*
* *
*/ */
@property (nonatomic, copy) NSString *createBy; @property (nonatomic, copy) NSString *category;
/** /**
* 方法: 取得java.lang.String
* *
* *
*/
@property (nonatomic, copy) NSString *style;
/**
* 方法: 取得java.lang.String
*
* *
*/ */
@property (nonatomic, copy) NSString *updateName; @property (nonatomic, copy) NSString *space;
@end /* interface TOSceneEntity */
/** /**
* @Title: Entity
@Description: t_o_shipping_addr
@author onlineGenerator
@date 2016-05-14 16:14:15
@version V1.0
*/
@interface TOShippingAddrEntity : JSONModel
/**
* 方法: 取得java.lang.String
* *
* *
*/
@property (nonatomic, copy) NSString *fid;
/**
* 方法: 取得java.util.Date
*
* *
*/ */
@property (nonatomic, copy) NSString *updateBy; @property (nonatomic, copy) NSString *createDate;
/** /**
* 方法: 取得java.lang.String
*
* *
*/
@property (nonatomic, copy) NSString *sysOrgCode;
/**
* 方法: 取得java.lang.String
* *
* *
*/ */
@property (nonatomic, copy) NSString *code; @property (nonatomic, copy) NSString *name;
/** /**
* 方法: 取得java.lang.String
*
* *
*/
@property (nonatomic, copy) NSString *miblephone;
/**
* 方法: 取得java.lang.String
* *
* *
*/ */
@property (nonatomic, copy) NSString *name; @property (nonatomic, copy) NSString *province;
/** /**
* 方法: 取得java.lang.String
* *
* *
*/
@property (nonatomic, copy) NSString *city;
/**
* 方法: 取得java.lang.String
*
* *
*/ */
@property (nonatomic, copy) NSString *createDate; @property (nonatomic, copy) NSString *country;
/** /**
* 方法: 取得java.lang.String
* *
* *
*/
@property (nonatomic, copy) NSString *address;
/**
* 方法: 取得java.lang.String
*
* *
*/ */
@property (nonatomic, copy) NSString *updateDate; @property (nonatomic, copy) NSString *consumerId;
@end /* interface TOPrizeEntity */ @end /* interface TOShippingAddrEntity */
/** /**
* 积分变更记录 * @Title: Entity
@Description: 学习类型
@author onlineGenerator
@date 2016-11-05 16:44:04
@version V1.0
@author wolv
*/ */
@interface TOScoreRecordEntity : JSONModel @interface TOStudyTypeEntity : JSONModel
/** /**
* * 唯一标识。
* *
* *
*/ */
@property (nonatomic, copy) NSString *fid; @property (nonatomic, copy) NSString *fid;
/** /**
* * 名称。
* *
* *
*/ */
@property (nonatomic, copy) NSString *createDate; @property (nonatomic, copy) NSString *name;
/** /**
* * 附件id
* *
* *
*/ */
@property (nonatomic, copy) NSString *employeeId; @property (nonatomic, copy) NSString *attachmentId;
/** /**
* * 附件
* *
* *
*/ */
@property (nonatomic, assign) double score; @property (nonatomic, strong) TOAttachmentEntity *attachment;
@end /* interface TOStudyTypeEntity */
/** /**
* * 促销动作。
@author Debenson
@since 0.1
*/
@interface Action : JSONModel
@end /* interface Action */
/**
* (no documentation provided)
*/
@interface IdEntity : JSONModel
/**
* (no documentation provided)
* *
* *
*/ */
@property (nonatomic, copy) NSString *sourceId; @property (nonatomic, copy) NSString *fid;
@end /* interface IdEntity */
/** /**
* * UUID + CODE + NAME
@author Debenson
@since 0.1
*/
@interface UCN : JSONModel
/**
* (no documentation provided)
* *
* *
*/ */
@property (nonatomic, copy) NSString *sourceType; @property (nonatomic, copy) NSString *uuid;
/** /**
* (no documentation provided)
*
* *
*/
@property (nonatomic, copy) NSString *code;
/**
* (no documentation provided)
* *
* *
*/ */
@property (nonatomic, copy) NSString *sourceReason; @property (nonatomic, copy) NSString *name;
@end /* interface TOScoreRecordEntity */ @end /* interface UCN */
...@@ -2183,231 +2427,288 @@ extern NSString * const TOPRIZEBILLENTITYSTATE_DONE; ...@@ -2183,231 +2427,288 @@ extern NSString * const TOPRIZEBILLENTITYSTATE_DONE;
* *
* *
*/ */
@property (nonatomic, copy) NSString *updateName; @property (nonatomic, copy) NSString *updateName;
/**
* 方法: 取得java.lang.String
*
*
*/
@property (nonatomic, copy) NSString *updateBy;
/**
* 方法: 取得java.util.Date
*
*
*/
@property (nonatomic, copy) NSString *updateDate;
/**
* 方法: 取得java.lang.String
*
*
*/
@property (nonatomic, copy) NSString *goodsId;
/**
* 方法: 取得java.lang.Integer
*
*
*/
@property (nonatomic, assign) NSInteger goodsNum;
/**
* 方法: 取得java.lang.String
*
*
*/
@property (nonatomic, copy) NSString *consumerId;
/**
* 方法: 取得java.lang.String
*
*
*/
@property (nonatomic, copy) NSString *resellerId;
/**
* 方法: 取得java.lang.String
*
*
*/
@property (nonatomic, strong) NSNumber *costPrice;
@end /* interface TOShopcartEntity */
/**
* 积分变更记录
@author wolv
*/
@interface TOScoreRecordEntity : JSONModel
/**
*
*
*
*/
@property (nonatomic, copy) NSString *fid;
/**
*
*
*
*/
@property (nonatomic, copy) NSString *createDate;
/**
*
*
*
*/
@property (nonatomic, copy) NSString *employeeId;
/**
*
*
*
*/
@property (nonatomic, assign) double score;
/** /**
* 方法: 取得java.lang.String *
* *
* *
*/ */
@property (nonatomic, copy) NSString *updateBy; @property (nonatomic, copy) NSString *sourceId;
/** /**
* 方法: 取得java.util.Date *
* *
* *
*/ */
@property (nonatomic, copy) NSString *updateDate; @property (nonatomic, copy) NSString *sourceType;
/** /**
* 方法: 取得java.lang.String *
* *
* *
*/ */
@property (nonatomic, copy) NSString *goodsId; @property (nonatomic, copy) NSString *sourceReason;
@end /* interface TOScoreRecordEntity */
/** /**
* 方法: 取得java.lang.Integer * 奖品
@author wolv
*/
@interface TOPrizeEntity : JSONModel
/**
*
* *
* *
*/ */
@property (nonatomic, assign) NSInteger goodsNum; @property (nonatomic, copy) NSString *fid;
/** /**
* 方法: 取得java.lang.String *
* *
* *
*/ */
@property (nonatomic, copy) NSString *consumerId; @property (nonatomic, copy) NSString *picture;
/** /**
* 方法: 取得java.lang.String *
* *
* *
*/ */
@property (nonatomic, copy) NSString *resellerId; @property (nonatomic, copy) NSString *createName;
/** /**
* 方法: 取得java.lang.String *
* *
* *
*/ */
@property (nonatomic, strong) NSNumber *costPrice; @property (nonatomic, copy) NSString *createBy;
@end /* interface TOShopcartEntity */
/** /**
* UUID + CODE + NAME *
*
@author Debenson *
@since 0.1
*/ */
@interface UCN : JSONModel @property (nonatomic, copy) NSString *updateName;
/** /**
* (no documentation provided) *
* *
* *
*/ */
@property (nonatomic, copy) NSString *uuid; @property (nonatomic, copy) NSString *updateBy;
/** /**
* (no documentation provided) *
* *
* *
*/ */
@property (nonatomic, copy) NSString *code; @property (nonatomic, copy) NSString *code;
/** /**
* (no documentation provided) *
* *
* *
*/ */
@property (nonatomic, copy) NSString *name; @property (nonatomic, copy) NSString *name;
@end /* interface UCN */
/**
* 促销动作。
@author Debenson
@since 0.1
*/
@interface Action : JSONModel
@end /* interface Action */
/** /**
* (no documentation provided) *
*
*
*/ */
@interface IdEntity : JSONModel @property (nonatomic, copy) NSString *createDate;
/** /**
* (no documentation provided) *
* *
* *
*/ */
@property (nonatomic, copy) NSString *fid; @property (nonatomic, copy) NSString *updateDate;
@end /* interface IdEntity */ @end /* interface TOPrizeEntity */
/** /**
* @Title: Entity * 兑奖单实体
@Description: 学习类型
@author onlineGenerator
@date 2016-11-05 16:44:04
@version V1.0
@author wolv
*/ */
@interface TOStudyTypeEntity : JSONModel @interface TOPrizeBillEntity : JSONModel
/** /**
* 唯一标识。 *
* *
* *
*/ */
@property (nonatomic, copy) NSString *fid; @property (nonatomic, copy) NSString *fid;
/** /**
* 名称。 *
* *
* *
*/ */
@property (nonatomic, copy) NSString *name; @property (nonatomic, copy) NSString *createName;
/** /**
* 附件id *
* *
* *
*/ */
@property (nonatomic, copy) NSString *attachmentId; @property (nonatomic, copy) NSString *createBy;
/** /**
* 附件 *
* *
* *
*/ */
@property (nonatomic, strong) TOAttachmentEntity *attachment; @property (nonatomic, copy) NSString *createDate;
@end /* interface TOStudyTypeEntity */
/** /**
* @Title: Entity *
@Description: t_o_shipping_addr *
@author onlineGenerator *
@date 2016-05-14 16:14:15
@version V1.0
*/ */
@interface TOShippingAddrEntity : JSONModel @property (nonatomic, copy) NSString *updateName;
/** /**
* 方法: 取得java.lang.String *
* *
* *
*/ */
@property (nonatomic, copy) NSString *fid; @property (nonatomic, copy) NSString *updateBy;
/** /**
* 方法: 取得java.util.Date *
* *
* *
*/ */
@property (nonatomic, copy) NSString *createDate; @property (nonatomic, copy) NSString *updateDate;
/** /**
* 方法: 取得java.lang.String *
* *
* *
*/ */
@property (nonatomic, copy) NSString *sysOrgCode; @property (nonatomic, copy) NSString *billnumber;
/** /**
* 方法: 取得java.lang.String
* *
* *
* 取值: TOPRIZEBILLENTITYSTATE_REQUESTED, TOPRIZEBILLENTITYSTATE_SHIPPED, TOPRIZEBILLENTITYSTATE_DONE,
*/ */
@property (nonatomic, copy) NSString *name; @property (nonatomic, copy) NSString *state;
/** /**
* 方法: 取得java.lang.String *
* *
* *
*/ */
@property (nonatomic, copy) NSString *miblephone; @property (nonatomic, copy) NSString *receiver;
/** /**
* 方法: 取得java.lang.String *
* *
* *
*/ */
@property (nonatomic, copy) NSString *province; @property (nonatomic, copy) NSString *mobilephone;
/** /**
* 方法: 取得java.lang.String *
* *
* *
*/ */
@property (nonatomic, copy) NSString *city; @property (nonatomic, copy) NSString *receiveAddress;
/** /**
* 方法: 取得java.lang.String *
* *
* *
*/ */
@property (nonatomic, copy) NSString *country; @property (nonatomic, copy) NSString *employee;
/** /**
* 方法: 取得java.lang.String *
* *
* *
*/ */
@property (nonatomic, copy) NSString *address; @property (nonatomic, copy) NSString *logisticsCompany;
/** /**
* 方法: 取得java.lang.String *
* *
* *
*/ */
@property (nonatomic, copy) NSString *consumerId; @property (nonatomic, copy) NSString *trackingNumber;
@end /* interface TOShippingAddrEntity */ @end /* interface TOPrizeBillEntity */
/** /**
* @Title: Entity * @Title: Entity
@Description: 场景 @Description: 经销商员工职位
@author onlineGenerator @author onlineGenerator
@date 2016-05-05 18:39:39 @date 2016-05-02 17:39:21
@version V1.0 @version V1.0
*/ */
@interface TOSceneEntity : JSONModel @interface TOPositionEntity : JSONModel
/** /**
* 方法: 取得java.lang.String * 方法: 取得java.lang.String
* *
...@@ -2419,7 +2720,7 @@ extern NSString * const TOPRIZEBILLENTITYSTATE_DONE; ...@@ -2419,7 +2720,7 @@ extern NSString * const TOPRIZEBILLENTITYSTATE_DONE;
* *
* *
*/ */
@property (nonatomic, copy) NSString *sceneCode; @property (nonatomic, copy) NSString *code;
/** /**
* 方法: 取得java.lang.String * 方法: 取得java.lang.String
* *
...@@ -2427,59 +2728,85 @@ extern NSString * const TOPRIZEBILLENTITYSTATE_DONE; ...@@ -2427,59 +2728,85 @@ extern NSString * const TOPRIZEBILLENTITYSTATE_DONE;
*/ */
@property (nonatomic, copy) NSString *name; @property (nonatomic, copy) NSString *name;
/** /**
* 方法: 取得java.lang.String * 方法: 取得java.math.BigDecimal
*
*
*/
@property (nonatomic, copy) NSString *pricure;
/**
* 方法: 取得java.lang.String
* *
* *
*/ */
@property (nonatomic, copy) NSString *category; @property (nonatomic, strong) NSNumber *commission;
/** /**
* 方法: 取得java.lang.String * (no documentation provided)
* *
* *
*/ */
@property (nonatomic, copy) NSString *style; @property (nonatomic, strong) NSNumber *lowestDiscount;
/** /**
* 方法: 取得java.lang.String * 方法: 取得java.lang.String
* *
* *
*/ */
@property (nonatomic, copy) NSString *space; @property (nonatomic, copy) NSString *resellerCode;
@end /* interface TOSceneEntity */ @end /* interface TOPositionEntity */
/** /**
* 兑奖单奖品明细 * @Title: Entity
@Description: 闯关题目
@author wolv @author onlineGenerator
@date 2016-11-13 20:47:49
@version V1.0
*/ */
@interface TOPrizeBillDetailsEntity : JSONModel @interface TOPassLevelTopicEntity : JSONModel
/** /**
* * 方法: 取得主键
* *
* *
*/ */
@property (nonatomic, copy) NSString *fid; @property (nonatomic, copy) NSString *fid;
/** /**
* 方法: 取得题目类型
*
* 取值: PASSLEVELTOPICTYPE_SINGLE, PASSLEVELTOPICTYPE_MULTIPLE, PASSLEVELTOPICTYPE_TRUEORFALSE, PASSLEVELTOPICTYPE_GAPFILLING, PASSLEVELTOPICTYPE_SHORTANSWER,
*/
@property (nonatomic, copy) NSString *topicType;
/**
* 方法: 取得行号
* *
* *
*/
@property (nonatomic, assign) NSInteger lineNo;
/**
* 方法: 取得标题
*
* *
*/ */
@property (nonatomic, copy) NSString *bill; @property (nonatomic, copy) NSString *title;
/**
* 方法: 取得答案
*
*
*/
@property (nonatomic, copy) NSString *answer;
/** /**
* 方法: 取得分数
*
* *
*/
@property (nonatomic, strong) NSNumber *grade;
/**
* 方法: 取得闯关id
* *
* *
*/ */
@property (nonatomic, copy) NSString *prize; @property (nonatomic, copy) NSString *passLevelId;
@end /* interface TOPrizeBillDetailsEntity */ /**
* 选项
* @see TOPassLevelTopicOptionEntity
*
*/
@property (nonatomic, strong) NSArray<TOPassLevelTopicOptionEntity> *options;
@end /* interface TOPassLevelTopicEntity */
...@@ -2612,7 +2939,7 @@ extern NSString * const TOPRIZEBILLENTITYSTATE_DONE; ...@@ -2612,7 +2939,7 @@ extern NSString * const TOPRIZEBILLENTITYSTATE_DONE;
* *
* *
*/ */
@property (nonatomic, strong) NSNumber *JDEcardDenomation; @property (nonatomic, strong) NSNumber *jdEcardDenomation;
/** /**
* 方法: 红包面额 * 方法: 红包面额
* *
...@@ -4468,18 +4795,16 @@ extern NSString * const TOPRIZEBILLENTITYSTATE_DONE; ...@@ -4468,18 +4795,16 @@ extern NSString * const TOPRIZEBILLENTITYSTATE_DONE;
/** /**
* @author Administrator * (no documentation provided)
@since 0.1
*/ */
@interface SceneResponse : PageRows @interface PassLevelResponse : PageRows
/** /**
* (no documentation provided) * 闯关列表
* @see TOSceneEntity * @see TOPassLevelEntity
* *
*/ */
@property (nonatomic, strong) NSArray<TOSceneEntity> *list; @property (nonatomic, strong) NSArray<TOPassLevelEntity> *passLevelEntity;
@end /* interface SceneResponse */ @end /* interface PassLevelResponse */
...@@ -4501,6 +4826,22 @@ extern NSString * const TOPRIZEBILLENTITYSTATE_DONE; ...@@ -4501,6 +4826,22 @@ extern NSString * const TOPRIZEBILLENTITYSTATE_DONE;
/**
* @author Administrator
@since 0.1
*/
@interface SceneResponse : PageRows
/**
* (no documentation provided)
* @see TOSceneEntity
*
*/
@property (nonatomic, strong) NSArray<TOSceneEntity> *list;
@end /* interface SceneResponse */
/** /**
* 奖品查询结果 * 奖品查询结果
...@@ -4685,7 +5026,7 @@ extern NSString * const TOPRIZEBILLENTITYSTATE_DONE; ...@@ -4685,7 +5026,7 @@ extern NSString * const TOPRIZEBILLENTITYSTATE_DONE;
*/ */
@property (nonatomic, copy) NSString *updateBy; @property (nonatomic, copy) NSString *updateBy;
/** /**
* 方法: 取得java.lang.String * 方法: ���得java.lang.String
* *
* *
*/ */
...@@ -4696,6 +5037,12 @@ extern NSString * const TOPRIZEBILLENTITYSTATE_DONE; ...@@ -4696,6 +5037,12 @@ extern NSString * const TOPRIZEBILLENTITYSTATE_DONE;
* *
*/ */
@property (nonatomic, copy) NSString *position; @property (nonatomic, copy) NSString *position;
/**
* 备注
*
*
*/
@property (nonatomic, copy) NSString *note;
@end /* interface TSUser */ @end /* interface TSUser */
......
Tools/opple_objc_json_client.m
View file @ 8c2af504
...@@ -302,6 +302,22 @@ ...@@ -302,6 +302,22 @@
} }
@end
@implementation PassLevelCondition
@synthesize titleLike;
@synthesize beginDateFrom;
@synthesize endDateTo;
@synthesize validEquals;
@synthesize employeeIdEquals;
@synthesize page;
+(BOOL)propertyIsOptional:(NSString*)propertyName
{
return YES;
}
@end @end
@implementation PrizeCondition @implementation PrizeCondition
...@@ -439,6 +455,7 @@ ...@@ -439,6 +455,7 @@
@synthesize thumbnailUrl; @synthesize thumbnailUrl;
@synthesize entityType; @synthesize entityType;
@synthesize entityId; @synthesize entityId;
@synthesize playTime;
+(BOOL)propertyIsOptional:(NSString*)propertyName +(BOOL)propertyIsOptional:(NSString*)propertyName
{ {
...@@ -662,13 +679,28 @@ ...@@ -662,13 +679,28 @@
@end @end
@implementation TOPositionEntity NSString * const GRADEMETHOD_AUTO = @"auto";
NSString * const GRADEMETHOD_MANUL = @"manul";
@implementation TOPassLevelEntity
@synthesize fid; @synthesize fid;
@synthesize code; @synthesize createName;
@synthesize name; @synthesize createBy;
@synthesize commission; @synthesize createDate;
@synthesize lowestDiscount; @synthesize updateName;
@synthesize resellerCode; @synthesize updateBy;
@synthesize updateDate;
@synthesize sysOrgCode;
@synthesize beginDate;
@synthesize endDate;
@synthesize passGrade;
@synthesize title;
@synthesize gradeMethod;
@synthesize score;
@synthesize valid;
@synthesize passResult;
@synthesize topics;
+(BOOL)propertyIsOptional:(NSString*)propertyName +(BOOL)propertyIsOptional:(NSString*)propertyName
{ {
...@@ -686,22 +718,12 @@ ...@@ -686,22 +718,12 @@
@end @end
@implementation TOPrizeBillEntity @implementation TOPassLevelTopicOptionEntity
@synthesize fid; @synthesize fid;
@synthesize createName; @synthesize findex;
@synthesize createBy; @synthesize value;
@synthesize createDate; @synthesize name;
@synthesize updateName; @synthesize topicId;
@synthesize updateBy;
@synthesize updateDate;
@synthesize billnumber;
@synthesize state;
@synthesize receiver;
@synthesize mobilephone;
@synthesize receiveAddress;
@synthesize employee;
@synthesize logisticsCompany;
@synthesize trackingNumber;
+(BOOL)propertyIsOptional:(NSString*)propertyName +(BOOL)propertyIsOptional:(NSString*)propertyName
{ {
...@@ -719,17 +741,10 @@ ...@@ -719,17 +741,10 @@
@end @end
@implementation TOPrizeEntity @implementation TOPrizeBillDetailsEntity
@synthesize fid; @synthesize fid;
@synthesize picture; @synthesize bill;
@synthesize createName; @synthesize prize;
@synthesize createBy;
@synthesize updateName;
@synthesize updateBy;
@synthesize code;
@synthesize name;
@synthesize createDate;
@synthesize updateDate;
+(BOOL)propertyIsOptional:(NSString*)propertyName +(BOOL)propertyIsOptional:(NSString*)propertyName
{ {
...@@ -747,14 +762,19 @@ ...@@ -747,14 +762,19 @@
@end @end
@implementation TOScoreRecordEntity NSString * const TOPRIZEBILLENTITYSTATE_REQUESTED = @"requested";
NSString * const TOPRIZEBILLENTITYSTATE_SHIPPED = @"shipped";
NSString * const TOPRIZEBILLENTITYSTATE_DONE = @"done";
@implementation TOSceneEntity
@synthesize fid; @synthesize fid;
@synthesize createDate; @synthesize sceneCode;
@synthesize employeeId; @synthesize name;
@synthesize score; @synthesize pricure;
@synthesize sourceId; @synthesize category;
@synthesize sourceType; @synthesize style;
@synthesize sourceReason; @synthesize space;
+(BOOL)propertyIsOptional:(NSString*)propertyName +(BOOL)propertyIsOptional:(NSString*)propertyName
{ {
...@@ -772,20 +792,17 @@ ...@@ -772,20 +792,17 @@
@end @end
@implementation TOShopcartEntity @implementation TOShippingAddrEntity
@synthesize goods;
@synthesize fid; @synthesize fid;
@synthesize createName;
@synthesize createBy;
@synthesize createDate; @synthesize createDate;
@synthesize updateName; @synthesize sysOrgCode;
@synthesize updateBy; @synthesize name;
@synthesize updateDate; @synthesize miblephone;
@synthesize goodsId; @synthesize province;
@synthesize goodsNum; @synthesize city;
@synthesize country;
@synthesize address;
@synthesize consumerId; @synthesize consumerId;
@synthesize resellerId;
@synthesize costPrice;
+(BOOL)propertyIsOptional:(NSString*)propertyName +(BOOL)propertyIsOptional:(NSString*)propertyName
{ {
...@@ -803,10 +820,11 @@ ...@@ -803,10 +820,11 @@
@end @end
@implementation UCN @implementation TOStudyTypeEntity
@synthesize uuid; @synthesize fid;
@synthesize code;
@synthesize name; @synthesize name;
@synthesize attachmentId;
@synthesize attachment;
+(BOOL)propertyIsOptional:(NSString*)propertyName +(BOOL)propertyIsOptional:(NSString*)propertyName
{ {
...@@ -814,6 +832,14 @@ ...@@ -814,6 +832,14 @@
} }
+(JSONKeyMapper*)keyMapper
{
return [[JSONKeyMapper alloc] initWithDictionary:@{
@"id": @"fid",
}];
}
@end @end
@implementation Action @implementation Action
...@@ -824,14 +850,58 @@ ...@@ -824,14 +850,58 @@
} }
@end
@implementation IdEntity
@synthesize fid;
+(BOOL)propertyIsOptional:(NSString*)propertyName
{
return YES;
}
+(JSONKeyMapper*)keyMapper
{
return [[JSONKeyMapper alloc] initWithDictionary:@{
@"id": @"fid",
}];
}
@end @end
NSString * const SORTDIRECTION_ASC = @"asc"; NSString * const SORTDIRECTION_ASC = @"asc";
NSString * const SORTDIRECTION_DESC = @"desc"; NSString * const SORTDIRECTION_DESC = @"desc";
@implementation IdEntity @implementation UCN
@synthesize uuid;
@synthesize code;
@synthesize name;
+(BOOL)propertyIsOptional:(NSString*)propertyName
{
return YES;
}
@end
@implementation TOShopcartEntity
@synthesize goods;
@synthesize fid; @synthesize fid;
@synthesize createName;
@synthesize createBy;
@synthesize createDate;
@synthesize updateName;
@synthesize updateBy;
@synthesize updateDate;
@synthesize goodsId;
@synthesize goodsNum;
@synthesize consumerId;
@synthesize resellerId;
@synthesize costPrice;
+(BOOL)propertyIsOptional:(NSString*)propertyName +(BOOL)propertyIsOptional:(NSString*)propertyName
{ {
...@@ -849,11 +919,14 @@ NSString * const SORTDIRECTION_DESC = @"desc"; ...@@ -849,11 +919,14 @@ NSString * const SORTDIRECTION_DESC = @"desc";
@end @end
@implementation TOStudyTypeEntity @implementation TOScoreRecordEntity
@synthesize fid; @synthesize fid;
@synthesize name; @synthesize createDate;
@synthesize attachmentId; @synthesize employeeId;
@synthesize attachment; @synthesize score;
@synthesize sourceId;
@synthesize sourceType;
@synthesize sourceReason;
+(BOOL)propertyIsOptional:(NSString*)propertyName +(BOOL)propertyIsOptional:(NSString*)propertyName
{ {
...@@ -871,17 +944,17 @@ NSString * const SORTDIRECTION_DESC = @"desc"; ...@@ -871,17 +944,17 @@ NSString * const SORTDIRECTION_DESC = @"desc";
@end @end
@implementation TOShippingAddrEntity @implementation TOPrizeEntity
@synthesize fid; @synthesize fid;
@synthesize createDate; @synthesize picture;
@synthesize sysOrgCode; @synthesize createName;
@synthesize createBy;
@synthesize updateName;
@synthesize updateBy;
@synthesize code;
@synthesize name; @synthesize name;
@synthesize miblephone; @synthesize createDate;
@synthesize province; @synthesize updateDate;
@synthesize city;
@synthesize country;
@synthesize address;
@synthesize consumerId;
+(BOOL)propertyIsOptional:(NSString*)propertyName +(BOOL)propertyIsOptional:(NSString*)propertyName
{ {
...@@ -899,14 +972,22 @@ NSString * const SORTDIRECTION_DESC = @"desc"; ...@@ -899,14 +972,22 @@ NSString * const SORTDIRECTION_DESC = @"desc";
@end @end
@implementation TOSceneEntity @implementation TOPrizeBillEntity
@synthesize fid; @synthesize fid;
@synthesize sceneCode; @synthesize createName;
@synthesize name; @synthesize createBy;
@synthesize pricure; @synthesize createDate;
@synthesize category; @synthesize updateName;
@synthesize style; @synthesize updateBy;
@synthesize space; @synthesize updateDate;
@synthesize billnumber;
@synthesize state;
@synthesize receiver;
@synthesize mobilephone;
@synthesize receiveAddress;
@synthesize employee;
@synthesize logisticsCompany;
@synthesize trackingNumber;
+(BOOL)propertyIsOptional:(NSString*)propertyName +(BOOL)propertyIsOptional:(NSString*)propertyName
{ {
...@@ -924,15 +1005,39 @@ NSString * const SORTDIRECTION_DESC = @"desc"; ...@@ -924,15 +1005,39 @@ NSString * const SORTDIRECTION_DESC = @"desc";
@end @end
NSString * const TOPRIZEBILLENTITYSTATE_REQUESTED = @"requested"; @implementation TOPositionEntity
NSString * const TOPRIZEBILLENTITYSTATE_SHIPPED = @"shipped"; @synthesize fid;
NSString * const TOPRIZEBILLENTITYSTATE_DONE = @"done"; @synthesize code;
@synthesize name;
@synthesize commission;
@synthesize lowestDiscount;
@synthesize resellerCode;
+(BOOL)propertyIsOptional:(NSString*)propertyName
{
return YES;
}
@implementation TOPrizeBillDetailsEntity
+(JSONKeyMapper*)keyMapper
{
return [[JSONKeyMapper alloc] initWithDictionary:@{
@"id": @"fid",
}];
}
@end
@implementation TOPassLevelTopicEntity
@synthesize fid; @synthesize fid;
@synthesize bill; @synthesize topicType;
@synthesize prize; @synthesize lineNo;
@synthesize title;
@synthesize answer;
@synthesize grade;
@synthesize passLevelId;
@synthesize options;
+(BOOL)propertyIsOptional:(NSString*)propertyName +(BOOL)propertyIsOptional:(NSString*)propertyName
{ {
...@@ -950,6 +1055,13 @@ NSString * const TOPRIZEBILLENTITYSTATE_DONE = @"done"; ...@@ -950,6 +1055,13 @@ NSString * const TOPRIZEBILLENTITYSTATE_DONE = @"done";
@end @end
NSString * const PASSLEVELTOPICTYPE_SINGLE = @"single";
NSString * const PASSLEVELTOPICTYPE_MULTIPLE = @"multiple";
NSString * const PASSLEVELTOPICTYPE_TRUEORFALSE = @"trueorfalse";
NSString * const PASSLEVELTOPICTYPE_GAPFILLING = @"gapFilling";
NSString * const PASSLEVELTOPICTYPE_SHORTANSWER = @"shortAnswer";
@implementation TOOrderPromotionEntity @implementation TOOrderPromotionEntity
@synthesize fid; @synthesize fid;
@synthesize createName; @synthesize createName;
...@@ -970,7 +1082,7 @@ NSString * const TOPRIZEBILLENTITYSTATE_DONE = @"done"; ...@@ -970,7 +1082,7 @@ NSString * const TOPRIZEBILLENTITYSTATE_DONE = @"done";
@synthesize wxcardNumber; @synthesize wxcardNumber;
@synthesize wxcardDenomation; @synthesize wxcardDenomation;
@synthesize wxcardRealDeduction; @synthesize wxcardRealDeduction;
@synthesize JDEcardDenomation; @synthesize jdEcardDenomation;
@synthesize redPackageNumber; @synthesize redPackageNumber;
@synthesize redPackageCount; @synthesize redPackageCount;
@synthesize prority; @synthesize prority;
...@@ -1649,8 +1761,8 @@ NSString * const TOPRIZEBILLENTITYSTATE_DONE = @"done"; ...@@ -1649,8 +1761,8 @@ NSString * const TOPRIZEBILLENTITYSTATE_DONE = @"done";
@end @end
@implementation SceneResponse @implementation PassLevelResponse
@synthesize list; @synthesize passLevelEntity;
+(BOOL)propertyIsOptional:(NSString*)propertyName +(BOOL)propertyIsOptional:(NSString*)propertyName
{ {
...@@ -1669,6 +1781,17 @@ NSString * const TOPRIZEBILLENTITYSTATE_DONE = @"done"; ...@@ -1669,6 +1781,17 @@ NSString * const TOPRIZEBILLENTITYSTATE_DONE = @"done";
} }
@end
@implementation SceneResponse
@synthesize list;
+(BOOL)propertyIsOptional:(NSString*)propertyName
{
return YES;
}
@end @end
@implementation PrizeResponse @implementation PrizeResponse
...@@ -1760,6 +1883,7 @@ NSString * const TOPRIZEBILLENTITYSTATE_DONE = @"done"; ...@@ -1760,6 +1883,7 @@ NSString * const TOPRIZEBILLENTITYSTATE_DONE = @"done";
@synthesize updateBy; @synthesize updateBy;
@synthesize updateName; @synthesize updateName;
@synthesize position; @synthesize position;
@synthesize note;
+(BOOL)propertyIsOptional:(NSString*)propertyName +(BOOL)propertyIsOptional:(NSString*)propertyName
{ {
......
Markdown is supported
0% or
You are about to add 0 people to the discussion. Proceed with caution.
Finish editing this message first!
Please register or to comment