修改检测退款逻辑

@@ -54,36 +54,34 @@ public class CheckRefundStatusBizServiceImpl extends AbstractBizService<CheckRef
         if(!StringUtil.isNull(memberProductBackList) && !memberProductBackList.isEmpty()){
             MemberProductBack memberProductBack = memberProductBackList.stream().findFirst().get();
             PineappleRefundEnum refundEnum = PineappleRefundEnum.resolveByPlatformRefundStatus(memberProductBack.getStateReturn());
-            //不予理会表示没有退款
-            if(!StringUtil.isNull(refundEnum) && PineappleRefundEnum.JH_05.getCode() != refundEnum.getCode()){
-                //如果退款状态是店铺收货需要判断该退款信息是否已付款
-                if(memberProductBack.getStateReturn().intValue() == MemberProductBackEnum.ShopDelivery.getCode()){
-                    if(memberProductBack.getStateMoney() == 1){
-                        checkRefundStatusResponse.setRefundStatus(PineappleRefundEnum.JH_99.getCode());
-                        checkRefundStatusResponse.setSubmessage(PineappleRefundEnum.JH_99.getMsg());
-                        checkRefundStatusResponse.setRefundStatusdescription(PineappleRefundEnum.JH_99.getMsg());
-                        checkRefundStatusResponse.setChildrenrefundStatus(new ArrayList());
-                        checkRefundStatusResponse.setCode(PineappleEnum.SUCCESS.getCode());
-                        checkRefundStatusResponse.setMessage(PineappleEnum.SUCCESS.getMsg());
-                        return checkRefundStatusResponse;
-                    }else{
-                        checkRefundStatusResponse.setRefundStatus(PineappleRefundEnum.JH_06.getCode());
-                        checkRefundStatusResponse.setSubmessage(PineappleRefundEnum.JH_06.getMsg());
-                        checkRefundStatusResponse.setRefundStatusdescription(PineappleRefundEnum.JH_06.getMsg());
-                        checkRefundStatusResponse.setChildrenrefundStatus(new ArrayList());
-                        checkRefundStatusResponse.setCode(PineappleEnum.SUCCESS.getCode());
-                        checkRefundStatusResponse.setMessage(PineappleEnum.SUCCESS.getMsg());
-                        return checkRefundStatusResponse;
-                    }
+            //如果退款状态是店铺收货需要判断该退款信息是否已付款
+            if(memberProductBack.getStateReturn().intValue() == MemberProductBackEnum.ShopDelivery.getCode()){
+                if(memberProductBack.getStateMoney() == 1){
+                    checkRefundStatusResponse.setRefundStatus(PineappleRefundEnum.JH_99.getCode());
+                    checkRefundStatusResponse.setSubmessage(PineappleRefundEnum.JH_99.getMsg());
+                    checkRefundStatusResponse.setRefundStatusdescription(PineappleRefundEnum.JH_99.getMsg());
+                    checkRefundStatusResponse.setChildrenrefundStatus(new ArrayList());
+                    checkRefundStatusResponse.setCode(PineappleEnum.SUCCESS.getCode());
+                    checkRefundStatusResponse.setMessage(PineappleEnum.SUCCESS.getMsg());
+                    return checkRefundStatusResponse;
+                }else{
+                    checkRefundStatusResponse.setRefundStatus(PineappleRefundEnum.JH_06.getCode());
+                    checkRefundStatusResponse.setSubmessage(PineappleRefundEnum.JH_06.getMsg());
+                    checkRefundStatusResponse.setRefundStatusdescription(PineappleRefundEnum.JH_06.getMsg());
+                    checkRefundStatusResponse.setChildrenrefundStatus(new ArrayList());
+                    checkRefundStatusResponse.setCode(PineappleEnum.SUCCESS.getCode());
+                    checkRefundStatusResponse.setMessage(PineappleEnum.SUCCESS.getMsg());
+                    return checkRefundStatusResponse;
                 }
-                checkRefundStatusResponse.setRefundStatus(refundEnum.getCode());
-                checkRefundStatusResponse.setSubmessage(refundEnum.getMsg());
-                checkRefundStatusResponse.setRefundStatusdescription(refundEnum.getMsg());
-                checkRefundStatusResponse.setChildrenrefundStatus(new ArrayList());
-                checkRefundStatusResponse.setCode(PineappleEnum.SUCCESS.getCode());
-                checkRefundStatusResponse.setMessage(PineappleEnum.SUCCESS.getMsg());
-                return checkRefundStatusResponse;
             }
+            checkRefundStatusResponse.setRefundStatus(refundEnum.getCode());
+            checkRefundStatusResponse.setSubmessage(refundEnum.getMsg());
+            checkRefundStatusResponse.setRefundStatusdescription(refundEnum.getMsg());
+            checkRefundStatusResponse.setChildrenrefundStatus(new ArrayList());
+            checkRefundStatusResponse.setCode(PineappleEnum.SUCCESS.getCode());
+            checkRefundStatusResponse.setMessage(PineappleEnum.SUCCESS.getMsg());
+            return checkRefundStatusResponse;
+
         }
         //2.查询换货表有没有记录
         List<MemberProductExchange> memberProductExchangeList = memberReadDao.getMemberProductExchangeByOrderSn(callRequest.getBizModel().getOrderID());