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

修改项说明:已抽奖未使用,在此使用同样需要满足当时促销条件

parent b264ee99
...@@ -326,7 +326,14 @@ NSString *const PROMOTIONALSTRING = @"促销信息"; ...@@ -326,7 +326,14 @@ NSString *const PROMOTIONALSTRING = @"促销信息";
/// 消费者抽奖成功后若没有支付,后面支付时可以继续享受奖品折扣 /// 消费者抽奖成功后若没有支付,后面支付时可以继续享受奖品折扣
if ([resultModel.draw.state isEqualToString:ACCOMPLISHED]) { if ([resultModel.draw.state isEqualToString:ACCOMPLISHED]) {
weakSelf.customerDrawModel = [LuckDrawResultModel initializeWith:resultModel]; for (JSONModel *model in weakSelf.luckyDrawAndJDECardArray) {
if ([model isMemberOfClass:[LuckyDrawModel class]]) {
LuckyDrawModel *consumerModel = (LuckyDrawModel *)model;
if ([consumerModel.body isEqualToString:CONSUMER]) {
weakSelf.customerDrawModel = [LuckDrawResultModel initializeWith:resultModel];break;
}
}
}
} }
/// 支付完成后 /// 支付完成后
if (self.isShowPrintButton && resultModel.award) { if (self.isShowPrintButton && resultModel.award) {
......
...@@ -136,12 +136,12 @@ ...@@ -136,12 +136,12 @@
/** /**
* 服务器测试地址 * 服务器测试地址
*/ */
//#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]
///** ///**
// * 服务器正式地址 // * 服务器正式地址
// */ // */
#define SERVERREQUESTURL(URL) [NSString stringWithFormat:@"http://dg.opple.com/opple-web/app%@",URL] //#define SERVERREQUESTURL(URL) [NSString stringWithFormat:@"http://dg.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