Merge branch 'feature/20201015_麦咖啡允许重复申请退款_xukang' into qa

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

@@ -19,6 +19,7 @@ import com.freemud.sdk.api.assortment.order.adapter.OrderSdkAdapter;
 import com.freemud.sdk.api.assortment.order.domain.ResponseCodeConstant;
 import com.freemud.sdk.api.assortment.message.enums.OrderType;
 import com.freemud.sdk.api.assortment.order.enums.OldOrderAccountType;
+import com.freemud.sdk.api.assortment.order.enums.RefundStatus;
 import com.freemud.sdk.api.assortment.order.request.order.CancelOrderRequest;
 import com.freemud.sdk.api.assortment.order.response.order.BaseOrderResponse;
 import com.freemud.sdk.api.assortment.order.response.order.QueryOrdersResponse;
@@ -260,9 +261,13 @@ public class OrderVerifyHandle {
         if (ObjectUtils.equals(OrderStatus.CANCEL.getCode(), orderBean.getStatus())) {
             return ResponseUtil.error(ResponseResult.ORDER_HAS_CANCELED);
         }
-        if(CollectionUtils.isNotEmpty(orderBean.getRefundList())
-                && orderBean.getRefundList().get(orderBean.getRefundList().size() - 1).getStatus() != 1) {
-            return ResponseUtil.error(ResponseResult.ORDER_REFUND_NOT_APPLY);
+        for (QueryOrdersResponse.DataBean.OrderBean.RefundBean refundBean : orderBean.getRefundList()) {
+            if(RefundStatus.APPLY_REFUND.getCode().equals(refundBean.getStatus())) {
+                return ResponseUtil.success();
+            }
+            if(RefundStatus.COMPLETE_REFUND.getCode().equals(refundBean.getStatus())) {
+                return ResponseUtil.error(ResponseResult.AGREE_REFUND_ORDER_FAIL.getCode(), "订单已经退款完成，不能重复申请");
+            }
         }
         return ResponseUtil.success();
     }

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

@@ -211,11 +211,12 @@ public class SaasOrderHandle {
                 } else {
                     baseOrderResponse = orderCenterSdkService.refundReturn(refundAgreeRequest);
                 }
-            }
-            if (RefundStatus.COMPLETE_REFUND.getCode().equals(orderBean.getRefundList().get(i).getStatus())) {
+                break;
+            } else if (RefundStatus.COMPLETE_REFUND.getCode().equals(orderBean.getRefundList().get(i).getStatus())) {
                 baseOrderResponse = new BaseOrderResponse();
-                baseOrderResponse.setErrcode(100);
-                baseOrderResponse.setErrmsg("success");
+                baseOrderResponse.setErrcode(Integer.valueOf(ResponseResult.AGREE_REFUND_ORDER_FAIL.getCode()));
+                baseOrderResponse.setErrmsg("订单已经退款完成，不能重复申请");
+                break;
             }
         }
         if(null == baseOrderResponse) {