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
af02d7dd
Commit
af02d7dd
authored
May 17, 2022
by
查志伟
Browse files
Options
Browse Files
Download
Email Patches
Plain Diff
去除无用代码
parent
a57cb197
Hide whitespace changes
Inline
Side-by-side
Showing
1 changed file
with
0 additions
and
33 deletions
+0
-33
order-application-service/src/main/java/cn/freemud/service/impl/OrderServiceImpl.java
+0
-33
No files found.
order-application-service/src/main/java/cn/freemud/service/impl/OrderServiceImpl.java
View file @
af02d7dd
...
@@ -99,7 +99,6 @@ import com.freemud.application.sdk.api.ordercenter.entities.v1.RefundBeanV1;
...
@@ -99,7 +99,6 @@ import com.freemud.application.sdk.api.ordercenter.entities.v1.RefundBeanV1;
import
com.freemud.application.sdk.api.ordercenter.enums.*
;
import
com.freemud.application.sdk.api.ordercenter.enums.*
;
import
com.freemud.application.sdk.api.ordercenter.enums.orderv1.OrderStatusV1
;
import
com.freemud.application.sdk.api.ordercenter.enums.orderv1.OrderStatusV1
;
import
com.freemud.application.sdk.api.ordercenter.enums.orderv1.OrderTypeV1
;
import
com.freemud.application.sdk.api.ordercenter.enums.orderv1.OrderTypeV1
;
import
com.freemud.application.sdk.api.ordercenter.enums.orderv1.RefundStatusV1
;
import
com.freemud.application.sdk.api.ordercenter.request.*
;
import
com.freemud.application.sdk.api.ordercenter.request.*
;
import
com.freemud.application.sdk.api.ordercenter.request.carpark.ParkingOrderCreateReq
;
import
com.freemud.application.sdk.api.ordercenter.request.carpark.ParkingOrderCreateReq
;
import
com.freemud.application.sdk.api.ordercenter.response.BaseDownLoadResponse
;
import
com.freemud.application.sdk.api.ordercenter.response.BaseDownLoadResponse
;
...
@@ -394,38 +393,6 @@ public class OrderServiceImpl implements Orderservice {
...
@@ -394,38 +393,6 @@ public class OrderServiceImpl implements Orderservice {
//若该订单使用了优惠券,则移除卡包,移除失败也不退款,现在支付成功个调用核销,无需调用此功能
//若该订单使用了优惠券,则移除卡包,移除失败也不退款,现在支付成功个调用核销,无需调用此功能
// couponActivityService.callbackNotify(orderBean);
// couponActivityService.callbackNotify(orderBean);
try
{
//美团POS需求,混合支付(现金+储值卡)时,储值卡的交易流水号在预支付时是没有的,导致订单里没有储值卡的流水号,这里查一下支付信息,将储值卡的流水号信息更新到订单信息里
List
<
OrderPayItemResp
>
payItem
=
orderBean
.
getOrderPayItem
();
if
(
CollectionUtils
.
isNotEmpty
(
payItem
)
&&
payItem
.
size
()
>
1
)
{
MultiQueryRequest
queryPay
=
new
MultiQueryRequest
();
queryPay
.
setPartnerId
(
Integer
.
valueOf
(
partnerId
));
queryPay
.
setStoreId
(
storeId
);
queryPay
.
setOutOrderNo
(
orderBean
.
getOid
());
MultiQueryRespDto
payResponse
=
comPayClient
.
paymentApplicationQuery
(
queryPay
,
Integer
.
valueOf
(
partnerId
));
if
(
null
!=
payResponse
&&
null
!=
payResponse
.
getData
()
&&
CollectionUtils
.
isNotEmpty
(
payResponse
.
getData
().
getQueryList
()))
{
List
<
MultiPaymentRespDto
>
payList
=
payResponse
.
getData
().
getQueryList
();
// 和订单里的匹配
payList
.
forEach
(
pay
->
{
payItem
.
forEach
(
item
->
{
if
(
item
.
getTransId
().
equals
(
pay
.
getTransId
()))
{
item
.
setFmTradeNo
(
pay
.
getFmTradeNo
());
item
.
setOutOrderNo
(
pay
.
getOutOrderNo
());
}
});
});
// 更新订单信息
OrderEditRequest
editReq
=
new
OrderEditRequest
(
orderBean
.
getOid
(),
orderBean
.
getExtInfo
(),
orderBean
.
getCompanyId
());
editReq
.
setPayChannel
(
PayChannelType
.
COMB
.
getEbcode
());
editReq
.
setPayChannelName
(
PayChannelType
.
COMB
.
getName
());
editReq
.
setPayChannelType
(
PayChannelType
.
COMB
.
getIndex
());
editReq
.
setOrderPayItem
(
payItem
);
orderCenterSdkService
.
orderEdit
(
editReq
);
}
}
}
catch
(
Exception
ignored
)
{
}
//这个异常catch住,不影响业务流程
String
takeCode
;
String
takeCode
;
String
daySeq
;
String
daySeq
;
PayAccessResponse
payAccessResponse
;
PayAccessResponse
payAccessResponse
;
...
...
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