记得上下班打卡 | git大法好,push需谨慎

Commit ea4e980d authored by 张国柄's avatar 张国柄

~api:job:平台券移除时间单位调整为秒数计算;

parent 1accaec5
...@@ -122,7 +122,7 @@ public class PlatformTaskHandler { ...@@ -122,7 +122,7 @@ public class PlatformTaskHandler {
String url = sevPlatformUrl.concat("/platform/ccoupon/task/due/rmv"); String url = sevPlatformUrl.concat("/platform/ccoupon/task/due/rmv");
LinkedMultiValueMap<String, String> paramsMap = CollectionUtil.linkedMultiValueMapStringString(); LinkedMultiValueMap<String, String> paramsMap = CollectionUtil.linkedMultiValueMapStringString();
String jobParam = XxlJobHelper.getJobParam(); String jobParam = XxlJobHelper.getJobParam();
paramsMap.add("displayDays", DESUtils.DES().encrypt(StringUtils.isNotBlank(jobParam) ? jobParam : "31")); paramsMap.add("displayDays", DESUtils.DES().encrypt(StringUtils.isNotBlank(jobParam) ? jobParam : "2678400"));
LinkedMultiValueMap<String, String> headersMap = CollectionUtil.linkedMultiValueMapStringString(); LinkedMultiValueMap<String, String> headersMap = CollectionUtil.linkedMultiValueMapStringString();
headersMap.add("Accept", MediaType.APPLICATION_JSON_UTF8_VALUE); headersMap.add("Accept", MediaType.APPLICATION_JSON_UTF8_VALUE);
headersMap.add("Content-Type", MediaType.APPLICATION_FORM_URLENCODED_VALUE); headersMap.add("Content-Type", MediaType.APPLICATION_FORM_URLENCODED_VALUE);
......
...@@ -320,7 +320,7 @@ public class CandyCouponDueTaskController { ...@@ -320,7 +320,7 @@ public class CandyCouponDueTaskController {
* - 已用券:暂不处理 * - 已用券:暂不处理
* 同步REDIS.DTO * 同步REDIS.DTO
* *
* @param displayDays 有效展示天数,例如:"31,366",其中31为过期券对应有效展示天数,366为已用券对应有效展示天数,其中366可以不传即不处理已用券,31必传,否则执行无效 * @param displayDays 有效展示秒数,例如:"2678400,31622400",其中2678400为过期券对应有效展示秒数(31天),31622400为已用券对应有效展示秒数(366天),其中31622400可以不传即不处理已用券,2678400必传,否则执行无效
* @return ResponseDto<String> * @return ResponseDto<String>
*/ */
@PostMapping("rmv") @PostMapping("rmv")
...@@ -332,7 +332,7 @@ public class CandyCouponDueTaskController { ...@@ -332,7 +332,7 @@ public class CandyCouponDueTaskController {
String decrypt = DESUtils.DES().decrypt(displayDays); String decrypt = DESUtils.DES().decrypt(displayDays);
String[] decryptArr = decrypt.split(","); String[] decryptArr = decrypt.split(",");
displayDaysIntVal1 = Integer.parseInt(decryptArr[0]); displayDaysIntVal1 = Integer.parseInt(decryptArr[0]);
displayDaysIntVal2 = decryptArr.length > 1 ? Integer.parseInt(decryptArr[1]) : 0; displayDaysIntVal2 = decryptArr.length > 1 && StringUtils.isNotBlank(decryptArr[1]) ? Integer.parseInt(decryptArr[1]) : 0;
} catch (NumberFormatException ignored) { } catch (NumberFormatException ignored) {
} catch (Exception e) { } catch (Exception e) {
return ResponseDto.failure(paramError.getCode(), paramError.getMessage()); return ResponseDto.failure(paramError.getCode(), paramError.getMessage());
......
...@@ -41,7 +41,7 @@ public class PlatformCandyCommonCouponService extends ServiceImpl<CandyCommonCou ...@@ -41,7 +41,7 @@ public class PlatformCandyCommonCouponService extends ServiceImpl<CandyCommonCou
try { try {
LambdaQueryWrapper<CandyCommonCoupon> commonCouponQueryWrapper = Wrappers.lambdaQuery(CandyCommonCoupon.class); LambdaQueryWrapper<CandyCommonCoupon> commonCouponQueryWrapper = Wrappers.lambdaQuery(CandyCommonCoupon.class);
commonCouponQueryWrapper.eq(CandyCommonCoupon::getState, 3); commonCouponQueryWrapper.eq(CandyCommonCoupon::getState, 3);
commonCouponQueryWrapper.le(CandyCommonCoupon::getUpdatedAt, currentDateTime.minusDays(displayDays)); commonCouponQueryWrapper.le(CandyCommonCoupon::getUpdatedAt, currentDateTime.minusSeconds(displayDays));
int totalCount = this.count(commonCouponQueryWrapper); int totalCount = this.count(commonCouponQueryWrapper);
int remainCount = totalCount, pSize = 1000; int remainCount = totalCount, pSize = 1000;
if (totalCount > 0) { if (totalCount > 0) {
......
...@@ -133,10 +133,10 @@ public class PlatformCandyUserCouponService extends ServiceImpl<CandyUserCouponM ...@@ -133,10 +133,10 @@ public class PlatformCandyUserCouponService extends ServiceImpl<CandyUserCouponM
LambdaQueryWrapper<CandyUserCoupon> userCouponQueryWrapper = Wrappers.lambdaQuery(CandyUserCoupon.class); LambdaQueryWrapper<CandyUserCoupon> userCouponQueryWrapper = Wrappers.lambdaQuery(CandyUserCoupon.class);
if (usedDisplayFlg) { if (usedDisplayFlg) {
userCouponQueryWrapper.eq(CandyUserCoupon::getState, 5); userCouponQueryWrapper.eq(CandyUserCoupon::getState, 5);
userCouponQueryWrapper.le(CandyUserCoupon::getUsedAt, currentDateTime.minusDays(displayDays)); userCouponQueryWrapper.le(CandyUserCoupon::getUsedAt, currentDateTime.minusSeconds(displayDays));
} else { } else {
userCouponQueryWrapper.eq(CandyUserCoupon::getState, 3); userCouponQueryWrapper.eq(CandyUserCoupon::getState, 3);
userCouponQueryWrapper.le(CandyUserCoupon::getDuedAt, currentDateTime.minusDays(displayDays)); userCouponQueryWrapper.le(CandyUserCoupon::getDuedAt, currentDateTime.minusSeconds(displayDays));
} }
int totalCount = this.count(userCouponQueryWrapper); int totalCount = this.count(userCouponQueryWrapper);
int remainCount = totalCount, pSize = 1000; int remainCount = totalCount, pSize = 1000;
......
Markdown is supported
0% or
You are about to add 0 people to the discussion. Proceed with caution.
Finish editing this message first!
Please register or to comment