From e8b242f43a9238651a19943c94e6738a91f5d9fb Mon Sep 17 00:00:00 2001
From: dzc <2388224167@qq.com>
Date: Fri, 4 Jul 2025 15:16:43 +0800
Subject: [PATCH] =?UTF-8?q?feat:=E5=8F=91=E7=A5=A8=E6=B7=BB=E5=8A=A0?=
 =?UTF-8?q?=E5=AD=97=E6=AE=B5?=
MIME-Version: 1.0
Content-Type: text/plain; charset=UTF-8
Content-Transfer-Encoding: 8bit

---
 .../recharge/WalletRechargeInvoiceController.java      |  3 +++
 .../recharge/WalletRechargeInvoiceServiceImpl.java     |  4 +++-
 .../utils/flow/dto/WalletRechargeInvoiceFlowDto.java   | 10 ++++++++++
 3 files changed, 16 insertions(+), 1 deletion(-)

diff --git a/pjcloud-wallet/pjcloud-wallet-biz/src/main/java/com/bsd/pjcloud/wallet/controller/recharge/WalletRechargeInvoiceController.java b/pjcloud-wallet/pjcloud-wallet-biz/src/main/java/com/bsd/pjcloud/wallet/controller/recharge/WalletRechargeInvoiceController.java
index 8ef2955ce..170280e3a 100644
--- a/pjcloud-wallet/pjcloud-wallet-biz/src/main/java/com/bsd/pjcloud/wallet/controller/recharge/WalletRechargeInvoiceController.java
+++ b/pjcloud-wallet/pjcloud-wallet-biz/src/main/java/com/bsd/pjcloud/wallet/controller/recharge/WalletRechargeInvoiceController.java
@@ -4,11 +4,14 @@ import cn.hutool.core.util.ArrayUtil;
 import cn.hutool.core.collection.CollUtil;
 import com.baomidou.mybatisplus.core.toolkit.Wrappers;
 import com.baomidou.mybatisplus.extension.plugins.pagination.Page;
+import com.bsd.pjcloud.admin.api.entity.SysUser;
 import com.bsd.pjcloud.common.core.util.R;
 import com.bsd.pjcloud.common.data.datascope.DataScope;
 import com.bsd.pjcloud.common.idempotent.annotation.Idempotent;
 import com.bsd.pjcloud.common.log.annotation.SysLog;
 import com.bsd.pjcloud.common.security.annotation.Inner;
+import com.bsd.pjcloud.common.security.service.PjcloudUser;
+import com.bsd.pjcloud.common.security.util.SecurityUtils;
 import com.bsd.pjcloud.flow.task.dto.ProcessNodeRecordAssignUserParamDto;
 import com.bsd.pjcloud.wallet.api.dto.recharge.WalletRechargeBindInvoiceDto;
 import com.bsd.pjcloud.wallet.api.dto.recharge.WalletRechargeInvoiceApplyDto;
diff --git a/pjcloud-wallet/pjcloud-wallet-biz/src/main/java/com/bsd/pjcloud/wallet/service/impl/recharge/WalletRechargeInvoiceServiceImpl.java b/pjcloud-wallet/pjcloud-wallet-biz/src/main/java/com/bsd/pjcloud/wallet/service/impl/recharge/WalletRechargeInvoiceServiceImpl.java
index af412fef0..10b2c01b7 100644
--- a/pjcloud-wallet/pjcloud-wallet-biz/src/main/java/com/bsd/pjcloud/wallet/service/impl/recharge/WalletRechargeInvoiceServiceImpl.java
+++ b/pjcloud-wallet/pjcloud-wallet-biz/src/main/java/com/bsd/pjcloud/wallet/service/impl/recharge/WalletRechargeInvoiceServiceImpl.java
@@ -340,8 +340,10 @@ public class WalletRechargeInvoiceServiceImpl extends ServiceImpl<WalletRecharge
         flowDto.setApplyDeptName(dept.getName());
         flowDto.setApplyDeptId(dept.getDeptId());
         flowDto.setApplyCreateTime(LocalDateTimeUtil.format(detail.getCreateTime(), DatePattern.NORM_DATETIME_PATTERN));
+        flowDto.setPrice((double) (detail.getTotalPrice() / 100));
+        flowDto.setDeptOrUser(detail.getDeptOrUser());
         flowDto.setRemark(detail.getRemark());
-        String processId = flowUtil.startFlow("TASK_RECHARGE_APPLY_FLOW", user.getSysUser(), detail.getId(), flowDto);
+        String processId = flowUtil.startFlow("TASK_RECHARGE_APPLY_INVOICE_FLOW", user.getSysUser(), detail.getId(), flowDto);
         // 更新
         WalletRechargeInvoiceEntity updateObj = new WalletRechargeInvoiceEntity();
         updateObj.setId(detail.getId());
diff --git a/pjcloud-wallet/pjcloud-wallet-biz/src/main/java/com/bsd/pjcloud/wallet/utils/flow/dto/WalletRechargeInvoiceFlowDto.java b/pjcloud-wallet/pjcloud-wallet-biz/src/main/java/com/bsd/pjcloud/wallet/utils/flow/dto/WalletRechargeInvoiceFlowDto.java
index 0b338c53f..bc2abd893 100644
--- a/pjcloud-wallet/pjcloud-wallet-biz/src/main/java/com/bsd/pjcloud/wallet/utils/flow/dto/WalletRechargeInvoiceFlowDto.java
+++ b/pjcloud-wallet/pjcloud-wallet-biz/src/main/java/com/bsd/pjcloud/wallet/utils/flow/dto/WalletRechargeInvoiceFlowDto.java
@@ -6,6 +6,16 @@ import lombok.Data;
 @Data
 public class WalletRechargeInvoiceFlowDto extends FlowBaseDto {
 
+    /**
+     * 交款单位或个人
+     */
+    private String deptOrUser;
+
+    /**
+     * 金额
+     */
+    private Double price;
+
     /**
      * 备注
      */