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(OrderPayParam param) { - PageParam page = new PageParam<>(param); - page.setDefaultOrder("create_time desc"); - //return success(orderPayService.list(page.getOrderWrapper())); List 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 i List list = baseMapper.selectListRel(param); // 排序 PageParam page = new PageParam<>(); - //page.setDefaultOrder("create_time desc"); + page.setDefaultOrder("pay_time desc"); return page.sortRecords(list); }