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
497e89f5
Commit
497e89f5
authored
Oct 15, 2020
by
徐康
Browse files
Options
Browse Files
Download
Email Patches
Plain Diff
运费券核销
parent
564a18e6
Hide whitespace changes
Inline
Side-by-side
Showing
2 changed files
with
2 additions
and
5 deletions
+2
-5
order-application-service/src/main/java/cn/freemud/adapter/CouponAdapter.java
+2
-4
order-application-service/src/main/java/cn/freemud/service/impl/MCCafeOrderServiceImpl.java
+0
-1
No files found.
order-application-service/src/main/java/cn/freemud/adapter/CouponAdapter.java
View file @
497e89f5
...
@@ -711,11 +711,9 @@ public class CouponAdapter {
...
@@ -711,11 +711,9 @@ public class CouponAdapter {
}
else
{
}
else
{
try
{
try
{
McdNetCouponProductRespDto
mcdNetCouponProductRespDto
=
mcdNetBatchQueryResponse
.
getCouponlist
().
get
(
0
).
getCodeInfo
().
getProducts
().
get
(
0
);
McdNetCouponProductRespDto
mcdNetCouponProductRespDto
=
mcdNetBatchQueryResponse
.
getCouponlist
().
get
(
0
).
getCodeInfo
().
getProducts
().
get
(
0
);
String
pid
=
mcdNetCouponProductRespDto
.
getPid
();
MCCafeProductRedeemVo
mcCafeProductRedeemVo
=
new
MCCafeProductRedeemVo
();
MCCafeProductRedeemVo
mcCafeProductRedeemVo
=
new
MCCafeProductRedeemVo
();
mcCafeProductRedeemVo
.
setPid
(
pid
);
mcCafeProductRedeemVo
.
setKeyProductCode
(
mcdNetCouponProductRespDto
.
getPid
());
mcCafeProductRedeemVo
.
setKeyProductCode
(
mcdNetCouponProductRespDto
.
getMcd_productCode
());
mcCafeProductRedeemVo
.
setCustomer_code
(
mcdNetCouponProductRespDto
.
getPid
());
mcCafeProductRedeemVo
.
setCustomer_code
(
mcdNetCouponProductRespDto
.
getMcd_productCode
());
mcCafeProductRedeemVo
.
setConsume_num
(
mcdNetCouponProductRespDto
.
getNumber
());
mcCafeProductRedeemVo
.
setConsume_num
(
mcdNetCouponProductRespDto
.
getNumber
());
mcCafeProductRedeemVo
.
setSeq
(
1
);
mcCafeProductRedeemVo
.
setSeq
(
1
);
products
.
add
(
mcCafeProductRedeemVo
);
products
.
add
(
mcCafeProductRedeemVo
);
...
...
order-application-service/src/main/java/cn/freemud/service/impl/MCCafeOrderServiceImpl.java
View file @
497e89f5
...
@@ -426,7 +426,6 @@ public class MCCafeOrderServiceImpl implements MCCafeOrderService {
...
@@ -426,7 +426,6 @@ public class MCCafeOrderServiceImpl implements MCCafeOrderService {
if
(
CollectionUtils
.
isNotEmpty
(
productDto
.
getComboProduct
())){
if
(
CollectionUtils
.
isNotEmpty
(
productDto
.
getComboProduct
())){
for
(
CreateOrderProductRequest
comboProduct
:
productDto
.
getComboProduct
()){
for
(
CreateOrderProductRequest
comboProduct
:
productDto
.
getComboProduct
()){
String
comboSkuId
=
comboProduct
.
getSpecification
();
String
comboSkuId
=
comboProduct
.
getSpecification
();
System
.
out
.
println
(
comboSkuId
);
if
(
products
.
get
(
comboSkuId
)
!=
null
)
{
if
(
products
.
get
(
comboSkuId
)
!=
null
)
{
comboProduct
.
setThirdProductSpecId
(
products
.
get
(
comboSkuId
).
getThirdProductSpecId
());
comboProduct
.
setThirdProductSpecId
(
products
.
get
(
comboSkuId
).
getThirdProductSpecId
());
comboProduct
.
setThirdProductPropertyId
(
getThirdPropertyId
(
products
.
get
(
comboSkuId
).
getProductAttributeGroupList
(),
comboProduct
.
getAddInfo
()));
comboProduct
.
setThirdProductPropertyId
(
getThirdPropertyId
(
products
.
get
(
comboSkuId
).
getProductAttributeGroupList
(),
comboProduct
.
getAddInfo
()));
...
...
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