记得上下班打卡 | git大法好,push需谨慎

Commit 962ccd79 authored by jiangxiulong's avatar jiangxiulong

没用的todo3

parent f9d081e7
...@@ -112,7 +112,6 @@ public class KylinOrderRefundsServiceImpl extends ServiceImpl<KylinOrderRefundsM ...@@ -112,7 +112,6 @@ public class KylinOrderRefundsServiceImpl extends ServiceImpl<KylinOrderRefundsM
int thisPayStatus = orderStatus.getPayStatus(); int thisPayStatus = orderStatus.getPayStatus();
BigDecimal priceExpress = orderInfo.getPriceExpress(); BigDecimal priceExpress = orderInfo.getPriceExpress();
// todo 转增是否能退
// 订单状态需已付款 // 订单状态需已付款
if (thisOrderStatus != KylinTableStatusConst.ORDER_STATUS1 && thisOrderStatus != KylinTableStatusConst.ORDER_STATUS3 && thisOrderStatus != KylinTableStatusConst.ORDER_STATUS6) { if (thisOrderStatus != KylinTableStatusConst.ORDER_STATUS1 && thisOrderStatus != KylinTableStatusConst.ORDER_STATUS3 && thisOrderStatus != KylinTableStatusConst.ORDER_STATUS6) {
return ResponseDto.failure("当前订单状态不支持退款申请"); return ResponseDto.failure("当前订单状态不支持退款申请");
...@@ -124,8 +123,7 @@ public class KylinOrderRefundsServiceImpl extends ServiceImpl<KylinOrderRefundsM ...@@ -124,8 +123,7 @@ public class KylinOrderRefundsServiceImpl extends ServiceImpl<KylinOrderRefundsM
if (thisPayStatus != KylinTableStatusConst.ORDER_PAY_STATUS1) { if (thisPayStatus != KylinTableStatusConst.ORDER_PAY_STATUS1) {
return ResponseDto.failure("订单支付状态需为已支付"); return ResponseDto.failure("订单支付状态需为已支付");
} }
// TODO: 2021/6/16 是否能单独退快递飞 批量退款是否退快递费 现在做的是自动退剩余快递费 // 传的快递费不能大于实际的快递费=(支付的快递费-已退的快递费) 自动退剩余快递费
// 传的快递费不能大于实际的快递费=(支付的快递费-已退的快递费)
BigDecimal refundPriceExpressSum = kylinOrderRefundsMapper.RefundPriceExpressSum(// 已退快递费 BigDecimal refundPriceExpressSum = kylinOrderRefundsMapper.RefundPriceExpressSum(// 已退快递费
orderTicketsId, orderTicketsId,
KylinTableStatusConst.ORDER_REFUND_STATUS_CANCEL KylinTableStatusConst.ORDER_REFUND_STATUS_CANCEL
......
...@@ -30,7 +30,6 @@ public class PushClient { ...@@ -30,7 +30,6 @@ public class PushClient {
protected static final String postPath = "/api/send"; protected static final String postPath = "/api/send";
public String send(UmengNotification msg) throws Exception { public String send(UmengNotification msg) throws Exception {
// TODO: 2021/7/14 上线去掉
// msg.setTestMode(); // msg.setTestMode();
String timestamp = Integer.toString((int)(System.currentTimeMillis() / 1000)); String timestamp = Integer.toString((int)(System.currentTimeMillis() / 1000));
msg.setPredefinedKeyValue("timestamp", timestamp); msg.setPredefinedKeyValue("timestamp", timestamp);
......
...@@ -49,7 +49,6 @@ public class PerformancesExpressInfoServiceImpl { ...@@ -49,7 +49,6 @@ public class PerformancesExpressInfoServiceImpl {
expressInfo.setRouteList(routeList); expressInfo.setRouteList(routeList);
} }
} else { } else {
// TODO: jxl 2021/8/27 查询物流信息
expressInfo.setRouteList(null); expressInfo.setRouteList(null);
} }
return expressInfo; return expressInfo;
......
Markdown is supported
0% or
You are about to add 0 people to the discussion. Proceed with caution.
Finish editing this message first!
Please register or to comment