Skip to content
Projects
Groups
Snippets
Help
This project
Loading...
Sign in / Register
Toggle navigation
O
order-group
Overview
Overview
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
Collapse sidebar
Close sidebar
Activity
Graph
Charts
Create a new issue
Jobs
Commits
Issue Boards
Open sidebar
order-group-application
order-group
Commits
328e4148
Commit
328e4148
authored
Jul 09, 2021
by
周晓航
Browse files
Options
Browse Files
Download
Email Patches
Plain Diff
修改 bug
Signed-off-by: 周晓航 <xiaohang.zhou@freemud.com>
parent
dff7e16c
Show whitespace changes
Inline
Side-by-side
Showing
2 changed files
with
2 additions
and
3 deletions
+2
-3
shopping-cart-application-service/src/main/java/cn/freemud/adapter/ActivityAdapter.java
+2
-2
shopping-cart-application-service/src/main/java/cn/freemud/service/thirdparty/CouponAdapterClient.java
+0
-1
No files found.
shopping-cart-application-service/src/main/java/cn/freemud/adapter/ActivityAdapter.java
View file @
328e4148
...
@@ -405,8 +405,8 @@ public class ActivityAdapter {
...
@@ -405,8 +405,8 @@ public class ActivityAdapter {
couponAvailableCartInfo
.
setRealAmount
(
0L
);
couponAvailableCartInfo
.
setRealAmount
(
0L
);
couponAvailableCartInfo
.
setDiscountAmount
(
0L
);
couponAvailableCartInfo
.
setDiscountAmount
(
0L
);
}
}
couponAvailableCartInfo
.
setDeliveryAmount
(
discountResult
.
getDeliveryAmount
()
);
couponAvailableCartInfo
.
setDeliveryAmount
(
discountResult
!=
null
?
discountResult
.
getDeliveryAmount
():
0
);
couponAvailableCartInfo
.
setDistributionFee
(
discountResult
.
getDistributionFee
()
);
couponAvailableCartInfo
.
setDistributionFee
(
discountResult
!=
null
?
discountResult
.
getDistributionFee
():
0
);
return
couponAvailableCartInfo
;
return
couponAvailableCartInfo
;
}
}
public
CouponAvailableCartInfo
convert2CouponAvailableCartInfo
(
String
partnerId
,
String
storeId
,
ActivityCalculationDiscountResponseDto
.
CalculationDiscountResult
discountResult
,
List
<
String
>
orgCodes
)
{
public
CouponAvailableCartInfo
convert2CouponAvailableCartInfo
(
String
partnerId
,
String
storeId
,
ActivityCalculationDiscountResponseDto
.
CalculationDiscountResult
discountResult
,
List
<
String
>
orgCodes
)
{
...
...
shopping-cart-application-service/src/main/java/cn/freemud/service/thirdparty/CouponAdapterClient.java
View file @
328e4148
...
@@ -12,7 +12,6 @@
...
@@ -12,7 +12,6 @@
*/
*/
package
cn
.
freemud
.
service
.
thirdparty
;
package
cn
.
freemud
.
service
.
thirdparty
;
import
cn.freemud.entities.dto.*
;
import
cn.freemud.entities.dto.coupon.CouponAvailableRespDto
;
import
cn.freemud.entities.dto.coupon.CouponAvailableRespDto
;
import
cn.freemud.entities.vo.coupon.CouponAvailableReqVo
;
import
cn.freemud.entities.vo.coupon.CouponAvailableReqVo
;
import
org.springframework.cloud.openfeign.FeignClient
;
import
org.springframework.cloud.openfeign.FeignClient
;
...
...
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