diff --git a/ad-platform-common/ad-platform-common-core/src/main/java/com/baiye/constant/DefaultNumberConstants.java b/ad-platform-common/ad-platform-common-core/src/main/java/com/baiye/constant/DefaultNumberConstants.java index cbb89ce3..4455331f 100644 --- a/ad-platform-common/ad-platform-common-core/src/main/java/com/baiye/constant/DefaultNumberConstants.java +++ b/ad-platform-common/ad-platform-common-core/src/main/java/com/baiye/constant/DefaultNumberConstants.java @@ -125,6 +125,12 @@ public class DefaultNumberConstants { * 30 */ public static final int THIRTY = 30; + + /** + * 60 + */ + public static final int FIFTY = 50; + /** * 60 */ diff --git a/ad-platform-manage/ad-platform-management/src/main/java/com/baiye/modules/agent/service/impl/CustomManageServiceImpl.java b/ad-platform-manage/ad-platform-management/src/main/java/com/baiye/modules/agent/service/impl/CustomManageServiceImpl.java index 443ec9f6..38cd71bc 100644 --- a/ad-platform-manage/ad-platform-management/src/main/java/com/baiye/modules/agent/service/impl/CustomManageServiceImpl.java +++ b/ad-platform-manage/ad-platform-management/src/main/java/com/baiye/modules/agent/service/impl/CustomManageServiceImpl.java @@ -363,7 +363,9 @@ public class CustomManageServiceImpl implements CustomManageService { @Override public void enableChannelCustom(Long userId) { ChannelCustom custom = channelCustomRepository.findByUserId(userId); - channelCustomRepository.updateCustomStatus(custom.getId(), 1); + if (ObjectUtil.isNotNull(custom)) { + channelCustomRepository.updateCustomStatus(custom.getId(), 1); + } } private void disableChannelById(ChannelCustom custom, List channelCustoms, List num) { diff --git a/ad-platform-manage/ad-platform-management/src/main/java/com/baiye/modules/platform/service/impl/AliPayServiceImpl.java b/ad-platform-manage/ad-platform-management/src/main/java/com/baiye/modules/platform/service/impl/AliPayServiceImpl.java index c17a3f4b..1af28d7e 100644 --- a/ad-platform-manage/ad-platform-management/src/main/java/com/baiye/modules/platform/service/impl/AliPayServiceImpl.java +++ b/ad-platform-manage/ad-platform-management/src/main/java/com/baiye/modules/platform/service/impl/AliPayServiceImpl.java @@ -88,11 +88,10 @@ public class AliPayServiceImpl implements AliPayService { companyById.getUserBalance() : DefaultNumberConstants.ZERO_NUMBER; companyService.updateUserBalanceByCompanyId (NumberUtil.add(balance, order.getAmount()), companyId); - redisUtils.set("call_sms:" + companyId, 0); + payOrderRepository.save(order); + return ResponseCode.SUCCESS.getDesc(); } - payOrderRepository.save(order); - return ResponseCode.SUCCESS.getDesc(); } } } catch (Exception e) { @@ -113,9 +112,9 @@ public class AliPayServiceImpl implements AliPayService { valueStr = (i == values.length - 1) ? valueStr + values[i] : valueStr + values[i] + StrPool.COMMA; } - //乱码解决,这段代码在出现乱码时使用 + /* //乱码解决,这段代码在出现乱码时使用 valueStr = new String(valueStr.getBytes - (StandardCharsets.ISO_8859_1), StandardCharsets.UTF_8); + (StandardCharsets.ISO_8859_1), StandardCharsets.UTF_8);*/ params.put(stringEntry.getKey(), valueStr); } } @@ -132,7 +131,7 @@ public class AliPayServiceImpl implements AliPayService { AlipayTradePagePayResponse response = Factory.Payment.Page() .pay(PayConstants.PAY_TITLE + orderNo, orderNo, aliPayPcDTO.getAmount().toString(), - aliPay.getNotifyUrl()); + aliPay.getReturnUrl()); if (ResponseChecker.success(response)) { boolean result = savePayOrder(aliPayPcDTO, orderNo); log.info("============= the save order result {} =============", result); diff --git a/ad-platform-manage/ad-platform-management/src/main/java/com/baiye/timed/DeliveryBalanceTask.java b/ad-platform-manage/ad-platform-management/src/main/java/com/baiye/timed/DeliveryBalanceTask.java index 0ed3f5c7..21e8de29 100644 --- a/ad-platform-manage/ad-platform-management/src/main/java/com/baiye/timed/DeliveryBalanceTask.java +++ b/ad-platform-manage/ad-platform-management/src/main/java/com/baiye/timed/DeliveryBalanceTask.java @@ -68,7 +68,7 @@ public class DeliveryBalanceTask { /** * 修改时间 为8点至21点 */ - @Scheduled(cron = "0 0/30 8-21 * * ? ") + @Scheduled(cron = "0 0/15 8-21 * * ? ") @Transactional(rollbackFor = Exception.class) public void cashResources() { // 查询所有未兑换的 @@ -135,7 +135,7 @@ public class DeliveryBalanceTask { Long minId = (long) DefaultNumberConstants.ZERO_NUMBER; Long maxId = (long) DefaultNumberConstants.ZERO_NUMBER; // 大于100 进行兑换 - if (taskImeiList.size() >= DefaultNumberConstants.ONE_HUNDRED) { + if (taskImeiList.size() >= DefaultNumberConstants.FIFTY) { String fileUrl = deliveryProperties.getFileUrl(); Comparator comparing = Comparator.comparing(TaskImei::getId); String format = DateUtil.format(DateUtil.date(), DatePattern.PURE_DATE_PATTERN);