From 5cfeaf015e0d6038079ab6d7a70acfd8322d32ec Mon Sep 17 00:00:00 2001
From: wen <1455474577@qq.com>
Date: Fri, 21 Jan 2022 15:36:29 +0800
Subject: [PATCH] =?UTF-8?q?=E4=BF=AE=E5=A4=8D=E5=8F=91=E7=A5=A8=E7=AE=A1?=
 =?UTF-8?q?=E7=90=86=E7=B3=BB=E7=BB=9F=E7=9A=84Bug=EF=BC=8C=E6=8C=89?=
 =?UTF-8?q?=E7=85=A7=E5=89=8D=E7=AB=AF=E6=89=80=E4=BC=A0=E9=80=92=E7=9A=84?=
 =?UTF-8?q?=E5=8F=82=E6=95=B0=E6=9D=A5?=
MIME-Version: 1.0
Content-Type: text/plain; charset=UTF-8
Content-Transfer-Encoding: 8bit

---
 .../service/impl/XhpcInvoiceServiceImpl.java       | 14 ++++++++++----
 1 file changed, 10 insertions(+), 4 deletions(-)

diff --git a/xhpc-modules/xhpc-invoice/src/main/java/com/xhpc/invoice/service/impl/XhpcInvoiceServiceImpl.java b/xhpc-modules/xhpc-invoice/src/main/java/com/xhpc/invoice/service/impl/XhpcInvoiceServiceImpl.java
index f6ddb1c5..5a401ff1 100644
--- a/xhpc-modules/xhpc-invoice/src/main/java/com/xhpc/invoice/service/impl/XhpcInvoiceServiceImpl.java
+++ b/xhpc-modules/xhpc-invoice/src/main/java/com/xhpc/invoice/service/impl/XhpcInvoiceServiceImpl.java
@@ -128,8 +128,11 @@ public class XhpcInvoiceServiceImpl implements XhpcInvoiceService {
     @Override
     @Transactional(rollbackFor = Exception.class)
     public Boolean invoiceToUser(InvoiceToUserRequest requestData) {
-        //获取当前时间
-        requestData.setInvoicingTime(DateUtil.getYyyyMmDdHhMmSs());
+
+        if (requestData.getInvoicingTime() == null || "".equals(requestData.getInvoicingTime())) {
+            //获取当前时间
+            requestData.setInvoicingTime(DateUtil.getYyyyMmDdHhMmSs());
+        }
         //根据操作人的id，查询操作人的名字
         SysUser sysUser = sysUserMapper.selectUserById(Long.valueOf(requestData.getDrawer()));
         requestData.setDrawer(sysUser.getNickName());
@@ -178,8 +181,11 @@ public class XhpcInvoiceServiceImpl implements XhpcInvoiceService {
     @Override
     @Transactional(rollbackFor = Exception.class)
     public void failInvoiceToUser(InvoiceToUserRequest requestData) {
-        //获取当前时间
-        requestData.setInvoicingTime(DateUtil.getYyyyMmDdHhMmSs());
+
+        if (requestData.getInvoicingTime() == null || "".equals(requestData.getInvoicingTime())) {
+            //获取当前时间
+            requestData.setInvoicingTime(DateUtil.getYyyyMmDdHhMmSs());
+        }
         //根据操作人的id，查询操作人的名字
         SysUser sysUser = sysUserMapper.selectUserById(Long.valueOf(requestData.getDrawer()));
         requestData.setDrawer(sysUser.getNickName());