Merge branches 'feature/20220622_退款失败记录到订单_wuping' and 'qa' of…

Merge branches 'feature/20220622_退款失败记录到订单_wuping' and 'qa' of http://gitlab.freemud.com/order-group-application/order-group into qa

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

@@ -447,16 +447,14 @@ public class OrderVerifyHandle {
      */
     public BaseResponse orderRejectRefund(OrderBeanV1 orderBean, OrderManagerRequest request) {
         //判断当前订单是否发起退款
-        if (orderBean.getHasRefund() == null || !orderBean.getHasRefund()) {
+        if (orderBean.getHasRefund() == null || !orderBean.getHasRefund() || orderBean.getAfterSalesOrderResp() == null) {
             return ResponseUtil.error(ResponseResult.ORDER_REFUND_NOT_APPLY);
         }
-        //判断该当前订单是否已经退款
-        List<RefundBeanV1> list = orderBean.getRefundList();
-        if (ObjectUtils.equals(list.get(list.size() - 1).getStatus(), 5)) {
+        if (ObjectUtils.equals(AfterSalesStatus.COMPLETE.getIndex(), orderBean.getAfterSalesOrderResp().getAfterSalesStatus())) {
             return ResponseUtil.error(ResponseResult.ORDER_REJECT_REFUND_REPETITION);
         }
         //订单不是申请退款中，不能操作
-        if (ObjectUtils.notEqual(list.get(list.size() - 1).getStatus(), 1)) {
+        if  (ObjectUtils.notEqual(AfterSalesStatus.PENDING.getIndex(), orderBean.getAfterSalesOrderResp().getAfterSalesStatus())) {
             return ResponseUtil.error(ResponseResult.ORDER_REJECT_REFUND_STATUS_NOT);
         }
         //新订单，已完成，取消订单不能操作