fix refund

@@ -83,6 +83,7 @@ public class OrderDbDTO {
     private Integer preparingCount;
     private Integer preparingCount;
     private Integer allServedCount;
     private Integer allServedCount;
     private Integer canceledCount;
     private Integer canceledCount;
+    private Integer refundCount;
   }
   }
 
 
   @Data
   @Data

@@ -381,21 +381,17 @@ public class PayServiceClient {
     String signInfo = DigestUtils.sha1Hex(signInfoStr.getBytes());
     String signInfo = DigestUtils.sha1Hex(signInfoStr.getBytes());
 
 
     // 构建请求
     // 构建请求
-    // 设置请求体的媒体类型为JSON
     try {
     try {
-      //        MediaType mediaType = MediaType.parse("application/json; charset=utf-8");
-      //        RequestBody body = RequestBody.create(mediaType, jsonDataString);
-
       String url = businessConfig.getCancelPayUrl() + "?" + "appid=" + appId + "&paycontent=" + payContent + "&signinfo=" + signInfo;
       String url = businessConfig.getCancelPayUrl() + "?" + "appid=" + appId + "&paycontent=" + payContent + "&signinfo=" + signInfo;
       log.info("cancel order pay url:" + url);
       log.info("cancel order pay url:" + url);
-      Request request =
-          new Request.Builder().url(url).get().build();
-      Response payResponse = client.newCall(request).execute();
-      if (payResponse.code() != 200) {
-        throw ClientEndExceptions.BusinessException.build(ErrorCodeEnum.ORDER_PAY_REFUND_FAILED);
-      }
-      String htmlContent = payResponse.body().string();
-      return htmlContent;
+//      Request request =
+//          new Request.Builder().url(url).get().build();
+//      Response payResponse = client.newCall(request).execute();
+//      if (payResponse.code() != 200) {
+//        throw ClientEndExceptions.BusinessException.build(ErrorCodeEnum.ORDER_PAY_REFUND_FAILED);
+//      }
+//      String htmlContent = payResponse.body().string();
+      return url;
     } catch (Exception e) {
     } catch (Exception e) {
       log.error(e.getMessage());
       log.error(e.getMessage());
       throw ClientEndExceptions.BusinessException.build(ErrorCodeEnum.ORDER_PAY_REFUND_FAILED);
       throw ClientEndExceptions.BusinessException.build(ErrorCodeEnum.ORDER_PAY_REFUND_FAILED);

@@ -509,6 +509,7 @@ public class OrderServiceImpl implements OrderService {
                 .preparingCount(response.getCountByStatus().getPreparingCount())
                 .preparingCount(response.getCountByStatus().getPreparingCount())
                 .toPrepareCount(response.getCountByStatus().getToPrepareCount())
                 .toPrepareCount(response.getCountByStatus().getToPrepareCount())
                 .unknownCount(response.getCountByStatus().getUnknownCount())
                 .unknownCount(response.getCountByStatus().getUnknownCount())
+                .refundCount(response.getCountByStatus().getRefundCount())
                 .build();
                 .build();
         return PageUtil.from(results, response.getTotal(), response.getPages(),
         return PageUtil.from(results, response.getTotal(), response.getPages(),
                 queryOrderDto.getPn(), queryOrderDto.getPz(), orderCountByStatus);
                 queryOrderDto.getPn(), queryOrderDto.getPz(), orderCountByStatus);
@@ -582,8 +583,16 @@ public class OrderServiceImpl implements OrderService {
                 .orderNotice(orderNotice)
                 .orderNotice(orderNotice)
                 .build();
                 .build();
         }).collect(Collectors.toList());
         }).collect(Collectors.toList());
+        final var orderCountByStatus = OrderCountByStatusDto.builder()
+            .allServedCount(response.getCountByStatus().getAllServedCount())
+            .canceledCount(response.getCountByStatus().getCanceledCount())
+            .preparingCount(response.getCountByStatus().getPreparingCount())
+            .toPrepareCount(response.getCountByStatus().getToPrepareCount())
+            .unknownCount(response.getCountByStatus().getUnknownCount())
+            .refundCount(response.getCountByStatus().getRefundCount())
+            .build();
         return PageUtil.from(results, response.getTotal(), response.getPages(),
         return PageUtil.from(results, response.getTotal(), response.getPages(),
-            queryOrderDto.getPn(), queryOrderDto.getPz(), OrderCountByStatusDto.builder().build());
+            queryOrderDto.getPn(), queryOrderDto.getPz(), orderCountByStatus);
     }
     }
     private CustomerDetailDto getCustomerDetail(Integer customerId,
     private CustomerDetailDto getCustomerDetail(Integer customerId,
                                                 List<SingleClientCustomerRpcResponse> customers) {
                                                 List<SingleClientCustomerRpcResponse> customers) {

@@ -192,6 +192,7 @@ message OrderCountByStatus {
   int32 preparingCount = 3;
   int32 preparingCount = 3;
   int32 allServedCount = 4;
   int32 allServedCount = 4;
   int32 canceledCount = 5;
   int32 canceledCount = 5;
+  int32 refundCount = 6;
 }
 }
 
 
 message QueryClientCustomerOrdersByPaginationRpcResponse {
 message QueryClientCustomerOrdersByPaginationRpcResponse {