From 8e5a0e0fa9f9cbd31bb1d3a6a863ce5efe1b056b Mon Sep 17 00:00:00 2001
From: yangqingyuan <yangqingyuan@163.com>
Date: Sun, 15 Sep 2024 19:07:00 +0800
Subject: [PATCH] =?UTF-8?q?feat=EF=BC=9A=E7=BB=AD=E8=B4=B9=E8=AE=A2?=
 =?UTF-8?q?=E5=8D=95=E4=BF=AE=E6=94=B9=E7=BB=AD=E6=9C=9F=E6=9C=9F=E6=95=B0?=
 =?UTF-8?q?=EF=BC=8C=E5=B9=B6=E6=8C=89=E7=85=A7=E6=94=AF=E4=BB=98=E6=97=B6?=
 =?UTF-8?q?=E9=97=B4=E9=99=8D=E5=BA=8F?=
MIME-Version: 1.0
Content-Type: text/plain; charset=UTF-8
Content-Transfer-Encoding: 8bit

---
 .../gxwebsoft/shop/controller/OrderPayController.java  | 10 +++++-----
 .../shop/service/impl/OrderPayServiceImpl.java         |  2 +-
 2 files changed, 6 insertions(+), 6 deletions(-)

diff --git a/src/main/java/com/gxwebsoft/shop/controller/OrderPayController.java b/src/main/java/com/gxwebsoft/shop/controller/OrderPayController.java
index bab5419..a928463 100644
--- a/src/main/java/com/gxwebsoft/shop/controller/OrderPayController.java
+++ b/src/main/java/com/gxwebsoft/shop/controller/OrderPayController.java
@@ -31,13 +31,13 @@ import com.gxwebsoft.shop.service.OrderService;
 import io.swagger.annotations.Api;
 import io.swagger.annotations.ApiOperation;
 import lombok.extern.slf4j.Slf4j;
-import org.springframework.security.access.prepost.PreAuthorize;
 import org.springframework.web.bind.annotation.*;
 
 import javax.annotation.Resource;
 import java.math.BigDecimal;
 import java.util.Date;
 import java.util.List;
+import java.util.concurrent.atomic.AtomicInteger;
 
 import static com.gxwebsoft.common.core.constants.OrderConstants.ORDER_STATUS_OVER;
 import static com.gxwebsoft.common.core.constants.OrderConstants.PAY_STATUS_NO_PAY;
@@ -78,11 +78,7 @@ public class OrderPayController extends BaseController {
 
     @GetMapping()
     public ApiResult<List<OrderPay>> list(OrderPayParam param) {
-        PageParam<OrderPay, OrderPayParam> page = new PageParam<>(param);
-        page.setDefaultOrder("create_time desc");
-        //return success(orderPayService.list(page.getOrderWrapper()));
         List<OrderPay> orderPays =  orderPayService.listRel(param);
-
         if (null != param.getRentOrderId() && 0 != param.getRentOrderId()) {//如果是单个查询
             Order order = orderService.getById(param.getRentOrderId());
             if (null != order && !orderPays.isEmpty()) {
@@ -91,6 +87,10 @@ public class OrderPayController extends BaseController {
                     orderPay.setIsFreeze(order.getIsFreeze());
                 });
             }
+            if (!CollectionUtil.isEmpty(orderPays)) {
+                AtomicInteger counter = new AtomicInteger(orderPays.size());
+                orderPays.forEach(orderPay -> orderPay.setCurrPeriods(counter.getAndDecrement())); //注意：原来的期数计算数有问题的，这里直接用这里方式
+            }
         }
         // 使用关联查询
         return success(orderPays);
diff --git a/src/main/java/com/gxwebsoft/shop/service/impl/OrderPayServiceImpl.java b/src/main/java/com/gxwebsoft/shop/service/impl/OrderPayServiceImpl.java
index d337247..e8ff5f2 100644
--- a/src/main/java/com/gxwebsoft/shop/service/impl/OrderPayServiceImpl.java
+++ b/src/main/java/com/gxwebsoft/shop/service/impl/OrderPayServiceImpl.java
@@ -33,7 +33,7 @@ public class OrderPayServiceImpl extends ServiceImpl<OrderPayMapper, OrderPay> i
         List<OrderPay> list = baseMapper.selectListRel(param);
         // 排序
         PageParam<OrderPay, OrderPayParam> page = new PageParam<>();
-        //page.setDefaultOrder("create_time desc");
+        page.setDefaultOrder("pay_time desc");
         return page.sortRecords(list);
     }