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
0c2ea9df
Commit
0c2ea9df
authored
Apr 24, 2017
by
曹云霄
Browse files
Options
Browse Files
Download
Email Patches
Plain Diff
优化促销金额为浮点数
parent
1b9b7f5d
Hide whitespace changes
Inline
Side-by-side
Showing
3 changed files
with
5 additions
and
5 deletions
+5
-5
SettlementViewController.m
...Client/Orderdetails/controller/SettlementViewController.m
+2
-2
PromotionWeChatCardModel.h
Class/MyClient/Orderdetails/model/PromotionWeChatCardModel.h
+1
-1
Info.plist
Lighting/Supporting Files/Info.plist
+2
-2
No files found.
Class/MyClient/Orderdetails/controller/SettlementViewController.m
View file @
0c2ea9df
...
@@ -395,7 +395,7 @@
...
@@ -395,7 +395,7 @@
PromotionalReadPacketModel
*
model
=
(
PromotionalReadPacketModel
*
)
object
;
PromotionalReadPacketModel
*
model
=
(
PromotionalReadPacketModel
*
)
object
;
if
([
model
.
body
isEqualToString
:
GUIDE
])
{
if
([
model
.
body
isEqualToString
:
GUIDE
])
{
RedPackageDetail
*
entity
=
[[
RedPackageDetail
alloc
]
init
];
RedPackageDetail
*
entity
=
[[
RedPackageDetail
alloc
]
init
];
entity
.
money
=
[
NSNumber
numberWith
Integer
:
model
.
total
];
entity
.
money
=
[
NSNumber
numberWith
Float
:
model
.
total
];
entity
.
promotionBillNumber
=
model
.
promotionBillNumber
;
entity
.
promotionBillNumber
=
model
.
promotionBillNumber
;
entity
.
redPrority
=
[
NSString
stringWithFormat
:
@"%ld"
,
model
.
priority
];
entity
.
redPrority
=
[
NSString
stringWithFormat
:
@"%ld"
,
model
.
priority
];
[
readPacketArray
addObject
:
entity
];
[
readPacketArray
addObject
:
entity
];
...
@@ -422,7 +422,7 @@
...
@@ -422,7 +422,7 @@
if
([
model
.
body
isEqualToString
:
CONSUMER
])
{
if
([
model
.
body
isEqualToString
:
CONSUMER
])
{
if
(
!
[[
self
class
]
isBlankString
:
self
.
weChatModel
.
wxcardNumber
])
{
if
(
!
[[
self
class
]
isBlankString
:
self
.
weChatModel
.
wxcardNumber
])
{
order
.
wxcardNumber
=
self
.
weChatModel
.
wxcardNumber
;
order
.
wxcardNumber
=
self
.
weChatModel
.
wxcardNumber
;
order
.
wxcardDenomation
=
[
NSNumber
numberWith
Integer
:
self
.
weChatModel
.
wxcardDenomation
];
order
.
wxcardDenomation
=
[
NSNumber
numberWith
Float
:
self
.
weChatModel
.
wxcardDenomation
];
order
.
wxCardPrority
=
model
.
priority
;
order
.
wxCardPrority
=
model
.
priority
;
}
}
}
}
...
...
Class/MyClient/Orderdetails/model/PromotionWeChatCardModel.h
View file @
0c2ea9df
...
@@ -40,7 +40,7 @@
...
@@ -40,7 +40,7 @@
/**
/**
微信卡劵面额
微信卡劵面额
*/
*/
@property
(
nonatomic
,
assign
)
NSInteger
wxcardDenomation
;
@property
(
nonatomic
,
assign
)
CGFloat
wxcardDenomation
;
/**
/**
微信卡劵卡号
微信卡劵卡号
...
...
Lighting/Supporting Files/Info.plist
View file @
0c2ea9df
...
@@ -15,7 +15,7 @@
...
@@ -15,7 +15,7 @@
<
k
e
y
>
CFBundleName
<
/k
e
y
>
<
k
e
y
>
CFBundleName
<
/k
e
y
>
<
string
>
欧立方
<
/string
>
<
string
>
欧立方
<
/string
>
<
k
e
y
>
CFBundleShortVersionString
<
/k
e
y
>
<
k
e
y
>
CFBundleShortVersionString
<
/k
e
y
>
<
string
>
2.1.
2
<
/string
>
<
string
>
2.1.
3
<
/string
>
<
k
e
y
>
CFBundleURLTypes
<
/k
e
y
>
<
k
e
y
>
CFBundleURLTypes
<
/k
e
y
>
<
a
rr
a
y
>
<
a
rr
a
y
>
<
d
i
c
t
>
<
d
i
c
t
>
...
@@ -48,7 +48,7 @@
...
@@ -48,7 +48,7 @@
<
/
d
i
c
t
>
<
/
d
i
c
t
>
<
/
a
rr
a
y
>
<
/
a
rr
a
y
>
<
k
e
y
>
CFBundleVersion
<
/k
e
y
>
<
k
e
y
>
CFBundleVersion
<
/k
e
y
>
<
string
>
2.1.
2
<
/string
>
<
string
>
2.1.
3
<
/string
>
<
k
e
y
>
LSApplicationQueriesSchemes
<
/k
e
y
>
<
k
e
y
>
LSApplicationQueriesSchemes
<
/k
e
y
>
<
a
rr
a
y
>
<
a
rr
a
y
>
<
string
>
wechat
<
/string
>
<
string
>
wechat
<
/string
>
...
...
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