记得上下班打卡 | git大法好,push需谨慎
Skip to content
Projects
Groups
Snippets
Help
Loading...
Help
Submit feedback
Contribute to GitLab
Sign in
Toggle navigation
L
liquidnet-bus-v1
Project
Project
Details
Activity
Releases
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
Members
Collapse sidebar
Close sidebar
Activity
Graph
Charts
Create a new issue
Jobs
Commits
Issue Boards
Open sidebar
董敬伟
liquidnet-bus-v1
Commits
266fea26
Commit
266fea26
authored
Dec 21, 2021
by
jiangxiulong
Browse files
Options
Browse Files
Download
Email Patches
Plain Diff
超市支付退款 申请就同步大麦
parent
46c52021
Changes
3
Hide whitespace changes
Inline
Side-by-side
Showing
3 changed files
with
69 additions
and
13 deletions
+69
-13
OrderRefundOvertimeServiceImpl.java
...ce/order/service/impl/OrderRefundOvertimeServiceImpl.java
+9
-2
TaobaoTicketUtils.java
.../com/liquidnet/service/order/utils/TaobaoTicketUtils.java
+58
-0
OrderRefundsCallbackServiceImpl.java
...tform/service/refund/OrderRefundsCallbackServiceImpl.java
+2
-11
No files found.
liquidnet-bus-service/liquidnet-service-order/liquidnet-service-order-impl/src/main/java/com/liquidnet/service/order/service/impl/OrderRefundOvertimeServiceImpl.java
View file @
266fea26
...
@@ -5,9 +5,11 @@ import com.liquidnet.commons.lang.util.CollectionUtil;
...
@@ -5,9 +5,11 @@ import com.liquidnet.commons.lang.util.CollectionUtil;
import
com.liquidnet.commons.lang.util.HttpUtil
;
import
com.liquidnet.commons.lang.util.HttpUtil
;
import
com.liquidnet.service.kylin.dto.vo.mongo.KylinOrderTicketEntitiesVo
;
import
com.liquidnet.service.kylin.dto.vo.mongo.KylinOrderTicketEntitiesVo
;
import
com.liquidnet.service.kylin.dto.vo.mongo.KylinOrderTicketVo
;
import
com.liquidnet.service.kylin.dto.vo.mongo.KylinOrderTicketVo
;
import
com.liquidnet.service.kylin.dto.vo.mongo.KylinPerformanceVo
;
import
com.liquidnet.service.kylin.entity.KylinOrderCoupons
;
import
com.liquidnet.service.kylin.entity.KylinOrderCoupons
;
import
com.liquidnet.service.kylin.service.IKylinOrderRefundsService
;
import
com.liquidnet.service.kylin.service.IKylinOrderRefundsService
;
import
com.liquidnet.service.order.utils.DataUtils
;
import
com.liquidnet.service.order.utils.DataUtils
;
import
com.liquidnet.service.order.utils.TaobaoTicketUtils
;
import
lombok.extern.slf4j.Slf4j
;
import
lombok.extern.slf4j.Slf4j
;
import
org.springframework.beans.factory.annotation.Autowired
;
import
org.springframework.beans.factory.annotation.Autowired
;
import
org.springframework.beans.factory.annotation.Value
;
import
org.springframework.beans.factory.annotation.Value
;
...
@@ -40,8 +42,8 @@ public class OrderRefundOvertimeServiceImpl implements IKylinOrderRefundsService
...
@@ -40,8 +42,8 @@ public class OrderRefundOvertimeServiceImpl implements IKylinOrderRefundsService
@Autowired
@Autowired
private
DataUtils
dataUtils
;
private
DataUtils
dataUtils
;
@
Value
(
"${liquidnet.service.candy.url}"
)
@
Autowired
private
String
candyUrl
;
private
TaobaoTicketUtils
taobaoTicketUtils
;
public
Boolean
refundApply
(
String
orderTicketsId
,
String
paymentId
,
String
paymentType
)
{
public
Boolean
refundApply
(
String
orderTicketsId
,
String
paymentId
,
String
paymentType
)
{
log
.
info
(
"订单超时支付refundApply-Start:[orderTicketsId={}, [paymentId={}, paymentType={}]"
,
log
.
info
(
"订单超时支付refundApply-Start:[orderTicketsId={}, [paymentId={}, paymentType={}]"
,
...
@@ -70,6 +72,11 @@ public class OrderRefundOvertimeServiceImpl implements IKylinOrderRefundsService
...
@@ -70,6 +72,11 @@ public class OrderRefundOvertimeServiceImpl implements IKylinOrderRefundsService
);
);
if
(
res
)
{
if
(
res
)
{
// 优惠券 库存 积分 大美已自己处理
// 优惠券 库存 积分 大美已自己处理
// 同步大麦退款
KylinOrderTicketVo
orderData
=
dataUtils
.
getOrderTicketVo
(
orderTicketsId
);
KylinPerformanceVo
vo
=
dataUtils
.
getPerformanceVo
(
orderData
.
getPerformanceId
());
taobaoTicketUtils
.
refundDamaiOrder
(
orderData
,
vo
);
// TODO: 2021/12/21 jxl 同步票务平台
return
true
;
return
true
;
}
else
{
}
else
{
return
false
;
return
false
;
...
...
liquidnet-bus-service/liquidnet-service-order/liquidnet-service-order-impl/src/main/java/com/liquidnet/service/order/utils/TaobaoTicketUtils.java
View file @
266fea26
package
com
.
liquidnet
.
service
.
order
.
utils
;
package
com
.
liquidnet
.
service
.
order
.
utils
;
import
com.liquidnet.commons.lang.util.IDGenerator
;
import
com.liquidnet.service.kylin.dto.vo.middle.KylinTicketTimesVo
;
import
com.liquidnet.service.kylin.dto.vo.middle.KylinTicketVo
;
import
com.liquidnet.service.kylin.dto.vo.mongo.KylinOrderTicketEntitiesVo
;
import
com.liquidnet.service.kylin.dto.vo.mongo.KylinOrderTicketVo
;
import
com.liquidnet.service.kylin.dto.vo.mongo.KylinPerformanceVo
;
import
com.taobao.api.DefaultTaobaoClient
;
import
com.taobao.api.DefaultTaobaoClient
;
import
com.taobao.api.TaobaoClient
;
import
com.taobao.api.TaobaoClient
;
import
com.taobao.api.request.AlibabaDamaiMevOpenWithdrawticketRequest
;
import
com.taobao.api.request.AlibabaDamaiMevOpenWithdrawticketRequest
;
import
com.taobao.api.response.AlibabaDamaiMevOpenWithdrawticketResponse
;
import
com.taobao.api.response.AlibabaDamaiMevOpenWithdrawticketResponse
;
import
lombok.extern.slf4j.Slf4j
;
import
org.springframework.stereotype.Service
;
import
org.springframework.stereotype.Service
;
import
java.util.List
;
@Slf4j
@Service
@Service
public
class
TaobaoTicketUtils
{
public
class
TaobaoTicketUtils
{
...
@@ -47,4 +57,52 @@ public class TaobaoTicketUtils {
...
@@ -47,4 +57,52 @@ public class TaobaoTicketUtils {
return
false
;
return
false
;
}
}
}
}
public
boolean
refundDamaiOrder
(
KylinOrderTicketVo
orderData
,
KylinPerformanceVo
vo
)
{
try
{
int
isSysDamai
=
0
;
for
(
int
x
=
0
;
x
<
vo
.
getTicketTimeList
().
size
();
x
++)
{
KylinTicketTimesVo
timeItem
=
vo
.
getTicketTimeList
().
get
(
x
);
for
(
int
y
=
0
;
y
<
timeItem
.
getTicketList
().
size
();
y
++)
{
KylinTicketVo
ticketItem
=
timeItem
.
getTicketList
().
get
(
y
);
if
(
ticketItem
.
getTicketsId
().
equals
(
orderData
.
getTicketId
()))
{
isSysDamai
=
ticketItem
.
getSysDamai
();
break
;
}
}
}
if
(
isSysDamai
==
1
)
{
List
<
KylinOrderTicketEntitiesVo
>
listData
=
orderData
.
getEntitiesVoList
();
for
(
int
i
=
0
;
i
<
listData
.
size
();
i
++)
{
KylinOrderTicketEntitiesVo
item
=
listData
.
get
(
i
);
long
ticketTimesKey
;
if
(
item
.
getTicketId
().
length
()
>
13
)
{
ticketTimesKey
=
Long
.
valueOf
(
IDGenerator
.
getDamaiCode
(
item
.
getTimeId
()));
}
else
{
ticketTimesKey
=
Long
.
parseLong
(
item
.
getTimeId
());
}
long
orderTicketEntitiesKey
;
// if (item.getOrderTicketEntitiesId().length() > 13) {
// orderTicketEntitiesKey = Long.valueOf(IDGenerator.getDamaiCode(item.getOrderTicketEntitiesId()));
// } else {
// orderTicketEntitiesKey = Long.valueOf(item.getOrderTicketEntitiesId());//票单号 入场人id
// }
if
(
orderData
.
getIsMember
()
==
1
)
{
orderTicketEntitiesKey
=
Long
.
valueOf
(
IDGenerator
.
getDamaiCode
(
item
.
getOrderTicketEntitiesId
()).
toString
().
concat
(
"010"
));
}
else
{
orderTicketEntitiesKey
=
Long
.
valueOf
(
IDGenerator
.
getDamaiCode
(
item
.
getOrderTicketEntitiesId
()).
toString
().
concat
(
"020"
));
}
withdrawDamaiOrder
(
ticketTimesKey
,
orderTicketEntitiesKey
);
}
return
true
;
}
return
true
;
}
catch
(
Exception
e
){
log
.
info
(
"REFUND DAMAI ERROR = {}"
,
e
);
return
false
;
}
}
}
}
liquidnet-bus-service/liquidnet-service-platform/liquidnet-service-platform-impl/src/main/java/com/liquidnet/service/platform/service/refund/OrderRefundsCallbackServiceImpl.java
View file @
266fea26
...
@@ -72,9 +72,6 @@ public class OrderRefundsCallbackServiceImpl extends ServiceImpl<KylinOrderRefun
...
@@ -72,9 +72,6 @@ public class OrderRefundsCallbackServiceImpl extends ServiceImpl<KylinOrderRefun
@Autowired
@Autowired
private
DataUtils
dataUtils
;
private
DataUtils
dataUtils
;
/*@Autowired
private TaobaoTicketUtils taobaoTicketUtils;*/
public
String
refundCallback
(
RefundCallbackParam
refundCallbackParam
)
{
public
String
refundCallback
(
RefundCallbackParam
refundCallbackParam
)
{
log
.
info
(
"refundCallback订单退款回调参数: [RefundCallbackParam={}]"
,
refundCallbackParam
);
log
.
info
(
"refundCallback订单退款回调参数: [RefundCallbackParam={}]"
,
refundCallbackParam
);
KylinOrderRefunds
refundInfo
=
kylinOrderRefundsMapper
.
selectOne
(
KylinOrderRefunds
refundInfo
=
kylinOrderRefundsMapper
.
selectOne
(
...
@@ -162,11 +159,10 @@ public class OrderRefundsCallbackServiceImpl extends ServiceImpl<KylinOrderRefun
...
@@ -162,11 +159,10 @@ public class OrderRefundsCallbackServiceImpl extends ServiceImpl<KylinOrderRefun
params
.
add
(
"orderRefundCode"
,
refundInfo
.
getOrderRefundCode
());
params
.
add
(
"orderRefundCode"
,
refundInfo
.
getOrderRefundCode
());
params
.
add
(
"paymentId"
,
orderInfo
.
getPaymentId
());
params
.
add
(
"paymentId"
,
orderInfo
.
getPaymentId
());
// log.info("退款参数" + JsonUtils.toJson(params));
log
.
info
(
"\n支付宝退款主动查询参数:\n[{}] "
,
params
.
toString
());
log
.
info
(
"\n支付宝退款主动查询参数:\n[{}] "
,
params
.
toString
());
// 请求
pay
// 请求
dragon
try
{
try
{
String
postResult
=
HttpUtil
.
post
(
refund
Apply
,
params
);
String
postResult
=
HttpUtil
.
post
(
refund
Result
,
params
);
log
.
info
(
"\n支付宝退款主动查询处理结果:\n[{}] "
+
postResult
);
log
.
info
(
"\n支付宝退款主动查询处理结果:\n[{}] "
+
postResult
);
}
catch
(
Exception
e
)
{
}
catch
(
Exception
e
)
{
log
.
info
(
"\n支付宝退款主动查询失败:[errorMsg=[{}], [orderRefundsId=[{}]"
,
e
.
getMessage
(),
refundInfo
.
getOrderRefundsId
());
log
.
info
(
"\n支付宝退款主动查询失败:[errorMsg=[{}], [orderRefundsId=[{}]"
,
e
.
getMessage
(),
refundInfo
.
getOrderRefundsId
());
...
@@ -276,11 +272,6 @@ public class OrderRefundsCallbackServiceImpl extends ServiceImpl<KylinOrderRefun
...
@@ -276,11 +272,6 @@ public class OrderRefundsCallbackServiceImpl extends ServiceImpl<KylinOrderRefun
dataUtils
.
delOrderRefundVoByOrderId
(
orderId
);
dataUtils
.
delOrderRefundVoByOrderId
(
orderId
);
continue
;
continue
;
}
else
{
// 同步大麦退款
/*KylinOrderTicketVo orderData = dataUtils.getOrderTicketVo(orderId);
KylinPerformanceVo vo = dataUtils.getPerformanceVo(orderData.getPerformanceId());
taobaoTicketUtils.refundDamaiOrder(orderData, vo);*/
}
}
}
catch
(
Exception
e
)
{
}
catch
(
Exception
e
)
{
log
.
info
(
"退款请求pay失败e"
+
e
.
getMessage
());
log
.
info
(
"退款请求pay失败e"
+
e
.
getMessage
());
...
...
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