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
34cdae9a6d33f418a010a5960439a7b22d29a75b
1 parent
85406aa7
format currency plus or sub sign
Hide whitespace changes
Inline
Side-by-side
Showing
2 changed files
with
9 additions
and
1 deletions
dal/src/main/java/com/yohoufo/dal/promotion/model/CouponQueryParamOfUseLimitType.java
order/src/main/java/com/yohoufo/order/convert/SellerOrderConvertor.java
dal/src/main/java/com/yohoufo/dal/promotion/model/CouponQueryParamOfUseLimitType.java
View file @
34cdae9
...
...
@@ -4,7 +4,6 @@ import lombok.AllArgsConstructor;
import
lombok.Builder
;
import
lombok.Data
;
import
lombok.NoArgsConstructor
;
import
org.apache.ibatis.annotations.Param
;
@Data
@Builder
...
...
order/src/main/java/com/yohoufo/order/convert/SellerOrderConvertor.java
View file @
34cdae9
...
...
@@ -5,6 +5,7 @@ import com.yohobuy.ufo.model.order.bo.PlatformFee;
import
com.yohobuy.ufo.model.order.bo.SellerOrderChargeParam
;
import
com.yohobuy.ufo.model.order.bo.SoldPrdComputeBo
;
import
com.yohobuy.ufo.model.order.common.SellerOrderStatus
;
import
com.yohobuy.ufo.model.order.constants.OrderConstant
;
import
com.yohobuy.ufo.model.order.resp.CouponInfo
;
import
com.yohobuy.ufo.model.order.resp.ShoppingCoupon
;
import
com.yohoufo.common.utils.BigDecimalHelper
;
...
...
@@ -227,10 +228,18 @@ public final class SellerOrderConvertor {
public
static
SoldPrdComputeBo
convertWithCoupon
(
SellerOrderRelatedBuyerOrderContext
sorboc
){
SellerOrderComputeResult
computeResult
=
sorboc
.
getSellerOrderComputeResult
();
SoldPrdComputeBo
bo
=
pureComputeResult2SoldPrdComputeBo
(
computeResult
);
PlatformFee
platformFee
=
bo
.
getPlatformFee
();
if
(
Objects
.
nonNull
(
platformFee
)){
platformFee
.
setAppraiseFee
(
OrderConstant
.
SUB_SIGN
+
platformFee
.
getAppraiseFee
());
platformFee
.
setServiceFee
(
OrderConstant
.
SUB_SIGN
+
platformFee
.
getServiceFee
());
platformFee
.
setPackageFee
(
OrderConstant
.
SUB_SIGN
+
platformFee
.
getPackageFee
());
}
SellerOrderChargeParam
chargeParam
=
sorboc
.
getChargeParam
();
switch
(
chargeParam
.
getChargeStage
()){
case
COMPUTE:
{
CouponInfo
couponInfo
=
CouponSupport
.
buildCouponInfo
(
computeResult
.
getCouponPayResultList
().
getCouponPayResults
());
couponInfo
.
setCouponAmountStr
(
OrderConstant
.
PLUS_SIGN
+
couponInfo
.
getCouponAmountStr
());
bo
.
setCouponInfo
(
couponInfo
);
List
<
String
>
couponCodes
=
Lists
.
newArrayList
(
sorboc
.
getCouponCode
());
//
...
...
Please
register
or
login
to post a comment