From f3e07ac5be2b59870aeaa07005f6d7cd1b3b3645 Mon Sep 17 00:00:00 2001
From: ky <592468495@qq.com>
Date: Sat, 30 May 2020 14:03:57 +0800
Subject: [PATCH] p

---
 .../gszc/service/impl/CustomServiceImpl.java  | 19 +++++++++----------
 .../gszc/service/impl/InvoiceServiceImpl.java | 12 +++++++-----
 2 files changed, 16 insertions(+), 15 deletions(-)

diff --git a/src/main/java/com/gszc/service/impl/CustomServiceImpl.java b/src/main/java/com/gszc/service/impl/CustomServiceImpl.java
index bb8499d..1700ca3 100644
--- a/src/main/java/com/gszc/service/impl/CustomServiceImpl.java
+++ b/src/main/java/com/gszc/service/impl/CustomServiceImpl.java
@@ -15,13 +15,7 @@ import org.springframework.stereotype.Service;
 import org.springframework.transaction.annotation.Transactional;
 
 import java.math.BigDecimal;
-import java.time.Instant;
-import java.time.LocalDateTime;
-import java.time.ZoneId;
-import java.util.Calendar;
-import java.util.Date;
-import java.util.List;
-import java.util.UUID;
+import java.util.*;
 
 /**
  * <p>
@@ -63,7 +57,12 @@ public class CustomServiceImpl extends ServiceImpl<CustomMapper, Custom> impleme
     MiniUserServiceImpl miniUserService;
 
     public void customRegister(Custom custom,List<CustomSupport> customSupports){
-        String id = Uuid8Utils.generateShortUUID();
+        String id = String.format("%06d",new Random().nextInt(999999)+1);
+        Custom isHave = customMapper.selectById(id);
+        while(null!=isHave){
+            id = String.format("%06d",new Random().nextInt(999999)+1);
+            isHave = customMapper.selectById(id);
+        }
         custom.setId(id);
         custom.setCreateDate( new Date());
         custom.setModifyDate( new Date());
@@ -71,8 +70,8 @@ public class CustomServiceImpl extends ServiceImpl<CustomMapper, Custom> impleme
         customMapper.insert(custom);
         if(customSupports.size()>0){
             for(CustomSupport customSupport:customSupports){
-                String supportid = UUID.randomUUID().toString();
-                customSupport.setId(supportid);
+                String supportId = UUID.randomUUID().toString();
+                customSupport.setId(supportId);
                 customSupport.setCreateDate( new Date());
                 customSupport.setModifyDate( new Date());
                 customSupport.setCustomId(id);
diff --git a/src/main/java/com/gszc/service/impl/InvoiceServiceImpl.java b/src/main/java/com/gszc/service/impl/InvoiceServiceImpl.java
index 58d77a0..61a45dc 100644
--- a/src/main/java/com/gszc/service/impl/InvoiceServiceImpl.java
+++ b/src/main/java/com/gszc/service/impl/InvoiceServiceImpl.java
@@ -23,10 +23,7 @@ import org.springframework.stereotype.Service;
 import org.springframework.transaction.annotation.Transactional;
 
 import java.math.BigDecimal;
-import java.util.ArrayList;
-import java.util.Date;
-import java.util.List;
-import java.util.UUID;
+import java.util.*;
 import java.util.stream.Collectors;
 
 /**
@@ -60,7 +57,12 @@ public class InvoiceServiceImpl extends ServiceImpl<InvoiceMapper, Invoice> impl
     PcUserMapper pcUserMapper;
 
     public void addInvoice(Invoice invoice) {
-        String id = Uuid8Utils.generateShortUUID();
+        String id = String.format("%06d",new Random().nextInt(999999)+1);
+        Invoice isHave = invoiceMapper.selectById(id);
+        while(null!=isHave){
+            id = String.format("%06d",new Random().nextInt(999999)+1);
+            isHave = invoiceMapper.selectById(id);
+        }
         invoice.setId(id);
         invoice.setStatusCode("disable");
         invoice.setCreateDate(new Date());