liujc пре 1 година
родитељ
комит
188eb6aabf

+ 5 - 2
cooleshow-user/user-biz/src/main/java/com/yonge/cooleshow/biz/dal/service/impl/TenantAlbumServiceImpl.java

@@ -16,6 +16,7 @@ import com.yonge.cooleshow.biz.dal.wrapper.TenantAlbumWrapper;
 import com.yonge.cooleshow.biz.dal.wrapper.UserPaymentOrderWrapper;
 import com.yonge.cooleshow.biz.dal.wrapper.UserPaymentOrderWrapper;
 import com.yonge.cooleshow.common.enums.EActivationCode;
 import com.yonge.cooleshow.common.enums.EActivationCode;
 import com.yonge.toolset.base.exception.BizException;
 import com.yonge.toolset.base.exception.BizException;
+import com.yonge.toolset.base.util.StringUtil;
 import lombok.extern.slf4j.Slf4j;
 import lombok.extern.slf4j.Slf4j;
 import org.apache.commons.collections.CollectionUtils;
 import org.apache.commons.collections.CollectionUtils;
 import org.springframework.beans.factory.annotation.Autowired;
 import org.springframework.beans.factory.annotation.Autowired;
@@ -25,6 +26,7 @@ import org.springframework.transaction.annotation.Transactional;
 import java.math.BigDecimal;
 import java.math.BigDecimal;
 import java.util.ArrayList;
 import java.util.ArrayList;
 import java.util.Collection;
 import java.util.Collection;
+import java.util.Date;
 import java.util.List;
 import java.util.List;
 import java.util.concurrent.atomic.AtomicInteger;
 import java.util.concurrent.atomic.AtomicInteger;
 import java.util.stream.Collectors;
 import java.util.stream.Collectors;
@@ -275,8 +277,9 @@ public class TenantAlbumServiceImpl extends ServiceImpl<TenantAlbumMapper, Tenan
                     tenantActivationCode.setTenantId(tenantAlbumContent.getTenantId());
                     tenantActivationCode.setTenantId(tenantAlbumContent.getTenantId());
                     tenantActivationCode.setTenantAlbumId(tenantAlbumContent.getTenantAlbumId());
                     tenantActivationCode.setTenantAlbumId(tenantAlbumContent.getTenantAlbumId());
                     tenantActivationCode.setTenantAlbumPurchaseId(tenantAlbumPurchase.getId());
                     tenantActivationCode.setTenantAlbumPurchaseId(tenantAlbumPurchase.getId());
-//                    tenantActivationCode.setActivationCode(StringUtil.DeciamlToThirtySix(IdWorker.get32UUID()));
-                    tenantActivationCode.setActivationCode(IdWorker.get32UUID());
+                    long l = Long.parseLong(new Date().getTime() + i + String.valueOf(tenantAlbumPurchase.getId()));
+                    tenantActivationCode.setActivationCode(StringUtil.DeciamlToThirtySix(l,7));
+//                    tenantActivationCode.setActivationCode(IdWorker.get32UUID());
                     tenantActivationCode.setSendStatus(EActivationCode.WAIT);
                     tenantActivationCode.setSendStatus(EActivationCode.WAIT);
                     tenantActivationCodes.add(tenantActivationCode);
                     tenantActivationCodes.add(tenantActivationCode);
                 }
                 }

+ 23 - 5
toolset/toolset-base/src/main/java/com/yonge/toolset/base/util/StringUtil.java

@@ -5,6 +5,7 @@ import com.yonge.toolset.base.string.StringPool;
 import org.springframework.lang.Nullable;
 import org.springframework.lang.Nullable;
 import org.springframework.util.CollectionUtils;
 import org.springframework.util.CollectionUtils;
 
 
+import java.time.LocalDateTime;
 import java.util.*;
 import java.util.*;
 
 
 /**
 /**
@@ -360,7 +361,17 @@ public class StringUtil {
      * @param iSrc
      * @param iSrc
      * @return
      * @return
      */
      */
-    public static String DeciamlToThirtySix(Long iSrc) {
+    public static String DeciamlToThirtySix(Long iSrc,Integer length) {
+
+        String s ="00000000" + DeciamlToThirtySix(iSrc);
+        // 获取string 后7位
+//        return s.substring(s.length()-7);
+
+        return s;
+
+    }
+
+    private static String DeciamlToThirtySix(Long iSrc) {
         String result = "";
         String result = "";
         Long key;
         Long key;
         Long value;
         Long value;
@@ -376,11 +387,18 @@ public class StringUtil {
         return result;
         return result;
     }
     }
 
 
-
-
     public static void main(String[] args) {
     public static void main(String[] args) {
 
 
-        String s = DeciamlToThirtySix(1684471133338419201L);
-        System.out.println(s);
+        int i = 0;
+        int num = 10;
+        int second = LocalDateTime.now().getSecond();
+        Random random = new Random();
+        int id = 100006;
+
+        for (int i1 = 0; i1 < num; i1++) {
+            second = second + i1;
+            String s = DeciamlToThirtySix(Long.parseLong(second + String.valueOf(id)),7);
+            System.out.println(s);
+        }
     }
     }
 }
 }