Skip to content

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

购物车增加手动促销、优化代码

parent b8e88c23
Hide whitespace changes
Inline Side-by-side
Showing with 921 additions and 555 deletions
Class/CardAmplificationViewController.h
View file @ 1fdb50ad
......@@ -55,6 +55,6 @@
/**
* 改变京东卡状态后需要刷新
*/
@property (nonatomic,copy) void(^refreshJDCardList)();
@property (nonatomic,copy) void(^refreshJDCardList)(BOOL isComplete);
@end
Class/CardAmplificationViewController.m
View file @ 1fdb50ad
......@@ -31,7 +31,7 @@
make.size.equalTo(self.cardPasswordLabel);
}];
_maskView.delegate = self;
[_maskView setImage:TCImage(@"mask") radius:10];
[_maskView setImage:TCImage(@"mask") radius:20];
}
- (void)viewWillAppear:(BOOL)animated
......@@ -50,17 +50,18 @@
WS(weakSelf);
[self CreateMBProgressHUDLoding];
[[NetworkRequestClassManager Manager] NetworkWithDictionaryRequestWithURL:[NSString stringWithFormat:SERVERREQUESTURL(RECEIVEJDECARD),_cardModel.cardNumber] WithRequestType:Zero WithParameter:nil WithReturnValueBlock:^(id returnValue) {
[[NetworkRequestClassManager Manager] NetworkWithDictionaryRequestWithURL:[NSString stringWithFormat:SERVERREQUESTURL(RECEIVEJDECARD),_cardModel.cardNumber] WithRequestType:ZERO WithParameter:nil WithReturnValueBlock:^(id returnValue) {
[weakSelf RemoveMBProgressHUDLoding];
if ([returnValue[@"code"] isEqualToNumber:@0]) {
[weakSelf SHOWPrompttext:@"领取成功"];
if (weakSelf.refreshJDCardList) {
weakSelf.refreshJDCardList();
weakSelf.refreshJDCardList(YES);
}
}else
{
[weakSelf ErrorMBProgressView:@"领取失败"];
if (weakSelf.refreshJDCardList) {
weakSelf.refreshJDCardList(YES);
}
}
} WithErrorCodeBlock:^(id errorCodeValue) {
......
Class/CardBeenUseViewController.m
View file @ 1fdb50ad
......@@ -91,15 +91,17 @@
- (void)getCardDatasAction:(BOOL)isRemove
{
WS(weakSelf);
[[NetworkRequestClassManager Manager] NetworkRequestWithURL:SERVERREQUESTURL(CARDINFORMATION) WithRequestType:Zero WithParameter:self.requestModel WithReturnValueBlock:^(id returnValue) {
[self CreateMBProgressHUDLoding];
[[NetworkRequestClassManager Manager] NetworkRequestWithURL:SERVERREQUESTURL(CARDINFORMATION) WithRequestType:ZERO WithParameter:self.requestModel WithReturnValueBlock:^(id returnValue) {
[weakSelf RemoveMBProgressHUDLoding];
weakSelf.beenUseCardCollectionView.emptyDataSetSource = self;
weakSelf.beenUseCardCollectionView.emptyDataSetDelegate = self;
[weakSelf endRefreshingForTableView:weakSelf.beenUseCardCollectionView];
if ([returnValue[@"code"] isEqualToNumber:@0]) {
RsJingDongECardResponse *cardInformation = [[RsJingDongECardResponse alloc]initWithDictionary:returnValue[@"data"] error:nil];
weakSelf.totalPage = cardInformation.totalpages;
if (cardInformation.list.count) {
if (isRemove) {
[weakSelf.datasArray removeAllObjects];
}
[weakSelf.datasArray addObjectsFromArray:cardInformation.list];
......@@ -109,8 +111,12 @@
}
} WithErrorCodeBlock:^(id errorCodeValue) {
[weakSelf endRefreshingForTableView:weakSelf.beenUseCardCollectionView];
[weakSelf RemoveMBProgressHUDLoding];
[weakSelf ErrorMBProgressView:NETWORK];
} WithFailureBlock:^(NSError *error) {
[weakSelf endRefreshingForTableView:weakSelf.beenUseCardCollectionView];
[weakSelf RemoveMBProgressHUDLoding];
[weakSelf ErrorMBProgressView:error.localizedDescription];
}];
}
......
Class/CardDontUseViewController.m
View file @ 1fdb50ad
......@@ -107,15 +107,17 @@
- (void)getCardDatasAction:(BOOL)isRemove
{
WS(weakSelf);
[self CreateMBProgressHUDLoding];
NSLog(@"%@",[self.requestModel toDictionary]);
[[NetworkRequestClassManager Manager] NetworkRequestWithURL:SERVERREQUESTURL(CARDINFORMATION) WithRequestType:Zero WithParameter:self.requestModel WithReturnValueBlock:^(id returnValue) {
[[NetworkRequestClassManager Manager] NetworkRequestWithURL:SERVERREQUESTURL(CARDINFORMATION) WithRequestType:ZERO WithParameter:self.requestModel WithReturnValueBlock:^(id returnValue) {
[weakSelf RemoveMBProgressHUDLoding];
weakSelf.dontUseCardCollectionView.emptyDataSetSource = weakSelf;
weakSelf.dontUseCardCollectionView.emptyDataSetDelegate = weakSelf;
[weakSelf endRefreshingForTableView:weakSelf.dontUseCardCollectionView];
if ([returnValue[@"code"] isEqualToNumber:@0]) {
RsJingDongECardResponse *cardInformation = [[RsJingDongECardResponse alloc]initWithDictionary:returnValue[@"data"] error:nil];
if (cardInformation.list.count) {
if (isRemove) {
[weakSelf.datasArray removeAllObjects];
}
weakSelf.totalPage = cardInformation.totalpages;
......@@ -126,8 +128,12 @@
}
} WithErrorCodeBlock:^(id errorCodeValue) {
[weakSelf endRefreshingForTableView:weakSelf.dontUseCardCollectionView];
[weakSelf RemoveMBProgressHUDLoding];
[weakSelf ErrorMBProgressView:NETWORK];
} WithFailureBlock:^(NSError *error) {
[weakSelf endRefreshingForTableView:weakSelf.dontUseCardCollectionView];
[weakSelf RemoveMBProgressHUDLoding];
[weakSelf ErrorMBProgressView:error.localizedDescription];
}];
}
......@@ -152,6 +158,7 @@
CardOrderInformationReusableView *headerView = [collectionView dequeueReusableSupplementaryViewOfKind:UICollectionElementKindSectionHeader withReuseIdentifier:@"CardOrderInformationReusableView" forIndexPath:indexPath];
headerView.delegate = self;
headerView.model = self.datasArray[indexPath.section];
headerView.sectionIndex = indexPath.section;
return headerView;
}
return nil;
......@@ -180,7 +187,8 @@
pop.sourceView = settlement.view;
settlement.cardModel = model.eCards[indexPath.row];
WS(weakSelf);
[settlement setRefreshJDCardList:^{
[settlement setRefreshJDCardList:^(BOOL boolValue) {
[weakSelf SHOWPrompttext:boolValue?@"领取成功":@"领取失败"];
[weakSelf.dontUseCardCollectionView.mj_header beginRefreshing];
[[NSNotificationCenter defaultCenter] postNotificationName:VIEWPASSWORD object:nil];
}];
......@@ -267,17 +275,17 @@
{
WS(weakSelf);
[self CreateMBProgressHUDLoding];
[[NetworkRequestClassManager Manager] NetworkWithDictionaryRequestWithURL:[NSString stringWithFormat:SERVERREQUESTURL(ACTIVIATIONJDECARD),self.orderNumber,imagePath] WithRequestType:Zero WithParameter:nil WithReturnValueBlock:^(id returnValue) {
[[NetworkRequestClassManager Manager] NetworkWithDictionaryRequestWithURL:[NSString stringWithFormat:SERVERREQUESTURL(ACTIVIATIONJDECARD),self.orderNumber,imagePath] WithRequestType:ZERO WithParameter:nil WithReturnValueBlock:^(id returnValue) {
[weakSelf RemoveMBProgressHUDLoding];
if ([returnValue[@"code"] isEqualToNumber:@0]) {
[weakSelf SuccessMBProgressView:@"激活成功"];
for (GroupByOrderNumber *order in weakSelf.datasArray) {
if ([order.orderNumber isEqualToString:self.orderNumber]) {
order.orderReceiptUrl = imagePath;break;
order.orderReceiptUrl = imagePath;
[weakSelf.dontUseCardCollectionView reloadSections:[NSIndexSet indexSetWithIndex:[weakSelf.datasArray indexOfObject:order]]];break;
}
}
[[NSNotificationCenter defaultCenter] postNotificationName:UPLOAD_COMPLETE object:nil];
}else{
[weakSelf ErrorMBProgressView:returnValue[@"message"]];
}
......
Class/CardOrderInformationReusableView.m
View file @ 1fdb50ad
......@@ -11,11 +11,6 @@
@implementation CardOrderInformationReusableView
- (void)awakeFromNib
{
[[NSNotificationCenter defaultCenter] addObserver:self selector:@selector(uploadCompleteHiddenButton:) name:UPLOAD_COMPLETE object:nil];
}
#pragma mark - 上传小票
- (IBAction)uploadReceiptsButtonClickAction:(UIButton *)sender {
......@@ -32,12 +27,6 @@
self.uploadReceiptsButton.hidden = [BaseViewController isBlankString:_model.orderReceiptUrl]?NO:YES;
}
#pragma mark - 上传完成隐藏按钮
- (void)uploadCompleteHiddenButton:(NSNotification *)sender
{
self.uploadReceiptsButton.hidden = YES;
}
- (void)dealloc
{
[[NSNotificationCenter defaultCenter] removeObserver:self];
......
Class/CardViewController.m
View file @ 1fdb50ad
......@@ -58,7 +58,7 @@
- (void)getCardDatasAction
{
WS(weakSelf);
[[NetworkRequestClassManager Manager] NetworkRequestWithURL:SERVERREQUESTURL(CARDINFORMATION) WithRequestType:Zero WithParameter:self.requestModel WithReturnValueBlock:^(id returnValue) {
[[NetworkRequestClassManager Manager] NetworkRequestWithURL:SERVERREQUESTURL(CARDINFORMATION) WithRequestType:ZERO WithParameter:self.requestModel WithReturnValueBlock:^(id returnValue) {
// weakSelf.cardCollectionView.emptyDataSetSource = self;
// weakSelf.cardCollectionView.emptyDataSetDelegate = self;
......
Class/ClientViewController.m
View file @ 1fdb50ad
......@@ -87,7 +87,6 @@
}
}
#pragma mark -布局
- (void)uiConfigAction
{
......@@ -107,10 +106,8 @@
self.indexPage = 1;
self.customerHeader.userInteractionEnabled = YES;
[self.customerHeader addGestureRecognizer:[[UITapGestureRecognizer alloc]initWithTarget:self action:@selector(customerHeaderClckAction:)]];
//隐藏更改客户按钮
self.changePersonInformationButton.hidden = YES;
//代理
self.informationTableview.delegate = self;
self.informationTableview.dataSource = self;
......@@ -122,7 +119,6 @@
[[NSNotificationCenter defaultCenter] addObserver:self selector:@selector(SetupCurrentCustomer:) name:@"SETUPCURRENTCUSTOMER" object:nil];
//清空当前客户数据
[[NSNotificationCenter defaultCenter] addObserver:self selector:@selector(ChangeCustomerName:) name:@"EMPTYCUSTOMERNAME" object:nil];
WS(weakSelf);
//下拉刷新
MjRefreshHeaderCustom *headerRefresh = [MjRefreshHeaderCustom headerWithRefreshingBlock:^{
......@@ -157,7 +153,7 @@
#pragma mark -获取导购关联客户
- (void)getShoppersAssociatedCustomer:(ConsumerQueryCondition *)condition isRemoveArray:(BOOL)remove
{
__weak typeof(self) weakSelf = self;
WS(weakSelf);
[self CreateMBProgressHUDLoding];
[[NetworkRequestClassManager Manager] NetworkRequestWithURL:SERVERREQUESTURL(GETSHOPPERSCONSUMER) WithRequestType:0 WithParameter:condition WithReturnValueBlock:^(id returnValue) {
......@@ -212,12 +208,13 @@
} WithErrorCodeBlock:^(id errorCodeValue) {
[weakSelf RemoveMBProgressHUDLoding];
[weakSelf promptCustomerWithString:@"网络连接已断开"];
[weakSelf promptCustomerWithString:NETWORK];
} WithFailureBlock:^(id error) {
} WithFailureBlock:^(NSError *error) {
[weakSelf RemoveMBProgressHUDLoding];
[weakSelf endRefreshingForTableView:weakSelf.informationTableview];
[weakSelf ErrorMBProgressView:error.localizedDescription];
}];
}
......@@ -229,7 +226,7 @@
cell.indexNumber = indexPath.row;
cell.model = [self.CustomerresultArray objectAtIndex_opple:indexPath.row];
//清空其他选中状态
__weak typeof(self) weakSelf = self;
WS(weakSelf);
[cell setBlockSeletced:^(NSInteger index) {
[weakSelf SetCustomerButtonClick:index];
}];
......@@ -254,13 +251,12 @@
clientdetails.model = [self.CustomerresultArray objectAtIndex_opple:indexPath.row];
clientdetails.cellindex = indexPath.row;
//设置当前客户
__weak typeof(self) weakSelf = self;
WS(weakSelf);
[clientdetails setCurrentUserBlock:^(NSInteger index,NSString *title) {
if ([title isEqualToString:@"设为当前客户"]) {
InformationTableViewCell *cell = [weakSelf.informationTableview cellForRowAtIndexPath:[NSIndexPath indexPathForRow:index inSection:0]];
[weakSelf SetCustomerButtonClick:index];
cell.setCurrentCustomer.selected = YES;
}else if ([title isEqualToString:@"退出当前客户"])
{
[weakSelf ExitCurrentCustomer];
......@@ -316,23 +312,18 @@
#pragma mark -设置为当前客户回调2
- (void)SetCustomerButtonClick:(NSInteger)index;
{
for (InformationTableViewCell *cell in self.informationTableview.visibleCells) {
cell.setCurrentCustomer.selected = NO;
}
for (MyclientEntityModel *model in self.CustomerresultArray) {
model.selectedState = NO;
}
MyclientEntityModel *model = [self.CustomerresultArray objectAtIndex_opple:index];
model.selectedState = YES;
self.customerNameField.text = model.name;
self.phoneNumberField.text = model.mobile;
self.customerAddress.text = model.address;
self.companyNameField.text = model.company;
[self.customerHeader sd_setImageWithURL:[NSURL URLWithString:model.picture] placeholderImage:TCImage(@"now")];
//保存客户信息
[Shoppersmanager manager].currentCustomer = YES;
......
Class/InformationTableViewCell.h
View file @ 1fdb50ad
......@@ -48,8 +48,6 @@
*/
@property (weak, nonatomic) IBOutlet UIButton *setCurrentCustomer;
/**
* 数据源
*/
......@@ -60,7 +58,6 @@
*/
@property (nonatomic,assign) NSInteger indexNumber;
/**
* 反传回控制器.cell位置
*/
......
Class/InformationTableViewCell.m
View file @ 1fdb50ad
......@@ -30,20 +30,15 @@
self.setCurrentCustomer.selected = _model.selectedState;
}
#pragma mark -设为当前用户
- (IBAction)SelectedButtonClick:(UIButton *)sender {
if (self.blockSeletced) {
self.blockSeletced(_indexNumber);
}
sender.selected = YES;
}
- (void)setSelected:(BOOL)selected animated:(BOOL)animated {
[super setSelected:selected animated:animated];
......
Class/OrderdetailsViewController.m
View file @ 1fdb50ad
......@@ -138,7 +138,7 @@ NSString *const lotteryAction = @"lotteryAction";
[super viewDidLoad];
[self uiConfigAction];
[self getOrderDetailsData:NO issueJDECard:Zero andGuideId:nil andOrderNumber:nil];
[self getOrderDetailsData:NO issueJDECard:ZERO andGuideId:nil andOrderNumber:nil];
}
#pragma mark - UI
......@@ -258,12 +258,13 @@ NSString *const lotteryAction = @"lotteryAction";
- (void)showJEDCard
{
JDEcardViewController *jdeCard = [[self getStoryboardWithName] instantiateViewControllerWithIdentifier:@"JDEcardViewController"];
jdeCard.preferredContentSize = CGSizeMake(500, 400);
jdeCard.preferredContentSize = CGSizeMake(345, 360);
self.settingsPopoverController = [[WYPopoverController alloc] initWithContentViewController:jdeCard];
self.settingsPopoverController.popoverLayoutMargins = UIEdgeInsetsMake(10, 20, 10, 20);
self.settingsPopoverController.wantsDefaultContentAppearance = NO;
self.settingsPopoverController.theme.fillBottomColor = [UIColor clearColor];
self.settingsPopoverController.theme.fillTopColor = [UIColor clearColor];
self.settingsPopoverController.theme.glossShadowColor = [UIColor clearColor];
[self.settingsPopoverController presentPopoverAsDialogAnimated:YES
options:WYPopoverAnimationOptionFadeWithScale];
}
......@@ -345,12 +346,12 @@ NSString *const lotteryAction = @"lotteryAction";
//支付成功
WS(weakSelf);
[settlement setPaySuccessReturnBlock:^{
[weakSelf SuccessMBProgressView:@"支付成功"];
weakSelf.isDelectedButton = NO;
weakSelf.isUserInteractionEnabled = NO;
[weakSelf CreateTableviewHeaderView];
//** 京东E卡 */
for (id object in self.luckyDrawAndJDECardArray) {
for (id object in weakSelf.luckyDrawAndJDECardArray) {
if ([object isKindOfClass:[PromotionalDeductionModel class]]) {
PromotionalDeductionModel *model = (PromotionalDeductionModel *)object;
if ([model.type isEqualToString:JDECardAction]) {
......@@ -358,6 +359,10 @@ NSString *const lotteryAction = @"lotteryAction";
}
}
}
//** 无促销的情况 */
if (self.luckyDrawAndJDECardArray.count == 0) {
[weakSelf getOrderDetailsData:NO issueJDECard:ZERO andGuideId:nil andOrderNumber:nil];
}
weakSelf.orderDetailsTableview.tableFooterView = nil;
if (weakSelf.DelecteAndPayButtonBlock) {
weakSelf.DelecteAndPayButtonBlock(_cellindex,@"002");
......@@ -572,23 +577,22 @@ NSString *const lotteryAction = @"lotteryAction";
[self DownloadPDF:^(id Value) {
[weakSelf CreateMBProgressHUDLoding];
[[NetworkRequestClassManager Manager] DownloadPDFdatasWithURL:Value WithReturnValueBlock:^(id returnValue) {
[weakSelf RemoveMBProgressHUDLoding];
[weakSelf callAirprintWithdata:returnValue SuccessBlock:^{
[weakSelf SuccessMBProgressView:@"打印完成"];
} ErrorBlock:^{
[weakSelf ErrorMBProgressView:@"打印失败"];
}];
} WithErrorCodeBlock:^(id errorCodeValue) {
} WithFailureBlock:^(id error) {
[weakSelf RemoveMBProgressHUDLoding];
[weakSelf ErrorMBProgressView:NETWORK];
} WithFailureBlock:^(NSError *error) {
[weakSelf RemoveMBProgressHUDLoding];
[weakSelf ErrorMBProgressView:error.localizedDescription];
}];
}];
}
#pragma mark -下载PDF
- (void)DownloadPDF:(void(^)(id returnValue))success
{
......@@ -602,26 +606,19 @@ NSString *const lotteryAction = @"lotteryAction";
} WithErrorCodeBlock:^(id errorCodeValue) {
[weakSelf RemoveMBProgressHUDLoding];
[weakSelf ErrorMBProgressView:@"网络中断"];
} WithFailureBlock:^(id error) {
[weakSelf ErrorMBProgressView:NETWORK];
} WithFailureBlock:^(NSError *error) {
[weakSelf RemoveMBProgressHUDLoding];
[weakSelf ErrorMBProgressView:error.localizedDescription];
}];
}
#pragma mark -预览订单、撤销订单
- (void)PreviewButtonClick:(UIButton *)button
{
WS(weakSelf);
if ([button.currentTitle isEqualToString:@"预览"]) {
[self DownloadPDF:^(id returnValue) {
// self.PDFpath = returnValue;
// QLPreviewController *previewController = [[QLPreviewController alloc] init];
// previewController.dataSource = weakSelf;
// previewController.navigationController.navigationBarHidden = YES;
// [weakSelf presentViewController:previewController animated:YES completion:nil];
PDFViewController *pdfvc = [[PDFViewController alloc]init];
pdfvc.pdfURLString = returnValue;
[weakSelf presentViewController:pdfvc animated:YES completion:nil];
......@@ -650,17 +647,16 @@ NSString *const lotteryAction = @"lotteryAction";
if (weakSelf.DelecteAndPayButtonBlock) {
weakSelf.DelecteAndPayButtonBlock(_cellindex,@"005");
}
}
else
{
} else {
[weakSelf ErrorMBProgressView:returnValue[@"message"]];
}
} WithErrorCodeBlock:^(id errorCodeValue) {
} WithFailureBlock:^(id error) {
[weakSelf RemoveMBProgressHUDLoding];
[weakSelf ErrorMBProgressView:NETWORK];
} WithFailureBlock:^(NSError *error) {
[weakSelf RemoveMBProgressHUDLoding];
[weakSelf ErrorMBProgressView:error.localizedDescription];
}];
}]];
[self presentViewController:alertVC animated:YES completion:nil];
......
Class/PaymentsViewController.m
View file @ 1fdb50ad
......@@ -40,7 +40,7 @@
if (!_model) {
_model = [[RsCommissionRequest alloc]init];
DataPage *page = [[DataPage alloc]init];
page.page = Zero;
page.page = ZERO;
page.rows = KROWS;
_model.page = page;
_model.emploreeId = [Shoppersmanager manager].Shoppers.employee.fid;
......
Class/ProductDetailsViewController.m
View file @ 1fdb50ad
......@@ -405,7 +405,7 @@
} WithErrorCodeBlock:^(id errorCodeValue) {
[weakSelf RemoveMBProgressHUDLoding];
[weakSelf ErrorMBProgressView:@"无网络"];
[weakSelf ErrorMBProgressView:NETWORK];
} WithFailureBlock:^(id error) {
[weakSelf ErrorMBProgressView:@"添加购物车失败"];
}];
......
Class/ProductLibraryViewController.m
View file @ 1fdb50ad
......@@ -121,11 +121,11 @@
#pragma mark -获取商品列表数据
- (void)getGoodsListDatasisRemove:(BOOL)remove Withobject:(GoodsCondition *)conditon
{
__weak typeof(self)weakSelf = self;
WS(weakSelf);
[self getGoodsListdatas:conditon returnResponse:^(GoodsResponse *response) {
if (remove) {
[self.datasArray removeAllObjects];
[weakSelf.datasArray removeAllObjects];
}
for (TOGoodsEntity *model in response.goodsEntity) {
[weakSelf.datasArray addObject:model];
......@@ -137,32 +137,29 @@
#pragma mark -获取产品筛选数据
- (void)getScreeningdatasisRemoveArray:(BOOL)remove
{
WS(weakSelf);
[[NetworkRequestClassManager Manager] NetworkWithDictionaryRequestWithURL:SERVERREQUESTURL(PRODUCTSCREENING) WithRequestType:1 WithParameter:nil WithReturnValueBlock:^(id returnValue) {
if ([returnValue[@"code"] isEqualToNumber:@0]) {
if (remove) {
[self.screeningDatas removeAllObjects];
[weakSelf.screeningDatas removeAllObjects];
}
GoodsFilter *goodsStyle = [[GoodsFilter alloc]initWithDictionary:returnValue[@"data"] error:nil];
[self.screeningDatas addObject:goodsStyle.styles];
[self.screeningDatas addObject:goodsStyle.categories];
[self.screeningDatas addObject:goodsStyle.space];
[self.screeningDatas addObject:goodsStyle.material];
[self.screeningDatas addObject:goodsStyle.price];
[weakSelf.screeningDatas addObject:goodsStyle.styles];
[weakSelf.screeningDatas addObject:goodsStyle.categories];
[weakSelf.screeningDatas addObject:goodsStyle.space];
[weakSelf.screeningDatas addObject:goodsStyle.material];
[weakSelf.screeningDatas addObject:goodsStyle.price];
}
else
{
[self ErrorMBProgressView:returnValue[@"message"]];
[weakSelf ErrorMBProgressView:returnValue[@"message"]];
}
} WithErrorCodeBlock:^(id errorCodeValue) {
[self RemoveMBProgressHUDLoding];
[self ErrorMBProgressView:@"无网络"];
[weakSelf ErrorMBProgressView:NETWORK];
} WithFailureBlock:^(NSError *error) {
[self ErrorMBProgressView:error.localizedDescription];
[weakSelf ErrorMBProgressView:error.localizedDescription];
}];
}
......@@ -192,23 +189,20 @@
}
} WithErrorCodeBlock:^(id errorCodeValue) {
[weakSelf ErrorMBProgressView:@"网络连接中断"];
[weakSelf endRefreshingForTableView:weakSelf.productCollectionView];
[weakSelf ErrorMBProgressView:NETWORK];
[weakSelf RemoveMBProgressHUDLoding];
} WithFailureBlock:^(NSError *error) {
[weakSelf endRefreshingForTableView:weakSelf.productCollectionView];
[weakSelf RemoveMBProgressHUDLoding];
[weakSelf ErrorMBProgressView:error.localizedDescription];
}];
}
#pragma mark -布局
- (void)uiConfigAction
{
self.indexPage = 1;
self.selectedIndex = 9999;
self.selectedIndex = 9999;//无任何意义
self.productCollectionLayout.itemSize = CGSizeMake((ScreenWidth-100)/3, (ScreenWidth-100)/3);
self.productCollectionLayout.sectionInset = UIEdgeInsetsMake(20, 30, 20, 30);
self.productCollectionLayout.minimumLineSpacing = 20;
......@@ -222,16 +216,12 @@
#pragma mark -获取数据
- (void)GetdatasAction
{
__weak typeof(self) weakSelf = self;
WS(weakSelf);
//下拉刷新
MjRefreshHeaderCustom *headerRefresh = [MjRefreshHeaderCustom headerWithRefreshingBlock:^{
//扫描二维码结果
if (weakSelf.barcode) {
[weakSelf barCodeSearchRequest];
}else
{
//分页数据
......@@ -287,12 +277,9 @@
[self.productCollectionView.mj_header beginRefreshing];
//上拉加载
self.productCollectionView.mj_footer = [MJRefreshAutoNormalFooter footerWithRefreshingBlock:^{
//扫描二维码结果
if (weakSelf.barcode) {
[weakSelf barCodeSearchRequest];
}else
{
if ( ++ weakSelf.indexPage > weakSelf.totalPages) {
......@@ -345,45 +332,44 @@
}
}];
self.productCollectionView.mj_footer.automaticallyHidden = YES;
}
#pragma mark 填条形码搜索
- (void)barCodeSearchRequest
{
WS(weakSelf);
[self CreateMBProgressHUDLoding];
[[NetworkRequestClassManager Manager] NetworkWithDictionaryRequestWithURL:[NSString stringWithFormat:@"%@%@",SERVERREQUESTURL(BARCODESEARCH),_barcode] WithRequestType:1 WithParameter:nil WithReturnValueBlock:^(id returnValue) {
[self endRefreshingForTableView:self.productCollectionView];
[self RemoveMBProgressHUDLoding];
[weakSelf endRefreshingForTableView:self.productCollectionView];
[weakSelf RemoveMBProgressHUDLoding];
if ([returnValue[@"code"] isEqualToNumber:@0]) {
if ([returnValue[@"data"] isKindOfClass:[NSNull class]]) {
[self ErrorMBProgressView:@"暂无商品信息"];
[weakSelf ErrorMBProgressView:@"暂无商品信息"];
return;
}
TOGoodsEntity *goods = [[TOGoodsEntity alloc]initWithDictionary:returnValue[@"data"] error:nil];
[self.datasArray removeAllObjects];
[self.datasArray addObject:goods];
[self.productCollectionView reloadData];
[weakSelf.datasArray removeAllObjects];
[weakSelf.datasArray addObject:goods];
[weakSelf.productCollectionView reloadData];
}else
{
[self ErrorMBProgressView:@"查询失败"];
[weakSelf ErrorMBProgressView:@"查询失败"];
}
} WithErrorCodeBlock:^(id errorCodeValue) {
[self endRefreshingForTableView:self.productCollectionView];
[self ErrorMBProgressView:@"网络连接中断"];
[self RemoveMBProgressHUDLoding];
[weakSelf RemoveMBProgressHUDLoding];
[weakSelf endRefreshingForTableView:self.productCollectionView];
[weakSelf ErrorMBProgressView:NETWORK];
} WithFailureBlock:^(id error) {
[self ErrorMBProgressView:@"查询失败"];
[self endRefreshingForTableView:self.productCollectionView];
[self RemoveMBProgressHUDLoding];
[weakSelf endRefreshingForTableView:self.productCollectionView];
[weakSelf RemoveMBProgressHUDLoding];
[weakSelf ErrorMBProgressView:@"查询失败"];
}];
}
......@@ -521,7 +507,6 @@
- (void)collectionView:(UICollectionView *)collectionView didSelectItemAtIndexPath:(NSIndexPath *)indexPath
{
ProductDetailsViewController *productDetails = [[self getStoryboardWithName] instantiateViewControllerWithIdentifier:@"productdetails"];
productDetails.goodsID = [[self.datasArray objectAtIndex_opple:indexPath.item] fid];
[self.navigationController pushViewController:productDetails animated:YES];
......@@ -531,7 +516,6 @@
#pragma mark -筛选
- (void)ScreeningButtonClick
{
self.screenView = [[[NSBundle mainBundle] loadNibNamed:@"ScreeningView" owner:self options:nil]firstObject];
self.screenView.frame = CGRectMake(0, 0, ScreenWidth, ScreenHeight);
self.screenView.backgroundColor = [[UIColor blackColor] colorWithAlphaComponent:0.5];
......@@ -544,15 +528,11 @@
self.screenView.frame = CGRectMake(0, 0, ScreenWidth, ScreenHeight);
[self.view.window addSubview:self.screenView];
self.screenView.alpha = 0;
//监听Segmented菜单
[self.screenView.sortingSegmented addTarget:self action:@selector(sortingSegmentedClick:) forControlEvents:UIControlEventValueChanged];
self.selectedIndex = 0;
[self CreateClassificationView];
[UIView animateWithDuration:0.2 animations:^{
self.screenView.alpha = 1;
}];
}
......
Class/RebateDetailsViewController.m
View file @ 1fdb50ad
......@@ -146,8 +146,8 @@
return NO;
}
}
NSRange zeroRange = [textField.text rangeOfString:@"0"];
if(zeroRange.length == 1 && zeroRange.location == 0){ //判断输入框第一个字符是否为“0”
NSRange ZERORange = [textField.text rangeOfString:@"0"];
if(ZERORange.length == 1 && ZERORange.location == 0){ //判断输入框第一个字符是否为“0”
if(![string isEqualToString:@"0"] && ![string isEqualToString:@"."] && [textField.text length] == 1){ //当输入框只有一个字符并且字符为“0”时，再输入不为“0”或者“.”的字符时，则将此输入替换输入框的这唯一字符。
textField.text = string;
return NO;
......
Class/SettlementViewController.m
View file @ 1fdb50ad
......@@ -355,12 +355,10 @@
}
[self CreateMBProgressHUDLoding];
WS(weakSelf);
NSLog(@"%@",[[order toDictionary] JSONString]);
[[NetworkRequestClassManager Manager] NetworkRequestWithURL:SERVERREQUESTURL(CONFIRMPAY) WithRequestType:0 WithParameter:order WithReturnValueBlock:^(id returnValue) {
[weakSelf RemoveMBProgressHUDLoding];
if ([returnValue[@"code"] isEqualToNumber:@0]) {
[weakSelf ErrorMBProgressView:@"支付成功"];
if (weakSelf.PaySuccessReturnBlock) {
weakSelf.PaySuccessReturnBlock();
}
......
Class/Shoppingcart/GenerateOrdersViewController.m
View file @ 1fdb50ad
......@@ -484,11 +484,8 @@
#pragma mark -设置为当前地址回调
- (void)SetCustomerButtonClick:(NSInteger)index;
{
for (UITableViewCell *cell in self.generateOrderTableview.visibleCells) {
if ([cell isKindOfClass:[GenerateOrdersTableViewCell class]]) {
GenerateOrdersTableViewCell *Newcell = (GenerateOrdersTableViewCell *)cell;
Newcell.isSelectedButton.selected = NO;
}
......
Class/Shoppingcart/ShoppingTableViewCell.h
View file @ 1fdb50ad
......@@ -16,7 +16,7 @@
/**
* 当前商品数量、成交价 ,通过返回参数判断是否能修改
*/
- (void)ChangeGoodsNumber:(NSInteger)goodsNumber WithcostPrice:(CGFloat)costprice Withcellindex:(NSInteger)cellindex returnValue:(void(^)(id value))result;
- (void)changeGoodsNumber:(NSInteger)goodsNumber WithcostPrice:(CGFloat)costprice Withcellindex:(NSInteger)cellindex returnValue:(void(^)(id value))result;
@end
......
Class/Shoppingcart/ShoppingTableViewCell.m
View file @ 1fdb50ad
......@@ -66,7 +66,7 @@
break;
case 101://增加
{
if (goodsNumber >= [_model.goods.number integerValue]) {
if (goodsNumber >= [self.model.goods.number integerValue]) {
//不能大于库存
if (self.promptStringBlock) {
self.promptStringBlock(@"个数不能大于库存");
......@@ -81,12 +81,14 @@
}
//改变价格
WS(weakSelf);
if ([self.delegate respondsToSelector:@selector(ChangeGoodsNumber:WithcostPrice:Withcellindex:returnValue:)]) {
[self.delegate ChangeGoodsNumber:goodsNumber WithcostPrice:[self.clinchTextfield.text floatValue]Withcellindex:_cellindex returnValue:^(id value) {
if ([self.delegate respondsToSelector:@selector(changeGoodsNumber:WithcostPrice:Withcellindex:returnValue:)]) {
[self.delegate changeGoodsNumber:goodsNumber WithcostPrice:[self.clinchTextfield.text floatValue]Withcellindex:_cellindex returnValue:^(id value) {
if ([value isKindOfClass:[NSDictionary class]]) {
if ([value[@"code"] isEqualToNumber:@0]) {
weakSelf.goodsNumbersLabe.text = [NSString stringWithFormat:@"%ld",goodsNumber];
weakSelf.productPriceLabe.text = [NSString stringWithFormat:@"￥%.2f",[self.goodsNumbersLabe.text integerValue]*[self.clinchTextfield.text floatValue]];
weakSelf.productPriceLabe.text = [NSString stringWithFormat:@"￥%.2f",goodsNumber*[self.clinchTextfield.text floatValue]];
self.model.costPrice = [NSNumber numberWithFloat:[self.clinchTextfield.text floatValue]];
self.model.goodsNum = goodsNumber;
}
}
}];
......@@ -120,8 +122,8 @@
//改变价格
self.productPriceLabe.text = [NSString stringWithFormat:@"￥%.2f",[self.goodsNumbersLabe.text integerValue]*[textField.text floatValue]];
if ([self.delegate respondsToSelector:@selector(ChangeGoodsNumber:WithcostPrice:Withcellindex:returnValue:)]) {
[self.delegate ChangeGoodsNumber:[self.goodsNumbersLabe.text integerValue] WithcostPrice:[self.clinchTextfield.text floatValue]Withcellindex:_cellindex returnValue:^(id value) {
if ([self.delegate respondsToSelector:@selector(changeGoodsNumber:WithcostPrice:Withcellindex:returnValue:)]) {
[self.delegate changeGoodsNumber:[self.goodsNumbersLabe.text integerValue] WithcostPrice:[self.clinchTextfield.text floatValue]Withcellindex:_cellindex returnValue:^(id value) {
}];
}
}
......@@ -153,8 +155,8 @@
return NO;
}
}
NSRange zeroRange = [textField.text rangeOfString:@"0"];
if(zeroRange.length == 1 && zeroRange.location == 0){ //判断输入框第一个字符是否为“0”
NSRange ZERORange = [textField.text rangeOfString:@"0"];
if(ZERORange.length == 1 && ZERORange.location == 0){ //判断输入框第一个字符是否为“0”
if(![string isEqualToString:@"0"] && ![string isEqualToString:@"."] && [textField.text length] == 1){ //当输入框只有一个字符并且字符为“0”时，再输入不为“0”或者“.”的字符时，则将此输入替换输入框的这唯一字符。
textField.text = string;
return NO;
......
Class/Shoppingcart/ShoppingViewController.h
View file @ 1fdb50ad
......@@ -32,6 +32,11 @@
*/
@property (weak, nonatomic) IBOutlet UIButton *allSelectedButton;
/**
* 折扣比例
*/
@property (weak, nonatomic) IBOutlet UITextField *discountTextField;
@end
Class/Shoppingcart/ShoppingViewController.m
View file @ 1fdb50ad
......@@ -14,21 +14,16 @@
#import "AddressModel.h"
#import "ProductDetailsViewController.h"
@interface ShoppingViewController ()<UITableViewDelegate,UITableViewDataSource,ChangeGoodsNumberDelegate,DZNEmptyDataSetSource>
@interface ShoppingViewController ()<UITableViewDelegate,UITableViewDataSource,ChangeGoodsNumberDelegate,DZNEmptyDataSetSource,UITextFieldDelegate>
@property (weak, nonatomic) IBOutlet UITableView *shoppingTableview;
/**
* 购物车数据源
*/
@property (nonatomic,strong) NSMutableArray *shopResponseArray;
@end
@implementation ShoppingViewController
......@@ -46,10 +41,8 @@
return _shopResponseArray;
}
- (void)viewDidLoad {
[super viewDidLoad];
// Do any additional setup after loading the view.
[self uiConfigAction];
}
......@@ -83,9 +76,9 @@
[self.settlementButton setTitle:@"去结算(0)" forState:UIControlStateNormal];
self.allSelectedButton.selected = NO;
self.totalpriceLabe.text = nil;
self.discountTextField.text = nil;
}
#pragma mark - UI
- (void)uiConfigAction
{
......@@ -96,16 +89,105 @@
self.shoppingTableview.delegate = self;
self.shoppingTableview.backgroundColor = [UIColor clearColor];
self.shoppingTableview.tableFooterView = [UIView new];
self.discountTextField.delegate = self;
}
#pragma mark -<UITextFieldDelegate>
- (BOOL)textFieldShouldBeginEditing:(UITextField *)textField
{
if (self.shopResponseArray.count == 0) {
[self ErrorMBProgressView:@"请先添加商品到购物车"];return NO;
}
NSMutableArray *array = [NSMutableArray array];
for (ShopcarModel *model in self.shopResponseArray) {
if (model.isSelected) {
[array addObject:model];
}
}
if (array.count == 0) {
[self ErrorMBProgressView:@"没有选中任何商品"];return NO;
}
return YES;
}
- (BOOL)textFieldShouldEndEditing:(UITextField *)textField
{
Shoppersmanager *user = [Shoppersmanager manager];
if ([textField.text integerValue] < [user.Shoppers.lowestDiscount integerValue] && textField.text.length)
{
[self SHOWPrompttext:@"当前价格低于你的价格权限!"];return NO;
}
[self unifiedChangeDiscount:textField.text];
return YES;
}
#pragma mark - 输入折扣比例
- (BOOL)textField:(UITextField *)textField shouldChangeCharactersInRange:(NSRange)range replacementString:(NSString *)string
{
return [self validateNumber:string];
}
#pragma mark - 判断输入是否有效<两位整数、第一位不能为0>
- (BOOL)validateNumber:(NSString*)number
{
BOOL res = YES;
if ([number isEqualToString:@""]) {
return YES;
}
if (self.discountTextField.text.length == 2) {
return NO;
}
if(self.discountTextField.text.length == 0 && [number isEqualToString:@"0"])
{
if([number isEqualToString:@"0"]){
return NO;
}
}
NSCharacterSet* tmpSet = [NSCharacterSet characterSetWithCharactersInString:@"0123456789"];
int i = 0;
while (i < number.length) {
NSString * string = [number substringWithRange:NSMakeRange(i, 1)];
NSRange range = [string rangeOfCharacterFromSet:tmpSet];
if (range.length == 0) {
res = NO;
break;
}
i++;
}
return res;
}
#pragma mark - 统一修改折扣率
- (void)unifiedChangeDiscount:(NSString *)discount
{
WS(weakSelf);
NSDecimalNumber *discountNumber = [NSDecimalNumber decimalNumberWithString:discount];
NSDecimalNumber *number = [discountNumber decimalNumberByDividingBy:[NSDecimalNumber decimalNumberWithString:@"100"]];
for (ShopcarModel *model in self.shopResponseArray) {
if (model.isSelected) {
NSNumber *constPrice = model.goods.tagPrice;
model.costPrice = [number decimalNumberByMultiplyingBy:[NSDecimalNumber decimalNumberWithString:[constPrice stringValue]]];
}
}
//** boolValue为false表示修改失败 */
[self modifyMultipleGoodsNnumberOrPrice:self.shopResponseArray completeModify:^(BOOL boolValue) {
if (!boolValue) {
for (ShopcarModel *model in weakSelf.shopResponseArray) {
if (model.isSelected) {
model.costPrice = model.goods.tagPrice;
model.goodsNum = 1;
}
}
}
[weakSelf.shoppingTableview reloadData];
}];
}
#pragma mark -获取购物车商品
- (void)getShoppingCardata
{
//判断是否需要请求数据-通过当前客户ID
if (![Shoppersmanager manager].currentCustomer) {
return;
}
ShopCartFilter *shopcarNumber = [[ShopCartFilter alloc]init];
......@@ -148,12 +230,13 @@
[weakSelf ErrorMBProgressView:returnValue[@"message"]];
}
} WithErrorCodeBlock:^(id errorCodeValue) {
[weakSelf endRefreshingForTableView:weakSelf.shoppingTableview];
[weakSelf RemoveMBProgressHUDLoding];
[weakSelf ErrorMBProgressView:@"无网络"];
} WithFailureBlock:^(id error) {
[weakSelf RemoveMBProgressHUDLoding];
[weakSelf ErrorMBProgressView:NETWORK];
} WithFailureBlock:^(NSError *error) {
[weakSelf endRefreshingForTableView:weakSelf.shoppingTableview];
[weakSelf RemoveMBProgressHUDLoding];
[weakSelf ErrorMBProgressView:error.localizedDescription];
}];
}
......@@ -243,7 +326,6 @@
//商品总信息占位
ShopcarModel*ZhanweiModel = [[ShopcarModel alloc]init];
[array addObject:ZhanweiModel];
GenerateOrdersViewController *generateOrder = [[self getStoryboardWithName] instantiateViewControllerWithIdentifier:@"generateorders"];
generateOrder.settlementGoodsdatas = array;
//清除已经生成订单的商品
......@@ -256,7 +338,6 @@
[weakSelf RemoveMBProgressHUDLoding];
if ([returnValue[@"code"] isEqualToNumber:@0]) {
[weakSelf QueryShoppingCarNumber];
//商品cell
NSMutableArray *cellArray = [NSMutableArray array];
......@@ -269,7 +350,6 @@
[cellArray addObject:indexpath];
}
}
//删除cell
[weakSelf.shoppingTableview deleteRowsAtIndexPaths:cellArray withRowAnimation:UITableViewRowAnimationTop];
}else
{
......@@ -278,43 +358,34 @@
} WithErrorCodeBlock:^(id errorCodeValue) {
[weakSelf RemoveMBProgressHUDLoding];
[weakSelf ErrorMBProgressView:@"无网络"];
} WithFailureBlock:^(id error) {
[weakSelf ErrorMBProgressView:NETWORK];
} WithFailureBlock:^(NSError *error) {
[weakSelf RemoveMBProgressHUDLoding];
[weakSelf ErrorMBProgressView:error.localizedDescription];
}];
}];
[self.navigationController pushViewController:generateOrder animated:YES];
}
#pragma mark -全选
- (IBAction)allSelectedButtonClick:(UIButton *)sender {
sender.selected = !sender.selected;
if (sender.selected) {
//全部选中
for (ShoppingTableViewCell *cell in self.shoppingTableview.visibleCells) {
cell.selectedButton.selected = YES;
}
for (ShopcarModel *model in self.shopResponseArray) {
model.isSelected = YES;
}
[self.settlementButton setTitle:[NSString stringWithFormat:@"去结算(%ld)",self.shopResponseArray.count] forState:UIControlStateNormal];
}else
{
//取消全部选中
for (ShoppingTableViewCell *cell in self.shoppingTableview.visibleCells) {
cell.selectedButton.selected = NO;
}
for (ShopcarModel *model in self.shopResponseArray) {
model.isSelected = NO;
}
[self.settlementButton setTitle:@"去结算(0)" forState:UIControlStateNormal];
......@@ -339,7 +410,6 @@
#pragma mark -删除选中商品
- (IBAction)delecteSelectedGoods:(UIButton *)sender {
[self CreateMBProgressHUDLoding];
DeleteCartRequest *delecteGoods = [[DeleteCartRequest alloc]init];
//code数组
......@@ -349,10 +419,8 @@
//模型数组
NSMutableArray *delectemodel = [NSMutableArray array];
for (int i=0; i<self.shopResponseArray.count; i++) {
ShopcarModel *model = [self.shopResponseArray objectAtIndex_opple:i];
if (model.isSelected) {
[codeArr addObject:model.fid];
[delectemodel addObject:model];
NSIndexPath *indexpath = [NSIndexPath indexPathForRow:i inSection:0];
......@@ -392,31 +460,67 @@
} WithErrorCodeBlock:^(id errorCodeValue) {
[weakSelf RemoveMBProgressHUDLoding];
[weakSelf ErrorMBProgressView:@"无网络"];
} WithFailureBlock:^(id error) {
[weakSelf ErrorMBProgressView:NETWORK];
} WithFailureBlock:^(NSError *error) {
[weakSelf RemoveMBProgressHUDLoding];
[weakSelf ErrorMBProgressView:error.localizedDescription];
}];
}
#pragma mark - 修改多个商品数量、价格
- (void)modifyMultipleGoodsNnumberOrPrice:(NSArray<ShopcarModel *> *)goodsArray completeModify:(void(^)(BOOL boolValue))finish
{
WS(weakSelf);
dispatch_group_t group = dispatch_group_create();
static NSInteger number = ZERO;
[self CreateMBProgressHUDLoding];
[goodsArray enumerateObjectsUsingBlock:^(ShopcarModel * _Nonnull model, NSUInteger idx, BOOL * _Nonnull stop) {
dispatch_group_enter(group);
NSLog(@"%@",[NSString stringWithFormat:@"%@%@/%@/%@/%ld",SERVERREQUESTURL(CHANGESHOPPINGBAGNUMBERPRICE),model.fid,model.goodsId,[model.costPrice stringValue],model.goodsNum]);
[[NetworkRequestClassManager Manager] NetworkWithDictionaryRequestWithURL:[NSString stringWithFormat:@"%@%@/%@/%@/%ld",SERVERREQUESTURL(CHANGESHOPPINGBAGNUMBERPRICE),model.fid,model.goodsId,[model.costPrice stringValue],model.goodsNum] WithRequestType:1 WithParameter:nil WithReturnValueBlock:^(id returnValue) {
dispatch_group_leave(group);
if ([returnValue[@"code"] isEqualToNumber:@0]) {
number ++;
}
} WithErrorCodeBlock:^(id errorCodeValue) {
dispatch_group_leave(group);
} WithFailureBlock:^(NSError *error) {
dispatch_group_leave(group);
}];
}];
dispatch_group_notify(group, dispatch_get_main_queue(), ^{
[weakSelf RemoveMBProgressHUDLoding];
if (number == goodsArray.count) {
[weakSelf CalculateSelectedGoodsAllprice];
[weakSelf QueryShoppingCarNumber];
finish(YES);
}else {
[self SHOWPrompttext:@"修改失败" ComcpleteBlock:^{
finish(NO);
}];
}
number = ZERO;
});
}
#pragma mark -改变商品数量
- (void)ChangeGoodsNumber:(NSInteger)goodsNumber WithcostPrice:(CGFloat)costprice Withcellindex:(NSInteger)cellindex returnValue:(void (^)(id))result
#pragma mark -修改单个商品数量、价格
- (void)changeGoodsNumber:(NSInteger)goodsNumber WithcostPrice:(CGFloat)costprice Withcellindex:(NSInteger)cellindex returnValue:(void (^)(id))result
{
[self CreateMBProgressHUDLoding];
//保存商品数量
ShopcarModel *model = [self.shopResponseArray objectAtIndex_opple:cellindex];
model.goodsNum = goodsNumber;
//保存成交价格
ShopcarModel *Newmodel = [self.shopResponseArray objectAtIndex_opple:cellindex];
Newmodel.costPrice = (NSDecimalNumber *)[NSDecimalNumber numberWithFloat:costprice];
model.costPrice = [NSNumber numberWithFloat:costprice];
//在服务器保存数量、成交价
//购物车ID
NSString *carid = [[self.shopResponseArray objectAtIndex_opple:cellindex] fid];
NSString *carid = model.fid;
//商品id
NSString *goodsis = [[[self.shopResponseArray objectAtIndex_opple:cellindex] goods] uuid];
NSString *goodsis = model.goodsId;
//成交价
NSString *costpriceString = [NSString stringWithFormat:@"%.2f",costprice];
//商品数量
......@@ -427,7 +531,6 @@
[weakSelf RemoveMBProgressHUDLoding];
result(returnValue);//提供是否支持修改的参数
if ([returnValue[@"code"] isEqualToNumber:@0]) {
NSLog(@"写入服务器成功");
[weakSelf CalculateSelectedGoodsAllprice];
[weakSelf QueryShoppingCarNumber];
}else{
......@@ -437,27 +540,24 @@
} WithErrorCodeBlock:^(id errorCodeValue) {
[weakSelf RemoveMBProgressHUDLoding];
[weakSelf ErrorMBProgressView:@"无网络"];
} WithFailureBlock:^(id error) {
NSLog(@"写入服务器失败");
[weakSelf ErrorMBProgressView:NETWORK];
} WithFailureBlock:^(NSError *error) {
[weakSelf RemoveMBProgressHUDLoding];
[weakSelf ErrorMBProgressView:error.localizedDescription];
}];
}
#pragma mark -友好界面
- (UIImage *)imageForEmptyDataSet:(UIScrollView *)scrollView
{
return kNoDataImage;
}
- (NSAttributedString *)titleForEmptyDataSet:(UIScrollView *)scrollView
{
return [[NSAttributedString alloc]initWithString:@"暂无数据" attributes:nil];
}
@end
Class/Tabbar/CustomTabbarController.m
View file @ 1fdb50ad
......@@ -100,8 +100,8 @@
#pragma mark -UI
- (void)uiConfigAction
{
self.tabBar.frame = CGRectMake(Zero, Zero, ScreenWidth, NavigationHeight);
self.toolview = [[Toolview alloc]initWithFrame:CGRectMake(Zero, Zero, ScreenWidth, NavigationHeight)];
self.tabBar.frame = CGRectMake(ZERO, ZERO, ScreenWidth, NavigationHeight);
self.toolview = [[Toolview alloc]initWithFrame:CGRectMake(ZERO, ZERO, ScreenWidth, NavigationHeight)];
self.toolview.delegate = self;
self.toolview.inputField.delegate = self;
self.delegate = self;
......
Class/WithdrawalViewController.m
View file @ 1fdb50ad
......@@ -39,7 +39,7 @@
if (!_model) {
_model = [[RsApplyBillRequest alloc]init];
DataPage *page = [[DataPage alloc]init];
page.page = Zero;
page.page = ZERO;
page.rows = KROWS;
_model.page = page;
_model.employeeId = [Shoppersmanager manager].Shoppers.employee.fid;
......
Lighting.xcodeproj/project.pbxproj
View file @ 1fdb50ad
......@@ -188,7 +188,7 @@
041843DB1CF773490081B694 /* Security.framework */ = {isa = PBXFileReference; lastKnownFileType = wrapper.framework; name = Security.framework; path = System/Library/Frameworks/Security.framework; sourceTree = SDKROOT; };
041843DD1CF773530081B694 /* libiconv.tbd */ = {isa = PBXFileReference; lastKnownFileType = "sourcecode.text-based-dylib-definition"; name = libiconv.tbd; path = usr/lib/libiconv.tbd; sourceTree = SDKROOT; };
041843E01CF773710081B694 /* CoreGraphics.framework */ = {isa = PBXFileReference; lastKnownFileType = wrapper.framework; name = CoreGraphics.framework; path = System/Library/Frameworks/CoreGraphics.framework; sourceTree = SDKROOT; };
041843E21CF7737E0081B694 /* libsqlite3.tbd */ = {isa = PBXFileReference; lastKnownFileType = "sourcecode.text-based-dylib-definition"; name = libsqlite3.tbd; path = usr/lib/libsqlite3.tbd; sourceTree = SDKROOT; };
041843E21CF7737E0081B694 /* libsqlite3.tbd */ = {isa = PBXFileReference; lastKnownFileType = "sourcecode.text-based-dylib-definition"; lineEnding = 0; name = libsqlite3.tbd; path = usr/lib/libsqlite3.tbd; sourceTree = SDKROOT; xcLanguageSpecificationIdentifier = "xcode.lang.text-based-dylib"; };
041843E41CF773990081B694 /* libstdc++.tbd */ = {isa = PBXFileReference; lastKnownFileType = "sourcecode.text-based-dylib-definition"; name = "libstdc++.tbd"; path = "usr/lib/libstdc++.tbd"; sourceTree = SDKROOT; };
041843E61CF773A00081B694 /* libz.tbd */ = {isa = PBXFileReference; lastKnownFileType = "sourcecode.text-based-dylib-definition"; name = libz.tbd; path = usr/lib/libz.tbd; sourceTree = SDKROOT; };
0447085C1CD7C06B00555827 /* LoginViewController.h */ = {isa = PBXFileReference; fileEncoding = 4; lastKnownFileType = sourcecode.c.h; path = LoginViewController.h; sourceTree = "<group>"; };
......@@ -216,9 +216,9 @@
2916A73C1D70232700644C8C /* RebateViewController.h */ = {isa = PBXFileReference; fileEncoding = 4; lastKnownFileType = sourcecode.c.h; path = RebateViewController.h; sourceTree = "<group>"; };
2916A73D1D70232700644C8C /* RebateViewController.m */ = {isa = PBXFileReference; fileEncoding = 4; lastKnownFileType = sourcecode.c.objc; path = RebateViewController.m; sourceTree = "<group>"; };
2916A73F1D70362000644C8C /* PaymentsViewController.h */ = {isa = PBXFileReference; fileEncoding = 4; lastKnownFileType = sourcecode.c.h; path = PaymentsViewController.h; sourceTree = "<group>"; };
2916A7401D70362000644C8C /* PaymentsViewController.m */ = {isa = PBXFileReference; fileEncoding = 4; lastKnownFileType = sourcecode.c.objc; path = PaymentsViewController.m; sourceTree = "<group>"; };
2916A7401D70362000644C8C /* PaymentsViewController.m */ = {isa = PBXFileReference; fileEncoding = 4; lastKnownFileType = sourcecode.c.objc; lineEnding = 0; path = PaymentsViewController.m; sourceTree = "<group>"; xcLanguageSpecificationIdentifier = xcode.lang.objc; };
2916A7421D70363E00644C8C /* WithdrawalViewController.h */ = {isa = PBXFileReference; fileEncoding = 4; lastKnownFileType = sourcecode.c.h; path = WithdrawalViewController.h; sourceTree = "<group>"; };
2916A7431D70363E00644C8C /* WithdrawalViewController.m */ = {isa = PBXFileReference; fileEncoding = 4; lastKnownFileType = sourcecode.c.objc; path = WithdrawalViewController.m; sourceTree = "<group>"; };
2916A7431D70363E00644C8C /* WithdrawalViewController.m */ = {isa = PBXFileReference; fileEncoding = 4; lastKnownFileType = sourcecode.c.objc; lineEnding = 0; path = WithdrawalViewController.m; sourceTree = "<group>"; xcLanguageSpecificationIdentifier = xcode.lang.objc; };
2916A7461D703A1700644C8C /* UIView+cornerRadius.h */ = {isa = PBXFileReference; fileEncoding = 4; lastKnownFileType = sourcecode.c.h; path = "UIView+cornerRadius.h"; sourceTree = "<group>"; };
2916A7471D703A1700644C8C /* UIView+cornerRadius.m */ = {isa = PBXFileReference; fileEncoding = 4; lastKnownFileType = sourcecode.c.objc; path = "UIView+cornerRadius.m"; sourceTree = "<group>"; };
2916A74A1D703DFF00644C8C /* PaymentsTableViewCell.h */ = {isa = PBXFileReference; fileEncoding = 4; lastKnownFileType = sourcecode.c.h; path = PaymentsTableViewCell.h; sourceTree = "<group>"; };
......@@ -254,7 +254,7 @@
2921F3051DB5F27A00D6439B /* PromotionalTableViewCell.m */ = {isa = PBXFileReference; fileEncoding = 4; lastKnownFileType = sourcecode.c.objc; path = PromotionalTableViewCell.m; sourceTree = "<group>"; };
2925D03B1CFEE5D7008879BC /* ScreeningTableViewCell.h */ = {isa = PBXFileReference; fileEncoding = 4; lastKnownFileType = sourcecode.c.h; path = ScreeningTableViewCell.h; sourceTree = "<group>"; };
2925D03C1CFEE5D7008879BC /* ScreeningTableViewCell.m */ = {isa = PBXFileReference; fileEncoding = 4; lastKnownFileType = sourcecode.c.objc; path = ScreeningTableViewCell.m; sourceTree = "<group>"; };
2928F7E21CD085F40036D761 /* PrefixHeader.pch */ = {isa = PBXFileReference; lastKnownFileType = sourcecode.c.h; path = PrefixHeader.pch; sourceTree = "<group>"; };
2928F7E21CD085F40036D761 /* PrefixHeader.pch */ = {isa = PBXFileReference; lastKnownFileType = sourcecode.c.h; lineEnding = 0; path = PrefixHeader.pch; sourceTree = "<group>"; xcLanguageSpecificationIdentifier = xcode.lang.objc; };
2928F7E51CD087FE0036D761 /* BaseViewController.h */ = {isa = PBXFileReference; fileEncoding = 4; lastKnownFileType = sourcecode.c.h; path = BaseViewController.h; sourceTree = "<group>"; };
2928F7E61CD087FE0036D761 /* BaseViewController.m */ = {isa = PBXFileReference; fileEncoding = 4; lastKnownFileType = sourcecode.c.objc; path = BaseViewController.m; sourceTree = "<group>"; };
2928F8301CD09E320036D761 /* Toolview.h */ = {isa = PBXFileReference; fileEncoding = 4; lastKnownFileType = sourcecode.c.h; path = Toolview.h; sourceTree = "<group>"; };
......@@ -262,7 +262,7 @@
2928F8361CD09E730036D761 /* CustomButton.h */ = {isa = PBXFileReference; fileEncoding = 4; lastKnownFileType = sourcecode.c.h; path = CustomButton.h; sourceTree = "<group>"; };
2928F8371CD09E730036D761 /* CustomButton.m */ = {isa = PBXFileReference; fileEncoding = 4; lastKnownFileType = sourcecode.c.objc; path = CustomButton.m; sourceTree = "<group>"; };
2928F8391CD0A0CE0036D761 /* CustomTabbarController.h */ = {isa = PBXFileReference; fileEncoding = 4; lastKnownFileType = sourcecode.c.h; path = CustomTabbarController.h; sourceTree = "<group>"; };
2928F83A1CD0A0CE0036D761 /* CustomTabbarController.m */ = {isa = PBXFileReference; fileEncoding = 4; lastKnownFileType = sourcecode.c.objc; path = CustomTabbarController.m; sourceTree = "<group>"; };
2928F83A1CD0A0CE0036D761 /* CustomTabbarController.m */ = {isa = PBXFileReference; fileEncoding = 4; lastKnownFileType = sourcecode.c.objc; lineEnding = 0; path = CustomTabbarController.m; sourceTree = "<group>"; xcLanguageSpecificationIdentifier = xcode.lang.objc; };
2928F8401CD0ABAC0036D761 /* ShoppingViewController.h */ = {isa = PBXFileReference; fileEncoding = 4; lastKnownFileType = sourcecode.c.h; path = ShoppingViewController.h; sourceTree = "<group>"; };
2928F8411CD0ABAC0036D761 /* ShoppingViewController.m */ = {isa = PBXFileReference; fileEncoding = 4; lastKnownFileType = sourcecode.c.objc; path = ShoppingViewController.m; sourceTree = "<group>"; };
292A142F1CE81D1D00EB4430 /* AddressModel.h */ = {isa = PBXFileReference; fileEncoding = 4; lastKnownFileType = sourcecode.c.h; path = AddressModel.h; sourceTree = "<group>"; };
......@@ -270,7 +270,7 @@
2933934D1CD3158B000D997B /* instructionsLabe.h */ = {isa = PBXFileReference; fileEncoding = 4; lastKnownFileType = sourcecode.c.h; path = instructionsLabe.h; sourceTree = "<group>"; };
2933934E1CD3158B000D997B /* instructionsLabe.m */ = {isa = PBXFileReference; fileEncoding = 4; lastKnownFileType = sourcecode.c.objc; path = instructionsLabe.m; sourceTree = "<group>"; };
293393531CD3379E000D997B /* ShoppingTableViewCell.h */ = {isa = PBXFileReference; fileEncoding = 4; lastKnownFileType = sourcecode.c.h; path = ShoppingTableViewCell.h; sourceTree = "<group>"; };
293393541CD3379E000D997B /* ShoppingTableViewCell.m */ = {isa = PBXFileReference; fileEncoding = 4; lastKnownFileType = sourcecode.c.objc; path = ShoppingTableViewCell.m; sourceTree = "<group>"; };
293393541CD3379E000D997B /* ShoppingTableViewCell.m */ = {isa = PBXFileReference; fileEncoding = 4; lastKnownFileType = sourcecode.c.objc; lineEnding = 0; path = ShoppingTableViewCell.m; sourceTree = "<group>"; xcLanguageSpecificationIdentifier = xcode.lang.objc; };
2934B0A91DB4E1F1009CBAC4 /* CYConstManager.h */ = {isa = PBXFileReference; fileEncoding = 4; lastKnownFileType = sourcecode.c.h; path = CYConstManager.h; sourceTree = "<group>"; };
2934B0AA1DB4E1F1009CBAC4 /* CYConstManager.m */ = {isa = PBXFileReference; fileEncoding = 4; lastKnownFileType = sourcecode.c.objc; path = CYConstManager.m; sourceTree = "<group>"; };
29360C2D1CDDC47E002A5D89 /* ScreeningView.h */ = {isa = PBXFileReference; fileEncoding = 4; lastKnownFileType = sourcecode.c.h; path = ScreeningView.h; sourceTree = "<group>"; };
......@@ -281,9 +281,9 @@
2936F28D1D0141FD007CA67C /* ProductScreeningTableViewCell.h */ = {isa = PBXFileReference; fileEncoding = 4; lastKnownFileType = sourcecode.c.h; path = ProductScreeningTableViewCell.h; sourceTree = "<group>"; };
2936F28E1D0141FD007CA67C /* ProductScreeningTableViewCell.m */ = {isa = PBXFileReference; fileEncoding = 4; lastKnownFileType = sourcecode.c.objc; path = ProductScreeningTableViewCell.m; sourceTree = "<group>"; };
2936F2941D017BBD007CA67C /* GoodsImageView.h */ = {isa = PBXFileReference; fileEncoding = 4; lastKnownFileType = sourcecode.c.h; path = GoodsImageView.h; sourceTree = "<group>"; };
2936F2951D017BBD007CA67C /* GoodsImageView.m */ = {isa = PBXFileReference; fileEncoding = 4; lastKnownFileType = sourcecode.c.objc; path = GoodsImageView.m; sourceTree = "<group>"; };
2936F2971D01868E007CA67C /* ShareGoodsViewController.h */ = {isa = PBXFileReference; fileEncoding = 4; lastKnownFileType = sourcecode.c.h; path = ShareGoodsViewController.h; sourceTree = "<group>"; };
2936F2981D01868E007CA67C /* ShareGoodsViewController.m */ = {isa = PBXFileReference; fileEncoding = 4; lastKnownFileType = sourcecode.c.objc; path = ShareGoodsViewController.m; sourceTree = "<group>"; };
2936F2951D017BBD007CA67C /* GoodsImageView.m */ = {isa = PBXFileReference; fileEncoding = 4; lastKnownFileType = sourcecode.c.objc; lineEnding = 0; path = GoodsImageView.m; sourceTree = "<group>"; xcLanguageSpecificationIdentifier = xcode.lang.objc; };
2936F2971D01868E007CA67C /* ShareGoodsViewController.h */ = {isa = PBXFileReference; fileEncoding = 4; lastKnownFileType = sourcecode.c.h; lineEnding = 0; path = ShareGoodsViewController.h; sourceTree = "<group>"; xcLanguageSpecificationIdentifier = xcode.lang.objcpp; };
2936F2981D01868E007CA67C /* ShareGoodsViewController.m */ = {isa = PBXFileReference; fileEncoding = 4; lastKnownFileType = sourcecode.c.objc; lineEnding = 0; path = ShareGoodsViewController.m; sourceTree = "<group>"; xcLanguageSpecificationIdentifier = xcode.lang.objc; };
2936F2991D01868E007CA67C /* ShareGoodsViewController.xib */ = {isa = PBXFileReference; fileEncoding = 4; lastKnownFileType = file.xib; path = ShareGoodsViewController.xib; sourceTree = "<group>"; };
2942F8A41CDD80C2005B377E /* authenticateView.h */ = {isa = PBXFileReference; fileEncoding = 4; lastKnownFileType = sourcecode.c.h; path = authenticateView.h; sourceTree = "<group>"; };
2942F8A51CDD80C2005B377E /* authenticateView.m */ = {isa = PBXFileReference; fileEncoding = 4; lastKnownFileType = sourcecode.c.objc; path = authenticateView.m; sourceTree = "<group>"; };
......@@ -302,7 +302,7 @@
2949BAC11CD3055A0049385A /* MMExampleDrawerVisualStateManager.m */ = {isa = PBXFileReference; fileEncoding = 4; lastKnownFileType = sourcecode.c.objc; path = MMExampleDrawerVisualStateManager.m; sourceTree = "<group>"; };
294BFDD01D47225A00BFD53F /* StoryboardwithCYX.storyboard */ = {isa = PBXFileReference; fileEncoding = 4; lastKnownFileType = file.storyboard; path = StoryboardwithCYX.storyboard; sourceTree = "<group>"; };
294BFDD21D47225E00BFD53F /* Main.storyboard */ = {isa = PBXFileReference; fileEncoding = 4; lastKnownFileType = file.storyboard; path = Main.storyboard; sourceTree = "<group>"; };
294BFDD41D47227900BFD53F /* ExperienceCentreViewController.m */ = {isa = PBXFileReference; fileEncoding = 4; lastKnownFileType = sourcecode.c.objc; path = ExperienceCentreViewController.m; sourceTree = "<group>"; };
294BFDD41D47227900BFD53F /* ExperienceCentreViewController.m */ = {isa = PBXFileReference; fileEncoding = 4; lastKnownFileType = sourcecode.c.objc; lineEnding = 0; path = ExperienceCentreViewController.m; sourceTree = "<group>"; xcLanguageSpecificationIdentifier = xcode.lang.objc; };
294CF0EA1CEDCF480055F1D8 /* PromptinformationView.h */ = {isa = PBXFileReference; fileEncoding = 4; lastKnownFileType = sourcecode.c.h; path = PromptinformationView.h; sourceTree = "<group>"; };
294CF0EB1CEDCF480055F1D8 /* PromptinformationView.m */ = {isa = PBXFileReference; fileEncoding = 4; lastKnownFileType = sourcecode.c.objc; path = PromptinformationView.m; sourceTree = "<group>"; };
294CF0ED1CEDCF540055F1D8 /* PromptinformationView.xib */ = {isa = PBXFileReference; fileEncoding = 4; lastKnownFileType = file.xib; path = PromptinformationView.xib; sourceTree = "<group>"; };
......@@ -315,9 +315,9 @@
295DEAA81DB77572006ED4A6 /* CardDetailsViewController.h */ = {isa = PBXFileReference; fileEncoding = 4; lastKnownFileType = sourcecode.c.h; path = CardDetailsViewController.h; sourceTree = "<group>"; };
295DEAA91DB77572006ED4A6 /* CardDetailsViewController.m */ = {isa = PBXFileReference; fileEncoding = 4; lastKnownFileType = sourcecode.c.objc; path = CardDetailsViewController.m; sourceTree = "<group>"; };
295DEAC01DB786B8006ED4A6 /* CardDontUseViewController.h */ = {isa = PBXFileReference; fileEncoding = 4; lastKnownFileType = sourcecode.c.h; path = CardDontUseViewController.h; sourceTree = "<group>"; };
295DEAC11DB786B8006ED4A6 /* CardDontUseViewController.m */ = {isa = PBXFileReference; fileEncoding = 4; lastKnownFileType = sourcecode.c.objc; path = CardDontUseViewController.m; sourceTree = "<group>"; };
295DEAC11DB786B8006ED4A6 /* CardDontUseViewController.m */ = {isa = PBXFileReference; fileEncoding = 4; lastKnownFileType = sourcecode.c.objc; lineEnding = 0; path = CardDontUseViewController.m; sourceTree = "<group>"; xcLanguageSpecificationIdentifier = xcode.lang.objc; };
295DEAC31DB786C6006ED4A6 /* CardBeenUseViewController.h */ = {isa = PBXFileReference; fileEncoding = 4; lastKnownFileType = sourcecode.c.h; path = CardBeenUseViewController.h; sourceTree = "<group>"; };
295DEAC41DB786C6006ED4A6 /* CardBeenUseViewController.m */ = {isa = PBXFileReference; fileEncoding = 4; lastKnownFileType = sourcecode.c.objc; path = CardBeenUseViewController.m; sourceTree = "<group>"; };
295DEAC41DB786C6006ED4A6 /* CardBeenUseViewController.m */ = {isa = PBXFileReference; fileEncoding = 4; lastKnownFileType = sourcecode.c.objc; lineEnding = 0; path = CardBeenUseViewController.m; sourceTree = "<group>"; xcLanguageSpecificationIdentifier = xcode.lang.objc; };
2962D06B1CD1A43A0058829D /* ClientViewController.h */ = {isa = PBXFileReference; fileEncoding = 4; lastKnownFileType = sourcecode.c.h; path = ClientViewController.h; sourceTree = "<group>"; };
2962D06C1CD1A43A0058829D /* ClientViewController.m */ = {isa = PBXFileReference; fileEncoding = 4; lastKnownFileType = sourcecode.c.objc; path = ClientViewController.m; sourceTree = "<group>"; };
2962D06F1CD1A58B0058829D /* RightViewController.h */ = {isa = PBXFileReference; fileEncoding = 4; lastKnownFileType = sourcecode.c.h; path = RightViewController.h; sourceTree = "<group>"; };
......@@ -347,7 +347,7 @@
29702B521D72921600322196 /* SVProgressHUD.framework */ = {isa = PBXFileReference; lastKnownFileType = wrapper.framework; name = SVProgressHUD.framework; path = "Pods/../build/Debug-iphoneos/SVProgressHUD.framework"; sourceTree = "<group>"; };
29702B531D72921600322196 /* YLProgressBar.framework */ = {isa = PBXFileReference; lastKnownFileType = wrapper.framework; name = YLProgressBar.framework; path = "Pods/../build/Debug-iphoneos/YLProgressBar.framework"; sourceTree = "<group>"; };
29702B611D72EE2E00322196 /* RebateDetailsViewController.h */ = {isa = PBXFileReference; fileEncoding = 4; lastKnownFileType = sourcecode.c.h; path = RebateDetailsViewController.h; sourceTree = "<group>"; };
29702B621D72EE2E00322196 /* RebateDetailsViewController.m */ = {isa = PBXFileReference; fileEncoding = 4; lastKnownFileType = sourcecode.c.objc; path = RebateDetailsViewController.m; sourceTree = "<group>"; };
29702B621D72EE2E00322196 /* RebateDetailsViewController.m */ = {isa = PBXFileReference; fileEncoding = 4; lastKnownFileType = sourcecode.c.objc; lineEnding = 0; path = RebateDetailsViewController.m; sourceTree = "<group>"; xcLanguageSpecificationIdentifier = xcode.lang.objc; };
29706DA11CD082990003C412 /* Lighting.app */ = {isa = PBXFileReference; explicitFileType = wrapper.application; includeInIndex = 0; path = Lighting.app; sourceTree = BUILT_PRODUCTS_DIR; };
29706DA51CD082990003C412 /* main.m */ = {isa = PBXFileReference; lastKnownFileType = sourcecode.c.objc; path = main.m; sourceTree = "<group>"; };
29706DA71CD082990003C412 /* AppDelegate.h */ = {isa = PBXFileReference; lastKnownFileType = sourcecode.c.h; path = AppDelegate.h; sourceTree = "<group>"; };
......@@ -405,7 +405,7 @@
2998763A1CD9983A00C90D0A /* CommodityListTableViewCell.h */ = {isa = PBXFileReference; fileEncoding = 4; lastKnownFileType = sourcecode.c.h; path = CommodityListTableViewCell.h; sourceTree = "<group>"; };
2998763B1CD9983A00C90D0A /* CommodityListTableViewCell.m */ = {isa = PBXFileReference; fileEncoding = 4; lastKnownFileType = sourcecode.c.objc; path = CommodityListTableViewCell.m; sourceTree = "<group>"; };
299876401CD99E4000C90D0A /* OrderdetailsViewController.h */ = {isa = PBXFileReference; fileEncoding = 4; lastKnownFileType = sourcecode.c.h; path = OrderdetailsViewController.h; sourceTree = "<group>"; };
299876411CD99E4000C90D0A /* OrderdetailsViewController.m */ = {isa = PBXFileReference; fileEncoding = 4; lastKnownFileType = sourcecode.c.objc; path = OrderdetailsViewController.m; sourceTree = "<group>"; };
299876411CD99E4000C90D0A /* OrderdetailsViewController.m */ = {isa = PBXFileReference; fileEncoding = 4; lastKnownFileType = sourcecode.c.objc; lineEnding = 0; path = OrderdetailsViewController.m; sourceTree = "<group>"; xcLanguageSpecificationIdentifier = xcode.lang.objc; };
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>"; };
299C7F591CE21FA800E7D7CB /* AddressViewController.xib */ = {isa = PBXFileReference; fileEncoding = 4; lastKnownFileType = file.xib; path = AddressViewController.xib; sourceTree = "<group>"; };
......@@ -457,7 +457,7 @@
29E28CE61CE0B91B00812A55 /* HENLENSONG.h */ = {isa = PBXFileReference; fileEncoding = 4; lastKnownFileType = sourcecode.c.h; path = HENLENSONG.h; sourceTree = "<group>"; };
29E28CE71CE0B91B00812A55 /* HENLENSONG.m */ = {isa = PBXFileReference; fileEncoding = 4; lastKnownFileType = sourcecode.c.objc; path = HENLENSONG.m; sourceTree = "<group>"; };
29E2D31E1DB8737000443170 /* CardViewController.h */ = {isa = PBXFileReference; fileEncoding = 4; lastKnownFileType = sourcecode.c.h; path = CardViewController.h; sourceTree = "<group>"; };
29E2D31F1DB8737000443170 /* CardViewController.m */ = {isa = PBXFileReference; fileEncoding = 4; lastKnownFileType = sourcecode.c.objc; path = CardViewController.m; sourceTree = "<group>"; };
29E2D31F1DB8737000443170 /* CardViewController.m */ = {isa = PBXFileReference; fileEncoding = 4; lastKnownFileType = sourcecode.c.objc; lineEnding = 0; path = CardViewController.m; sourceTree = "<group>"; xcLanguageSpecificationIdentifier = xcode.lang.objc; };
29E2D3221DB878F200443170 /* XLPlainFlowLayout.h */ = {isa = PBXFileReference; fileEncoding = 4; lastKnownFileType = sourcecode.c.h; path = XLPlainFlowLayout.h; sourceTree = "<group>"; };
29E2D3231DB878F200443170 /* XLPlainFlowLayout.m */ = {isa = PBXFileReference; fileEncoding = 4; lastKnownFileType = sourcecode.c.objc; path = XLPlainFlowLayout.m; sourceTree = "<group>"; };
29E2D3251DB88D8B00443170 /* CardOrderInformationReusableView.h */ = {isa = PBXFileReference; fileEncoding = 4; lastKnownFileType = sourcecode.c.h; path = CardOrderInformationReusableView.h; sourceTree = "<group>"; };
......@@ -468,7 +468,7 @@
29E2D32D1DB8AFD500443170 /* MDScratchImageView.h */ = {isa = PBXFileReference; fileEncoding = 4; lastKnownFileType = sourcecode.c.h; path = MDScratchImageView.h; sourceTree = "<group>"; };
29E2D32E1DB8AFD500443170 /* MDScratchImageView.mm */ = {isa = PBXFileReference; fileEncoding = 4; lastKnownFileType = sourcecode.cpp.objcpp; path = MDScratchImageView.mm; sourceTree = "<group>"; };
29E2D3391DB8BE7F00443170 /* CardAmplificationViewController.h */ = {isa = PBXFileReference; fileEncoding = 4; lastKnownFileType = sourcecode.c.h; path = CardAmplificationViewController.h; sourceTree = "<group>"; };
29E2D33A1DB8BE7F00443170 /* CardAmplificationViewController.m */ = {isa = PBXFileReference; fileEncoding = 4; lastKnownFileType = sourcecode.c.objc; path = CardAmplificationViewController.m; sourceTree = "<group>"; };
29E2D33A1DB8BE7F00443170 /* CardAmplificationViewController.m */ = {isa = PBXFileReference; fileEncoding = 4; lastKnownFileType = sourcecode.c.objc; lineEnding = 0; path = CardAmplificationViewController.m; sourceTree = "<group>"; xcLanguageSpecificationIdentifier = xcode.lang.objc; };
29E2D33B1DB8BE7F00443170 /* CardAmplificationViewController.xib */ = {isa = PBXFileReference; fileEncoding = 4; lastKnownFileType = file.xib; path = CardAmplificationViewController.xib; sourceTree = "<group>"; };
29E384BB1CE9933300888199 /* AdditionalTableViewCell.h */ = {isa = PBXFileReference; fileEncoding = 4; lastKnownFileType = sourcecode.c.h; path = AdditionalTableViewCell.h; sourceTree = "<group>"; };
29E384BC1CE9933300888199 /* AdditionalTableViewCell.m */ = {isa = PBXFileReference; fileEncoding = 4; lastKnownFileType = sourcecode.c.objc; path = AdditionalTableViewCell.m; sourceTree = "<group>"; };
......
Lighting/StoryboardwithCYX.storyboard
View file @ 1fdb50ad
......@@ -289,7 +289,7 @@
</viewController>
<placeholder placeholderIdentifier="IBFirstResponder" id="X4y-1C-nSB" userLabel="First Responder" sceneMemberID="firstResponder"/>
</objects>
<point key="canvasLocation" x="1784" y="433"/>
<point key="canvasLocation" x="1769" y="490"/>
</scene>
<!--Clientdetails View Controller-->
<scene sceneID="lDH-lU-tQw">
......@@ -1283,7 +1283,7 @@
<autoresizingMask key="autoresizingMask" widthSizable="YES" heightSizable="YES"/>
<subviews>
<imageView userInteractionEnabled="NO" contentMode="scaleToFill" horizontalHuggingPriority="251" verticalHuggingPriority="251" image="JDECard" id="vNC-g1-zfP">
<rect key="frame" x="134" y="312" width="500" height="400"/>
<rect key="frame" x="212" y="332" width="345" height="360"/>
<autoresizingMask key="autoresizingMask" flexibleMinX="YES" flexibleMaxX="YES" flexibleMinY="YES" flexibleMaxY="YES"/>
<color key="backgroundColor" white="0.0" alpha="0.0" colorSpace="calibratedWhite"/>
</imageView>
......@@ -1910,16 +1910,16 @@
<color key="textColor" white="0.66666666666666663" alpha="1" colorSpace="calibratedWhite"/>
<nil key="highlightedColor"/>
</label>
<label opaque="NO" multipleTouchEnabled="YES" userInteractionEnabled="NO" contentMode="left" horizontalHuggingPriority="251" verticalHuggingPriority="251" text="" textAlignment="natural" lineBreakMode="tailTruncation" baselineAdjustment="alignBaselines" adjustsFontSizeToFit="NO" id="SzO-sh-Q17">
<label opaque="NO" multipleTouchEnabled="YES" userInteractionEnabled="NO" contentMode="left" horizontalHuggingPriority="251" verticalHuggingPriority="251" text="" lineBreakMode="tailTruncation" baselineAdjustment="alignBaselines" adjustsFontSizeToFit="NO" id="SzO-sh-Q17">
<rect key="frame" x="668" y="18" width="144" height="25"/>
<autoresizingMask key="autoresizingMask" flexibleMinX="YES" flexibleMaxY="YES"/>
<fontDescription key="fontDescription" type="system" pointSize="24"/>
<color key="textColor" red="0.9882352941176471" green="0.33725490196078434" blue="0.12941176470588234" alpha="1" colorSpace="calibratedRGB"/>
<nil key="highlightedColor"/>
</label>
<label opaque="NO" multipleTouchEnabled="YES" userInteractionEnabled="NO" contentMode="left" horizontalHuggingPriority="251" verticalHuggingPriority="251" text="合计金额：" textAlignment="natural" lineBreakMode="tailTruncation" baselineAdjustment="alignBaselines" adjustsFontSizeToFit="NO" id="lfY-O6-zCQ">
<rect key="frame" x="604" y="21" width="85" height="21"/>
<autoresizingMask key="autoresizingMask" flexibleMinX="YES" flexibleMaxY="YES"/>
<label opaque="NO" multipleTouchEnabled="YES" userInteractionEnabled="NO" contentMode="left" horizontalHuggingPriority="251" verticalHuggingPriority="251" text="折扣比例(%):" textAlignment="natural" lineBreakMode="tailTruncation" baselineAdjustment="alignBaselines" adjustsFontSizeToFit="NO" id="5UU-hv-OWB">
<rect key="frame" x="392" y="21" width="82" height="21"/>
<autoresizingMask key="autoresizingMask" flexibleMinX="YES" flexibleMinY="YES" flexibleMaxY="YES"/>
<fontDescription key="fontDescription" type="system" pointSize="14"/>
<nil key="highlightedColor"/>
</label>
......@@ -1954,6 +1954,18 @@
<action selector="delecteSelectedGoods:" destination="4Ho-ZE-RT8" eventType="touchUpInside" id="Ylw-dW-E2P"/>
</connections>
</button>
<textField opaque="NO" clipsSubviews="YES" contentMode="scaleToFill" contentHorizontalAlignment="left" contentVerticalAlignment="center" borderStyle="roundedRect" placeholder="请输入" textAlignment="center" minimumFontSize="17" id="3Ma-x4-wIO">
<rect key="frame" x="481" y="17" width="70" height="30"/>
<autoresizingMask key="autoresizingMask" flexibleMinX="YES" flexibleMinY="YES" flexibleMaxY="YES"/>
<fontDescription key="fontDescription" type="system" pointSize="14"/>
<textInputTraits key="textInputTraits"/>
</textField>
<label opaque="NO" multipleTouchEnabled="YES" userInteractionEnabled="NO" contentMode="left" horizontalHuggingPriority="251" verticalHuggingPriority="251" text="合计金额：" textAlignment="natural" lineBreakMode="tailTruncation" baselineAdjustment="alignBaselines" adjustsFontSizeToFit="NO" id="lfY-O6-zCQ">
<rect key="frame" x="594" y="21" width="73" height="21"/>
<autoresizingMask key="autoresizingMask" flexibleMinX="YES" flexibleMinY="YES" flexibleMaxY="YES"/>
<fontDescription key="fontDescription" type="system" pointSize="14"/>
<nil key="highlightedColor"/>
</label>
</subviews>
<color key="backgroundColor" white="1" alpha="1" colorSpace="calibratedWhite"/>
</view>
......@@ -1964,6 +1976,7 @@
<simulatedScreenMetrics key="simulatedDestinationMetrics" type="iPadPro"/>
<connections>
<outlet property="allSelectedButton" destination="va8-YD-eVD" id="QFT-8I-gC3"/>
<outlet property="discountTextField" destination="3Ma-x4-wIO" id="KWE-H2-HVs"/>
<outlet property="settlementButton" destination="QOZ-rd-1Ea" id="eFY-bt-n2S"/>
<outlet property="shoppingTableview" destination="RJW-eG-Q3P" id="M5W-yO-xaT"/>
<outlet property="totalpriceLabe" destination="SzO-sh-Q17" id="L5U-re-i18"/>
......
Tools/BaseViewController.h
View file @ 1fdb50ad
......@@ -98,6 +98,11 @@
*/
- (void)QueryShoppingCarNumber;
/**
* 查询购物车商品
*/
- (void)queryShoppingCarGoods;
/**
* 系统提示框
......
Tools/BaseViewController.m
View file @ 1fdb50ad
......@@ -436,22 +436,27 @@
#pragma mark -查询购物车数量
- (void)QueryShoppingCarNumber
{
WS(weakSelf);
[[NetworkRequestClassManager Manager] NetworkWithDictionaryRequestWithURL:[NSString stringWithFormat:@"%@%@",SERVERREQUESTURL(QUERYSHOPPINGBAGNUMBER),[Customermanager manager].model.fid] WithRequestType:1 WithParameter:nil WithReturnValueBlock:^(id returnValue) {
if ([returnValue[@"code"] isEqualToNumber:@0]) {
NSLog(@"更新购物车数量成功");
[[NSNotificationCenter defaultCenter]postNotificationName:REFRESHSHOPPINGCAR object:returnValue[@"data"]];
}
} WithErrorCodeBlock:^(id errorCodeValue) {
[self RemoveMBProgressHUDLoding];
[self ErrorMBProgressView:@"无网络"];
} WithFailureBlock:^(id error) {
[weakSelf RemoveMBProgressHUDLoding];
[weakSelf ErrorMBProgressView:@"无网络"];
} WithFailureBlock:^(NSError *error) {
NSLog(@"更新购物车数量失败");
[weakSelf ErrorMBProgressView:error.localizedDescription];
}];
}
#pragma mark - 查询购物车商品
- (void)queryShoppingCarGoods
{
[[NSNotificationCenter defaultCenter] postNotificationName:SHOPPINGCARGOODS object:nil];
}
#pragma mark -系统提示框
- (void)promptCustomerWithString:(NSString *)message
......@@ -466,7 +471,6 @@
});
}
#pragma mark -友好化时间
+ (NSString *) compareCurrentTime:(NSString *)str
{
......
Tools/CYConstManager.h
View file @ 1fdb50ad
......@@ -269,3 +269,8 @@ extern NSString *const ACTIVED;
* 京东卡状态<查看>
*/
extern NSString *const LOOKED;
/**
* 更新购物车商品
*/
extern NSString *const SHOPPINGCARGOODS;
Tools/CYConstManager.m
View file @ 1fdb50ad
......@@ -269,6 +269,11 @@ NSString *const ACTIVED = @"actived";
*/
NSString *const LOOKED = @"looked";
/**
* 更新购物车商品
*/
NSString *const SHOPPINGCARGOODS = @"shoppingCar";
......
Tools/ExperienceCentreViewController.m
View file @ 1fdb50ad
......@@ -585,7 +585,7 @@
}
#pragma mark -分享失败
- (void)CodeNotEqualZero:(NSString *)message
- (void)CodeNotEqualZERO:(NSString *)message
{
[self ErrorMBProgressView:message];
}
......
Tools/PrefixHeader.pch
View file @ 1fdb50ad
......@@ -83,7 +83,7 @@
/**
* 0
*/
#define Zero 0
#define ZERO 0
/**
* 断网标示
......
Tools/ShareGoodsViewController.h
View file @ 1fdb50ad
......@@ -34,7 +34,7 @@
/**
* code不为0
*/
- (void)CodeNotEqualZero:(NSString *)message;
- (void)CodeNotEqualZERO:(NSString *)message;
@end
......
Tools/ShareGoodsViewController.m
View file @ 1fdb50ad
......@@ -62,9 +62,9 @@
[weakSelf callSharePlatform:shareWeb withPlatformTag:sender withTitle:ShareTitle];
}else
{
if ([weakSelf.delegate respondsToSelector:@selector(CodeNotEqualZero:)]) {
if ([weakSelf.delegate respondsToSelector:@selector(CodeNotEqualZERO:)]) {
[weakSelf.delegate CodeNotEqualZero:returnValue[@"message"]];
[weakSelf.delegate CodeNotEqualZERO:returnValue[@"message"]];
}
}
......
Tools/ShoppingBagViewController.m
View file @ 1fdb50ad
......@@ -272,9 +272,10 @@
} WithErrorCodeBlock:^(id errorCodeValue) {
[weakSelf RemoveMBProgressHUDLoding];
} WithFailureBlock:^(id error) {
[weakSelf ErrorMBProgressView:@"加入购物车失败"];
[weakSelf ErrorMBProgressView:NETWORK];
} WithFailureBlock:^(NSError *error) {
[weakSelf RemoveMBProgressHUDLoding];
[weakSelf ErrorMBProgressView:error.localizedDescription];
}];
}
......@@ -284,41 +285,25 @@
{
UIAlertController *alertVC = [UIAlertController alertControllerWithTitle:@"提示" message:message preferredStyle:UIAlertControllerStyleAlert];
[alertVC addAction:[UIAlertAction actionWithTitle:@"我知道了" style:UIAlertActionStyleDefault handler:^(UIAlertAction * _Nonnull action) {
[alertVC dismissViewControllerAnimated:YES completion:nil];
}]];
[self presentViewController:alertVC animated:YES completion:nil];
}
//#pragma mark -改变商品数量
//- (void)ChangeGoodsNumber:(NSInteger)goodsNumber WithcostPrice:(CGFloat)costprice Withcellindex:(NSInteger)cellindex returnValue:(void (^)(id))result
//{
// ShopcarModel *model = [self.datasArray objectAtIndex_opple:cellindex];
// //保存商品数量
// model.goodsNum = goodsNumber;
// //保存成交价格
// model.costPrice = [NSNumber numberWithFloat:costprice];
// [self CalculateSelectedGoodsAllprice];
//}
#pragma mark -改变商品数量
- (void)ChangeGoodsNumber:(NSInteger)goodsNumber WithcostPrice:(CGFloat)costprice Withcellindex:(NSInteger)cellindex returnValue:(void (^)(id))result
#pragma mark -修改单个商品数量、价格
- (void)changeGoodsNumber:(NSInteger)goodsNumber WithcostPrice:(CGFloat)costprice Withcellindex:(NSInteger)cellindex returnValue:(void (^)(id))result
{
[self CreateMBProgressHUDLoding];
//保存商品数量
ShopcarModel *model = [self.datasArray objectAtIndex_opple:cellindex];
model.goodsNum = goodsNumber;
// [self.shopResponseArray replaceObjectAtIndex:cellindex withObject:model];
//保存成交价格
ShopcarModel *Newmodel = [self.datasArray objectAtIndex_opple:cellindex];
Newmodel.costPrice = (NSDecimalNumber *)[NSDecimalNumber numberWithFloat:costprice];
// [self.shopResponseArray replaceObjectAtIndex:cellindex withObject:Newmodel];
model.costPrice = [NSNumber numberWithFloat:costprice];
//在服务器保存数量、成交价
//购物车ID
NSString *carid = [[self.datasArray objectAtIndex_opple:cellindex] fid];
NSString *carid = model.fid;
//商品id
NSString *goodsis = [[[self.datasArray objectAtIndex_opple:cellindex] goods] uuid];
NSString *goodsis = model.goodsId;
//成交价
NSString *costpriceString = [NSString stringWithFormat:@"%.2f",costprice];
//商品数量
......@@ -329,7 +314,6 @@
[weakSelf RemoveMBProgressHUDLoding];
result(returnValue);//提供是否支持修改的参数
if ([returnValue[@"code"] isEqualToNumber:@0]) {
NSLog(@"写入服务器成功");
[weakSelf CalculateSelectedGoodsAllprice];
[weakSelf QueryShoppingCarNumber];
}else{
......@@ -339,11 +323,11 @@
} WithErrorCodeBlock:^(id errorCodeValue) {
[weakSelf RemoveMBProgressHUDLoding];
[weakSelf ErrorMBProgressView:@"无网络"];
[weakSelf ErrorMBProgressView:NETWORK];
} WithFailureBlock:^(id error) {
NSLog(@"写入服务器失败");
} WithFailureBlock:^(NSError *error) {
[weakSelf RemoveMBProgressHUDLoding];
[weakSelf ErrorMBProgressView:error.localizedDescription];
}];
}
......
Tools/opple_objc_json_client.h
View file @ 1fdb50ad
......@@ -33,15 +33,17 @@ extern NSString * const SORTDIRECTION_DESC;
@class GoodsFilter;
@class HotFilter;
@class RsJingDongECardRequest;
@class OrderBill;
@class Draw;
@class RsLotteryRequest;
@class OrderFilter;
@class OrderPayRequest;
@class PromotionGoods;
@class SceneCondition;
@class SceneFilter;
@class RsShippingAddrEntity;
@class SaveShoppingCartRequest;
@class DeleteCartRequest;
@class ShopCartFilter;
@class TOApplyBillEntity;
@class TOConsumerEntity;
@class RsShareResponse;
@class TOCommissionHistEntity;
@class TODrawEntity;
@class TOGoodsForResellerEntity;
@class TOGoodsBrandEntity;
@class TOGoodsLabelEntity;
......@@ -58,11 +60,12 @@ extern NSString * const SORTDIRECTION_DESC;
@class TOGoodsCategoryEntity;
@class VOResellerGoodsEntity;
@class TOGoodsEntity;
@class TOCommissionHistEntity;
@class RsShareResponse;
@class DeleteCartRequest;
@class SceneCondition;
@class OrderFilter;
@class TOConsumerEntity;
@class TOApplyBillEntity;
@class SaveShoppingCartRequest;
@class RsShippingAddrEntity;
@class PromotionGoods;
@class OrderBill;
@class GroupByOrderNumber;
@class GoodsCondition;
@class DataDict;
......@@ -75,10 +78,11 @@ extern NSString * const SORTDIRECTION_DESC;
@class RsJingDongECardResponse;
@class TSBaseUser;
@class TSDepart;
@class OrderResponse;
@class TSUserOrg;
@class SceneResponse;
@class ShopCartResponse;
@class OrderResponse;
@class SceneResponse;
@class RsLotteryResponse;
@class GoodsResponse;
@class ConsumerPageResult;
@class RsCommissionResponse;
......@@ -98,15 +102,17 @@ extern NSString * const SORTDIRECTION_DESC;
@protocol GoodsFilter @end
@protocol HotFilter @end
@protocol RsJingDongECardRequest @end
@protocol OrderBill @end
@protocol Draw @end
@protocol RsLotteryRequest @end
@protocol OrderFilter @end
@protocol OrderPayRequest @end
@protocol PromotionGoods @end
@protocol SceneCondition @end
@protocol SceneFilter @end
@protocol RsShippingAddrEntity @end
@protocol SaveShoppingCartRequest @end
@protocol DeleteCartRequest @end
@protocol ShopCartFilter @end
@protocol TOApplyBillEntity @end
@protocol TOConsumerEntity @end
@protocol RsShareResponse @end
@protocol TOCommissionHistEntity @end
@protocol TODrawEntity @end
@protocol TOGoodsForResellerEntity @end
@protocol TOGoodsBrandEntity @end
@protocol TOGoodsLabelEntity @end
......@@ -123,11 +129,12 @@ extern NSString * const SORTDIRECTION_DESC;
@protocol TOGoodsCategoryEntity @end
@protocol VOResellerGoodsEntity @end
@protocol TOGoodsEntity @end
@protocol TOCommissionHistEntity @end
@protocol RsShareResponse @end
@protocol DeleteCartRequest @end
@protocol SceneCondition @end
@protocol OrderFilter @end
@protocol TOConsumerEntity @end
@protocol TOApplyBillEntity @end
@protocol SaveShoppingCartRequest @end
@protocol RsShippingAddrEntity @end
@protocol PromotionGoods @end
@protocol OrderBill @end
@protocol GroupByOrderNumber @end
@protocol GoodsCondition @end
@protocol DataDict @end
......@@ -140,10 +147,11 @@ extern NSString * const SORTDIRECTION_DESC;
@protocol RsJingDongECardResponse @end
@protocol TSBaseUser @end
@protocol TSDepart @end
@protocol OrderResponse @end
@protocol TSUserOrg @end
@protocol SceneResponse @end
@protocol ShopCartResponse @end
@protocol OrderResponse @end
@protocol SceneResponse @end
@protocol RsLotteryResponse @end
@protocol GoodsResponse @end
@protocol ConsumerPageResult @end
@protocol RsCommissionResponse @end
......@@ -485,42 +493,118 @@ extern NSString * const SORTDIRECTION_DESC;
/**
* @author Flash
* 查询京东E卡对象
@author nevermore
@since 0.1
*/
@interface OrderBill : JSONModel
@interface Draw : JSONModel
/**
* (no documentation provided)
*
*
*/
@property (nonatomic, strong) DataPage *datapage;
@property (nonatomic, copy) NSString *fid;
/**
* (no documentation provided)
*
*
*/
@property (nonatomic, strong) TOOrderEntity *order;
@property (nonatomic, copy) NSString *lotteryId;
/**
* (no documentation provided)
* @see TOOrderdetailEntity
*
*
*/
@property (nonatomic, strong) NSArray<TOOrderdetailEntity> *orderdetailList;
@property (nonatomic, copy) NSString *drawDate;
/**
* (no documentation provided)
*
*
*/
@property (nonatomic, strong) TOConsumerEntity *consumer;
@property (nonatomic, copy) NSString *winnerId;
/**
* (no documentation provided)
*
*
*/
@property (nonatomic, strong) TOEmployee *employee;
@end /* interface OrderBill */
@property (nonatomic, copy) NSString *award;
/**
* (no documentation provided)
*
*
*/
@property (nonatomic, copy) NSString *orderNumber;
/**
* (no documentation provided)
*
*
*/
@property (nonatomic, copy) NSString *state;
@end /* interface Draw */
/**
* (no documentation provided)
*/
@interface RsLotteryRequest : JSONModel
/**
* (no documentation provided)
*
*
*/
@property (nonatomic, copy) NSString *guideIdEquals;
/**
* (no documentation provided)
*
*
*/
@property (nonatomic, strong) DataPage *page;
@end /* interface RsLotteryRequest */
/**
* 订单筛选条件。
@author Debenson
@since 0.1
*/
@interface OrderFilter : JSONModel
/**
* 经销商代码
*
*
*/
@property (nonatomic, copy) NSString *resellerCodeEquals;
/**
*
*
*
*/
@property (nonatomic, copy) NSString *orderStateEquals;
/**
* 消费者名称或手机号等于
*
*
*/
@property (nonatomic, copy) NSString *consumerNameOrMobileEquals;
/**
* 客户标识等于
*
*
*/
@property (nonatomic, copy) NSString *consumerIdEquals;
/**
* 分页数据
*
*
*/
@property (nonatomic, strong) DataPage *dp;
@end /* interface OrderFilter */
......@@ -580,6 +664,12 @@ extern NSString * const SORTDIRECTION_DESC;
*
*/
@property (nonatomic, strong) NSNumber *realAmount;
/**
* (no documentation provided)
*
*
*/
@property (nonatomic, strong) Draw *draw;
/**
* (no documentation provided)
* @see PromotionGoods
......@@ -591,26 +681,30 @@ extern NSString * const SORTDIRECTION_DESC;
/**
* 订单支付
@author wsx
* @author Administrator
@since 0.1
*/
@interface PromotionGoods : JSONModel
@interface SceneCondition : JSONModel
/**
*
* 查询条件:风格
*
*
*/
@property (nonatomic, strong) UCN *goods;
@property (nonatomic, copy) NSString *styleEquals;
/**
* 查询条件:空间
*
*
*/
@property (nonatomic, copy) NSString *spaceEquals;
/**
* (no documentation provided)
*
*
*/
@property (nonatomic, strong) NSNumber *promotionNumber;
@end /* interface PromotionGoods */
@property (nonatomic, strong) DataPage *page;
@end /* interface SceneCondition */
......@@ -637,27 +731,29 @@ extern NSString * const SORTDIRECTION_DESC;
/**
* @author Administrator
* @author Debenson
@since 0.1
*/
@interface RsShippingAddrEntity : JSONModel
@interface DeleteCartRequest : JSONModel
/**
* (no documentation provided)
* @see TOShippingAddrEntity
* 购物车标识列表
* @see NSString
*
*/
@property (nonatomic, strong) NSArray<TOShippingAddrEntity> *list;
@end /* interface RsShippingAddrEntity */
@property (nonatomic, strong) NSArray<NSString *> *cartIds;
@end /* interface DeleteCartRequest */
/**
* @author Debenson
* 购物车查询条件。
@author Debenson
@since 0.1
*/
@interface SaveShoppingCartRequest : JSONModel
@interface ShopCartFilter : JSONModel
/**
* 消费者标识
*
......@@ -665,56 +761,49 @@ extern NSString * const SORTDIRECTION_DESC;
*/
@property (nonatomic, copy) NSString *consumerId;
/**
* 商品标识
*
*
*/
@property (nonatomic, copy) NSString *goodsId;
/**
* 商品数量，>0表示添加, <0表示减少
* 分页数据
*
*
*/
@property (nonatomic, copy) NSString *count;
@end /* interface SaveShoppingCartRequest */
@property (nonatomic, strong) DataPage *dp;
@end /* interface ShopCartFilter */
/**
* 购物车查询条件。
* 商品分享返回数据。
@author Debenson
@since 0.1
*/
@interface ShopCartFilter : JSONModel
@interface RsShareResponse : JSONModel
/**
* 消费者标识
* 分享记录标识
*
*
*/
@property (nonatomic, copy) NSString *consumerId;
@property (nonatomic, copy) NSString *shareId;
/**
* 分页数据
* 分享页面链接
*
*
*/
@property (nonatomic, strong) DataPage *dp;
@end /* interface ShopCartFilter */
@property (nonatomic, copy) NSString *url;
@end /* interface RsShareResponse */
/**
*
@Title: Entity
@Description: 提现申请
* @Title: Entity
@Description: 导购分成表
@author onlineGenerator
@date 2016-08-24 09:40:02
@date 2016-05-16 16:15:27
@version V1.0
*/
@interface TOApplyBillEntity : JSONModel
@interface TOCommissionHistEntity : JSONModel
/**
* 方法: 取得java.lang.String
*
......@@ -727,12 +816,6 @@ extern NSString * const SORTDIRECTION_DESC;
*
*/
@property (nonatomic, copy) NSString *createName;
/**
* 方法: 取得java.lang.String
*
*
*/
@property (nonatomic, copy) NSString *createBy;
/**
* 方法: 取得java.util.Date
*
......@@ -744,81 +827,69 @@ extern NSString * const SORTDIRECTION_DESC;
*
*
*/
@property (nonatomic, copy) NSString *updateName;
@property (nonatomic, copy) NSString *resellerCode;
/**
* 方法: 取得java.lang.String
*
*
*/
@property (nonatomic, copy) NSString *updateBy;
/**
* 方法: 取得java.util.Date
*
*
*/
@property (nonatomic, copy) NSString *updateDate;
@property (nonatomic, copy) NSString *employeeId;
/**
* 方法: 取得java.lang.String
*
*
*/
@property (nonatomic, copy) NSString *sysOrgCode;
@property (nonatomic, copy) NSString *orderId;
/**
* 方法: 取得java.lang.String
* 方法: 取得java.math.BigDecimal
*
*
*/
@property (nonatomic, copy) NSString *billNumber;
@property (nonatomic, strong) NSNumber *amount;
/**
* 方法: 取得java.lang.String
* 方法: 取得java.math.BigDecimal
*
*
*/
@property (nonatomic, copy) NSString *guideId;
@property (nonatomic, strong) NSNumber *afteramount;
/**
* 方法: 取得java.lang.String
*
*
*/
@property (nonatomic, copy) NSString *guideName;
/**
* 方法: 取得java.math.BigDecimal
*
*
*/
@property (nonatomic, strong) NSNumber *applyMoney;
@property (nonatomic, copy) NSString *remark;
/**
* 方法: 取得java.math.BigDecimal
* 方法: 设置java.lang.String
*
*
*/
@property (nonatomic, strong) NSNumber *beforeMoney;
@property (nonatomic, copy) NSString *orderNumber;
/**
* 方法: 取得java.math.BigDecimal
* (no documentation provided)
*
*
*/
@property (nonatomic, strong) NSNumber *afterMoney;
@property (nonatomic, copy) NSString *employeeName;
/**
* 方法: 取得java.lang.String
* 方法: 设置java.lang.String
*
*
*/
@property (nonatomic, copy) NSString *billStates;
@end /* interface TOApplyBillEntity */
@property (nonatomic, copy) NSString *state;
@end /* interface TOCommissionHistEntity */
/**
* @Title: Entity
@Description: 客户
@Description: 中奖记录
@author onlineGenerator
@date 2016-05-08 18:08:58
@date 2016-10-19 18:34:48
@version V1.0
*/
@interface TOConsumerEntity : JSONModel
@interface TODrawEntity : JSONModel
/**
* 方法: 取得java.lang.String
*
......@@ -848,62 +919,62 @@ extern NSString * const SORTDIRECTION_DESC;
*
*
*/
@property (nonatomic, copy) NSString *sysOrgCode;
@property (nonatomic, copy) NSString *updateName;
/**
* 方法: 取得java.lang.String
*
*
*/
@property (nonatomic, copy) NSString *name;
@property (nonatomic, copy) NSString *updateBy;
/**
* 方法: 取得java.lang.String
* 方法: 取得java.util.Date
*
*
*/
@property (nonatomic, copy) NSString *mobile;
@property (nonatomic, copy) NSString *updateDate;
/**
* 方法: 取得java.lang.String
*
*
*/
@property (nonatomic, copy) NSString *province;
@property (nonatomic, copy) NSString *sysOrgCode;
/**
* 方法: 取得java.lang.String
*
*
*/
@property (nonatomic, copy) NSString *city;
@property (nonatomic, copy) NSString *lotteryId;
/**
* 方法: 取得java.lang.String
* 方法: 取得java.util.Date
*
*
*/
@property (nonatomic, copy) NSString *country;
@property (nonatomic, copy) NSString *drawDate;
/**
* 方法: 取得java.lang.String
* 方法: 取��java.lang.String
*
*
*/
@property (nonatomic, copy) NSString *address;
@property (nonatomic, copy) NSString *winnerId;
/**
* 方法: 取得java.lang.String
*
*
*/
@property (nonatomic, copy) NSString *picture;
@property (nonatomic, copy) NSString *award;
/**
* 方法: 取得java.util.Date
* 方法: 取得java.lang.String
*
*
*/
@property (nonatomic, copy) NSString *lastVisitedTime;
@property (nonatomic, copy) NSString *orderNumber;
/**
* 方法: 取得java.lang.String
*
*
*/
@property (nonatomic, copy) NSString *company;
@end /* interface TOConsumerEntity */
@property (nonatomic, copy) NSString *state;
@end /* interface TODrawEntity */
......@@ -2227,129 +2298,228 @@ extern NSString * const SORTDIRECTION_DESC;
*
*
*/
@property (nonatomic, assign) double weight;
@property (nonatomic, assign) double weight;
/**
* 方法: 取得java.lang.String
*
*
*/
@property (nonatomic, copy) NSString *unit;
/**
* 方法: 取得java.lang.String
*
*
*/
@property (nonatomic, copy) NSString *productProfile;
/**
* 方法: 取得java.lang.String
*
*
*/
@property (nonatomic, copy) NSString *power;
/**
* 方法: 取得java.lang.String
*
*
*/
@property (nonatomic, copy) NSString *colorTemperature;
/**
* 方法: 取得java.lang.String
*
*
*/
@property (nonatomic, copy) NSString *spec;
/**
* 方法: 取得java.lang.String
*
*
*/
@property (nonatomic, copy) NSString *function;
/**
* 方法: 取得java.lang.String
*
*
*/
@property (nonatomic, copy) NSString *material;
/**
* 方法: 取得java.lang.String
*
*
*/
@property (nonatomic, copy) NSString *lightSource;
/**
* 方法: 取得java.lang.String
*
*
*/
@property (nonatomic, copy) NSString *goodsStyle;
/**
* 方法: 取得java.lang.String
*
*
*/
@property (nonatomic, copy) NSString *series;
/**
* 方法: 取得java.lang.String
*
*
*/
@property (nonatomic, copy) NSString *area;
/**
* 方法: 取得java.lang.String
*
*
*/
@property (nonatomic, copy) NSString *size;
/**
* 方法: 取得java.lang.String
*
*
*/
@property (nonatomic, copy) NSString *space;
/**
* 方法: 取得java.lang.String
*
*
*/
@property (nonatomic, copy) NSString *installMethod;
/**
* 方法: 取得java.lang.String
*
*
*/
@property (nonatomic, copy) NSString *unit;
@property (nonatomic, copy) NSString *lightNumber;
/**
* 方法: 取得java.lang.String
*
*
*/
@property (nonatomic, copy) NSString *productProfile;
@property (nonatomic, copy) NSString *pictures;
/**
* 方法: 取得java.lang.String
*
*
*/
@property (nonatomic, copy) NSString *power;
@property (nonatomic, copy) NSString *barcode;
/**
* 方法: 取得java.lang.String
*
* (no documentation provided)
* @see TOGoodsForResellerEntity
*
*/
@property (nonatomic, copy) NSString *colorTemperature;
@property (nonatomic, strong) NSArray<TOGoodsForResellerEntity> *goodsResellerList;
@end /* interface TOGoodsEntity */
/**
* @Title: Entity
@Description: 客户
@author onlineGenerator
@date 2016-05-08 18:08:58
@version V1.0
*/
@interface TOConsumerEntity : JSONModel
/**
* 方法: 取得java.lang.String
*
*
*/
@property (nonatomic, copy) NSString *spec;
@property (nonatomic, copy) NSString *fid;
/**
* 方法: 取得java.lang.String
*
*
*/
@property (nonatomic, copy) NSString *function;
@property (nonatomic, copy) NSString *createName;
/**
* 方法: 取得java.lang.String
*
*
*/
@property (nonatomic, copy) NSString *material;
@property (nonatomic, copy) NSString *createBy;
/**
* 方法: 取得java.lang.String
* 方法: 取得java.util.Date
*
*
*/
@property (nonatomic, copy) NSString *lightSource;
@property (nonatomic, copy) NSString *createDate;
/**
* 方法: 取得java.lang.String
*
*
*/
@property (nonatomic, copy) NSString *goodsStyle;
@property (nonatomic, copy) NSString *sysOrgCode;
/**
* 方法: 取得java.lang.String
*
*
*/
@property (nonatomic, copy) NSString *series;
@property (nonatomic, copy) NSString *name;
/**
* 方法: 取得java.lang.String
*
*
*/
@property (nonatomic, copy) NSString *area;
@property (nonatomic, copy) NSString *mobile;
/**
* 方法: 取得java.lang.String
*
*
*/
@property (nonatomic, copy) NSString *size;
@property (nonatomic, copy) NSString *province;
/**
* 方法: 取得java.lang.String
*
*
*/
@property (nonatomic, copy) NSString *space;
@property (nonatomic, copy) NSString *city;
/**
* 方法: 取得java.lang.String
*
*
*/
@property (nonatomic, copy) NSString *installMethod;
@property (nonatomic, copy) NSString *country;
/**
* 方法: 取得java.lang.String
*
*
*/
@property (nonatomic, copy) NSString *lightNumber;
@property (nonatomic, copy) NSString *address;
/**
* 方法: 取得java.lang.String
*
*
*/
@property (nonatomic, copy) NSString *pictures;
@property (nonatomic, copy) NSString *picture;
/**
* 方法: 取得java.lang.String
* 方法: 取得java.util.Date
*
*
*/
@property (nonatomic, copy) NSString *barcode;
@property (nonatomic, copy) NSString *lastVisitedTime;
/**
* (no documentation provided)
* @see TOGoodsForResellerEntity
* 方法: 取得java.lang.String
*
*
*/
@property (nonatomic, strong) NSArray<TOGoodsForResellerEntity> *goodsResellerList;
@end /* interface TOGoodsEntity */
@property (nonatomic, copy) NSString *company;
@end /* interface TOConsumerEntity */
/**
* @Title: Entity
@Description: 导购分成表
*
@Title: Entity
@Description: 提现申请
@author onlineGenerator
@date 2016-05-16 16:15:27
@date 2016-08-24 09:40:02
@version V1.0
*/
@interface TOCommissionHistEntity : JSONModel
@interface TOApplyBillEntity : JSONModel
/**
* 方法: 取得java.lang.String
*
......@@ -2362,6 +2532,12 @@ extern NSString * const SORTDIRECTION_DESC;
*
*/
@property (nonatomic, copy) NSString *createName;
/**
* 方法: 取得java.lang.String
*
*
*/
@property (nonatomic, copy) NSString *createBy;
/**
* 方法: 取得java.util.Date
*
......@@ -2373,166 +2549,176 @@ extern NSString * const SORTDIRECTION_DESC;
*
*
*/
@property (nonatomic, copy) NSString *resellerCode;
@property (nonatomic, copy) NSString *updateName;
/**
* 方法: 取得java.lang.String
*
*
*/
@property (nonatomic, copy) NSString *employeeId;
@property (nonatomic, copy) NSString *updateBy;
/**
* 方法: 取得java.util.Date
*
*
*/
@property (nonatomic, copy) NSString *updateDate;
/**
* 方法: 取得java.lang.String
*
*
*/
@property (nonatomic, copy) NSString *orderId;
@property (nonatomic, copy) NSString *sysOrgCode;
/**
* 方法: 取得java.math.BigDecimal
* 方法: 取得java.lang.String
*
*
*/
@property (nonatomic, strong) NSNumber *amount;
@property (nonatomic, copy) NSString *billNumber;
/**
* 方法: 取得java.math.BigDecimal
* 方法: 取得java.lang.String
*
*
*/
@property (nonatomic, strong) NSNumber *afteramount;
@property (nonatomic, copy) NSString *guideId;
/**
* 方法: 取得java.lang.String
*
*
*/
@property (nonatomic, copy) NSString *remark;
@property (nonatomic, copy) NSString *guideName;
/**
* 方法: 设置java.lang.String
* 方法: 取得java.math.BigDecimal
*
*
*/
@property (nonatomic, copy) NSString *orderNumber;
@property (nonatomic, strong) NSNumber *applyMoney;
/**
* (no documentation provided)
* 方法: 取得java.math.BigDecimal
*
*
*/
@property (nonatomic, copy) NSString *employeeName;
@property (nonatomic, strong) NSNumber *beforeMoney;
/**
* 方法: 设置java.lang.String
* 方法: 取得java.math.BigDecimal
*
*
*/
@property (nonatomic, copy) NSString *state;
@end /* interface TOCommissionHistEntity */
@property (nonatomic, strong) NSNumber *afterMoney;
/**
* 方法: 取得java.lang.String
*
*
*/
@property (nonatomic, copy) NSString *billStates;
@end /* interface TOApplyBillEntity */
/**
* 商品分享返回数据。
@author Debenson
* @author Debenson
@since 0.1
*/
@interface RsShareResponse : JSONModel
@interface SaveShoppingCartRequest : JSONModel
/**
* 分享记录标识
* 消费者标识
*
*
*/
@property (nonatomic, copy) NSString *shareId;
@property (nonatomic, copy) NSString *consumerId;
/**
* 分享页面链接
* 商品标识
*
*
*/
@property (nonatomic, copy) NSString *url;
@end /* interface RsShareResponse */
@property (nonatomic, copy) NSString *goodsId;
/**
* 商品数量，>0表示添加, <0表示减少
*
*
*/
@property (nonatomic, copy) NSString *count;
@end /* interface SaveShoppingCartRequest */
/**
* @author Debenson
* @author Administrator
@since 0.1
*/
@interface DeleteCartRequest : JSONModel
@interface RsShippingAddrEntity : JSONModel
/**
* 购物车标识列表
* @see NSString
* (no documentation provided)
* @see TOShippingAddrEntity
*
*/
@property (nonatomic, strong) NSArray<NSString *> *cartIds;
@end /* interface DeleteCartRequest */
@property (nonatomic, strong) NSArray<TOShippingAddrEntity> *list;
@end /* interface RsShippingAddrEntity */
/**
* @author Administrator
* 订单支付
@author wsx
@since 0.1
*/
@interface SceneCondition : JSONModel
@interface PromotionGoods : JSONModel
/**
* 查询条件:风格
*
*
*/
@property (nonatomic, copy) NSString *styleEquals;
/**
* 查询条件:空间
*
*
*/
@property (nonatomic, copy) NSString *spaceEquals;
@property (nonatomic, strong) UCN *goods;
/**
* (no documentation provided)
*
*
*
*/
@property (nonatomic, strong) DataPage *page;
@end /* interface SceneCondition */
@property (nonatomic, strong) NSNumber *promotionNumber;
@end /* interface PromotionGoods */
/**
* 订单筛选条件。
@author Debenson
* @author Flash
@since 0.1
*/
@interface OrderFilter : JSONModel
@interface OrderBill : JSONModel
/**
* 经销商代码
* (no documentation provided)
*
*
*/
@property (nonatomic, copy) NSString *resellerCodeEquals;
@property (nonatomic, strong) DataPage *datapage;
/**
*
* (no documentation provided)
*
*
*/
@property (nonatomic, copy) NSString *orderStateEquals;
@property (nonatomic, strong) TOOrderEntity *order;
/**
* 消费者名称或手机号等于
*
* (no documentation provided)
* @see TOOrderdetailEntity
*
*/
@property (nonatomic, copy) NSString *consumerNameOrMobileEquals;
@property (nonatomic, strong) NSArray<TOOrderdetailEntity> *orderdetailList;
/**
* 客户标识等于
* (no documentation provided)
*
*
*/
@property (nonatomic, copy) NSString *consumerIdEquals;
@property (nonatomic, strong) TOConsumerEntity *consumer;
/**
* 分页数据
* (no documentation provided)
*
*
*/
@property (nonatomic, strong) DataPage *dp;
@end /* interface OrderFilter */
@property (nonatomic, strong) TOEmployee *employee;
@end /* interface OrderBill */
......@@ -2998,6 +3184,24 @@ extern NSString * const SORTDIRECTION_DESC;
/**
* 订单返回对象
@author wsx
@since 0.1
*/
@interface OrderResponse : PageRows
/**
* (no documentation provided)
* @see OrderBill
*
*/
@property (nonatomic, strong) NSArray<OrderBill> *orderBillList;
@end /* interface OrderResponse */
/**
* 用户-组织机构 实体
<p/>
......@@ -3025,54 +3229,54 @@ extern NSString * const SORTDIRECTION_DESC;
/**
* @author Administrator
* 购物车返回对象
@author Flash
@since 0.1
*/
@interface SceneResponse : PageRows
@interface ShopCartResponse : PageRows
/**
* (no documentation provided)
* @see TOSceneEntity
* @see TOShopcartEntity
*
*/
@property (nonatomic, strong) NSArray<TOSceneEntity> *list;
@end /* interface SceneResponse */
@property (nonatomic, strong) NSArray<TOShopcartEntity> *shopcart;
@end /* interface ShopCartResponse */
/**
* 购物车返回对象
@author Flash
* @author Administrator
@since 0.1
*/
@interface ShopCartResponse : PageRows
@interface SceneResponse : PageRows
/**
* (no documentation provided)
* @see TOShopcartEntity
* @see TOSceneEntity
*
*/
@property (nonatomic, strong) NSArray<TOShopcartEntity> *shopcart;
@end /* interface ShopCartResponse */
@property (nonatomic, strong) NSArray<TOSceneEntity> *list;
@end /* interface SceneResponse */
/**
* 订单返回对象
* 查询抽奖结果分页
@author wsx
@author nevermore
@since 0.1
*/
@interface OrderResponse : PageRows
@interface RsLotteryResponse : PageRows
/**
* (no documentation provided)
* @see OrderBill
* @see TODrawEntity
*
*/
@property (nonatomic, strong) NSArray<OrderBill> *orderBillList;
@end /* interface OrderResponse */
@property (nonatomic, strong) NSArray<TODrawEntity> *list;
@end /* interface RsLotteryResponse */
......
Tools/opple_objc_json_client.m
View file @ 1fdb50ad
......@@ -171,12 +171,49 @@
@end
@implementation OrderBill
@synthesize datapage;
@synthesize order;
@synthesize orderdetailList;
@synthesize consumer;
@synthesize employee;
@implementation Draw
@synthesize fid;
@synthesize lotteryId;
@synthesize drawDate;
@synthesize winnerId;
@synthesize award;
@synthesize orderNumber;
@synthesize state;
+(BOOL)propertyIsOptional:(NSString*)propertyName
{
return YES;
}
+(JSONKeyMapper*)keyMapper
{
return [[JSONKeyMapper alloc] initWithDictionary:@{
@"id": @"fid",
}];
}
@end
@implementation RsLotteryRequest
@synthesize guideIdEquals;
@synthesize page;
+(BOOL)propertyIsOptional:(NSString*)propertyName
{
return YES;
}
@end
@implementation OrderFilter
@synthesize resellerCodeEquals;
@synthesize orderStateEquals;
@synthesize consumerNameOrMobileEquals;
@synthesize consumerIdEquals;
@synthesize dp;
+(BOOL)propertyIsOptional:(NSString*)propertyName
{
......@@ -195,6 +232,7 @@
@synthesize billType;
@synthesize billTitle;
@synthesize realAmount;
@synthesize draw;
@synthesize promotionGoods;
+(BOOL)propertyIsOptional:(NSString*)propertyName
......@@ -213,9 +251,10 @@
@end
@implementation PromotionGoods
@synthesize goods;
@synthesize promotionNumber;
@implementation SceneCondition
@synthesize styleEquals;
@synthesize spaceEquals;
@synthesize page;
+(BOOL)propertyIsOptional:(NSString*)propertyName
{
......@@ -237,8 +276,8 @@
@end
@implementation RsShippingAddrEntity
@synthesize list;
@implementation DeleteCartRequest
@synthesize cartIds;
+(BOOL)propertyIsOptional:(NSString*)propertyName
{
......@@ -248,10 +287,9 @@
@end
@implementation SaveShoppingCartRequest
@implementation ShopCartFilter
@synthesize consumerId;
@synthesize goodsId;
@synthesize count;
@synthesize dp;
+(BOOL)propertyIsOptional:(NSString*)propertyName
{
......@@ -261,9 +299,9 @@
@end
@implementation ShopCartFilter
@synthesize consumerId;
@synthesize dp;
@implementation RsShareResponse
@synthesize shareId;
@synthesize url;
+(BOOL)propertyIsOptional:(NSString*)propertyName
{
......@@ -273,22 +311,19 @@
@end
@implementation TOApplyBillEntity
@implementation TOCommissionHistEntity
@synthesize fid;
@synthesize createName;
@synthesize createBy;
@synthesize createDate;
@synthesize updateName;
@synthesize updateBy;
@synthesize updateDate;
@synthesize sysOrgCode;
@synthesize billNumber;
@synthesize guideId;
@synthesize guideName;
@synthesize applyMoney;
@synthesize beforeMoney;
@synthesize afterMoney;
@synthesize billStates;
@synthesize resellerCode;
@synthesize employeeId;
@synthesize orderId;
@synthesize amount;
@synthesize afteramount;
@synthesize remark;
@synthesize orderNumber;
@synthesize employeeName;
@synthesize state;
+(BOOL)propertyIsOptional:(NSString*)propertyName
{
......@@ -306,21 +341,21 @@
@end
@implementation TOConsumerEntity
@implementation TODrawEntity
@synthesize fid;
@synthesize createName;
@synthesize createBy;
@synthesize createDate;
@synthesize updateName;
@synthesize updateBy;
@synthesize updateDate;
@synthesize sysOrgCode;
@synthesize name;
@synthesize mobile;
@synthesize province;
@synthesize city;
@synthesize country;
@synthesize address;
@synthesize picture;
@synthesize lastVisitedTime;
@synthesize company;
@synthesize lotteryId;
@synthesize drawDate;
@synthesize winnerId;
@synthesize award;
@synthesize orderNumber;
@synthesize state;
+(BOOL)propertyIsOptional:(NSString*)propertyName
{
......@@ -827,19 +862,21 @@ NSString * const SORTDIRECTION_DESC = @"desc";
@end
@implementation TOCommissionHistEntity
@implementation TOConsumerEntity
@synthesize fid;
@synthesize createName;
@synthesize createBy;
@synthesize createDate;
@synthesize resellerCode;
@synthesize employeeId;
@synthesize orderId;
@synthesize amount;
@synthesize afteramount;
@synthesize remark;
@synthesize orderNumber;
@synthesize employeeName;
@synthesize state;
@synthesize sysOrgCode;
@synthesize name;
@synthesize mobile;
@synthesize province;
@synthesize city;
@synthesize country;
@synthesize address;
@synthesize picture;
@synthesize lastVisitedTime;
@synthesize company;
+(BOOL)propertyIsOptional:(NSString*)propertyName
{
......@@ -857,9 +894,22 @@ NSString * const SORTDIRECTION_DESC = @"desc";
@end
@implementation RsShareResponse
@synthesize shareId;
@synthesize url;
@implementation TOApplyBillEntity
@synthesize fid;
@synthesize createName;
@synthesize createBy;
@synthesize createDate;
@synthesize updateName;
@synthesize updateBy;
@synthesize updateDate;
@synthesize sysOrgCode;
@synthesize billNumber;
@synthesize guideId;
@synthesize guideName;
@synthesize applyMoney;
@synthesize beforeMoney;
@synthesize afterMoney;
@synthesize billStates;
+(BOOL)propertyIsOptional:(NSString*)propertyName
{
......@@ -867,10 +917,20 @@ NSString * const SORTDIRECTION_DESC = @"desc";
}
+(JSONKeyMapper*)keyMapper
{
return [[JSONKeyMapper alloc] initWithDictionary:@{
@"id": @"fid",
}];
}
@end
@implementation DeleteCartRequest
@synthesize cartIds;
@implementation SaveShoppingCartRequest
@synthesize consumerId;
@synthesize goodsId;
@synthesize count;
+(BOOL)propertyIsOptional:(NSString*)propertyName
{
......@@ -880,10 +940,8 @@ NSString * const SORTDIRECTION_DESC = @"desc";
@end
@implementation SceneCondition
@synthesize styleEquals;
@synthesize spaceEquals;
@synthesize page;
@implementation RsShippingAddrEntity
@synthesize list;
+(BOOL)propertyIsOptional:(NSString*)propertyName
{
......@@ -893,12 +951,24 @@ NSString * const SORTDIRECTION_DESC = @"desc";
@end
@implementation OrderFilter
@synthesize resellerCodeEquals;
@synthesize orderStateEquals;
@synthesize consumerNameOrMobileEquals;
@synthesize consumerIdEquals;
@synthesize dp;
@implementation PromotionGoods
@synthesize goods;
@synthesize promotionNumber;
+(BOOL)propertyIsOptional:(NSString*)propertyName
{
return YES;
}
@end
@implementation OrderBill
@synthesize datapage;
@synthesize order;
@synthesize orderdetailList;
@synthesize consumer;
@synthesize employee;
+(BOOL)propertyIsOptional:(NSString*)propertyName
{
......@@ -1097,6 +1167,17 @@ NSString * const SORTDIRECTION_DESC = @"desc";
}
@end
@implementation OrderResponse
@synthesize orderBillList;
+(BOOL)propertyIsOptional:(NSString*)propertyName
{
return YES;
}
@end
@implementation TSUserOrg
......@@ -1111,8 +1192,8 @@ NSString * const SORTDIRECTION_DESC = @"desc";
@end
@implementation SceneResponse
@synthesize list;
@implementation ShopCartResponse
@synthesize shopcart;
+(BOOL)propertyIsOptional:(NSString*)propertyName
{
......@@ -1122,8 +1203,8 @@ NSString * const SORTDIRECTION_DESC = @"desc";
@end
@implementation ShopCartResponse
@synthesize shopcart;
@implementation SceneResponse
@synthesize list;
+(BOOL)propertyIsOptional:(NSString*)propertyName
{
......@@ -1133,8 +1214,8 @@ NSString * const SORTDIRECTION_DESC = @"desc";
@end
@implementation OrderResponse
@synthesize orderBillList;
@implementation RsLotteryResponse
@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