合代码

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

@@ -3487,21 +3487,15 @@ public class OrderServiceImpl implements Orderservice {
         QueryRefundFailuresListDto queryRefundFailuresListDto = queryRefundFailuresListDtoBaseResponse.getResult().get(0);
 
         // 查询订单
-        BaseResponse<OrderInfoReqs> orderResponse = this.checkOrderAndGetOrderBean(queryRefundFailuresListDto.getOrderCode());
+        BaseResponse<OrderBeanV1> orderResponse = this.checkOrderAndGetOrderBean(queryRefundFailuresListDto.getOrderCode());
         if (!Objects.equals(orderResponse.getCode(), ResponseResult.SUCCESS.getCode())) {
             return ResponseUtil.error(ResponseResult.ORDER__ERRORREFUND.getCode(), "订单数据查询失败："+orderResponse.getMessage());
         }
-        OrderInfoReqs orderBean = orderResponse.getResult();
-        List<AfterSalesOrderResp> afterSalesOrderList = orderBean.getAfterSalesOrderList();
-        if(CollectionUtils.isEmpty(afterSalesOrderList)) {
+        OrderBeanV1 orderBean = orderResponse.getResult();
+        AfterSalesOrderResp afterSalesOrderResp = orderBean.getAfterSalesOrderResp();
+        if(afterSalesOrderResp == null) {
             return ResponseUtil.error(ResponseResult.ORDER__ERRORREFUND.getCode(), "不存在售后单信息");
         }
-        Optional<AfterSalesOrderResp> afterSalesOrderRespOptional = afterSalesOrderList.stream().filter(o -> AfterSalesStatus.PENDING.getIndex().equals(o.getAfterSalesStatus())).findFirst();
-        if(!afterSalesOrderRespOptional.isPresent()) {
-            return ResponseUtil.error(ResponseResult.ORDER__ERRORREFUND.getCode(), "没有找到待处理的售后单");
-        }
-        AfterSalesOrderResp afterSalesOrderResp = afterSalesOrderRespOptional.get();
-
 
         String lockKey = "refund_retry_key:" + queryRefundFailuresListDto.getOrderCode();
         try {
@@ -3526,17 +3520,17 @@ public class OrderServiceImpl implements Orderservice {
 
                 RefundFailuresSuccessfulReq refundFailuresSuccessfulReq = new RefundFailuresSuccessfulReq();
                 refundFailuresSuccessfulReq.setId(orderRefundRetryVo.getId());
-                refundFailuresSuccessfulReq.setOrderCode(orderBean.getOrderCode());
-                refundFailuresSuccessfulReq.setPartnerId(orderBean.getPartnerId());
+                refundFailuresSuccessfulReq.setOrderCode(orderBean.getOid());
+                refundFailuresSuccessfulReq.setPartnerId(orderBean.getCompanyId());
                 BaseResponse baseResponse = orderServiceClient.refundFailuresSuccessful(refundFailuresSuccessfulReq);
                 if(!ResponseConstant.SUCCESS_RESPONSE_CODE_STR.equals(baseResponse.getCode())) {
                     return ResponseUtil.error(ResponseResult.ORDER__ERRORREFUND.getCode(), "处理完成但更新记录失败");
                 }
 
                 AfterSalesOperateReq request = new AfterSalesOperateReq();
-                request.setOrderCode(orderBean.getOrderCode());
-                request.setPartnerId(orderBean.getPartnerId());
-                request.setOrderClient(orderBean.getOrderClient());
+                request.setOrderCode(orderBean.getOid());
+                request.setPartnerId(orderBean.getCompanyId());
+                request.setOrderClient(Integer.parseInt(orderBean.getOrderClient()));
                 request.setAfterSalesCode(afterSalesOrderResp.getAfterSalesCode());
                 request.setAfterSerialNo(String.valueOf(orderPayRefundRequest.getRefundId()));
                 request.setAdultRemark("重试退款");