Przeglądaj źródła

1、优化忠诚奖励逻辑
2、优化职位续期逻辑

rayson 9 miesięcy temu
rodzic
commit
6cefdb3ab5

+ 2 - 4
citu-module-member/citu-module-member-biz/src/main/java/com/citu/module/member/service/invoice/InvoiceListService.java

@@ -1,16 +1,14 @@
 package com.citu.module.member.service.invoice;
 
-import java.util.*;
-import javax.validation.*;
-
 import com.citu.framework.common.pojo.PageResult;
-import com.citu.framework.common.pojo.PageParam;
 import com.citu.module.member.controller.admin.invoice.vo.AdminInvoiceListPageReqVO;
 import com.citu.module.member.controller.admin.invoice.vo.InvoiceStatusUpdateReqVo;
 import com.citu.module.member.controller.app.invoice.vo.InvoiceListPageReqVO;
 import com.citu.module.member.controller.app.invoice.vo.InvoiceListSaveReqVO;
 import com.citu.module.member.dal.dataobject.invoice.InvoiceListDO;
 
+import javax.validation.Valid;
+
 /**
  * 发票清单 Service 接口
  *

+ 12 - 17
citu-module-member/citu-module-member-biz/src/main/java/com/citu/module/member/service/invoice/InvoiceListServiceImpl.java

@@ -2,6 +2,8 @@ package com.citu.module.member.service.invoice;
 
 import com.baomidou.mybatisplus.core.conditions.query.LambdaQueryWrapper;
 import com.baomidou.mybatisplus.core.conditions.update.LambdaUpdateWrapper;
+import com.citu.framework.common.pojo.PageResult;
+import com.citu.framework.common.util.object.BeanUtils;
 import com.citu.framework.security.core.util.SecurityFrameworkUtils;
 import com.citu.module.member.controller.admin.invoice.vo.AdminInvoiceListPageReqVO;
 import com.citu.module.member.controller.admin.invoice.vo.InvoiceStatusUpdateReqVo;
@@ -11,22 +13,16 @@ import com.citu.module.member.dal.dataobject.invoice.InvoiceListDO;
 import com.citu.module.member.dal.mysql.invoice.InvoiceListMapper;
 import com.citu.module.pay.api.order.PayOrderApi;
 import com.citu.module.pay.api.order.dto.PayOrderBaseRespDTO;
-import com.citu.module.pay.api.order.dto.PayOrderRespDTO;
 import org.springframework.stereotype.Service;
-import javax.annotation.Resource;
 import org.springframework.validation.annotation.Validated;
-import org.springframework.transaction.annotation.Transactional;
-
-import java.util.*;
-;
-import com.citu.framework.common.pojo.PageResult;
-import com.citu.framework.common.pojo.PageParam;
-import com.citu.framework.common.util.object.BeanUtils;
 
+import javax.annotation.Resource;
 
 import static com.citu.framework.common.exception.util.ServiceExceptionUtil.exception;
 import static com.citu.module.member.enums.ErrorCodeConstants.*;
 
+;
+
 /**
  * 发票清单 Service 实现类
  *
@@ -47,8 +43,8 @@ public class InvoiceListServiceImpl implements InvoiceListService {
     public Long createInvoiceList(InvoiceListSaveReqVO createReqVO) {
         Long loginUserId = SecurityFrameworkUtils.getLoginUserId();
         PayOrderBaseRespDTO data = payOrderApi.getOrder2(createReqVO.getPayOrderId()).getData();
-        if(null==data){
-            throw   exception(INVOICE_LIST_ORDER_NOT_EXISTS);
+        if (null == data) {
+            throw exception(INVOICE_LIST_ORDER_NOT_EXISTS);
         }
 //        // 非本人订单
 //        if(!loginUserId.toString().equals( data.getChannelUserId())){
@@ -56,11 +52,10 @@ public class InvoiceListServiceImpl implements InvoiceListService {
 //        }
 
 
-
         InvoiceListDO invoiceListDO = invoiceListMapper.selectOne(new LambdaQueryWrapper<InvoiceListDO>().eq(InvoiceListDO::getPayOrderId, createReqVO.getPayOrderId()));
 
-        if(null!=invoiceListDO){
-          throw    exception(INVOICE_EXISTS);
+        if (null != invoiceListDO) {
+            throw exception(INVOICE_EXISTS);
         }
 
         // 插入
@@ -115,11 +110,11 @@ public class InvoiceListServiceImpl implements InvoiceListService {
     @Override
     public Object invoiceStatusUpdate(InvoiceStatusUpdateReqVo reqVo) {
         InvoiceListDO invoiceListDO = invoiceListMapper.selectById(reqVo.getId());
-        if(null == invoiceListDO){
-            throw  exception(INVOICE_LIST_NOT_EXISTS);
+        if (null == invoiceListDO) {
+            throw exception(INVOICE_LIST_NOT_EXISTS);
         }
 
-        if(!invoiceListDO.getStatus().equals(0)){
+        if (!invoiceListDO.getStatus().equals(0)) {
             throw exception(INVOICE_STATUS_ERROR);
         }
 

+ 2 - 4
citu-module-member/citu-module-member-biz/src/main/java/com/citu/module/member/service/invoice/InvoiceTitleService.java

@@ -1,14 +1,12 @@
 package com.citu.module.member.service.invoice;
 
-import java.util.*;
-import javax.validation.*;
-
 import com.citu.framework.common.pojo.PageResult;
-import com.citu.framework.common.pojo.PageParam;
 import com.citu.module.member.controller.app.invoice.vo.InvoiceTitlePageReqVO;
 import com.citu.module.member.controller.app.invoice.vo.InvoiceTitleSaveReqVO;
 import com.citu.module.member.dal.dataobject.invoice.InvoiceTitleDO;
 
+import javax.validation.Valid;
+
 /**
  * 发票抬头 Service 接口
  *

+ 4 - 9
citu-module-member/citu-module-member-biz/src/main/java/com/citu/module/member/service/invoice/InvoiceTitleServiceImpl.java

@@ -1,24 +1,19 @@
 package com.citu.module.member.service.invoice;
 
+import com.citu.framework.common.pojo.PageResult;
+import com.citu.framework.common.util.object.BeanUtils;
 import com.citu.framework.security.core.util.SecurityFrameworkUtils;
 import com.citu.module.member.controller.app.invoice.vo.InvoiceTitlePageReqVO;
 import com.citu.module.member.controller.app.invoice.vo.InvoiceTitleSaveReqVO;
 import com.citu.module.member.dal.dataobject.invoice.InvoiceTitleDO;
 import com.citu.module.member.dal.mysql.invoice.InvoiceTitleMapper;
 import org.springframework.stereotype.Service;
-import javax.annotation.Resource;
 import org.springframework.validation.annotation.Validated;
-import org.springframework.transaction.annotation.Transactional;
-
-import java.util.*;
-
-import com.citu.framework.common.pojo.PageResult;
-import com.citu.framework.common.pojo.PageParam;
-import com.citu.framework.common.util.object.BeanUtils;
 
+import javax.annotation.Resource;
 
 import static com.citu.framework.common.exception.util.ServiceExceptionUtil.exception;
-import static com.citu.module.member.enums.ErrorCodeConstants.*;
+import static com.citu.module.member.enums.ErrorCodeConstants.INVOICE_TITLE_NOT_EXISTS;
 
 /**
  * 发票抬头 Service 实现类

+ 1 - 1
menduner/menduner-reward-biz/src/main/java/com/citu/module/menduner/reward/service/config/PointRuleConfigServiceImpl.java

@@ -37,7 +37,7 @@ public class PointRuleConfigServiceImpl implements PointRuleConfigService {
     @Override
     @DSTransactional
     @Caching(evict = {
-            @CacheEvict(value = RedisKeyConstants.POINT_RULE_CONFIG, key = "#updateReqVO.url"),
+            @CacheEvict(value = RedisKeyConstants.POINT_RULE_CONFIG, key = "#createReqVO.url"),
             @CacheEvict(value = RedisKeyConstants.POINT_RULE_CONFIG_LIST, allEntries = true)
     })
     public Long createPointRuleConfig(PointRuleConfigSaveReqVO createReqVO) {

+ 1 - 1
menduner/menduner-system-biz/src/main/java/com/citu/module/menduner/system/service/job/JobAdvertisedServiceImpl.java

@@ -468,7 +468,7 @@ public class JobAdvertisedServiceImpl implements JobAdvertisedService {
     @Override
     public void renewal(AppRecruitJobRenewalReqVO reqVO) {
         JobAdvertisedDO job = get(reqVO.getId());
-        if(null == reqVO.getTime() || reqVO.getTime().isAfter(LocalDateTime.now())) {
+        if(null == reqVO.getTime() || LocalDateTime.now().isAfter(reqVO.getTime())) {
             // 时间不能小于当前时间
             throw exception(MDE_JOB_ADVERTISED_TIME_ERROR);
         }