Merge branch 'master' of http://120.76.84.145:10101/gitblit/r/java/mx_charg...

无关风月

2024-10-23 cd538c53101fd31982f41e86a6a06e928600a6d6

Merge branch 'master' of http://120.76.84.145:10101/gitblit/r/java/mx_charging_pile

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

@@ -261,6 +261,14 @@
            List<TAppUserCar> data3 = appUserCarClient.getCarByIds(Collections.singletonList(byId.getAppUserCarId())).getData();
            payOrderChargingInfo.setCarNum(data3.get(0).getLicensePlate());
        }
        payOrderChargingInfo.setTChargingOrder(byId);

        Long count = chargingOrderAccountingStrategyService.lambdaQuery().eq(TChargingOrderAccountingStrategy::getChargingOrderId, orderId).count();
        payOrderChargingInfo.setPeriodCount(count);
        List<Long> carid = new ArrayList<>();
        carid.add(byId.getAppUserCarId());
        R<List<TAppUserCar>> carByIds = appUserCarClient.getCarByIds(carid);
        payOrderChargingInfo.setCarNum(carByIds.getData().get(0).getLicensePlate());
        return R.ok(payOrderChargingInfo);
    }


 ruoyi-service/ruoyi-order/src/main/java/com/ruoyi/order/dto/PayOrderChargingInfo.java

@@ -2,6 +2,7 @@

import com.baomidou.mybatisplus.annotation.TableField;
import com.fasterxml.jackson.annotation.JsonFormat;
import com.ruoyi.order.api.model.TChargingOrder;
import io.swagger.annotations.ApiModelProperty;
import lombok.Data;

@@ -34,4 +35,6 @@
    private BigDecimal orderAmount;
    @ApiModelProperty(value = "车牌")
    private String carNum;
    private TChargingOrder tChargingOrder;
    private Long periodCount;
}

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

@@ -478,7 +478,7 @@
//            LocalDate lastDayOfMonth = date.with(TemporalAdjusters.lastDayOfMonth());
            // todo 临时修改为查询昨天凌晨00:00:00 到 23：59：59
            LocalDateTime firstDayOfMonth = LocalDateTime.of(date, LocalTime.MIN);
            LocalDateTime lastDayOfMonth = LocalDateTime.of(date, LocalTime.MIN);
            LocalDateTime lastDayOfMonth = LocalDateTime.of(date, LocalTime.MAX);
            QueryWrapper<TChargingOrder> eq = new QueryWrapper<TChargingOrder>()
                    .between("create_time", firstDayOfMonth, lastDayOfMonth)
                    .eq("status", 5)

 ruoyi-service/ruoyi-order/src/main/java/com/ruoyi/order/util/task/TaskUtil.java

@@ -49,6 +49,7 @@


@Scheduled(cron = "0 0 12 1 * ?")
//@Scheduled(fixedRate = 60000)
    public void taskMonth() {
        try {
            // 获取上个月的开始和结束日期