Browse Source

1、解决众聘支付后职位无法开启问题
2、解决开通了会员叠加后无法正常处理问题

rayson 8 months ago
parent
commit
f6ad00e739

+ 1 - 2
menduner/menduner-system-biz/src/main/java/com/citu/module/menduner/system/mq/consumer/PublishJobHireConsumer.java

@@ -11,7 +11,6 @@ import org.apache.rocketmq.spring.core.RocketMQListener;
 import org.springframework.stereotype.Component;
 import org.springframework.stereotype.Component;
 
 
 import javax.annotation.Resource;
 import javax.annotation.Resource;
-import java.util.Collections;
 
 
 /**
 /**
  * 众聘职位完成支付 消费
  * 众聘职位完成支付 消费
@@ -34,6 +33,6 @@ public class PublishJobHireConsumer implements RocketMQListener<Long> {
     public void onMessage(Long orderId) {
     public void onMessage(Long orderId) {
         log.info("接收到队列消息[{}]", orderId);
         log.info("接收到队列消息[{}]", orderId);
         TradeOrderDO order = tradeOrderService.getOrder(orderId);
         TradeOrderDO order = tradeOrderService.getOrder(orderId);
-        service.enable(Collections.singletonList(order.getSpuId()));
+        service.enableHire(order.getSpuId());
     }
     }
 }
 }

+ 2 - 1
menduner/menduner-system-biz/src/main/java/com/citu/module/menduner/system/mq/consumer/UserMemberConsumer.java

@@ -3,7 +3,6 @@ package com.citu.module.menduner.system.mq.consumer;
 import com.baomidou.dynamic.datasource.annotation.DSTransactional;
 import com.baomidou.dynamic.datasource.annotation.DSTransactional;
 import com.citu.module.menduner.common.enums.EventAsyncUrlEnum;
 import com.citu.module.menduner.common.enums.EventAsyncUrlEnum;
 import com.citu.module.menduner.common.message.EventAsyncConfirmMessage;
 import com.citu.module.menduner.common.message.EventAsyncConfirmMessage;
-import com.citu.module.menduner.common.util.LoginUserContext;
 import com.citu.module.menduner.system.controller.base.user.vip.UserEntitlementSaveReqVO;
 import com.citu.module.menduner.system.controller.base.user.vip.UserEntitlementSaveReqVO;
 import com.citu.module.menduner.system.dal.dataobject.order.TradeOrderDO;
 import com.citu.module.menduner.system.dal.dataobject.order.TradeOrderDO;
 import com.citu.module.menduner.system.dal.dataobject.user.MdeUserDO;
 import com.citu.module.menduner.system.dal.dataobject.user.MdeUserDO;
@@ -122,7 +121,9 @@ public class UserMemberConsumer implements RocketMQListener<Long> {
                     .build()
                     .build()
             );
             );
         } else {
         } else {
+
             userEntitleService.updateUserEntitlement(UserEntitlementSaveReqVO.builder()
             userEntitleService.updateUserEntitlement(UserEntitlementSaveReqVO.builder()
+                    .id(entitlement.getId())
                     .userId(user.getId())
                     .userId(user.getId())
                     .resumeRefreshCount(packageDO.getResumeRefreshCount() + packageDO.getResumeRefreshCount())
                     .resumeRefreshCount(packageDO.getResumeRefreshCount() + packageDO.getResumeRefreshCount())
                     // 覆盖权限,以新套餐为准,不会出现,买大权益套餐还能买小权益套餐的情况
                     // 覆盖权限,以新套餐为准,不会出现,买大权益套餐还能买小权益套餐的情况

+ 5 - 0
menduner/menduner-system-biz/src/main/java/com/citu/module/menduner/system/service/job/JobAdvertisedService.java

@@ -155,6 +155,11 @@ public interface JobAdvertisedService {
      **/
      **/
     void enable(List<Long> ids);
     void enable(List<Long> ids);
 
 
+    /**
+     * 开启职位(众聘职位使用)
+     **/
+    void enableHire(Long id);
+
     /**
     /**
      * 关闭职位
      * 关闭职位
      **/
      **/

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

@@ -506,6 +506,23 @@ public class JobAdvertisedServiceImpl implements JobAdvertisedService {
         }
         }
     }
     }
 
 
+    @Override
+    public void enableHire(Long id) {
+        JobAdvertisedDO job = get(id);
+        if (JobStatusEnum.ENABLE.getStatus().equals(job.getStatus())) {
+            // 已经是开启状态
+            throw exception(MDE_JOB_ADVERTISED_STATUS_ENABLE_ERROR);
+        }
+        if (job.getHire()) {
+            // 众聘职位调用才处理
+            job.setStatus(JobStatusEnum.ENABLE.getStatus());
+            mapper.updateById(job);
+            jobDataSync(job, SyncConstants.UPDATE);
+        }
+
+
+    }
+
     @Override
     @Override
     @DSTransactional
     @DSTransactional
     public void disable(List<Long> ids) {
     public void disable(List<Long> ids) {