修改bug

puzhibing

23 小时以前 63b68c39653208a1756640034c028789946d0e12

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

@@ -42,6 +42,7 @@
import com.ruoyi.common.core.web.domain.AjaxResult;
import com.ruoyi.common.core.web.page.PageInfo;
import com.ruoyi.order.api.dto.ChargingStatisticeDTO;
import com.ruoyi.order.api.dto.DeviceStartChargingDTO;
import com.ruoyi.order.api.model.*;
import com.ruoyi.order.api.query.ChargingOrderQuery;
import com.ruoyi.common.core.dto.MongoChargingOrderQuery;
@@ -128,6 +129,10 @@

    @Resource
    private TChargingOrderService chargingOrderService;
    @Resource
    private TCardChargingOrderService cardChargingOrderService;
    @Resource
    private TVinChargingOrderService vinChargingOrderService;
    @Autowired
    private TokenService tokenService;
    @Autowired
@@ -278,17 +283,59 @@
        result.put("electricityFee", electricity);
        result.put("serviceFee", service);
        result.put("incomeColumn", franchiseeIncomeTrendFromSix(sixChargingDtos));
        List<Map<String, Object>> incomePie = new ArrayList<>();
        Map<String, Object> electricityItem = new LinkedHashMap<>();
        electricityItem.put("name", "充电费");
        electricityItem.put("value", electricity);
        incomePie.add(electricityItem);
        Map<String, Object> serviceItem = new LinkedHashMap<>();
        serviceItem.put("name", "服务费");
        serviceItem.put("value", service);
        incomePie.add(serviceItem);
        result.put("incomePie", incomePie);
        // 电站收入占比：口径与后台 /six/circle 一致（近6月结算账单按站点分组，电费+服务费-三方佣金）
        result.put("incomePie", franchiseeIncomePieBySite(siteIds));
        return R.ok(result);
    }

    /** 加盟商看板"电站收入占比"：复用 /six/circle 统计口径，按金额降序返回站点占比列表 */
    private List<Map<String, Object>> franchiseeIncomePieBySite(List<Integer> siteIds) {
        List<Map<String, Object>> incomePie = new ArrayList<>();
        if (siteIds == null || siteIds.isEmpty()) {
            return incomePie;
        }
        List<SixCircleDto> circleDtos = chargingOrderService.circle(siteIds, PreviousSixMonths.get(), false);
        if (circleDtos == null || circleDtos.isEmpty()) {
            return incomePie;
        }
        // 站点名批量映射，避免逐个远程调用
        Map<Integer, String> siteNameMap = new HashMap<>();
        R<List<Site>> siteResult = siteClient.getSiteAll();
        List<Site> sites = siteResult == null ? null : siteResult.getData();
        if (sites != null) {
            for (Site site : sites) {
                if (site != null && site.getId() != null) {
                    siteNameMap.put(site.getId(), site.getName());
                }
            }
        }
        circleDtos.sort((a, b) -> {
            BigDecimal amountA = a == null || a.getPaymentAmount() == null ? BigDecimal.ZERO : a.getPaymentAmount();
            BigDecimal amountB = b == null || b.getPaymentAmount() == null ? BigDecimal.ZERO : b.getPaymentAmount();
            return amountB.compareTo(amountA);
        });
        // 总额用于计算各站点占比，name+value 为服务端拼好的饼图标签文本（站点名 xx.x%）
        BigDecimal total = BigDecimal.ZERO;
        for (SixCircleDto dto : circleDtos) {
            if (dto != null && dto.getPaymentAmount() != null) {
                total = total.add(dto.getPaymentAmount());
            }
        }
        for (SixCircleDto dto : circleDtos) {
            if (dto == null || dto.getSiteId() == null || dto.getPaymentAmount() == null) {
                continue;
            }
            Map<String, Object> item = new LinkedHashMap<>();
            String name = siteNameMap.getOrDefault(dto.getSiteId(), "电站" + dto.getSiteId());
            item.put("name", name);
            item.put("value", dto.getPaymentAmount());
            String percent = total.compareTo(BigDecimal.ZERO) > 0
                    ? dto.getPaymentAmount().multiply(BigDecimal.valueOf(100)).divide(total, 1, RoundingMode.HALF_UP).toPlainString()
                    : "0.0";
            item.put("name+value", name + " " + percent + "%");
            incomePie.add(item);
        }
        return incomePie;
    }

    @PostMapping("/app/franchisee/user")
