From 5b64f31f1d35b38b51935b5fa7f4b8cf46fbf4cf Mon Sep 17 00:00:00 2001
From: Pu Zhibing <393733352@qq.com>
Date: 星期四, 08 五月 2025 14:08:57 +0800
Subject: [PATCH] Merge branch 'master' of http://120.76.84.145:10101/gitblit/r/java/mx_charging_pile into 1.1
---
ruoyi-service/ruoyi-account/src/main/java/com/ruoyi/account/controller/TInvoiceInformationController.java | 18 ++++++++++++++++--
1 files changed, 16 insertions(+), 2 deletions(-)
diff --git a/ruoyi-service/ruoyi-account/src/main/java/com/ruoyi/account/controller/TInvoiceInformationController.java b/ruoyi-service/ruoyi-account/src/main/java/com/ruoyi/account/controller/TInvoiceInformationController.java
index 5eb18cf..9519658 100644
--- a/ruoyi-service/ruoyi-account/src/main/java/com/ruoyi/account/controller/TInvoiceInformationController.java
+++ b/ruoyi-service/ruoyi-account/src/main/java/com/ruoyi/account/controller/TInvoiceInformationController.java
@@ -6,6 +6,9 @@
import com.ruoyi.account.api.vo.InvoiceInformationVo;
import com.ruoyi.account.service.TInvoiceInformationService;
import com.ruoyi.common.core.web.domain.AjaxResult;
+import com.ruoyi.common.log.annotation.Log;
+import com.ruoyi.common.log.enums.BusinessType;
+import com.ruoyi.common.log.enums.OperatorType;
import com.ruoyi.common.security.service.TokenService;
import io.swagger.annotations.ApiOperation;
import org.springframework.beans.BeanUtils;
@@ -39,7 +42,8 @@
@ApiOperation(value = "获取开票抬头数据列表", tags = {"小程序-充电发票"})
public AjaxResult<List<InvoiceInformationVo>> getInvoiceInformationList(){
Long userId = tokenService.getLoginUserApplet().getUserId();
- List<TInvoiceInformation> list = invoiceInformationService.list(new LambdaQueryWrapper<TInvoiceInformation>().eq(TInvoiceInformation::getAppUserId, userId).eq(TInvoiceInformation::getDelFlag, 0));
+ List<TInvoiceInformation> list = invoiceInformationService.list(new LambdaQueryWrapper<TInvoiceInformation>()
+ .eq(TInvoiceInformation::getAppUserId, userId).eq(TInvoiceInformation::getDelFlag, 0).orderByDesc(TInvoiceInformation::getIsDefault));
List<InvoiceInformationVo> lists = new ArrayList<>();
for (TInvoiceInformation tInvoiceInformation : list) {
InvoiceInformationVo vo = new InvoiceInformationVo();
@@ -52,6 +56,7 @@
+ @Log(title = "【我的】添加开票抬头数据", businessType = BusinessType.INSERT,operatorType = OperatorType.MOBILE)
@ResponseBody
@PostMapping(value = "/addInvoiceInformation")
@ApiOperation(value = "添加开票抬头数据", tags = {"小程序-充电发票"})
@@ -78,6 +83,10 @@
@ApiOperation(value = "获取开票抬头详情数据", tags = {"小程序-充电发票"})
public AjaxResult<TInvoiceInformation> getInvoiceInformationInfo(@PathVariable String id){
TInvoiceInformation information = invoiceInformationService.getById(id);
+ Long userId = tokenService.getLoginUserApplet().getUserId();
+ if(!information.getAppUserId().equals(userId)){
+ return AjaxResult.error("权限不足");
+ }
return AjaxResult.success(information);
}
@@ -88,8 +97,13 @@
@ApiOperation(value = "编辑开票抬头数据", tags = {"小程序-充电发票"})
public AjaxResult editInvoiceInformation(@RequestBody TInvoiceInformation invoiceInformation){
Long userId = tokenService.getLoginUserApplet().getUserId();
+ TInvoiceInformation information = invoiceInformationService.getById(invoiceInformation.getId());
+ if(!information.getAppUserId().equals(userId)){
+ return AjaxResult.error("权限不足");
+ }
+
//如果当前是默认抬头，则需要去除其他的默认配置
- if(1 == invoiceInformation.getIsDefault()){
+ if(null != invoiceInformation.getIsDefault() && 1 == invoiceInformation.getIsDefault()){
TInvoiceInformation one = invoiceInformationService.getOne(new LambdaQueryWrapper<TInvoiceInformation>().eq(TInvoiceInformation::getDelFlag, 0)
.eq(TInvoiceInformation::getIsDefault, 1).eq(TInvoiceInformation::getAppUserId, userId));
if(null != one && !one.getId().equals(invoiceInformation.getId())){
--
Gitblit v1.7.1