Merge branch 'feature/20220727_非码付接口迁移准备_wuping' of…

Merge branch 'feature/20220727_非码付接口迁移准备_wuping' of https://gitlab.freemud.com/order-group-application/order-group into qa

order-management/src/main/java/cn/freemud/management/service/handle/OrderVerifyHandle.java

@@ -650,21 +650,22 @@ public class OrderVerifyHandle {
 
     /**
      * 获取已完成订单退款金额
+     * isRefundDeliveryFee 退款是否退配送费已在申请退款传到订单基础服务，取订单售后单中退款金额 actualAmount
      */
     public BigDecimal getRefundAmount(OrderBeanV1 data,boolean isRefundDeliveryFee) {
         //是否配置已完成订单可退款
         BigDecimal refundAmount = new BigDecimal(data.getAmount());
-        if (isRefundDeliveryFee || isPayBySVC(data)){
-            return refundAmount;
-        }
-        List<AccountBeanV1> accountList = data.getAccountList();
-        if (CollectionUtils.isNotEmpty(accountList)) {
-            for (AccountBeanV1 orderCostResp : accountList) {
-                if (orderCostResp.getType() == OldOrderAccountType.DELIVERY_AMOUNT.getCode()) {
-                    refundAmount = new BigDecimal(data.getAmount().intValue() - orderCostResp.getPrice());
-                }
-            }
-        }
+//        if (isRefundDeliveryFee || isPayBySVC(data)){
+//            return refundAmount;
+//        }
+//        List<AccountBeanV1> accountList = data.getAccountList();
+//        if (CollectionUtils.isNotEmpty(accountList)) {
+//            for (AccountBeanV1 orderCostResp : accountList) {
+//                if (orderCostResp.getType() == OldOrderAccountType.DELIVERY_AMOUNT.getCode()) {
+//                    refundAmount = new BigDecimal(data.getAmount().intValue() - orderCostResp.getPrice());
+//                }
+//            }
+//        }
         return refundAmount;
     }
     /**