Skip to content
Projects
Groups
Snippets
Help
Loading...
Sign in
Toggle navigation
O
Opple-iOS
Project
Project
Details
Activity
Cycle Analytics
Repository
Repository
Files
Commits
Branches
Tags
Contributors
Graph
Compare
Charts
Issues
0
Issues
0
List
Board
Labels
Milestones
Merge Requests
0
Merge Requests
0
CI / CD
CI / CD
Pipelines
Jobs
Schedules
Charts
Wiki
Wiki
Snippets
Snippets
Members
Members
Collapse sidebar
Close sidebar
Activity
Graph
Charts
Create a new issue
Jobs
Commits
Issue Boards
Open sidebar
张杰
Opple-iOS
Commits
43e28d0d
Commit
43e28d0d
authored
Nov 03, 2016
by
曹云霄
Browse files
Options
Browse Files
Download
Email Patches
Plain Diff
准备新建抽奖分支
parent
cef9c44f
Hide whitespace changes
Inline
Side-by-side
Showing
3 changed files
with
13 additions
and
1 deletion
+13
-1
OrderdetailsViewController.m
Class/OrderdetailsViewController.m
+3
-1
CYConstManager.h
Tools/CYConstManager.h
+5
-0
CYConstManager.m
Tools/CYConstManager.m
+5
-0
No files found.
Class/OrderdetailsViewController.m
View file @
43e28d0d
...
@@ -191,7 +191,7 @@ NSString *const lotteryAction = @"lotteryAction";
...
@@ -191,7 +191,7 @@ NSString *const lotteryAction = @"lotteryAction";
[
weakSelf
.
promotionalArray
removeAllObjects
];
[
weakSelf
.
promotionalArray
removeAllObjects
];
[
weakSelf
.
luckyDrawAndJDECardArray
removeAllObjects
];
[
weakSelf
.
luckyDrawAndJDECardArray
removeAllObjects
];
for
(
NSDictionary
*
dict
in
promotionalArray
)
{
for
(
NSDictionary
*
dict
in
promotionalArray
)
{
//** 抵扣金额、京东E卡、微信卡劵 */
/// 折扣金额
if
([
dict
[
@"type"
]
isEqualToString
:
deductionAction
])
{
if
([
dict
[
@"type"
]
isEqualToString
:
deductionAction
])
{
PromotionalDeductionModel
*
deductionModel
=
[[
PromotionalDeductionModel
alloc
]
initWithDictionary
:
dict
error
:
nil
];
PromotionalDeductionModel
*
deductionModel
=
[[
PromotionalDeductionModel
alloc
]
initWithDictionary
:
dict
error
:
nil
];
deductionModel
.
isSelected
=
YES
;
deductionModel
.
isSelected
=
YES
;
...
@@ -199,6 +199,7 @@ NSString *const lotteryAction = @"lotteryAction";
...
@@ -199,6 +199,7 @@ NSString *const lotteryAction = @"lotteryAction";
[
weakSelf
.
sectionTitle
addObject
:
PROMOTIONALSTRING
];
[
weakSelf
.
sectionTitle
addObject
:
PROMOTIONALSTRING
];
}
}
[
weakSelf
.
promotionalArray
addObject
:
deductionModel
];
[
weakSelf
.
promotionalArray
addObject
:
deductionModel
];
/// 赠送商品
}
else
if
([
dict
[
@"type"
]
isEqualToString
:
goodsAction
]){
}
else
if
([
dict
[
@"type"
]
isEqualToString
:
goodsAction
]){
PromotionalGoodsModel
*
goodsModel
=
[[
PromotionalGoodsModel
alloc
]
initWithDictionary
:
dict
error
:
nil
];
PromotionalGoodsModel
*
goodsModel
=
[[
PromotionalGoodsModel
alloc
]
initWithDictionary
:
dict
error
:
nil
];
goodsModel
.
isSelected
=
YES
;
goodsModel
.
isSelected
=
YES
;
...
@@ -206,6 +207,7 @@ NSString *const lotteryAction = @"lotteryAction";
...
@@ -206,6 +207,7 @@ NSString *const lotteryAction = @"lotteryAction";
[
weakSelf
.
sectionTitle
addObject
:
PROMOTIONALSTRING
];
[
weakSelf
.
sectionTitle
addObject
:
PROMOTIONALSTRING
];
}
}
[
weakSelf
.
promotionalArray
addObject
:
goodsModel
];
[
weakSelf
.
promotionalArray
addObject
:
goodsModel
];
/// 京东E卡
}
else
if
([
dict
[
@"type"
]
isEqualToString
:
JDECardAction
]){
}
else
if
([
dict
[
@"type"
]
isEqualToString
:
JDECardAction
]){
PromotionalDeductionModel
*
deductionModel
=
[[
PromotionalDeductionModel
alloc
]
initWithDictionary
:
dict
error
:
nil
];
PromotionalDeductionModel
*
deductionModel
=
[[
PromotionalDeductionModel
alloc
]
initWithDictionary
:
dict
error
:
nil
];
[
weakSelf
.
luckyDrawAndJDECardArray
addObject
:
deductionModel
];
[
weakSelf
.
luckyDrawAndJDECardArray
addObject
:
deductionModel
];
...
...
Tools/CYConstManager.h
View file @
43e28d0d
...
@@ -252,6 +252,11 @@ extern NSString *const QUERYALLJDECARD;
...
@@ -252,6 +252,11 @@ extern NSString *const QUERYALLJDECARD;
* 使用京东E卡
* 使用京东E卡
*/
*/
extern
NSString
*
const
USEJDECARD
;
extern
NSString
*
const
USEJDECARD
;
/**
* 抽奖
*/
extern
NSString
*
const
DRAW
;
/*****************************************接口地址*****************************************/
/*****************************************接口地址*****************************************/
...
...
Tools/CYConstManager.m
View file @
43e28d0d
...
@@ -251,6 +251,11 @@ NSString *const QUERYALLJDECARD = @"/jingdongecard/simpleQuery";
...
@@ -251,6 +251,11 @@ NSString *const QUERYALLJDECARD = @"/jingdongecard/simpleQuery";
* 使用京东E卡
* 使用京东E卡
*/
*/
NSString
*
const
USEJDECARD
=
@"/jingdongecard/use?cardNumber=%@"
;
NSString
*
const
USEJDECARD
=
@"/jingdongecard/use?cardNumber=%@"
;
/**
* 抽奖
*/
NSString
*
const
DRAW
=
@"/tOLotteryController.do?lotteryAward&lotteryId=%@&drawId=%@&orderNumber=%@"
;
/*****************************************接口地址*****************************************/
/*****************************************接口地址*****************************************/
...
...
Write
Preview
Markdown
is supported
0%
Try again
or
attach a new file
Attach a file
Cancel
You are about to add
0
people
to the discussion. Proceed with caution.
Finish editing this message first!
Cancel
Please
register
or
sign in
to comment