beauty-erp.git - Gitblit

			@@ -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;


			/**
			@@ -659,8 +656,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;
			}