明星电力充电桩
blame | 历史 | 补丁 | 提交 | 提交对比 | ignore whitespace
无关风月
2024-09-12 f7042f313660010345f199d62afb6e3aeb8b5194 
 ruoyi-service/ruoyi-order/src/main/java/com/ruoyi/order/service/impl/TShoppingOrderServiceImpl.java


@@ -201,7 +201,8 @@


            wrapper.eq(TShoppingOrder::getStatus, query.getStatus());


        }


        long count = this.count(wrapper);


        List<TShoppingOrder> list = this.list(wrapper.orderByDesc(TShoppingOrder::getCreateTime).last(" limit " + query.getPageCurr() + ", " + query.getPageSize()));


        Integer pageCurr = (query.getPageCurr() - 1) * query.getPageSize();


        List<TShoppingOrder> list = this.list(wrapper.orderByDesc(TShoppingOrder::getCreateTime).last(" limit " + pageCurr + ", " + query.getPageSize()));


        List<MyShoppingOrderList> pageList = new ArrayList<>();


        for (TShoppingOrder tShoppingOrder : list) {


            MyShoppingOrderList myShoppingOrderList = new MyShoppingOrderList();


@@ -347,7 +348,7 @@


        shoppingOrderRefund.setPayType(shoppingOrder.getPaymentType());


        shoppingOrderRefund.setShoppingOrderId(shoppingOrder.getId());


        SimpleDateFormat sdf = new SimpleDateFormat("yyyyMMddHHmmssSSS");


        shoppingOrderRefund.setRefundCode("GDF" + sdf.format(new Date()) + (Math.random() * 1000));


        shoppingOrderRefund.setRefundCode("GDF" + sdf.format(new Date()) + Double.valueOf((Math.random() * 1000)).intValue());


        shoppingOrderRefund.setRefundAmount(refundAmount);


        shoppingOrderRefund.setRefundStatus(1);


        shoppingOrderRefund.setCode(shoppingOrder.getCode());


@@ -447,7 +448,8 @@


    @Override


    public List<MyShoppingOrderList> getNoInvoicedOrder(GetNoInvoicedOrder query) {


        Long userId = tokenService.getLoginUserApplet().getUserId();


        List<TShoppingOrder> list = this.baseMapper.getNoInvoicedOrder(userId, query.getMonth(), query.getPageCurr(), query.getPageSize());


        Integer pageCurr = (query.getPageCurr() - 1) * query.getPageSize();


        List<TShoppingOrder> list = this.baseMapper.getNoInvoicedOrder(userId, query.getMonth(), pageCurr, query.getPageSize());


        List<MyShoppingOrderList> pageList = new ArrayList<>();


        for (TShoppingOrder tShoppingOrder : list) {


            MyShoppingOrderList myShoppingOrderList = new MyShoppingOrderList();