diff --git a/ad-platform-manage/ad-platform-management/src/main/java/com/baiye/modules/platform/service/impl/PayTemplateUserServiceImpl.java b/ad-platform-manage/ad-platform-management/src/main/java/com/baiye/modules/platform/service/impl/PayTemplateUserServiceImpl.java index a5fde632..30c99498 100644 --- a/ad-platform-manage/ad-platform-management/src/main/java/com/baiye/modules/platform/service/impl/PayTemplateUserServiceImpl.java +++ b/ad-platform-manage/ad-platform-management/src/main/java/com/baiye/modules/platform/service/impl/PayTemplateUserServiceImpl.java @@ -10,8 +10,10 @@ import com.baiye.modules.platform.domain.PayCombo; import com.baiye.modules.platform.domain.PayComboUser; import com.baiye.modules.platform.repository.PayComboRepository; import com.baiye.modules.platform.repository.PayComboUserRepository; -import com.baiye.modules.system.repository.UserRepository; import com.baiye.modules.platform.service.PayTemplateUserService; +import com.baiye.modules.system.repository.UserRepository; +import com.baiye.util.CacheKey; +import com.baiye.util.RedisUtils; import lombok.RequiredArgsConstructor; import lombok.extern.slf4j.Slf4j; import org.springframework.stereotype.Service; @@ -32,10 +34,13 @@ public class PayTemplateUserServiceImpl implements PayTemplateUserService { private final PayComboUserRepository payComboUserRepository; + private final PayComboRepository payComboRepository; private final UserRepository userRepository; + private final RedisUtils redisUtils; + @Override @Transactional(rollbackFor = Exception.class) public Boolean add(PayComboUser payComboUser) { @@ -63,6 +68,7 @@ public class PayTemplateUserServiceImpl implements PayTemplateUserService { } payComboUserOne.setPayComboId(payTemplateId); userRepository.updateExpirationTimeById(newDate, userId); + redisUtils.del(CacheKey.USER_ID + payComboUserOne.getUserId()); return payComboUserRepository.save(payComboUserOne).getId() != null; } else { PayComboUser addPayComboUser = new PayComboUser(); diff --git a/ad-platform-manage/ad-platform-management/src/main/java/com/baiye/modules/telemarkting/api/TelephoneCallController.java b/ad-platform-manage/ad-platform-management/src/main/java/com/baiye/modules/telemarkting/api/TelephoneCallController.java index b5dea4fa..630c943b 100644 --- a/ad-platform-manage/ad-platform-management/src/main/java/com/baiye/modules/telemarkting/api/TelephoneCallController.java +++ b/ad-platform-manage/ad-platform-management/src/main/java/com/baiye/modules/telemarkting/api/TelephoneCallController.java @@ -13,6 +13,7 @@ import com.baiye.modules.platform.domain.Company; import com.baiye.modules.platform.domain.Organize; import com.baiye.modules.platform.service.CompanyService; import com.baiye.modules.platform.service.OrganizeService; +import com.baiye.modules.system.service.UserService; import com.baiye.modules.telemarkting.entity.dto.*; import com.baiye.modules.telemarkting.service.TelephoneCallService; import com.baiye.util.SecurityUtils; @@ -39,8 +40,12 @@ public class TelephoneCallController { private final OrganizeService organizeService; + + private final CompanyService companyService; + private final UserService userService; + @PostMapping("/telephone/req") @ApiOperation("拨打电话") public CommonResponse doubleCallReq(@Validated @RequestBody TelephoneCallReqDTO telephoneCallReqDTO) { @@ -49,10 +54,15 @@ public class TelephoneCallController { } //判断账号是否到期 UserDto userDto = JSONUtil.toBean(SecurityUtils.getUser(), UserDto.class); - if (ObjectUtil.isNull(userDto) || userDto.getExpirationTime() == null || DateUtil.compare(userDto.getExpirationTime(), DateUtil.date()) < 0) { + if (ObjectUtil.isNull(userDto)) { + return CommonResponse.createByErrorMessage("账号不存在 请重新登录使用"); + } + UserDto userInfo = userService.findById(userDto.getId()); + if (ObjectUtil.isNull(userInfo.getExpirationTime()) + || DateUtil.compare(userInfo.getExpirationTime(), DateUtil.date()) < DefaultNumberConstants.ZERO_NUMBER) { return CommonResponse.createByErrorMessage("您的账号已到期,请续费后使用"); } - Long companyId = SecurityUtils.getCompanyId(); + Long companyId = userDto.getCompanyId(); if (companyId != null) { Organize organize; if (telephoneCallReqDTO.getTeamId() == null) { @@ -61,8 +71,7 @@ public class TelephoneCallController { } else { organize = organizeService.findByOrganizeId(telephoneCallReqDTO.getTeamId()); } - - Company byId = companyService.findById(SecurityUtils.getCompanyId()); + Company byId = companyService.findById(companyId); if (organize != null && byId != null) { //TODO 检查余额 if (byId.getUserBalance() == null || byId.getUserBalance() <= 0) { diff --git a/ad-platform-services/ad-platform-source/src/main/java/com/baiye/task/MailSourceTask.java b/ad-platform-services/ad-platform-source/src/main/java/com/baiye/task/MailSourceTask.java index 7353bfea..877ff275 100644 --- a/ad-platform-services/ad-platform-source/src/main/java/com/baiye/task/MailSourceTask.java +++ b/ad-platform-services/ad-platform-source/src/main/java/com/baiye/task/MailSourceTask.java @@ -160,26 +160,26 @@ public class MailSourceTask { deliveryRecordService.updateStatusByTaskName(DefaultNumberConstants.ONE_NUMBER,decryptList.size(), taskName); } log.info("============== message parsing succeeded file path as {} unzip path as {} ===============", path, unzipPath); - if (byTaskName.getType() == DefaultNumberConstants.THREE_NUMBER) { - Map map = Maps.newHashMap(); - List arrayList = Lists.newArrayList(); - DmpResponse dmpResponse = new DmpResponse(); - for (int i = 0; i < decryptList.size(); i++) { - DmpDataDTO dto = new DmpDataDTO(); - String encrypt = AESUtils.encrypt - (decryptList.get(i), deliveryProperties.getExchangePassword()); - dto.setTag(tagList.get(i)); - dto.setDecryptInfo(encrypt); - arrayList.add(dto); - } - dmpResponse.setBatchNo(taskName); - dmpResponse.setDecryptList(arrayList); - map.put("status",DefaultNumberConstants.TWO_HUNDRED); - map.put("msg", ResponseCode.SUCCESS.getDesc()); - map.put("data",dmpResponse); - HttpUtil.post("", JSONUtil.toJsonStr(map)); - deliveryRecordService.updateStatusByTaskName(DefaultNumberConstants.ONE_NUMBER, decryptList.size(), taskName); + } + if (byTaskName.getType() == DefaultNumberConstants.THREE_NUMBER) { + Map map = Maps.newHashMap(); + List arrayList = Lists.newArrayList(); + DmpResponse dmpResponse = new DmpResponse(); + for (int i = 0; i < decryptList.size(); i++) { + DmpDataDTO dto = new DmpDataDTO(); + String encrypt = AESUtils.encrypt + (decryptList.get(i), deliveryProperties.getExchangePassword()); + dto.setTag(tagList.get(i)); + dto.setDecryptInfo(encrypt); + arrayList.add(dto); } + dmpResponse.setBatchNo(taskName); + dmpResponse.setDecryptList(arrayList); + map.put("status",DefaultNumberConstants.TWO_HUNDRED); + map.put("msg", ResponseCode.SUCCESS.getDesc()); + map.put("data",dmpResponse); + HttpUtil.post("", JSONUtil.toJsonStr(map)); + deliveryRecordService.updateStatusByTaskName(DefaultNumberConstants.ONE_NUMBER, decryptList.size(), taskName); } } if (byTaskName.getType() == DefaultNumberConstants.TWO_NUMBER) {