From dc90f9745fa2c3bff7c73a2c38fe1bc66bfd3db7 Mon Sep 17 00:00:00 2001
From: 935090232@qq.com <ak473600000>
Date: Mon, 25 Oct 2021 14:24:52 +0800
Subject: [PATCH] 删除mq引用
---
zq-erp/src/main/java/com/matrix/system/hive/service/imp/SysProjServicesServiceImpl.java | 18 ++++++++++--------
1 files changed, 10 insertions(+), 8 deletions(-)
diff --git a/zq-erp/src/main/java/com/matrix/system/hive/service/imp/SysProjServicesServiceImpl.java b/zq-erp/src/main/java/com/matrix/system/hive/service/imp/SysProjServicesServiceImpl.java
index 5b10922..1ad9a9c 100644
--- a/zq-erp/src/main/java/com/matrix/system/hive/service/imp/SysProjServicesServiceImpl.java
+++ b/zq-erp/src/main/java/com/matrix/system/hive/service/imp/SysProjServicesServiceImpl.java
@@ -1,7 +1,7 @@
package com.matrix.system.hive.service.imp;
import cn.hutool.core.collection.CollUtil;
-import com.matrix.component.rabbitmq.RabiitMqTemplate;
+import com.matrix.component.asyncmessage.AsyncMessageManager;
import com.matrix.core.constance.MatrixConstance;
import com.matrix.core.exception.GlobleException;
import com.matrix.core.pojo.PaginationVO;
@@ -25,12 +25,11 @@
import com.matrix.system.score.constant.ScoreSettingConstant;
import com.matrix.system.score.entity.ScoreVipDetail;
import com.matrix.system.score.service.ScoreVipDetailService;
-import com.matrix.system.shopXcx.mqTask.MQTaskRouting;
+import com.matrix.system.shopXcx.mqTask.AsyncMessageRouting;
import com.matrix.system.wechart.templateMsg.UniformMsgParam;
import org.apache.commons.collections.CollectionUtils;
import org.springframework.beans.BeanUtils;
import org.springframework.beans.factory.annotation.Autowired;
-import org.springframework.beans.factory.annotation.Value;
import org.springframework.stereotype.Service;
import org.springframework.transaction.annotation.Transactional;
@@ -112,7 +111,7 @@
private ShoppingGoodsService shoppingGoodsService;
@Autowired
- private RabiitMqTemplate rabiitMqTemplate;
+ private AsyncMessageManager asyncMessageManager;
@Autowired
@@ -124,8 +123,6 @@
@Autowired
SysVipInfoDao sysVipInfoDao;
- @Value("${evn}")
- private String evn;
/**
@@ -260,6 +257,12 @@
for (SysBeauticianState sysBeauticianState : sysProjServices.getServiceItems()) {
SysProjUse sysProjUse = projUseService.findById(sysBeauticianState.getPuseId());
+
+ //检查是否已经处于无效状态
+ if(Dictionary.TAOCAN_STATUS_WX.equals(sysProjUse.getStatus())){
+ return new VerifyResult(true, sysProjUse.getProjName() + "项目已经失效");
+ }
+
int kjcs = 1;
if (sysProjUse.getTaocanId() != null) {
kjcs = sysBeauticianState.getCount() * sysProjUse.getDeductionNum();
@@ -659,8 +662,7 @@
//发送微信公众号提醒
UniformMsgParam uniformMsgParam = new UniformMsgParam(projServices.getCompanyId(), UniformMsgParam.GZH_FWWC);
uniformMsgParam.put("serviceId", projServices.getId());
- rabiitMqTemplate.sendMsg(MQTaskRouting.SEND_UNIFORM_TEMPLATE_MSG + evn, uniformMsgParam.toJSONString());
-
+ asyncMessageManager.sendMsg(AsyncMessageRouting.SEND_UNIFORM_TEMPLATE_MSG ,uniformMsgParam);
return result;
}
--
Gitblit v1.9.1