Commit ba1ca1b5 authored by 曹云霄's avatar 曹云霄

修改项说明:

parent 9f093788
......@@ -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) {
......
......@@ -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);
......
......@@ -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
......@@ -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;
......
......@@ -21,11 +21,12 @@ extern NSString * const SORTDIRECTION_DESC;
@class EarningsResponse;
@class RsApplyBillRequest;
@class RsCommissionRequest;
@class DataPage;
@class PageRows;
@class ExceptionCode;
@class RsResponse;
@class ConsumerQueryCondition;
@class LoginInfo;
@class ModifyPasswordRequest;
@class RsEmployeeRequest;
......@@ -54,14 +55,14 @@ extern NSString * const SORTDIRECTION_DESC;
@class TODrawEntity;
@class TOOrderdetailEntity;
@class TOPositionEntity;
@class TOPrizeBillDetailsEntity;
@class TOPrizeBillEntity;
@class TOShippingAddrEntity;
@class UCN;
@class Action;
@class IdEntity;
@class TOShopcartEntity;
@class TOSceneEntity;
@class TOPrizeEntity;
@class TOPrizeBillDetailsEntity;
@class TOOrderPromotionEntity;
@class TOOrderEntity;
@class TOAwardEntity;
......@@ -81,20 +82,21 @@ extern NSString * const SORTDIRECTION_DESC;
@class DataDict;
@class ResetPasswordRequest;
@class LoginResult;
@class ConsumerQueryCondition;
@class ExceptionCode;
@class EarningsResponse;
@class FunctionInfo;
@class PageRows;
@class DataPage;
@class ApplyRequest;
@class AfficheCondition;
@class RsJingDongECardResponse;
@class RsSimpleJingDongECardResponse;
@class TSBaseUser;
@class RsAwardDraw;
@class TSDepart;
@class TSBaseUser;
@class TSUserOrg;
@class RsLotteryResponse;
@class ShopCartResponse;
@class SceneResponse;
@class OrderResponse;
@class RsAwardDraw;
@class RsSimpleJingDongECardResponse;
@class GoodsResponse;
@class ConsumerPageResult;
@class RsCommissionResponse;
......@@ -102,11 +104,12 @@ extern NSString * const SORTDIRECTION_DESC;
@class TSUser;
@class TOEmployee;
@protocol EarningsResponse @end
@protocol RsApplyBillRequest @end
@protocol RsCommissionRequest @end
@protocol DataPage @end
@protocol PageRows @end
@protocol ExceptionCode @end
@protocol RsResponse @end
@protocol ConsumerQueryCondition @end
@protocol LoginInfo @end
@protocol ModifyPasswordRequest @end
@protocol RsEmployeeRequest @end
......@@ -135,14 +138,14 @@ extern NSString * const SORTDIRECTION_DESC;
@protocol TODrawEntity @end
@protocol TOOrderdetailEntity @end
@protocol TOPositionEntity @end
@protocol TOPrizeBillDetailsEntity @end
@protocol TOPrizeBillEntity @end
@protocol TOShippingAddrEntity @end
@protocol UCN @end
@protocol Action @end
@protocol IdEntity @end
@protocol TOShopcartEntity @end
@protocol TOSceneEntity @end
@protocol TOPrizeEntity @end
@protocol TOPrizeBillDetailsEntity @end
@protocol TOOrderPromotionEntity @end
@protocol TOOrderEntity @end
@protocol TOAwardEntity @end
......@@ -162,20 +165,21 @@ extern NSString * const SORTDIRECTION_DESC;
@protocol DataDict @end
@protocol ResetPasswordRequest @end
@protocol LoginResult @end
@protocol ConsumerQueryCondition @end
@protocol ExceptionCode @end
@protocol EarningsResponse @end
@protocol FunctionInfo @end
@protocol PageRows @end
@protocol DataPage @end
@protocol ApplyRequest @end
@protocol AfficheCondition @end
@protocol RsJingDongECardResponse @end
@protocol RsSimpleJingDongECardResponse @end
@protocol TSBaseUser @end
@protocol RsAwardDraw @end
@protocol TSDepart @end
@protocol TSBaseUser @end
@protocol TSUserOrg @end
@protocol RsLotteryResponse @end
@protocol ShopCartResponse @end
@protocol SceneResponse @end
@protocol OrderResponse @end
@protocol RsAwardDraw @end
@protocol RsSimpleJingDongECardResponse @end
@protocol GoodsResponse @end
@protocol ConsumerPageResult @end
@protocol RsCommissionResponse @end
......@@ -184,6 +188,38 @@ extern NSString * const SORTDIRECTION_DESC;
@protocol TOEmployee @end
/**
* (no documentation provided)
*/
@interface EarningsResponse : JSONModel
/**
* (no documentation provided)
*
*
*/
@property (nonatomic, strong) NSNumber *accountTotal;
/**
* (no documentation provided)
*
*
*/
@property (nonatomic, strong) NSNumber *yesterdayEarnings;
/**
* (no documentation provided)
*
*
*/
@property (nonatomic, strong) NSNumber *historyEarning;
/**
* (no documentation provided)
*
*
*/
@property (nonatomic, strong) NSNumber *applytotal;
@end /* interface EarningsResponse */
/**
* (no documentation provided)
*/
......@@ -229,110 +265,104 @@ extern NSString * const SORTDIRECTION_DESC;
/**
* easyui的datagrid向后台传递参数使用的model
@author
* 异常代码。
@author Debenson
@since 0.1
*/
@interface DataPage : JSONModel
@interface ExceptionCode : JSONModel
/**
* (no documentation provided)
* 异常代码
*
*
*/
@property (nonatomic, assign) NSInteger total;
@property (nonatomic, assign) NSInteger code;
/**
* (no documentation provided)
* 异常信息
*
*
*/
@property (nonatomic, assign) NSInteger page;
@property (nonatomic, copy) NSString *message;
@end /* interface ExceptionCode */
/**
* (no documentation provided)
* Restful Service response base
@author Debenson
@since 0.1
*/
@interface RsResponse : JSONModel
/**
* 0:正常, 非0异常。
*
*
*/
@property (nonatomic, assign) NSInteger rows;
@property (nonatomic, assign) long long code;
/**
* (no documentation provided)
* 异常描述
*
*
*/
@property (nonatomic, copy) NSString *sort;
@property (nonatomic, copy) NSString *message;
/**
* (no documentation provided)
* 返回数据
*
*
* 取值: SORTDIRECTION_ASC, SORTDIRECTION_DESC,
*/
@property (nonatomic, copy) NSString *order;
@end /* interface DataPage */
@property (nonatomic, strong) NSObject *data;
@end /* interface RsResponse */
/**
* 分页类
* 客户查询条件。
@author Administrator
@author Debenson
@since 0.1
*/
@interface PageRows : JSONModel
/**
* (no documentation provided)
*
*
*/
@property (nonatomic, assign) NSInteger page;
@interface ConsumerQueryCondition : JSONModel
/**
* (no documentation provided)
* 经销商代码等于
*
*
*/
@property (nonatomic, assign) NSInteger rows;
@property (nonatomic, copy) NSString *resellerCodeEquals;
/**
* (no documentation provided)
* 名称等于
*
*
*/
@property (nonatomic, assign) NSInteger total;
@property (nonatomic, copy) NSString *nameEquals;
/**
* (no documentation provided)
* 手机号等于
*
*
*/
@property (nonatomic, assign) NSInteger totalpages;
@end /* interface PageRows */
/**
* Restful Service response base
@author Debenson
@since 0.1
*/
@interface RsResponse : JSONModel
@property (nonatomic, copy) NSString *mobileEquals;
/**
* 0:正常, 非0异常。
* 创建时间起始于,格式: yyyy-MM-dd HH:mm:ss
*
*
*/
@property (nonatomic, assign) long long code;
@property (nonatomic, copy) NSString *createTimeBegin;
/**
* 异常描述
* 创建时间截止于,格式: yyyy-MM-dd HH:mm:ss
*
*
*/
@property (nonatomic, copy) NSString *message;
@property (nonatomic, copy) NSString *createTimeEnd;
/**
* 返回数据
* 分布查询条件, 可空
*
*
*/
@property (nonatomic, strong) NSObject *data;
@end /* interface RsResponse */
@property (nonatomic, strong) DataPage *page;
@end /* interface ConsumerQueryCondition */
......@@ -793,12 +823,11 @@ extern NSString * const SORTDIRECTION_DESC;
*/
@property (nonatomic, assign) NSInteger jdCardDenomation;
/**
* 抵扣金额
* 抵扣
*
*
*/
@property (nonatomic, strong) NSNumber *promotionMoney;
/**
* 微信卡券卡号
*
......@@ -811,31 +840,32 @@ extern NSString * const SORTDIRECTION_DESC;
*
*/
@property (nonatomic, strong) NSNumber *wxcardDenomation;
@end /* interface OrderPayRequest */
/**
* @author wolv
* 奖品查询条件
@author wolv
*/
@interface PrizeCondition : JSONModel
/**
* (no documentation provided)
*
*
*
*/
@property (nonatomic, copy) NSString *codeLike;
/**
* (no documentation provided)
*
*
*
*/
@property (nonatomic, copy) NSString *nameLike;
/**
* (no documentation provided)
*
*
*
*/
......@@ -1422,8 +1452,7 @@ extern NSString * const SORTDIRECTION_DESC;
/**
*
@Title: Entity
* @Title: Entity
@Description: 抽奖记录
@author onlineGenerator
@date 2016-11-09 18:13:23
......@@ -1675,35 +1704,109 @@ extern NSString * const SORTDIRECTION_DESC;
/**
*
@Title: Entity
@Description: 兑奖单奖品明细
@author onlineGenerator
@date 2016-11-06 21:01:00
@version V1.0
* 兑奖单实体
@author wolv
*/
@interface TOPrizeBillDetailsEntity : JSONModel
@interface TOPrizeBillEntity : JSONModel
/**
* 方法: 取得java.lang.String
*
*
*
*/
@property (nonatomic, copy) NSString *fid;
/**
* 方法: 取得java.lang.String
*
*
*
*/
@property (nonatomic, copy) NSString *bill;
@property (nonatomic, copy) NSString *orderNumber;
/**
* 方法: 取得java.lang.String
*
*
*
*/
@property (nonatomic, copy) NSString *prize;
@end /* interface TOPrizeBillDetailsEntity */
@property (nonatomic, copy) NSString *createName;
/**
*
*
*
*/
@property (nonatomic, copy) NSString *createBy;
/**
*
*
*
*/
@property (nonatomic, copy) NSString *createDate;
/**
*
*
*
*/
@property (nonatomic, copy) NSString *updateName;
/**
*
*
*
*/
@property (nonatomic, copy) NSString *updateBy;
/**
*
*
*
*/
@property (nonatomic, copy) NSString *updateDate;
/**
*
*
*
*/
@property (nonatomic, copy) NSString *billnumber;
/**
*
*
*
*/
@property (nonatomic, copy) NSString *state;
/**
*
*
*
*/
@property (nonatomic, copy) NSString *receiver;
/**
*
*
*
*/
@property (nonatomic, copy) NSString *mobilephone;
/**
*
*
*
*/
@property (nonatomic, copy) NSString *receiveAddress;
/**
*
*
*
*/
@property (nonatomic, copy) NSString *employee;
/**
*
*
*
*/
@property (nonatomic, copy) NSString *logisticsCompany;
/**
*
*
*
*/
@property (nonatomic, copy) NSString *trackingNumber;
@end /* interface TOPrizeBillEntity */
......@@ -1983,80 +2086,34 @@ extern NSString * const SORTDIRECTION_DESC;
@property (nonatomic, copy) NSString *space;
@end /* interface TOSceneEntity */
/**
*
@Title: Entity
@Description: 奖品
@author onlineGenerator
@date 2016-11-06 19:23:57
@version V1.0
*/
@interface TOPrizeEntity : JSONModel
/**
* 方法: 取得java.lang.String
*
*
*/
@property (nonatomic, copy) NSString *fid;
/**
* 方法: 取得java.lang.String
*
*
*/
@property (nonatomic, copy) NSString *picture;
/**
* 方法: 取得java.lang.String
*
*
*/
@property (nonatomic, copy) NSString *createName;
/**
* 方法: 取得java.lang.String
*
*
*/
@property (nonatomic, copy) NSString *createBy;
/**
* 方法: 取得java.lang.String
*
*
*/
@property (nonatomic, copy) NSString *updateName;
/**
* 方法: 取得java.lang.String
*
*
*/
@property (nonatomic, copy) NSString *updateBy;
/**
* 方法: 取得java.lang.String
*
*
* 兑奖单奖品明细
@author wolv
*/
@property (nonatomic, copy) NSString *code;
@interface TOPrizeBillDetailsEntity : JSONModel
/**
* 方法: 取得java.lang.String
*
*
*
*/
@property (nonatomic, copy) NSString *name;
@property (nonatomic, copy) NSString *fid;
/**
* 方法: 取得java.util.Date
*
*
*
*/
@property (nonatomic, copy) NSString *createDate;
@property (nonatomic, copy) NSString *bill;
/**
* 方法: 取得java.util.Date
*
*
*
*/
@property (nonatomic, copy) NSString *updateDate;
@end /* interface TOPrizeEntity */
@property (nonatomic, copy) NSString *prize;
@end /* interface TOPrizeBillDetailsEntity */
......@@ -2184,19 +2241,24 @@ extern NSString * const SORTDIRECTION_DESC;
*
*/
@property (nonatomic, copy) NSString *wxcardRealDeduction;
/**
* 方法: 京东E卡面额
*
*
*/
@property (nonatomic, strong) NSNumber *jdecardDenomation;
@property (nonatomic, strong) NSNumber *JDEcardDenomation;
/**
* 方法: 红包面额
*
*
*/
@property (nonatomic, strong) NSNumber *redPackageNumber;
/**
红包数
* 方法: 红包次数
*
*
*/
@property (nonatomic,strong) NSNumber *redPackageCount;
@property (nonatomic, strong) NSNumber *redPackageCount;
@end /* interface TOOrderPromotionEntity */
......@@ -3225,19 +3287,21 @@ extern NSString * const SORTDIRECTION_DESC;
/**
* @author wolv
* 兑奖单
@author wolv
*/
@interface RsPrizeBill : JSONModel
/**
* (no documentation provided)
*
*
*
*/
@property (nonatomic, strong) TOPrizeEntity *bill;
@property (nonatomic, strong) TOPrizeBillEntity *bill;
/**
* (no documentation provided)
*
* @see TOPrizeBillDetailsEntity
*
*/
......@@ -3341,7 +3405,7 @@ extern NSString * const SORTDIRECTION_DESC;
* @see TOJingdongEcardEntity
*
*/
@property (nonatomic, strong) NSArray<TOJingdongEcardEntity> *eCards;
@property (nonatomic, strong) NSMutableArray<TOJingdongEcardEntity> *eCards;
@end /* interface GroupByOrderNumber */
......@@ -3495,122 +3559,170 @@ extern NSString * const SORTDIRECTION_DESC;
/**
* 客户查询条件。
* 用户权限信息
@author Debenson
@since 0.1
@author thor
@date 2016年11月17日 下午2:29:40
@version 0.1
*/
@interface ConsumerQueryCondition : JSONModel
@interface FunctionInfo : JSONModel
/**
* 经销商代码等于
* (no documentation provided)
*
*
*/
@property (nonatomic, copy) NSString *resellerCodeEquals;
@property (nonatomic, copy) NSString *userName;
/**
* 名称等于
* (no documentation provided)
*
*
*/
@property (nonatomic, copy) NSString *nameEquals;
@property (nonatomic, copy) NSString *functionName;
@end /* interface FunctionInfo */
/**
* 手机号等于
* 分页类
@author Administrator
@since 0.1
*/
@interface PageRows : JSONModel
/**
* (no documentation provided)
*
*
*/
@property (nonatomic, copy) NSString *mobileEquals;
@property (nonatomic, assign) NSInteger page;
/**
* 创建时间起始于,格式: yyyy-MM-dd HH:mm:ss
* (no documentation provided)
*
*
*/
@property (nonatomic, copy) NSString *createTimeBegin;
@property (nonatomic, assign) NSInteger rows;
/**
* 创建时间截止于,格式: yyyy-MM-dd HH:mm:ss
* (no documentation provided)
*
*
*/
@property (nonatomic, copy) NSString *createTimeEnd;
@property (nonatomic, assign) NSInteger total;
/**
* 分布查询条件, 可空
* (no documentation provided)
*
*
*/
@property (nonatomic, strong) DataPage *page;
@end /* interface ConsumerQueryCondition */
@property (nonatomic, assign) NSInteger totalpages;
@end /* interface PageRows */
/**
* 异常代码。
* easyui的datagrid向后台传递参数使用的model
@author
@author Debenson
@since 0.1
*/
@interface ExceptionCode : JSONModel
@interface DataPage : JSONModel
/**
* 异常代码
* (no documentation provided)
*
*
*/
@property (nonatomic, assign) NSInteger code;
@property (nonatomic, assign) NSInteger total;
/**
* 异常信息
* (no documentation provided)
*
*
*/
@property (nonatomic, copy) NSString *message;
@end /* interface ExceptionCode */
@property (nonatomic, assign) NSInteger page;
/**
* (no documentation provided)
*
*
*/
@property (nonatomic, assign) NSInteger rows;
/**
* (no documentation provided)
*
*
*/
@property (nonatomic, copy) NSString *sort;
/**
* (no documentation provided)
*
* 取值: SORTDIRECTION_ASC, SORTDIRECTION_DESC,
*/
@property (nonatomic, copy) NSString *order;
@end /* interface DataPage */
/**
* @author Administrator
@since 0.1
*/
@interface ApplyRequest : JSONModel
/**
* (no documentation provided)
*
*
*/
@interface EarningsResponse : JSONModel
@property (nonatomic, strong) NSNumber *amount;
@end /* interface ApplyRequest */
/**
* 公告筛选条件
@author thor
@date 2016年11月16日 上午11:53:21
@version 0.1
*/
@interface AfficheCondition : JSONModel
/**
* (no documentation provided)
*
*
*/
@property (nonatomic, strong) NSNumber *accountTotal;
@property (nonatomic, strong) DataPage *page;
/**
* (no documentation provided)
*
*
*/
@property (nonatomic, strong) NSNumber *yesterdayEarnings;
@property (nonatomic, copy) NSString *userIdEquals;
/**
* (no documentation provided)
*
*
*/
@property (nonatomic, strong) NSNumber *historyEarning;
@property (nonatomic, assign) NSInteger dayCountEquals;
/**
* (no documentation provided)
*
*
*/
@property (nonatomic, strong) NSNumber *applytotal;
@end /* interface EarningsResponse */
@property (nonatomic, copy) NSString *afficheTypeEuals;
/**
* @author Administrator
@since 0.1
* (no documentation provided)
*
*
*/
@interface ApplyRequest : JSONModel
@property (nonatomic, copy) NSString *order;
/**
* (no documentation provided)
*
*
*/
@property (nonatomic, strong) NSNumber *amount;
@end /* interface ApplyRequest */
@property (nonatomic, copy) NSString *sort;
@end /* interface AfficheCondition */
......@@ -3633,160 +3745,166 @@ extern NSString * const SORTDIRECTION_DESC;
/**
* 查询京东E卡分页
* 查询抽奖结果分页
@author nevermore
@since 0.1
*/
@interface RsSimpleJingDongECardResponse : PageRows
@interface RsAwardDraw : PageRows
/**
* (no documentation provided)
* @see TOJingdongEcardEntity
*
*
*/
@property (nonatomic, strong) NSArray<TOJingdongEcardEntity> *list;
@end /* interface RsSimpleJingDongECardResponse */
@property (nonatomic, strong) TODrawEntity *draw;
/**
* (no documentation provided)
*
*
*/
@property (nonatomic, strong) TOAwardEntity *award;
@end /* interface RsAwardDraw */
/**
* 系统用户父类
* 部门机构
@author 张代浩
*/
@interface TSBaseUser : IdEntity
@interface TSDepart : IdEntity
/**
* (no documentation provided)
*
*
*/
@property (nonatomic, copy) NSString *departid;
@property (nonatomic, strong) TSDepart *TSPDepart;
/**
* (no documentation provided)
*
*
*/
@property (nonatomic, strong) NSData *signature;
@property (nonatomic, copy) NSString *departname;
/**
* (no documentation provided)
*
*
*/
@property (nonatomic, copy) NSString *browser;
@property (nonatomic, copy) NSString *fdescription;
/**
* (no documentation provided)
*
* @see TSDepart
*
*/
@property (nonatomic, copy) NSString *userKey;
@property (nonatomic, strong) NSArray<TSDepart> *TSDeparts;
/**
* (no documentation provided)
*
*
*/
@property (nonatomic, assign) short status;
@property (nonatomic, copy) NSString *orgCode;
/**
* (no documentation provided)
*
*
*/
@property (nonatomic, assign) short activitiSync;
@property (nonatomic, copy) NSString *orgType;
/**
* (no documentation provided)
*
*
*/
@property (nonatomic, copy) NSString *password;
@property (nonatomic, copy) NSString *mobile;
/**
* (no documentation provided)
*
*
*/
@property (nonatomic, copy) NSString *userName;
@property (nonatomic, copy) NSString *fax;
/**
* (no documentation provided)
*
*
*/
@property (nonatomic, copy) NSString *realName;
@property (nonatomic, copy) NSString *address;
@end /* interface TSDepart */
/**
* 系统用户父类表
@author 张代浩
*/
@interface TSBaseUser : IdEntity
/**
* (no documentation provided)
*
*
*/
@property (nonatomic, strong) TSDepart *currentDepart;
@property (nonatomic, copy) NSString *departid;
/**
* (no documentation provided)
* @see TSUserOrg
*
*
*/
@property (nonatomic, strong) NSArray<TSUserOrg> *userOrgList;
@end /* interface TSBaseUser */
/**
* 部门机构表
@author 张代浩
*/
@interface TSDepart : IdEntity
@property (nonatomic, strong) NSData *signature;
/**
* (no documentation provided)
*
*
*/
@property (nonatomic, strong) TSDepart *TSPDepart;
@property (nonatomic, copy) NSString *browser;
/**
* (no documentation provided)
*
*
*/
@property (nonatomic, copy) NSString *departname;
@property (nonatomic, copy) NSString *userKey;
/**
* (no documentation provided)
*
*
*/
@property (nonatomic, copy) NSString *fdescription;
@property (nonatomic, assign) short status;
/**
* (no documentation provided)
* @see TSDepart
*
*
*/
@property (nonatomic, strong) NSArray<TSDepart> *TSDeparts;
@property (nonatomic, assign) short activitiSync;
/**
* (no documentation provided)
*
*
*/
@property (nonatomic, copy) NSString *orgCode;
@property (nonatomic, copy) NSString *password;
/**
* (no documentation provided)
*
*
*/
@property (nonatomic, copy) NSString *orgType;
@property (nonatomic, copy) NSString *userName;
/**
* (no documentation provided)
*
*
*/
@property (nonatomic, copy) NSString *mobile;
@property (nonatomic, copy) NSString *realName;
/**
* (no documentation provided)
*
*
*/
@property (nonatomic, copy) NSString *fax;
@property (nonatomic, strong) TSDepart *currentDepart;
/**
* (no documentation provided)
*
* @see TSUserOrg
*
*/
@property (nonatomic, copy) NSString *address;
@end /* interface TSDepart */
@property (nonatomic, strong) NSArray<TSUserOrg> *userOrgList;
@end /* interface TSBaseUser */
......@@ -3887,26 +4005,20 @@ extern NSString * const SORTDIRECTION_DESC;
/**
* 查询抽奖结果分页
* 查询京东E卡分页
@author nevermore
@since 0.1
*/
@interface RsAwardDraw : PageRows
/**
* (no documentation provided)
*
*
*/
@property (nonatomic, strong) TODrawEntity *draw;
@interface RsSimpleJingDongECardResponse : PageRows
/**
* (no documentation provided)
*
* @see TOJingdongEcardEntity
*
*/
@property (nonatomic, strong) TOAwardEntity *award;
@end /* interface RsAwardDraw */
@property (nonatomic, strong) NSArray<TOJingdongEcardEntity> *list;
@end /* interface RsSimpleJingDongECardResponse */
......
#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
{
......
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