@@ -1137,6 +1184,7 @@


    @ResponseBody
    @RequiresPermissions(value = {"/paymentOrder/refund", "/paymentOrder/refund/select"}, logical = Logical.OR)
    @PostMapping(value = "/pay/order/refund")
    @ApiOperation(value = "退款", tags = {"管理后台-支付订单-订单信息"})
    public R refund(@RequestBody PayOrderRefundDto payOrderQueryDto) {
@@ -1233,6 +1281,7 @@


    @ResponseBody
    @RequiresPermissions(value = {"/paymentOrder/refund", "/paymentOrder/refund/select"}, logical = Logical.OR)
    @GetMapping(value = "/pay/order/refund/detail")
    @ApiOperation(value = "退款信息", tags = {"管理后台-支付订单-订单信息"})
    public R refundDetail(Long orderId, Integer type) {
@@ -1253,6 +1302,7 @@
    }

    @ResponseBody
    @RequiresPermissions(value = {"/paymentOrder/order"}, logical = Logical.OR)
    @GetMapping(value = "/pay/order/charging")
    @ApiOperation(value = "充电信息", tags = {"管理后台-支付订单-订单信息"})
    public R<PayOrderChargingInfo> refundDetail(Long orderId) {
@@ -1284,6 +1334,7 @@
    }

    @ResponseBody
    @RequiresPermissions(value = {"/paymentOrder/order"}, logical = Logical.OR)
    @GetMapping(value = "/pay/order/charging/details")
    @ApiOperation(value = "充电明细", tags = {"管理后台-支付订单-订单信息"})
    public R<List<TChargingOrderAccountingStrategy>> chargingDetail(Long orderId) {
@@ -1434,6 +1485,8 @@
        chargingOrderInfoVO.setCdVoltage(byId.getVoltage()!=null?byId.getVoltage().setScale(2, BigDecimal.ROUND_HALF_DOWN)+"":"");
        chargingOrderInfoVO.setSurplus(byId.getTotalElectricity()!=null?byId.getTotalElectricity().setScale(2, BigDecimal.ROUND_HALF_DOWN)+"":"");
        chargingOrderInfoVO.setTotalPower(byId.getPower()!=null?byId.getPower().setScale(2, BigDecimal.ROUND_HALF_DOWN)+"":"");
        chargingOrderInfoVO.setVin(byId.getActualVin());
        chargingOrderInfoVO.setActualVin(byId.getActualVin());
        if (byId.getAppUserCarId()!=null){
            TAppUserCar data = appUserCarClient.getCarById(byId.getAppUserCarId()+"").getData();
            if (data!=null){
@@ -1737,14 +1790,21 @@
    }
    
    /**
     * 远程启动充电应答
     * 远程启动充电应答（按订单号前缀路由：SD=刷卡订单，VD=VIN订单，其余=普通订单）
     * @param message
     */
    @ResponseBody
    @PostMapping(value = "/startChargeSuccessfully")
    public void startChargeSuccessfully(@RequestBody PlatformStartChargingReplyMessageVO message){
        log.info("-------------------远程启动充电请求应答-------------------：" + message);
        chargingOrderService.startChargeSuccessfully(message);
        String orderCode = message == null ? null : message.getTransaction_serial_number();
        if (isCardOrder(orderCode)) {
            cardChargingOrderService.cardStartChargeSuccessfully(message);
        } else if (isVinOrder(orderCode)) {
            vinChargingOrderService.vinStartChargeSuccessfully(message);
        } else {
            chargingOrderService.startChargeSuccessfully(message);
        }
    }
    
    
@@ -1852,28 +1912,53 @@
    })
    public AjaxResult stopCharging(@PathVariable String id) {
        log.info("小程序主动发起停止充电，订单ID：{}", id);
        // VIN 码充电订单路由：VD 订单存于 t_vin_charging_order，不在 t_charging_order；
        // VD 表存在该 ID 订单时优先走 VIN 停充（内部按状态返回准确的“不能重复操作/还未开始充电”），
        // 其余情况回落普通停充。雪花 ID 两表同源生成，撞号概率可忽略
        TVinChargingOrder vinOrder = null;
        try {
            vinOrder = vinChargingOrderService.getById(Long.valueOf(id));
        } catch (NumberFormatException ignored) {
            // 非数字订单ID，按普通停充处理
        }
        if (vinOrder != null) {
            return vinChargingOrderService.stopChargingByApplet(id);
        }
        return chargingOrderService.stopCharging(id);
    }
    
    
    /**
     * 停止充电应答处理逻辑
     * 停止充电应答处理逻辑（普通订单原逻辑 + VIN订单按枪兜底确认）
     * @param platformStopChargingReply
     */
    @PostMapping("/terminateSuccessfulResponse")
    public void terminateSuccessfulResponse(@RequestBody PlatformStopChargingReplyVO platformStopChargingReply){
        log.info("-------------------远程停止充电请求应答-------------------：" + platformStopChargingReply);
        // VIN订单平台停止应答兜底（按枪定位停止中订单，内部自带空判断，不影响普通订单处理）
        try {
            vinChargingOrderService.vinTerminateStopByReply(platformStopChargingReply);
        } catch (Exception ex) {
            log.error("VIN订单停止应答处理异常：", ex);
        }
        chargingOrderService.terminateSuccessfulResponse(platformStopChargingReply);
    }
    
    


    /**
     * 停止充电返回账单后计算费用
     * 停止充电返回账单后计算费用（按订单号前缀路由：SD=刷卡订单，VD=VIN订单，其余=普通订单）
     * @param vo
     */
    @PostMapping("/endChargeBillingCharge")
    public R endChargeBillingCharge(@RequestBody TransactionRecordMessageVO vo){
        log.info("-------------------停止充电返回账单后计算费用及修改业务状态-------------------：" + vo);
        String orderCode = vo == null ? null : vo.getTransaction_serial_number();
        if (isCardOrder(orderCode)) {
            return cardChargingOrderService.cardEndChargeBillingCharge(vo);
        }
        if (isVinOrder(orderCode)) {
            return vinChargingOrderService.vinEndChargeBillingCharge(vo);
        }
        return chargingOrderService.endChargeBillingCharge(vo);
    }

@@ -2252,29 +2337,145 @@
    }
    
    /**
     * 处理充电订单实时监控数据相关的业务逻辑
     * 处理充电订单实时监控数据相关的业务逻辑（按订单号前缀路由）
     * @param query
     */
    @PostMapping("/chargeMonitoring")
    public void chargeMonitoring(@RequestBody UploadRealTimeMonitoringDataQuery query){
        chargingOrderService.chargeMonitoring(query);
        String orderCode = query == null ? null : query.getTransaction_serial_number();
        if (isCardOrder(orderCode)) {
            cardChargingOrderService.cardChargeMonitoring(query);
        } else if (isVinOrder(orderCode)) {
            vinChargingOrderService.vinChargeMonitoring(query);
        } else {
            chargingOrderService.chargeMonitoring(query);
        }
    }
    /**
     * 通过流水号查询订单
     * 通过流水号查询订单（统一前缀路由：SD=刷卡订单，VD=VIN订单，其余=普通订单）
     * <p>设备链路（实时监控/BMS需求/交易记录确认等）统一经此按订单号前缀取三类订单，
     * SD/VD 订单实体继承自 TChargingOrder，字段兼容直接返回。</p>
     * @param code
     * @return
     */
    @PostMapping(value = "/getOrderByCode/{code}")
    public R<TChargingOrder> getOrderByCode(@PathVariable("code") String code){
        TChargingOrder one = chargingOrderService.getOne(Wrappers.lambdaQuery(TChargingOrder.class)
                .eq(TChargingOrder::getCode, code));
        TChargingOrder one;
        if (isCardOrder(code)) {
            one = cardChargingOrderService.getCardOrderByCode(code);
        } else if (isVinOrder(code)) {
            one = vinChargingOrderService.getVinOrderByCode(code);
        } else {
            one = chargingOrderService.getOne(Wrappers.lambdaQuery(TChargingOrder.class)
                    .eq(TChargingOrder::getCode, code));
        }
        if (one == null) {
            return R.ok(null);
        }
        one.setIdStr(one.getId().toString());
        return R.ok(one);
    }
    
    
    
    

    @PostMapping("/updateHandshakeVin")
    public R<Boolean> updateHandshakeVin(@RequestParam("orderCode") String orderCode,
                                         @RequestParam("vin") String vin) {
        if (StringUtils.isEmpty(orderCode)) {
            return R.ok(false);
        }
        boolean updated;
        if (orderCode.startsWith("CD")) {
            updated = StringUtils.isNotEmpty(vin) && chargingOrderService.update(Wrappers.<TChargingOrder>lambdaUpdate()
                    .eq(TChargingOrder::getCode, orderCode)
                    .set(TChargingOrder::getActualVin, vin));
        } else if (orderCode.startsWith("SD")) {
            // SD/VD：VIN 为空也进入握手处理（状态推进必达）；服务内部仅非空回写 VIN，且仅状态=启动中(2)才推进
            updated = cardChargingOrderService.handleHandshakeVin(orderCode, vin);
        } else if (orderCode.startsWith("VD")) {
            updated = vinChargingOrderService.handleHandshakeVin(orderCode, vin);
        } else {
            log.warn("握手VIN回写失败，未知订单类型：{}", orderCode);
            return R.ok(false);
        }
        return R.ok(updated);
    }

    /**
     * 设备链路订单号前缀判断：SD=刷卡充电订单
     */
    private boolean isCardOrder(String orderCode) {
        return orderCode != null && orderCode.startsWith("SD");
    }

    /**
     * 设备链路订单号前缀判断：VD=VIN码充电订单
     */
    private boolean isVinOrder(String orderCode) {
        return orderCode != null && orderCode.startsWith("VD");
    }

    /**
     * 设备主动发起充电（刷卡/VIN码）鉴权建单统一入口。
     * <p>协议 start_method：1=刷卡（创建SD订单），2=账号启动（暂不支持），3=VIN码（创建VD订单）。</p>
     */
    @PostMapping("/inner/device-start-charging")
    public R<DeviceStartChargingVO> deviceStartCharging(@RequestBody DeviceStartChargingDTO dto) {
        if (dto == null || dto.getStartMethod() == null) {
            log.warn("[设备启动] 缺少启动方式，拒绝建单 dto={}", dto);
            return R.ok(DeviceStartChargingVO.fail(null));
        }
        DeviceStartChargingVO result;
        switch (dto.getStartMethod()) {
            case 1:
                result = cardChargingOrderService.startCardCharging(dto);
                break;
            case 3:
                result = vinChargingOrderService.startVinCharging(dto);
                break;
            case 2:
                // 账号启动暂不支持（协议无对应失败码，按最接近的“账户不存在”返回）
                log.warn("[设备启动] 账号启动方式暂不支持 pile={} account={}", dto.getChargingPileCode(), dto.getAccount());
                result = DeviceStartChargingVO.fail(1);
                break;
            default:
                log.warn("[设备启动] 未知启动方式 startMethod={} pile={} gun={}",
                        dto.getStartMethod(), dto.getChargingPileCode(), dto.getChargingGunCode());
                result = DeviceStartChargingVO.fail(null);
                break;
        }
        return R.ok(result);
    }

    /**
     * 内部接口：统计公司名下进行中充电订单数（三表合计，状态 2=启动中/3=充电中/4=停止中，
     * 账户模式切换：分配→共享 前校验使用）
     */
    @PostMapping("/inner/count-active-by-company")
    public R<Integer> countActiveByCompany(@RequestParam("companyId") Integer companyId) {
        if (companyId == null) {
            return R.ok(0);
        }
        try {
            List<Integer> activeStatuses = Arrays.asList(2, 3, 4);
            long count = 0L;
            count += chargingOrderService.lambdaQuery()
                    .eq(TChargingOrder::getCompanyId, companyId)
                    .in(TChargingOrder::getStatus, activeStatuses)
                    .count();
            count += cardChargingOrderService.lambdaQuery()
                    .eq(TCardChargingOrder::getCompanyId, companyId)
                    .in(TCardChargingOrder::getStatus, activeStatuses)
                    .count();
            count += vinChargingOrderService.lambdaQuery()
                    .eq(TVinChargingOrder::getCompanyId, companyId)
                    .in(TVinChargingOrder::getStatus, activeStatuses)
                    .count();
            return R.ok((int) count);
        } catch (RuntimeException ex) {
            log.error("统计公司进行中充电订单失败：companyId={}", companyId, ex);
            return R.fail("统计公司进行中充电订单失败:" + ex.getMessage());
        }
    }

    @RequiresPermissions(value = {"/chargingOperationAnalysis"}, logical = Logical.OR)
    @ResponseBody
    @PostMapping(value = "/charging/statistics")
