激活码激活逻辑调整

pom.xml

@@ -32,6 +32,7 @@
         <logback-encoder.version>6.6</logback-encoder.version>
         <swagger.version>3.0.0</swagger.version>
         <knife4j.version>3.0.2</knife4j.version>
+        <oracle-ojdbc.version>23.2.0.0</oracle-ojdbc.version>
     </properties>
 
     <dependencies>
@@ -182,6 +183,12 @@
             <groupId>org.springframework.boot</groupId>
             <artifactId>spring-boot-starter-quartz</artifactId>
         </dependency>
+
+<!--        <dependency>-->
+<!--            <groupId>com.oracle.database.jdbc</groupId>-->
+<!--            <artifactId>ojdbc8</artifactId>-->
+<!--            <version>${oracle-ojdbc.version}</version>-->
+<!--        </dependency>-->
     </dependencies>
 
     <build>

src/main/java/com/ebiz/auth/service/impl/SysUserExServiceImpl.java

@@ -1,6 +1,8 @@
 package com.ebiz.auth.service.impl;
 
+import cn.hutool.core.collection.CollUtil;
 import cn.hutool.core.date.DateUtil;
+import cn.hutool.core.date.LocalDateTimeUtil;
 import com.alibaba.fastjson.JSONObject;
 import com.alibaba.fastjson2.JSON;
 import com.ebiz.auth.base.dto.ActivationRecordDTO;
@@ -213,6 +215,16 @@ public class SysUserExServiceImpl implements SysUserExService {
             customerInfo.setMobile(activationCodeActiveDTO.getMobile());
             this.customerInfoService.update(customerInfo);
         }
+        // 每个客户只能有一个生效的激活码
+        ContentModel<List<ActivationRecordDTO>> activationRecordServiceRes = this.activationRecordService.list(new ActivationRecordQueryDTO().setCustomerNo(customerInfo.getCustomerNo()).setActivationResult(String.valueOf(BaseEnum.TRUE.getCode())));
+        if (CollUtil.isNotEmpty(activationRecordServiceRes.getContent())) {
+            List<ActivationRecordDTO> activationRecordDTOList = activationRecordServiceRes.getContent();
+            activationRecordDTOList.sort(Comparator.comparing(ActivationRecordDTO::getActivationTime).reversed());
+            ActivationRecordDTO activationRecordDTO = activationRecordDTOList.get(0);
+            if (LocalDateTimeUtil.now().isBefore(LocalDateTimeUtil.of(activationRecordDTO.getActivationTime()).plusYears(1))) {
+                return ContentModel.error("激活码激活失败");
+            }
+        }
         // 激活码
         String activationCode = activationCodeActiveDTO.getActivationCode();
         // 激活码激活
@@ -340,9 +352,9 @@ public class SysUserExServiceImpl implements SysUserExService {
             List<BenefitRegistrationDTO> registerList = registrationQueryRes.getContent();
             registerList.sort(Comparator.comparing(BenefitRegistrationDTO::getRegisterTime));
             Collections.reverse(registerList);
-            JSONObject jsonObject = new JSONObject().fluentPut("out_user_id",customerNo)
+            JSONObject jsonObject = new JSONObject().fluentPut("out_user_id", customerNo)
-                    .fluentPut("out_order_no",registerList.get(0).getId())
+                    .fluentPut("out_order_no", registerList.get(0).getId())
-                    .fluentPut("stipulate_benefit_list",addYjyFamilyMemberList);
+                    .fluentPut("stipulate_benefit_list", addYjyFamilyMemberList);
             // 添加家庭成员
             ContentModel<Object> executeRes = this.interfaceInfoExService.execute(new InterfaceExecuteDTO()
                     .setInterfaceCode("addFamilyMember")

src/main/java/com/ebiz/benefit/service/impl/BenefitExServiceImpl.java

@@ -79,31 +79,6 @@ public class BenefitExServiceImpl implements BenefitExService {
      */
     @Override
     public ContentModel<List<GetBenefitInfoListRespDTO>> getBenefitInfoList() {
-        /*// 查询有所星级数据
-        List<StarLevelDTO> starLevelDTOList = this.starLevelService.list(new StarLevelQueryDTO()).getContent();
-        // 查询所有权益数据
-        List<BenefitDTO> benefitDTOList = this.benefitService.list(new BenefitQueryDTO()).getContent();
-        // 查询所有权益映射数据
-        List<StarLevelBenefitMappingDTO> starLevelBenefitMappingDTOList = this.starLevelBenefitMappingService.list(new StarLevelBenefitMappingQueryDTO()).getContent();
-        List<GetBenefitInfoListRespDTO> respDTOList = new ArrayList<>();
-        // 组装返回结果
-        for (StarLevelDTO starLevelDTO : starLevelDTOList) {
-            GetBenefitInfoListRespDTO respDTO = new GetBenefitInfoListRespDTO();
-            respDTO.setStarLevelCode(starLevelDTO.getStarLevelCode());
-            respDTO.setStarLevelName(starLevelDTO.getDescription());
-            List<String> benefitCodeList = starLevelBenefitMappingDTOList.stream().filter(slbm -> slbm.getStarLevelRight() <= starLevelDTO.getStarLevelRight()).map(StarLevelBenefitMappingDTO::getBenefitCode).distinct().collect(Collectors.toList());
-            List<GetBenefitInfoListRespDTO.BenefitInfo> benefitInfoList = new ArrayList<>();
-            for (String benefitCode : benefitCodeList) {
-                GetBenefitInfoListRespDTO.BenefitInfo benefitInfo = new GetBenefitInfoListRespDTO.BenefitInfo();
-                benefitInfo.setBenefitCode(benefitCode);
-                benefitInfo.setBenefitName(benefitDTOList.stream().filter(b -> StringUtils.equals(b.getBenefitCode(), benefitCode)).findFirst().orElse(new BenefitDTO()).getBenefitName());
-                benefitInfoList.add(benefitInfo);
-            }
-            respDTO.setBenefitInfoList(benefitInfoList);
-            respDTOList.add(respDTO);
-        }
-        // todo每个星级的权益列表取之前所有星级的差集
-        return ContentModel.success(respDTOList);*/
         // 查询所有星级数据
         List<StarLevelDTO> starLevelDTOList = this.starLevelService.list(new StarLevelQueryDTO()).getContent();
         // 查询所有权益数据

src/main/resources/application-dev.yml

@@ -57,7 +57,7 @@ spring:
 
   quartz:
     # 自定义参数, 控制是否启动定时任务
-    enabled: 0
+    enabled: 1
     job-store-type: memory
     properties:
       org: