From 010b1028b7121ae37d76441af1df7a2d9f698fc5 Mon Sep 17 00:00:00 2001
From: puzhibing <393733352@qq.com>
Date: 星期二, 29 九月 2026 11:30:44 +0800
Subject: [PATCH] 修改bug和修改VIN充电流程
---
ruoyi-service/ruoyi-account/src/main/java/com/ruoyi/account/controller/TCompanyAllocateRecordController.java | 25 +++++++++++++++++++++++++
1 files changed, 25 insertions(+), 0 deletions(-)
diff --git a/ruoyi-service/ruoyi-account/src/main/java/com/ruoyi/account/controller/TCompanyAllocateRecordController.java b/ruoyi-service/ruoyi-account/src/main/java/com/ruoyi/account/controller/TCompanyAllocateRecordController.java
index cf80340..c902459 100644
--- a/ruoyi-service/ruoyi-account/src/main/java/com/ruoyi/account/controller/TCompanyAllocateRecordController.java
+++ b/ruoyi-service/ruoyi-account/src/main/java/com/ruoyi/account/controller/TCompanyAllocateRecordController.java
@@ -14,7 +14,10 @@
import org.springframework.web.bind.annotation.PostMapping;
import org.springframework.web.bind.annotation.RequestBody;
import org.springframework.web.bind.annotation.RequestMapping;
+import org.springframework.web.bind.annotation.RequestParam;
import org.springframework.web.bind.annotation.RestController;
+
+import java.math.BigDecimal;
@Api(tags = "公司额度分配记录")
@RestController
@@ -30,4 +33,26 @@
public R<IPage<TCompanyAllocateRecord>> page(@RequestBody CompanyAllocateRecordQueryDTO query) {
return R.ok(companyAllocateRecordService.selectRecordPage(query));
}
+
+ /**
+ * 内部接口：写入消费流水（VIN码充电结算调用，按订单号+变更类型幂等）
+ */
+ @ApiOperation(value = "内部-写入消费流水", tags = {"内部调用"})
+ @PostMapping("/inner/record-consume")
+ public R<Boolean> recordConsume(@RequestParam("companyId") Integer companyId,
+ @RequestParam("userType") Integer userType,
+ @RequestParam("userInfo") String userInfo,
+ @RequestParam(value = "userName", required = false) String userName,
+ @RequestParam("beforeBalance") BigDecimal beforeBalance,
+ @RequestParam("amount") BigDecimal amount,
+ @RequestParam("chargingOrderCode") String chargingOrderCode,
+ @RequestParam(value = "remark", required = false) String remark) {
+ try {
+ return R.ok(companyAllocateRecordService.recordConsume(companyId, userType, userInfo, userName,
+ beforeBalance, amount, chargingOrderCode, remark));
+ } catch (RuntimeException ex) {
+ logger.error("写入消费流水失败：orderCode={}", chargingOrderCode, ex);
+ return R.fail("写入消费流水失败:" + ex.getMessage());
+ }
+ }
}
--
Gitblit v1.7.1