@@ -3199,25 +3400,37 @@


    /**
     * 硬件充电结束后的处理逻辑
     * 硬件充电结束后的处理逻辑（按订单号前缀路由，结束方式2=设备自动结束）
     * @param code
     */
    @PostMapping("/endCharge")
    public void endCharge(@RequestParam("code") String code){
        log.info(code + "：-------------------充电桩自动结束充电-------------------");
        chargingOrderService.endCharge(code, 2);
        if (isCardOrder(code)) {
            cardChargingOrderService.cardEndCharge(code, 2);
        } else if (isVinOrder(code)) {
            vinChargingOrderService.vinEndCharge(code, 2);
        } else {
            chargingOrderService.endCharge(code, 2);
        }
    }



    /**
     * 硬件异常结束充电后的处理逻辑
     * 硬件异常结束充电后的处理逻辑（按订单号前缀路由，结束方式0=异常终止）
     * @param code
     */
    @PostMapping("/excelEndCharge")
    public void excelEndCharge(@RequestParam("code") String code){
        log.info(code + "：-------------------充电异常，停止充电-------------------");
        chargingOrderService.excelEndCharge(code);
        if (isCardOrder(code)) {
            cardChargingOrderService.cardEndCharge(code, 0);
        } else if (isVinOrder(code)) {
            vinChargingOrderService.vinEndCharge(code, 0);
        } else {
            chargingOrderService.excelEndCharge(code);
        }
    }