Toggle navigation
Toggle navigation
This project
Loading...
Sign in
ufo
/
yohoufo-fore
·
Commits
Go to a project
GitLab
Go to group
Project
Activity
Files
Commits
Pipelines
0
Builds
0
Graphs
Milestones
Issues
0
Merge Requests
0
Members
Labels
Wiki
Forks
Network
Create a new issue
Download as
Email Patches
Plain Diff
Browse Files
Authored by
chenchao
5 years ago
Commit
44ce81c3d2cc953bc2b9df66280870d9eb114685
1 parent
c850a326
fix no plus sign before fee of coupon cut
Hide whitespace changes
Inline
Side-by-side
Showing
2 changed files
with
25 additions
and
14 deletions
common/src/main/java/com/yohoufo/common/utils/PriceFormater.java
order/src/main/java/com/yohoufo/order/convert/SellerOrderConvertor.java
common/src/main/java/com/yohoufo/common/utils/PriceFormater.java
View file @
44ce81c
package
com
.
yohoufo
.
common
.
utils
;
import
com.yohobuy.ufo.model.order.constants.OrderConstant
;
import
org.apache.commons.lang3.StringUtils
;
/**
* Created by chenchao on 2018/9/14.
*/
...
...
@@ -11,6 +14,19 @@ public class PriceFormater {
}
public
static
String
addPlusSign4Fee
(
String
fmtFee
){
if
(
StringUtils
.
isBlank
(
fmtFee
)){
return
fmtFee
;
}
return
OrderConstant
.
PLUS_SIGN
+
fmtFee
;
}
public
static
String
addSubtract4Fee
(
String
fmtFee
){
if
(
null
==
fmtFee
){
return
null
;
}
return
OrderConstant
.
SUB_SIGN
+
fmtFee
;
}
}
...
...
order/src/main/java/com/yohoufo/order/convert/SellerOrderConvertor.java
View file @
44ce81c
...
...
@@ -22,6 +22,7 @@ import com.yohoufo.order.model.dto.ServiceFeeRate;
import
com.yohoufo.order.service.proxy.ResourcesProxyService
;
import
com.yohoufo.order.service.support.CouponSupport
;
import
com.yohoufo.order.utils.MathUtils
;
import
org.apache.commons.lang3.StringUtils
;
import
java.math.BigDecimal
;
import
java.util.List
;
...
...
@@ -51,7 +52,7 @@ public final class SellerOrderConvertor {
}
PlatformFee
platformFeeWrapper
=
PlatformFee
.
builder
()
.
amount
(
buildSubtract
Fee
(
formatFee
(
platformFeeDto
.
getTotal
())))
.
amount
(
PriceFormater
.
addSubtract4
Fee
(
formatFee
(
platformFeeDto
.
getTotal
())))
.
appraiseFee
(
formatFee
(
platformFeeDto
.
getAppraiseFee
()))
.
packageFee
(
formatFee
(
platformFeeDto
.
getPackageFee
()))
.
serviceFee
(
formatFee
(
platformFeeDto
.
getServiceFee
()))
...
...
@@ -67,7 +68,7 @@ public final class SellerOrderConvertor {
.
earnestMoney
(
earnestMoney
.
doubleValue
())
.
earnestMoneyStr
(
earnestMoneyStr
)
.
platformFee
(
platformFeeWrapper
)
.
bankTransferFee
(
buildSubtract
Fee
(
bankTransferFeeStr
))
.
bankTransferFee
(
PriceFormater
.
addSubtract4
Fee
(
bankTransferFeeStr
))
.
income
(
incomeStr
)
.
build
();
return
computeBo
;
...
...
@@ -96,7 +97,7 @@ public final class SellerOrderConvertor {
}
}
PlatformFee
platformFeeWrapper
=
PlatformFee
.
builder
()
.
amount
(
buildSubtract
Fee
(
formatFee
(
platformFeeDto
.
getTotal
())))
.
amount
(
PriceFormater
.
addSubtract4
Fee
(
formatFee
(
platformFeeDto
.
getTotal
())))
.
appraiseFee
(
formatFee
(
platformFeeDto
.
getAppraiseFee
()))
.
packageFee
(
formatFee
(
platformFeeDto
.
getPackageFee
()))
.
serviceFee
(
formatFee
(
platformFeeDto
.
getServiceFee
()))
...
...
@@ -130,14 +131,14 @@ public final class SellerOrderConvertor {
//
BigDecimal
couponCutAmount
=
computeResult
.
getCouponCutAmount
();
CouponInfo
couponInfo
=
Objects
.
isNull
(
couponCutAmount
)
||
couponCutAmount
.
compareTo
(
BigDecimal
.
ZERO
)
<=
0
?
null
:
CouponInfo
.
builder
().
couponAmountStr
(
formatFee
(
couponCutAmount
)).
build
();
:
CouponInfo
.
builder
().
couponAmountStr
(
PriceFormater
.
addPlusSign4Fee
(
formatFee
(
couponCutAmount
)
)).
build
();
//
SoldPrdComputeBo
computeBo
=
SoldPrdComputeBo
.
builder
()
.
earnestMoney
(
earnestMoney
.
doubleValue
())
.
earnestMoneyStr
(
earnestMoneyStr
)
.
platformFee
(
platformFeeWrapper
)
.
bankTransferFee
(
buildSubtract
Fee
(
bankTransferFeeStr
))
.
bankTransferFee
(
PriceFormater
.
addSubtract4
Fee
(
bankTransferFeeStr
))
.
income
(
incomeStr
)
.
couponInfo
(
couponInfo
)
.
build
();
...
...
@@ -163,7 +164,7 @@ public final class SellerOrderConvertor {
}
PlatformFee
platformFeeWrapper
=
PlatformFee
.
builder
()
.
amount
(
buildSubtract
Fee
(
formatFee
(
platformFeeDto
.
getTotal
())))
.
amount
(
PriceFormater
.
addSubtract4
Fee
(
formatFee
(
platformFeeDto
.
getTotal
())))
.
appraiseFee
(
formatFee
(
platformFeeDto
.
getAppraiseFee
()))
.
packageFee
(
formatFee
(
platformFeeDto
.
getPackageFee
()))
.
serviceFee
(
formatFee
(
platformFeeDto
.
getServiceFee
()))
...
...
@@ -180,7 +181,7 @@ public final class SellerOrderConvertor {
.
earnestMoney
(
earnestMoney
.
doubleValue
())
.
earnestMoneyStr
(
earnestMoneyStr
)
.
platformFee
(
platformFeeWrapper
)
.
bankTransferFee
(
buildSubtract
Fee
(
bankTransferFeeStr
))
.
bankTransferFee
(
PriceFormater
.
addSubtract4
Fee
(
bankTransferFeeStr
))
.
income
(
incomeStr
)
.
build
();
return
computeBo
;
...
...
@@ -239,7 +240,7 @@ public final class SellerOrderConvertor {
switch
(
chargeParam
.
getChargeStage
()){
case
COMPUTE:
{
CouponInfo
couponInfo
=
CouponSupport
.
buildCouponInfo
(
computeResult
.
getCouponPayResultList
().
getCouponPayResults
());
couponInfo
.
setCouponAmountStr
(
OrderConstant
.
PLUS_SIGN
+
couponInfo
.
getCouponAmountStr
(
));
couponInfo
.
setCouponAmountStr
(
PriceFormater
.
addPlusSign4Fee
(
couponInfo
.
getCouponAmountStr
()
));
bo
.
setCouponInfo
(
couponInfo
);
List
<
String
>
couponCodes
=
Lists
.
newArrayList
(
sorboc
.
getCouponCode
());
//
...
...
@@ -253,12 +254,6 @@ public final class SellerOrderConvertor {
}
public
static
String
buildSubtractFee
(
String
fmtFee
){
if
(
null
==
fmtFee
){
return
null
;
}
return
"-"
+
fmtFee
;
}
public
static
String
formatFee
(
BigDecimal
fee
){
...
...
Please
register
or
login
to post a comment