|
@@ -16,6 +16,7 @@ import com.yonge.cooleshow.biz.dal.wrapper.TenantAlbumWrapper;
|
|
|
import com.yonge.cooleshow.biz.dal.wrapper.UserPaymentOrderWrapper;
|
|
|
import com.yonge.cooleshow.common.enums.EActivationCode;
|
|
|
import com.yonge.toolset.base.exception.BizException;
|
|
|
+import com.yonge.toolset.base.util.StringUtil;
|
|
|
import lombok.extern.slf4j.Slf4j;
|
|
|
import org.apache.commons.collections.CollectionUtils;
|
|
|
import org.springframework.beans.factory.annotation.Autowired;
|
|
@@ -25,6 +26,7 @@ import org.springframework.transaction.annotation.Transactional;
|
|
|
import java.math.BigDecimal;
|
|
|
import java.util.ArrayList;
|
|
|
import java.util.Collection;
|
|
|
+import java.util.Date;
|
|
|
import java.util.List;
|
|
|
import java.util.concurrent.atomic.AtomicInteger;
|
|
|
import java.util.stream.Collectors;
|
|
@@ -275,8 +277,9 @@ public class TenantAlbumServiceImpl extends ServiceImpl<TenantAlbumMapper, Tenan
|
|
|
tenantActivationCode.setTenantId(tenantAlbumContent.getTenantId());
|
|
|
tenantActivationCode.setTenantAlbumId(tenantAlbumContent.getTenantAlbumId());
|
|
|
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);
|
|
|
tenantActivationCodes.add(tenantActivationCode);
|
|
|
}
|