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
jenkins
order-group
Commits
bba68716
Commit
bba68716
authored
Mar 02, 2020
by
shuhu.hou
Browse files
Options
Browse Files
Download
Email Patches
Plain Diff
移除创建&支付订单上传微信
parent
c5647b37
Hide whitespace changes
Inline
Side-by-side
Showing
1 changed file
with
7 additions
and
9 deletions
+7
-9
order-application-service/src/main/java/cn/freemud/service/impl/OrderServiceImpl.java
+7
-9
No files found.
order-application-service/src/main/java/cn/freemud/service/impl/OrderServiceImpl.java
View file @
bba68716
...
@@ -200,8 +200,6 @@ public class OrderServiceImpl implements Orderservice {
...
@@ -200,8 +200,6 @@ public class OrderServiceImpl implements Orderservice {
@Autowired
@Autowired
private
AssortmentCustomerInfoManager
customerInfoManager
;
private
AssortmentCustomerInfoManager
customerInfoManager
;
@Autowired
@Autowired
private
WechatPushProcessor
wechatPushProcessor
;
@Autowired
private
CheckOrder
checkOrder
;
private
CheckOrder
checkOrder
;
@Autowired
@Autowired
private
RedisCache
redisCache
;
private
RedisCache
redisCache
;
...
@@ -459,11 +457,11 @@ public class OrderServiceImpl implements Orderservice {
...
@@ -459,11 +457,11 @@ public class OrderServiceImpl implements Orderservice {
buriedPointService
.
BuriedPointPayment
(
requestDto
,
orderBean
);
buriedPointService
.
BuriedPointPayment
(
requestDto
,
orderBean
);
// 推荐优惠插件用户支付完成数据上报
// 推荐优惠插件用户支付完成数据上报
if
(
message
.
getTotal_fee
()
!=
0
)
{
//
if (message.getTotal_fee() != 0) {
orderBean
.
setStatus
(
OrderStatus
.
TAKE_ORDER
.
getCode
());
//
orderBean.setStatus(OrderStatus.TAKE_ORDER.getCode());
wechatPushProcessor
.
statusOrderPay
(
orderBean
,
sessionId
,
message
.
getPaid_no
(),
message
.
getOut_trade_no
()
//
wechatPushProcessor.statusOrderPay(orderBean, sessionId, message.getPaid_no(), message.getOut_trade_no()
,
message
.
getEndTransId
(),
message
.
getPlatformMchId
(),
message
.
getTerminalId
());
//
, message.getEndTransId(), message.getPlatformMchId(), message.getTerminalId());
}
//
}
// 开通会员卡
// 开通会员卡
if
(
StringUtils
.
isNotBlank
(
ruleId
))
{
if
(
StringUtils
.
isNotBlank
(
ruleId
))
{
...
@@ -1817,7 +1815,7 @@ public class OrderServiceImpl implements Orderservice {
...
@@ -1817,7 +1815,7 @@ public class OrderServiceImpl implements Orderservice {
createOrderResponse
.
setPaySuccess
(
true
);
createOrderResponse
.
setPaySuccess
(
true
);
}
}
// 推荐优惠插件用户下单数据上报
// 推荐优惠插件用户下单数据上报
wechatPushProcessor
.
statusOrderCreate
(
userLoginInfoDto
,
createOrderResponse
.
getOid
(),
createOrderVo
.
getPartnerId
());
//
wechatPushProcessor.statusOrderCreate(userLoginInfoDto, createOrderResponse.getOid(), createOrderVo.getPartnerId());
if
(!
createOrderResponse
.
getPaySuccess
())
{
if
(!
createOrderResponse
.
getPaySuccess
())
{
return
ResponseUtil
.
success
(
createOrderResponse
);
return
ResponseUtil
.
success
(
createOrderResponse
);
}
else
{
}
else
{
...
@@ -2191,7 +2189,7 @@ public class OrderServiceImpl implements Orderservice {
...
@@ -2191,7 +2189,7 @@ public class OrderServiceImpl implements Orderservice {
}
}
CreateOrderResponseVo
createOrderResponse
=
orderAdapter
.
convent2CreateFatherSonOrderResponseVo
(
orderPayResponse
,
productOrderBean
);
CreateOrderResponseVo
createOrderResponse
=
orderAdapter
.
convent2CreateFatherSonOrderResponseVo
(
orderPayResponse
,
productOrderBean
);
// 推荐优惠插件用户下单数据上报
// 推荐优惠插件用户下单数据上报
wechatPushProcessor
.
statusOrderCreate
(
userLoginInfoDto
,
createOrderResponse
.
getOid
(),
createOrderVo
.
getPartnerId
());
//
wechatPushProcessor.statusOrderCreate(userLoginInfoDto, createOrderResponse.getOid(), createOrderVo.getPartnerId());
//设置是否唤起微信支付
//设置是否唤起微信支付
if
(
totalAmount
>
0
&&
StringUtils
.
isBlank
(
createOrderVo
.
getCardCode
())
&&
StringUtils
.
isBlank
(
createOrderVo
.
getFaceCode
()))
{
if
(
totalAmount
>
0
&&
StringUtils
.
isBlank
(
createOrderVo
.
getCardCode
())
&&
StringUtils
.
isBlank
(
createOrderVo
.
getFaceCode
()))
{
createOrderResponse
.
setPaySuccess
(
false
);
createOrderResponse
.
setPaySuccess
(
false
);
...
...
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