合并代码

Pu Zhibing

2024-10-28 72a76cd3ad51a520100ec59481d99118ffebd33c

 ruoyi-service/ruoyi-order/src/main/java/com/ruoyi/order/service/impl/TOrderInvoiceServiceImpl.java

@@ -162,9 +162,11 @@
   public List<OrderInvoiceList> getMyOrderInvoiceList(GetOrderInvoiceList query) {
      Long userId = tokenService.getLoginUserApplet().getUserId();
      Integer pageCurr = (query.getPageCurr() - 1) * query.getPageSize();
      List<TOrderInvoice> list = this.list(new LambdaQueryWrapper<TOrderInvoice>().eq(TOrderInvoice::getAppUserId, userId)
            .eq(TOrderInvoice::getStatus, query.getStatus()).orderByDesc(TOrderInvoice::getCreateTime)
            .last(" limit " + pageCurr + ", " + query.getPageSize()));
      LambdaQueryWrapper<TOrderInvoice> wrapper = new LambdaQueryWrapper<TOrderInvoice>().eq(TOrderInvoice::getAppUserId, userId);
      if(query.getStatus() != 1){
         wrapper.eq(TOrderInvoice::getStatus, query.getStatus());
      }
      List<TOrderInvoice> list = this.list(wrapper.orderByDesc(TOrderInvoice::getCreateTime).last(" limit " + pageCurr + ", " + query.getPageSize()));
      List<OrderInvoiceList> pageList = new ArrayList<>();
      for (TOrderInvoice tOrderInvoice : list) {
         OrderInvoiceList orderInvoiceList = new OrderInvoiceList();
@@ -216,6 +218,8 @@
            BigDecimal payMoney = tChargingOrder.getStatus() < 4 ? tChargingOrder.getRechargeAmount() : tChargingOrder.getPaymentAmount();
            myChargingOrderList.setPayMoney(payMoney);
            myChargingOrderList.setCreateTime(tChargingOrder.getCreateTime().format(DateTimeFormatter.ofPattern("yyyy.MM.dd HH:mm:ss")));
            myChargingOrderList.setElectricCharge(tChargingOrder.getElectrovalence());
            myChargingOrderList.setServiceCharge(tChargingOrder.getServiceCharge());
            chargingOrder.add(myChargingOrderList);
         }
         myOrderInvoiceInfo.setChargingOrder(chargingOrder);