退配送费 增加订单状态审核

order-application-service/src/main/java/cn/freemud/service/impl/OrderServiceImpl.java

@@ -1134,15 +1134,10 @@ public class OrderServiceImpl implements Orderservice {
 
                 Map<String, AssortmentOpenPlatformPartnerWxappConfig> configMap = partnerWxappConfigs.stream().collect(Collectors.toMap(AssortmentOpenPlatformPartnerWxappConfig::getAppKey, Function.identity()));
 
-                boolean isRefundDeliveryFee = true;
                 AssortmentOpenPlatformPartnerWxappConfig refundDeliveryFeeConfig = configMap.get(OrderRefundEnum.REFUND_DELIVERY_FEE_ENABLE.getKeyValue());
-                log.info("refundDeliveryFeeConfig:{}, {}, {}", refundDeliveryFeeConfig,orderBean.getStatus() ,LogTreadLocal.getTrackingNo());
+                LogUtil.info("refundDeliveryFeeConfig:{}, {}, {}", refundDeliveryFeeConfig.getAppValue(),orderBean.getStatus() ,LogTreadLocal.getTrackingNo());
                 // 0、null表示 关闭 ; 1 表示开启
-                if (null != refundDeliveryFeeConfig
-                        && Arrays.asList(OrderStatus.DISTRIBUTION.getCode(),OrderStatus.COMPLETE.getCode()).contains(orderBean.getStatus())
-                        && (!ALLOW_REFUND.equals(refundDeliveryFeeConfig.getAppValue())||PayChannel.SVC.getCode().equals(orderBean.getPayChannel()))) {
-                    isRefundDeliveryFee = false;
-                }
+
                 CancelOrderRequest cancelOrderRequest = new CancelOrderRequest();
                 cancelOrderRequest.setPartnerId(orderBean.getCompanyId());
                 cancelOrderRequest.setStoreId(orderBean.getShopId());
@@ -1159,7 +1154,12 @@ public class OrderServiceImpl implements Orderservice {
                 cancelOrderRequest.setReqRemark(orderRefundVo.getRemarks());
                 cancelOrderRequest.setOperator(orderBean.getUserName());
                 cancelOrderRequest.setTrackingNo(LogTreadLocal.getTrackingNo());
-                cancelOrderRequest.setRefundDeliveryAmount(isRefundDeliveryFee);
+                if (null != refundDeliveryFeeConfig
+                        && Arrays.asList(OrderStatus.DISTRIBUTION.getCode(),OrderStatus.COMPLETE.getCode()).contains(orderBean.getStatus())
+                        && (!ALLOW_REFUND.equals(refundDeliveryFeeConfig.getAppValue())||PayChannel.SVC.getCode().equals(orderBean.getPayChannel()))) {
+                    cancelOrderRequest.setRefundDeliveryAmount(false);
+                }
+
                 BaseOrderResponse baseResponseDto = orderCenterSdkService.orderCancel(cancelOrderRequest);
 
                 if (!RESPONSE_SUCCESS_CODE.equals(baseResponseDto.getErrcode())) {