Commit 0bd2275d by haibo.jiang

退单增加配送费逻辑

parent bdd40b13
...@@ -1158,7 +1158,10 @@ public class OrderServiceImpl implements Orderservice { ...@@ -1158,7 +1158,10 @@ public class OrderServiceImpl implements Orderservice {
// 0、null表示 关闭 ; 1 表示开启 // 0、null表示 关闭 ; 1 表示开启
if (null != refundDeliveryFeeConfig if (null != refundDeliveryFeeConfig
&& Arrays.asList(OrderStatus.DISTRIBUTION.getCode(),OrderStatus.COMPLETE.getCode()).contains(orderBean.getStatus()) && Arrays.asList(OrderStatus.DISTRIBUTION.getCode(),OrderStatus.COMPLETE.getCode()).contains(orderBean.getStatus())
&& (!ALLOW_REFUND.equals(refundDeliveryFeeConfig.getAppValue())||PayChannel.SVC.getCode().equals(orderBean.getPayChannel()))) { && !ALLOW_REFUND.equals(refundDeliveryFeeConfig.getAppValue())) {
isRefundDeliveryFee = false;
}
if(PayChannel.SVC.getCode().equals(orderBean.getPayChannel())){
isRefundDeliveryFee = false; isRefundDeliveryFee = false;
} }
......
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