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
65891bdf
Commit
65891bdf
authored
May 07, 2020
by
dingkai
Browse files
Options
Browse Files
Download
Email Patches
Plain Diff
支付回调
parent
d97450d0
Show whitespace changes
Inline
Side-by-side
Showing
1 changed file
with
5 additions
and
1 deletions
+5
-1
order-application-service/src/main/java/cn/freemud/service/impl/EncircleOrderServiceImpl.java
+5
-1
No files found.
order-application-service/src/main/java/cn/freemud/service/impl/EncircleOrderServiceImpl.java
View file @
65891bdf
...
@@ -18,6 +18,7 @@ import cn.freemud.enums.*;
...
@@ -18,6 +18,7 @@ import cn.freemud.enums.*;
import
cn.freemud.interceptor.ServiceException
;
import
cn.freemud.interceptor.ServiceException
;
import
cn.freemud.redis.RedisCache
;
import
cn.freemud.redis.RedisCache
;
import
cn.freemud.service.EncircleOrderService
;
import
cn.freemud.service.EncircleOrderService
;
import
cn.freemud.service.OrderAdapterService
;
import
cn.freemud.service.thirdparty.ShoppingCartClient
;
import
cn.freemud.service.thirdparty.ShoppingCartClient
;
import
cn.freemud.service.thirdparty.StoreItemClient
;
import
cn.freemud.service.thirdparty.StoreItemClient
;
import
cn.freemud.utils.AmountUtils
;
import
cn.freemud.utils.AmountUtils
;
...
@@ -105,6 +106,9 @@ public class EncircleOrderServiceImpl implements EncircleOrderService {
...
@@ -105,6 +106,9 @@ public class EncircleOrderServiceImpl implements EncircleOrderService {
private
MealCacheManager
mealCacheManager
;
private
MealCacheManager
mealCacheManager
;
@Autowired
@Autowired
private
ActivityCalculationDiscountService
calculationDiscountService
;
private
ActivityCalculationDiscountService
calculationDiscountService
;
@Autowired
private
OrderAdapterService
orderAdapterService
;
private
final
Integer
RESPONSE_SUCCESS_CODE
=
100
;
private
final
Integer
RESPONSE_SUCCESS_CODE
=
100
;
...
@@ -522,7 +526,7 @@ public class EncircleOrderServiceImpl implements EncircleOrderService {
...
@@ -522,7 +526,7 @@ public class EncircleOrderServiceImpl implements EncircleOrderService {
message
.
setOpenid
(
assortmentCustomerInfoVo
.
getOpenId
());
message
.
setOpenid
(
assortmentCustomerInfoVo
.
getOpenId
());
message
.
setPlatform_coupon
(
0
);
message
.
setPlatform_coupon
(
0
);
message
.
setMerchant_coupon
(
0
);
message
.
setMerchant_coupon
(
0
);
order
Common
Service
.
paySuccessCallback
(
message
);
order
Adapter
Service
.
paySuccessCallback
(
message
);
}
}
}
else
{
}
else
{
return
ResponseUtil
.
error
(
ResponseResultEnum
.
PAY_UNIFIED_ORDER_ERROR
.
getCode
(),
ResponseResultEnum
.
PAY_UNIFIED_ORDER_ERROR
.
getMessage
(),
null
);
return
ResponseUtil
.
error
(
ResponseResultEnum
.
PAY_UNIFIED_ORDER_ERROR
.
getCode
(),
ResponseResultEnum
.
PAY_UNIFIED_ORDER_ERROR
.
getMessage
(),
null
);
...
...
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