Commit 06caa08c by chongfu.liang

Merge branch 'feature/2.0.5-储值卡支持推配送费'

parents 5adc8e8e a1f3bb9e
...@@ -1612,10 +1612,6 @@ public class OrderServiceImpl implements Orderservice { ...@@ -1612,10 +1612,6 @@ public class OrderServiceImpl implements Orderservice {
&& !ALLOW_REFUND.equals(refundDeliveryFeeConfig.getAppValue())) { && !ALLOW_REFUND.equals(refundDeliveryFeeConfig.getAppValue())) {
isRefundDeliveryFee = false; isRefundDeliveryFee = false;
} }
if(PayChannel.SVC.getCode().equals(orderBean.getPayChannel())){
isRefundDeliveryFee = true;
}
// 未接单 // 未接单
if (OrderStatus.TAKE_ORDER.getCode().equals(orderBean.getStatus())) { if (OrderStatus.TAKE_ORDER.getCode().equals(orderBean.getStatus())) {
//商家未接单逻辑处理 1.调用支付退款 2.根据支付退款返回状态组装订单取消参数,调用订单取消接口 //商家未接单逻辑处理 1.调用支付退款 2.根据支付退款返回状态组装订单取消参数,调用订单取消接口
......
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