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

修改项说明:修复搜索闪退、促销价格大于商品总价

parent 968d8665
...@@ -102,7 +102,7 @@ ...@@ -102,7 +102,7 @@
[self.localSearchArray addObject:not.object]; [self.localSearchArray addObject:not.object];
} }
//调用商品控制器 //调用商品控制器
ProductLibraryViewController *productVC = [[self getStoryboardWithName] instantiateViewControllerWithIdentifier:@"productlibrary"]; ProductLibraryViewController *productVC = [[self getStoryboardWithName] instantiateViewControllerWithIdentifier:@"ProductLibraryViewController"];
productVC.selectedCode = not.object; productVC.selectedCode = not.object;
[self.navigationController pushViewController:productVC animated:YES]; [self.navigationController pushViewController:productVC animated:YES];
} }
......
...@@ -84,7 +84,6 @@ ...@@ -84,7 +84,6 @@
} }
#pragma mark -支付总金额,商品总数量 #pragma mark -支付总金额,商品总数量
- (void)setGoodsArray - (void)setGoodsArray
{ {
...@@ -105,6 +104,8 @@ ...@@ -105,6 +104,8 @@
} }
} }
goodAllprice -= totalNumber; goodAllprice -= totalNumber;
/// 促销金额大于商品金额情况
goodAllprice = (goodAllprice<0)?0:goodAllprice;
/// 抽奖结果<打折> /// 抽奖结果<打折>
if ([self.resultModel.type isEqualToString:@"discount"]) { if ([self.resultModel.type isEqualToString:@"discount"]) {
goodAllprice = goodAllprice*([self.resultModel.number integerValue]/100.0); goodAllprice = goodAllprice*([self.resultModel.number integerValue]/100.0);
......
...@@ -115,7 +115,7 @@ ...@@ -115,7 +115,7 @@
/** /**
* 服务器开发地址 * 服务器开发地址
*/ */
//#define SERVERREQUESTURL(URL) [NSString stringWithFormat:@"http://139.196.195.30:8090/opple-web/app%@",URL] #define SERVERREQUESTURL(URL) [NSString stringWithFormat:@"http://139.196.195.30:8090/opple-web/app%@",URL]
///** ///**
// * 服务器开发地址 // * 服务器开发地址
...@@ -125,7 +125,7 @@ ...@@ -125,7 +125,7 @@
/** /**
* 服务器测试地址 * 服务器测试地址
*/ */
#define SERVERREQUESTURL(URL) [NSString stringWithFormat:@"http://dg-dev.opple.com/opple-web/app%@",URL] //#define SERVERREQUESTURL(URL) [NSString stringWithFormat:@"http://dg-dev.opple.com/opple-web/app%@",URL]
///** ///**
// * 服务器正式地址 // * 服务器正式地址
......
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