Merge remote-tracking branch 'origin/2.3' into 2.3

longz

2026-09-29 0ca3a3922d2d25df52682b2290be15135cce100e

 ruoyi-api/ruoyi-api-account/src/main/java/com/ruoyi/account/api/feignClient/CompanyAllocateRecordClient.java

@@ -5,9 +5,11 @@
import com.ruoyi.common.core.domain.R;
import org.springframework.cloud.openfeign.FeignClient;
import org.springframework.web.bind.annotation.PostMapping;
import org.springframework.web.bind.annotation.RequestBody;
import org.springframework.web.bind.annotation.RequestParam;

import java.math.BigDecimal;
import java.util.List;

/**
 * 公司额度分配记录服务（VIN码充电结算写入消费流水使用）
@@ -40,4 +42,13 @@
                             @RequestParam("amount") BigDecimal amount,
                             @RequestParam("chargingOrderCode") String chargingOrderCode,
                             @RequestParam(value = "remark", required = false) String remark);
}

                             /**
                             * 查询已在账户侧落消费流水（change_type=2）的订单号集合（结算幂等判定、订单侧兜底扫描使用）
                             *
                             * @param orderCodes 待判定的充电订单号
                             * @return 已存在消费流水的订单号集合（无匹配返回空集合）
                             */
                             @PostMapping("/company-allocate-record/inner/list-consumed-order-codes")
                             R<List<String>> listConsumedOrderCodes(@RequestBody List<String> orderCodes);
                             }