Commit 569c43b1 by hanghang.wang

根据订单状态,判断商城订单是否退运费

parent 41b99c8f
......@@ -2247,6 +2247,12 @@ public class OrderServiceImpl implements Orderservice {
QueryFreightRefundSupportedVo queryFreightRefundSupportedVo = new QueryFreightRefundSupportedVo();
queryFreightRefundSupportedVo.setPartnerId(orderBean.getCompanyId());
queryFreightRefundSupportedVo.setProvince(province);
//整合商城订单状态,订单状态 1 2 3不需校验直接退运费 20210513
List<Integer> isRefundDeliveryFeeCodes = Arrays.asList(
OrderStatus.TAKE_ORDER.getCode(), OrderStatus.WAIT_PAY.getCode(), OrderStatus.RECEIPT.getCode());
if(isRefundDeliveryFeeCodes.contains(orderBean.getStatus())){
isRefundDeliveryFee = true;
}else{
QueryFreightRefundSupportedResponse queryFreightRefundSupportedResponse = deliveryFeiginClient.isFreightRefundSupported(queryFreightRefundSupportedVo);
LogUtil.info("queryFreightRefundSupportedResponse of oid:{}, {}, {}", orderBean.getOid(), orderBean.getStatus(), (null != queryFreightRefundSupportedResponse ? ToStringBuilder.reflectionToString(queryFreightRefundSupportedResponse) : null));
if(null != queryFreightRefundSupportedResponse && RESPONSE_SUCCESS_CODE == queryFreightRefundSupportedResponse.getCode()){
......@@ -2254,6 +2260,7 @@ public class OrderServiceImpl implements Orderservice {
isRefundDeliveryFee = freightRefundSupported;
}
}
}
}else {
AssortmentOpenPlatformPartnerWxappConfig refundDeliveryFeeConfig = configMap.get(OrderRefundEnum.REFUND_DELIVERY_FEE_ENABLE.getKeyValue());
LogUtil.info("orderRefund of oid:{}, {}, {}", orderBean.getOid(), orderBean.getStatus(), (null != refundDeliveryFeeConfig ? ToStringBuilder.reflectionToString(refundDeliveryFeeConfig) : null));
......@@ -2264,6 +2271,7 @@ public class OrderServiceImpl implements Orderservice {
isRefundDeliveryFee = false;
}
}
// 未接单
if (OrderStatus.TAKE_ORDER.getCode().equals(orderBean.getStatus())) {
// 拼团订单主动退款触发通知促销
......
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