记得上下班打卡 | 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
962ccd79
Commit
962ccd79
authored
Jan 06, 2022
by
jiangxiulong
Browse files
Options
Browse Files
Download
Email Patches
Plain Diff
没用的todo3
parent
f9d081e7
Changes
3
Hide whitespace changes
Inline
Side-by-side
Showing
3 changed files
with
1 addition
and
5 deletions
+1
-5
KylinOrderRefundsServiceImpl.java
...gzai/kylin/service/impl/KylinOrderRefundsServiceImpl.java
+1
-3
PushClient.java
...t/client/admin/zhengzai/kylin/utils/upush/PushClient.java
+0
-1
PerformancesExpressInfoServiceImpl.java
...ylin/service/impl/PerformancesExpressInfoServiceImpl.java
+0
-1
No files found.
liquidnet-bus-client/liquidnet-client-admin/liquidnet-client-admin-zhengzai/src/main/java/com/liquidnet/client/admin/zhengzai/kylin/service/impl/KylinOrderRefundsServiceImpl.java
View file @
962ccd79
...
...
@@ -112,7 +112,6 @@ public class KylinOrderRefundsServiceImpl extends ServiceImpl<KylinOrderRefundsM
int
thisPayStatus
=
orderStatus
.
getPayStatus
();
BigDecimal
priceExpress
=
orderInfo
.
getPriceExpress
();
// todo 转增是否能退
// 订单状态需已付款
if
(
thisOrderStatus
!=
KylinTableStatusConst
.
ORDER_STATUS1
&&
thisOrderStatus
!=
KylinTableStatusConst
.
ORDER_STATUS3
&&
thisOrderStatus
!=
KylinTableStatusConst
.
ORDER_STATUS6
)
{
return
ResponseDto
.
failure
(
"当前订单状态不支持退款申请"
);
...
...
@@ -124,8 +123,7 @@ public class KylinOrderRefundsServiceImpl extends ServiceImpl<KylinOrderRefundsM
if
(
thisPayStatus
!=
KylinTableStatusConst
.
ORDER_PAY_STATUS1
)
{
return
ResponseDto
.
failure
(
"订单支付状态需为已支付"
);
}
// TODO: 2021/6/16 是否能单独退快递飞 批量退款是否退快递费 现在做的是自动退剩余快递费
// 传的快递费不能大于实际的快递费=(支付的快递费-已退的快递费)
// 传的快递费不能大于实际的快递费=(支付的快递费-已退的快递费) 自动退剩余快递费
BigDecimal
refundPriceExpressSum
=
kylinOrderRefundsMapper
.
RefundPriceExpressSum
(
// 已退快递费
orderTicketsId
,
KylinTableStatusConst
.
ORDER_REFUND_STATUS_CANCEL
...
...
liquidnet-bus-client/liquidnet-client-admin/liquidnet-client-admin-zhengzai/src/main/java/com/liquidnet/client/admin/zhengzai/kylin/utils/upush/PushClient.java
View file @
962ccd79
...
...
@@ -30,7 +30,6 @@ public class PushClient {
protected
static
final
String
postPath
=
"/api/send"
;
public
String
send
(
UmengNotification
msg
)
throws
Exception
{
// TODO: 2021/7/14 上线去掉
// msg.setTestMode();
String
timestamp
=
Integer
.
toString
((
int
)(
System
.
currentTimeMillis
()
/
1000
));
msg
.
setPredefinedKeyValue
(
"timestamp"
,
timestamp
);
...
...
liquidnet-bus-service/liquidnet-service-kylin/liquidnet-service-kylin-impl/src/main/java/com/liquidnet/service/kylin/service/impl/PerformancesExpressInfoServiceImpl.java
View file @
962ccd79
...
...
@@ -49,7 +49,6 @@ public class PerformancesExpressInfoServiceImpl {
expressInfo
.
setRouteList
(
routeList
);
}
}
else
{
// TODO: jxl 2021/8/27 查询物流信息
expressInfo
.
setRouteList
(
null
);
}
return
expressInfo
;
...
...
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