|
@@ -34,11 +34,12 @@ import java.io.OutputStream;
|
|
|
import java.math.BigDecimal;
|
|
|
import java.net.URLEncoder;
|
|
|
import java.text.SimpleDateFormat;
|
|
|
+import java.time.LocalDateTime;
|
|
|
+import java.time.LocalTime;
|
|
|
import java.util.*;
|
|
|
import java.util.stream.Collectors;
|
|
|
|
|
|
-import static com.szwl.constant.ResponseCodesEnum.A0001;
|
|
|
-import static com.szwl.constant.ResponseCodesEnum.A0002;
|
|
|
+import static com.szwl.constant.ResponseCodesEnum.*;
|
|
|
import static com.szwl.model.utils.DateUtils.PATTERN_yyyy_MM_dd_HH_mm_ss;
|
|
|
|
|
|
/**
|
|
@@ -362,16 +363,16 @@ public class TPromoCodeController {
|
|
|
}
|
|
|
}
|
|
|
TAdmin admin = adminService.getById(adminId);
|
|
|
-// LocalDateTime now = LocalDateTime.now();
|
|
|
-// LocalDateTime startOfToday = now.with(LocalTime.MIN);
|
|
|
-// LocalDateTime endOfToday = now.with(LocalTime.MAX);
|
|
|
-// LambdaQueryWrapper<TPromoCode> promoCodeWrapper = new LambdaQueryWrapper<>();
|
|
|
-// promoCodeWrapper.between(TPromoCode::getCreateDate, startOfToday, endOfToday);
|
|
|
-// promoCodeWrapper.eq(TPromoCode::getAdminId, adminId);
|
|
|
-// int countCode = promoCodeService.count(promoCodeWrapper);
|
|
|
-// if (countCode >= 5000) {
|
|
|
-// return R.fail(B0002, "今日优惠码申请已达到上限");
|
|
|
-// }
|
|
|
+ LocalDateTime now = LocalDateTime.now();
|
|
|
+ LocalDateTime startOfToday = now.with(LocalTime.MIN);
|
|
|
+ LocalDateTime endOfToday = now.with(LocalTime.MAX);
|
|
|
+ LambdaQueryWrapper<TPromoCode> promoCodeWrapper = new LambdaQueryWrapper<>();
|
|
|
+ promoCodeWrapper.between(TPromoCode::getCreateDate, startOfToday, endOfToday);
|
|
|
+ promoCodeWrapper.eq(TPromoCode::getAdminId, adminId);
|
|
|
+ int countCode = promoCodeService.count(promoCodeWrapper);
|
|
|
+ if (countCode >= 5000) {
|
|
|
+ return R.fail(B0002, "今日优惠码申请已达到上限");
|
|
|
+ }
|
|
|
if (String.valueOf(admin.getId()).equals("1")) {
|
|
|
List<String> codes = new ArrayList<>();
|
|
|
if (addMode.equals("1")) {
|