bug修改

无关风月

2024-11-06 b472e4952016fb8934a65b19d76fb5348ff6e176

 ruoyi-service/ruoyi-order/src/main/java/com/ruoyi/order/controller/ChargingBillController.java

@@ -6,6 +6,7 @@
import cn.afterturn.easypoi.excel.entity.enmus.ExcelType;
import com.alibaba.nacos.shaded.com.google.common.collect.Maps;
import com.baomidou.mybatisplus.core.conditions.query.QueryWrapper;
import com.baomidou.mybatisplus.extension.conditions.query.LambdaQueryChainWrapper;
import com.ruoyi.chargingPile.api.feignClient.SiteClient;
import com.ruoyi.chargingPile.api.model.Site;
import com.ruoyi.common.core.domain.R;
@@ -64,8 +65,25 @@
    private SiteClient siteClient;
    @Resource
    private TChargingOrderService chargingOrderService;
//    @GetMapping(value = "/test")
//    public R accountAdd() {
    @Resource
    private TChargingOrderRefundService tChargingOrderRefundService;
    @Resource
    private TChargingBillService tChargingBillService;
    @GetMapping(value = "/test")
    public R accountAdd() {
        List<TChargingBill> list = tChargingBillService.lambdaQuery().list();
        for (TChargingBill tChargingBill : list) {
            tChargingBill.setStatus(2);
        }
        tChargingBillService.updateBatchById(list);
//        List<TChargingOrder> list = chargingOrderService.lambdaQuery().list();
//        for (TChargingOrder chargingOrder : list) {
//            chargingOrder.setSharingAmount(new BigDecimal("0"));
//            List<TChargingOrderRefund> list1 = tChargingOrderRefundService.lambdaQuery().eq(TChargingOrderRefund::getChargingOrderId, chargingOrder.getId()).list();
//            tChargingOrderRefundService.removeBatchByIds(list1);
//            chargingOrderService.removeById(chargingOrder);
//        }
//        chargingOrderService.updateBatchById(list);
//        TChargingBill tChargingBill = new TChargingBill();
//        Random random = new Random();
//        String randomDigits = random.ints(10, 0, 10) // 生成10个随机数字，范围在0-9
@@ -119,8 +137,8 @@
//        tChargingBill14.setOrderState(2);
//        tChargingBill14.setBillType(2);
//        chargingBillService.save(tChargingBill14);
//        return R.ok();
//    }
        return R.ok();
    }
    @PostMapping(value = "/accountBillList")
    @ApiOperation(value = "列表查询", tags = {"管理后台-账户结算账单"})
    public R<AccountListVO> accountBillList(@RequestBody ChargingListQuery dto) {
@@ -286,8 +304,6 @@
        }
    }

    @Autowired
    private TChargingOrderRefundService tChargingOrderRefundService;
    @ApiOperation(value = "下载-未出账", tags = {"管理后台-充电算账单"})
    @PutMapping("/download")
    public void download(@RequestBody ExportUidDto uid)
@@ -352,7 +368,7 @@
            // 账单信息
            paymentAmount = paymentAmount.add(tChargingOrder.getRechargeAmount());
            commissionAmount = commissionAmount.add(tChargingOrder.getPaymentAmount().multiply(bigDecimal1).setScale(2, BigDecimal.ROUND_DOWN));
            sharingAmount = sharingAmount.add(tChargingOrder.getSharingAmount());
            sharingAmount = sharingAmount.add(tChargingOrder.getSharingAmount()!=null?tChargingOrder.getSharingAmount():new BigDecimal("0"));
            // 退款信息
            ChargingBillRefundExport chargingBillRefundExport = new ChargingBillRefundExport();
            ChargingBillPayExport chargingBillPayExport = new ChargingBillPayExport();