feat: 启动成功

poyee-activity/src/main/java/com/tzy/app/service/impl/AppActGuessTeamServiceImpl.java

@@ -70,7 +70,7 @@ public class AppActGuessTeamServiceImpl implements IAppActGuessTeamService
     @Resource private ITzySysNoticeRecordService noticeRecordService;
 
     @Resource private AppActManageMapper appActManageMapper;
-    @Autowired
+    //@Autowired
     private RabbitTemplate rabbitTemplate;
     @Autowired
     CommonForestClient client;

poyee-activity/src/main/java/com/tzy/app/service/impl/LuckyPointServiceImpl.java

@@ -50,7 +50,7 @@ public class LuckyPointServiceImpl implements ILuckyPointService {
     @Value("${coreService.baseurl:https://coresvc-dev.hobbystocks.cn}")
     private String baseurl;
     @Resource private RedisUtils redisUtils;
-    @Resource
+    //@Resource
     private RabbitTemplate rabbitTemplate;
     @Resource
     private LuckyPointTask luckyPointTask;

poyee-activity/src/main/java/com/tzy/app/task/LuckyPointTask.java

@@ -44,7 +44,7 @@ public class LuckyPointTask {
     private AppActManageMapper appActManageMapper;
     @Resource
     private IAppActPrizeRecordService appActPrizeRecordService;
-    @Resource
+    //@Resource
     private RabbitTemplate rabbitTemplate;
     @Resource
     private TzySysNoticeRecordMapper tzySysNoticeRecordMapper;

poyee-app/src/main/java/com/tzy/app/service/impl/AppBaseUserInfoServiceImpl.java

@@ -41,7 +41,7 @@ public class AppBaseUserInfoServiceImpl implements AppBaseUserInfoService {
     private AppBaseUserInfoMapper appBaseUserInfoMapper;
     @Autowired
     private AppUserBaseService appUserBaseService;
-    @Autowired
+    //@Autowired
     private RabbitTemplate rabbitTemplate;
 
     @Override

poyee-coupon/src/main/java/com/tzy/coupon/card/controller/CardTaskInfoController.java

@@ -37,7 +37,7 @@ public class CardTaskInfoController extends BaseController {
 
     @Autowired
     private CardTaskInfoService cardTaskInfoService;
-    @Autowired
+    //@Autowired
     private RabbitTemplate rabbitTemplate;
 
     @Resource

poyee-coupon/src/main/java/com/tzy/coupon/card/listener/CardTaskDelayMessageListener.java

@@ -12,7 +12,7 @@ import org.springframework.beans.factory.annotation.Autowired;
 import org.springframework.stereotype.Component;
 
 import java.io.IOException;
-
+/*
 @Component
 @Slf4j
 public class CardTaskDelayMessageListener {
@@ -31,4 +31,4 @@ public class CardTaskDelayMessageListener {
         channel.basicAck(message.getMessageProperties()
                 .getDeliveryTag(), false);
     }
-}
+}*/

poyee-finance/src/main/java/com/tzy/system/mq/AutomaticTransferConsumer.java

@@ -1,154 +0,0 @@
-package com.tzy.system.mq;
-
-import com.alibaba.fastjson.JSONObject;
-import com.rabbitmq.client.Channel;
-import com.tzy.common.constant.MqConstans;
-import com.tzy.system.service.AutomaticTransferService;
-import lombok.extern.slf4j.Slf4j;
-import org.apache.commons.lang3.StringUtils;
-import org.springframework.amqp.core.Message;
-import org.springframework.amqp.rabbit.annotation.Queue;
-import org.springframework.amqp.rabbit.annotation.RabbitHandler;
-import org.springframework.amqp.rabbit.annotation.RabbitListener;
-import org.springframework.beans.factory.annotation.Autowired;
-import org.springframework.stereotype.Component;
-
-import java.io.IOException;
-import java.util.Objects;
-
-
-/**
- *
- */
-@Slf4j
-@Component
-public class AutomaticTransferConsumer {
-
-    @Autowired
-    private AutomaticTransferService automaticTransferService;
-    /**
-     * 回调前置消费
-     * @param data
-     * @param channel
-     * @param message
-     * @throws IOException
-     */
-    @RabbitHandler
-    @RabbitListener(queuesToDeclare=@Queue(MqConstans.QUEUE_GROUP_CLOSE_PAYMENT_AUTOMATIC))
-    public void payPreCallBack(String data, Channel channel, Message message) throws IOException {
-        checkTransferClosePaymentRecord(data, channel, message);
-    }
-
-    /**
-     * @param param
-     * @param channel
-     * @param message
-     * @throws IOException
-     */
-    private void checkTransferClosePaymentRecord(String param, Channel channel, Message message) throws IOException {
-        try {
-            JSONObject jsonObject = JSONObject.parseObject(param);
-            if(null != jsonObject && !jsonObject.isEmpty()){
-                automaticTransferService.checkTransferClosePaymentRecord(jsonObject.getInteger("id"));
-            }
-        } catch (Exception e) {
-            log.error("拼团专属通道打款计算失败,{}", param, e);
-        }
-        channel.basicReject(message.getMessageProperties().getDeliveryTag(), false);
-    }
-
-    /**
-     * 划付通知s
-     * @param data
-     * @param channel
-     * @param message
-     * @throws IOException
-     */
-    @RabbitHandler
-    @RabbitListener(queuesToDeclare=@Queue(MqConstans.QUEUE_PAY_ASSET_PAY_NOTICE))
-    public void payAssetPayNotice(String data, Channel channel, Message message) throws IOException {
-        doPayAssetPayNotice(data, channel, message);
-    }
-
-    /**
-     * @param data
-     * @param channel
-     * @param message
-     * @throws IOException
-     */
-    private void doPayAssetPayNotice(String data, Channel channel, Message message) throws IOException {
-        try {
-            JSONObject jsonObject = JSONObject.parseObject(data);
-            log.info( "划付通知:"+data);
-            if(null != jsonObject && !jsonObject.isEmpty()){
-                //判断 是否划付成功
-                // orderStatus : 0:待处理， 1:处理中 2:处理成功 3:处理失败
-                String status = jsonObject.getString("orderStatus");
-                boolean update = false;
-                //划付编码
-                String reqJournalNo = jsonObject.getString("reqJournalNo");
-                String orderType = jsonObject.getString("orderType");//0 商家划付, 1= py划付
-                if (Objects.equals("2", status) || Objects.equals("3", status)) {
-                    update = true;
-                }
-                if(update){
-                    //是否更新数据
-                    //更新 打款表，划付表信息
-                    if(automaticTransferService.updateClosePaymentRecord("pay" ,orderType, reqJournalNo, status,data)){
-                        channel.basicReject(message.getMessageProperties().getDeliveryTag(), false);
-                    }
-                }else{
-                    channel.basicReject(message.getMessageProperties().getDeliveryTag(), false);
-                }
-            }else{
-                channel.basicReject(message.getMessageProperties().getDeliveryTag(), false);
-            }
-        } catch (Exception e) {
-            log.error("划付通知消费失败,{}", data, e);
-            if(Objects.equals("未查询到划付记录！", e.getMessage())){
-                channel.basicReject(message.getMessageProperties().getDeliveryTag(), false);
-            }
-        }
-
-    }
-
-    /**
-     * 退票通知
-     * @param data
-     * @param channel
-     * @param message
-     * @throws IOException
-     */
-    @RabbitHandler
-    @RabbitListener(queuesToDeclare=@Queue(MqConstans.QUEUE_REFUND_ASSET_PAY_NOTICE))
-    public void refundAssetPayNotice(String data, Channel channel, Message message) throws IOException {
-        doRefundAssetPayNotice(data, channel, message);
-    }
-    private void doRefundAssetPayNotice(String data, Channel channel, Message message) throws IOException {
-        try {
-            JSONObject jsonObject = JSONObject.parseObject(data);
-            //处理数据中有 指定的描述的 直接消费
-            if(Objects.nonNull(jsonObject) && StringUtils.isNotBlank(jsonObject.getString("reason"))
-                && jsonObject.getString("reason").contains("客户代码未注册")
-            ){
-                channel.basicReject(message.getMessageProperties().getDeliveryTag(), false);
-                return;
-            }
-            log.info( "退票通知:"+data);
-            if(null != jsonObject && !jsonObject.isEmpty()){
-                String reqJournalNo = jsonObject.getString("reqJournalNo");
-                String orderType = jsonObject.getString("orderType");
-                //更新 打款表，划付表信息
-                //状态码 默认 999 = 退票
-                if(automaticTransferService.updateClosePaymentRecord("refund" ,orderType, reqJournalNo, "999",data)){
-                    channel.basicReject(message.getMessageProperties().getDeliveryTag(), false);
-                }
-            }else{
-                channel.basicReject(message.getMessageProperties().getDeliveryTag(), false);
-            }
-        } catch (Exception e) {
-            log.error("退票通知消费失败,{}", data, e);
-        }
-    }
-
-}

poyee-finance/src/main/java/com/tzy/system/service/PyFinanceBaseService.java

@@ -94,7 +94,7 @@ public class PyFinanceBaseService {
     protected String port;
     @Value("${tzy.app-version:test}")
     protected String version;
-    @Autowired
+    //@Autowired
     private RabbitTemplate rabbitTemplate;
 
     protected String getStatusMsg(Integer status){

poyee-living/src/main/java/com/tzy/living/service/impl/AppLiveLuckyBagServiceImpl.java

@@ -57,7 +57,7 @@ public class AppLiveLuckyBagServiceImpl implements IAppLiveLuckyBagService
     @Value("${liveWebSocketUrl:https://im-dev.hobbystocks.cn/chat/handler}")
     private String liveWebSocketUrl;
 
-    @Resource
+    //@Resource
     private RabbitTemplate rabbitTemplate;
 
     @Resource

poyee-living/src/main/java/com/tzy/living/service/impl/AppUserLivePrizeServiceImpl.java

@@ -51,7 +51,7 @@ public class AppUserLivePrizeServiceImpl implements IAppUserLivePrizeService
     @Resource
     private LivingTencentConfig livingTencentConfig;
 
-    @Resource
+    //@Resource
     private RabbitTemplate rabbitTemplate;
     @Resource
     private RedisUtils redisUtils;

tzy-admin/src/main/java/com/tzy/web/controller/app/MerchantOperController.java

@@ -47,7 +47,7 @@ public class MerchantOperController extends BaseController {
 
 	@Autowired
 	private ICardGroupOrderInfoService cardGroupOrderInfoService;
-	@Autowired
+	//@Autowired
 	private RabbitTemplate rabbitTemplate;
 	@Resource
 	private ICardGroupInfoService cardGroupInfoService;

tzy-admin/src/main/java/com/tzy/web/controller/tool/TestController.java

@@ -73,7 +73,7 @@ public class TestController extends BaseController
     private CardGroupOrderInfoMapper cardGroupOrderInfoMapper;
     @Autowired
     private ISysDictTypeService dictTypeService;
-    @Autowired
+    //@Autowired
     private RabbitTemplate rabbitTemplate;
     @Autowired
     private PaymentService paymentService;

tzy-order/src/main/java/com/tzy/order/mq/MqService.java

@@ -13,7 +13,7 @@ import java.util.Date;
 @Service
 public class MqService {
 
-    @Autowired
+    //@Autowired
     private RabbitTemplate rabbitTemplate;
 
     public void sendPointMq(PointOrderInfo orderInfos, String type, int points) {

tzy-order/src/main/java/com/tzy/order/service/OrderRefundBaseService.java

@@ -79,7 +79,7 @@ public class OrderRefundBaseService extends OrderPaymentFactory {
     protected AppBaseUserMapper appBaseUserMapper;
     @Autowired
     protected RedisUtils redisUtils;
-    @Autowired
+    //@Autowired
     private RabbitTemplate rabbitTemplate;
     @Autowired
     protected BasejigService basejigService;

tzy-sportcard/src/main/java/com/tzy/ad/service/impl/AppAdConfigServiceImpl.java

@@ -65,7 +65,7 @@ public class AppAdConfigServiceImpl implements IAppAdConfigService {
     private MerchantApiService merchantApiService;
     @Resource
     private MineApiService mineApiService;
-    @Resource
+    //@Resource
     private RabbitTemplate rabbitTemplate;
     @Autowired
     @Qualifier("threadPoolTaskExecutor")

tzy-sportcard/src/main/java/com/tzy/app/controller/AppBaseUserController.java

@@ -86,7 +86,7 @@ public class AppBaseUserController extends BaseController {
 	ISysDictDataService sysDictDataService;
 	@Resource
 	private IAppPayBlackUserService appPayBlackUserService;
-	@Resource
+	//@Resource
 	private RabbitTemplate rabbitTemplate;
 	@Value("${coreService.revocationTokenUrl:/api/internal/token/%s/revocation}")
 	private String revocationTokenUrl;

tzy-sportcard/src/main/java/com/tzy/app/service/impl/AppBaseUserServiceImpl.java

@@ -68,7 +68,7 @@ public class AppBaseUserServiceImpl implements IAppBaseUserService {
 	@Resource private AppAccountMapper appAccountMapper;
 	@Resource private ISysDictDataService dictDataService;
 	@Resource private ReportInfoMapper reportInfoMapper;
-	@Autowired
+	//@Autowired
 	private RabbitTemplate rabbitTemplate;
 
 	@Value("${wx.default_avatar:https://static.public.hobbystock.cn/applet/share/share_logo2.png}")

tzy-sportcard/src/main/java/com/tzy/sportcard/api/controller/MerchantApiController.java

@@ -105,7 +105,7 @@ public class MerchantApiController {
 	private IAppBaseUserService baseUserService;
 	@Autowired
 	private ISysDictDataService dictDataService;
-	@Autowired
+	//@Autowired
 	private RabbitTemplate rabbitTemplate;
 
 	@Value("${living.im.SDKAppID:1400661352}")

tzy-sportcard/src/main/java/com/tzy/sportcard/api/service/impl/AsyncAppServiceImpl.java

@@ -75,7 +75,7 @@ public class AsyncAppServiceImpl implements AsyncAppService {
 	private String baseurl;
 	@Value("${carmichael.url.add:http://localhost:8089/api/goods/add}")
 	private String carmichaelAddUrl;
-	@Resource
+	//@Resource
 	private RabbitTemplate rabbitTemplate;
 
 	@Async

tzy-sportcard/src/main/java/com/tzy/sportcard/group/controller/CardGroupInfoController.java

@@ -183,7 +183,7 @@ public class CardGroupInfoController extends BaseController {
     private ThreadPoolTaskExecutor pools;
     @Resource
     private IGoodsActRecordService goodsActRecordService;
-    @Resource
+    //@Resource
     private RabbitTemplate rabbitTemplate;
 
     @RequestMapping()

tzy-sportcard/src/main/java/com/tzy/sportcard/group/service/impl/CardGroupInfoServiceImpl.java

@@ -141,7 +141,7 @@ public class CardGroupInfoServiceImpl implements ICardGroupInfoService
     private IAppCarouselPictureService appCarouselPictureService;
     @Autowired
     private RedisUtils redisUtils;
-    @Autowired
+    //@Autowired
     private RabbitTemplate rabbitTemplate;
     @Autowired
     private ICardGroupConfigService cardGroupConfigService;

tzy-sportcard/src/main/java/com/tzy/sportcard/group/service/impl/CardGroupLivesConfigServiceImpl.java

@@ -52,7 +52,8 @@ public class CardGroupLivesConfigServiceImpl implements ICardGroupLivesConfigSer
     private ThreadPoolTaskExecutor pools;
     @Autowired
     private ITzySysNoticeRecordService noticeRecordService;
-    @Resource private RabbitTemplate rabbitTemplate;
+    //@Resource
+    private RabbitTemplate rabbitTemplate;
 
     /**
      * 查询拼团直播配置

tzy-sportcard/src/main/java/com/tzy/sportcard/mq/DelaySysMsgConsumer.java

@@ -1,42 +0,0 @@
-package com.tzy.sportcard.mq;
-
-import com.alibaba.fastjson.JSONObject;
-import com.rabbitmq.client.Channel;
-import com.tzy.common.constant.MqConstans;
-import com.tzy.common.dto.PushMsgDTO;
-import com.tzy.sportcard.api.service.AsyncAppService;
-import lombok.extern.slf4j.Slf4j;
-import org.springframework.amqp.core.Message;
-import org.springframework.amqp.rabbit.annotation.Queue;
-import org.springframework.amqp.rabbit.annotation.RabbitHandler;
-import org.springframework.amqp.rabbit.annotation.RabbitListener;
-import org.springframework.beans.factory.annotation.Autowired;
-import org.springframework.context.annotation.Lazy;
-import org.springframework.stereotype.Component;
-
-import java.io.IOException;
-
-/**
- * 延迟消息消费者
- */
-@Slf4j
-@Component
-public class DelaySysMsgConsumer {
-
-    @Autowired
-    private AsyncAppService asyncAppService;
-    @RabbitHandler
-    @RabbitListener(queuesToDeclare = @Queue(MqConstans.QUEUE_SYS_MSG_SEND))
-    public void delayMsgReceive(String msg, Channel channel, Message message) throws IOException {
-        log.info("延迟消息：{}", msg);
-        try {
-            PushMsgDTO param = JSONObject.parseObject(msg, PushMsgDTO.class);
-            asyncAppService.pushTimedMsg(param);
-        } catch (Exception e) {
-            log.error("延迟消息异常", e);
-        }
-        channel.basicAck(message.getMessageProperties()
-                                .getDeliveryTag(), false);
-    }
-
-}

tzy-sportcard/src/main/java/com/tzy/sportcard/mq/GroupAppSubmitReviewConsumer.java

@@ -1,99 +0,0 @@
-package com.tzy.sportcard.mq;
-
-import com.alibaba.fastjson.JSON;
-import com.alibaba.fastjson.JSONObject;
-import com.rabbitmq.client.Channel;
-import com.tzy.app.mapper.TzyMerchantGroupMapper;
-import com.tzy.base.dto.base.IMMstNoticeAdditionalInfo;
-import com.tzy.base.dto.base.IMMstNoticeInfo;
-import com.tzy.base.service.SysBaseService;
-import com.tzy.common.constant.MqConstans;
-import com.tzy.goods_act.service.IGoodsActRecordService;
-import com.tzy.sportcard.group.domain.CardGroupInfo;
-import com.tzy.sportcard.group.domain.TzyMerchantInfo;
-import com.tzy.sportcard.group.dto.GroupAppSubmitReviewParam;
-import com.tzy.sportcard.group.dto.GroupReviewParam;
-import com.tzy.sportcard.group.mapper.CardGroupGoodsMapper;
-import com.tzy.sportcard.group.mapper.TzyMerchantInfoMapper;
-import com.tzy.sportcard.group.service.GroupActRecordService;
-import com.tzy.sportcard.group.service.ICardGroupInfoService;
-import lombok.extern.slf4j.Slf4j;
-import org.springframework.amqp.core.Message;
-import org.springframework.amqp.rabbit.annotation.Queue;
-import org.springframework.amqp.rabbit.annotation.RabbitHandler;
-import org.springframework.amqp.rabbit.annotation.RabbitListener;
-import org.springframework.beans.factory.annotation.Autowired;
-import org.springframework.stereotype.Component;
-
-import javax.annotation.Resource;
-import java.io.IOException;
-
-/**
- * 拼团app提交审核消费mq
- */
-@Slf4j
-@Component
-public class GroupAppSubmitReviewConsumer {
-
-    @Resource
-    private ICardGroupInfoService cardGroupInfoService;
-    @Resource
-    private IGoodsActRecordService goodsActRecordService;
-    @Resource
-    private CardGroupGoodsMapper cardGroupGoodsMapper;
-    @Resource
-    private GroupActRecordService groupActRecordService;
-    @Autowired
-    protected SysBaseService sysBaseService;
-    @Resource
-    private TzyMerchantInfoMapper tzyMerchantInfoMapper;
-    @RabbitHandler
-    @RabbitListener(queuesToDeclare = @Queue(MqConstans.QUEUE_GROUP_SUBMIT))
-    public void groupReview(String groupInfoStr, Channel channel, Message message) throws IOException {
-        log.info("拼团app提交审核参数：{}", groupInfoStr);
-        try {
-            GroupAppSubmitReviewParam param = JSONObject.parseObject(groupInfoStr, GroupAppSubmitReviewParam.class);
-            CardGroupInfo cardGroupInfo = cardGroupInfoService.selectCardGroupInfoById(param.getGroupId());
-            log.info("拼团app提交审核参数：{}", cardGroupInfo);
-            cardGroupInfo.setStatus(param.getStatus());
-            cardGroupInfoService.jsonHoldV3Submit(cardGroupInfo);
-            // 审核提交后发送im消息给审核人
-            JSONObject jsonObjectExtra = new JSONObject();
-            JSONObject jsonObjectPayload = new JSONObject();
-            jsonObjectPayload.put("data", "reviewGroupBuying");
-            jsonObjectPayload.put("description", cardGroupInfo.getCode());
-            IMMstNoticeAdditionalInfo imMstNoticeAdditionalInfo = new IMMstNoticeAdditionalInfo();
-            imMstNoticeAdditionalInfo.setUpdateType("reviewGroupBuying");
-            imMstNoticeAdditionalInfo.setId(cardGroupInfo.getId());
-            imMstNoticeAdditionalInfo.setStatus("pending");
-//            jsonObjectAddition.put("updateType", "reviewGroupBuying");
-//            jsonObjectAddition.put("id", cardGroupInfo.getId());
-//            jsonObjectAddition.put("status", "refuse");
-            jsonObjectPayload.put("additionalInformation", imMstNoticeAdditionalInfo);
-            JSONObject jsonObjectGroupInfo = new JSONObject();
-            jsonObjectGroupInfo.put("id", cardGroupInfo.getId());
-            jsonObjectGroupInfo.put("pointType", cardGroupInfo.getPointType());
-            jsonObjectGroupInfo.put("statusMsg", cardGroupInfo.getStatus());
-            jsonObjectGroupInfo.put("groupInfoName", cardGroupInfo.getName());
-            jsonObjectGroupInfo.put("coverPicture", cardGroupInfo.getCoverPicture());
-            jsonObjectGroupInfo.put("code", cardGroupInfo.getCode());
-            jsonObjectGroupInfo.put("unitPrice", cardGroupInfo.getUnitPrice());
-
-//            jsonObjectGroupInfo.put("cardGroupInfo", cardGroupInfo);
-            jsonObjectPayload.put("extension", JSON.toJSONString(jsonObjectGroupInfo));
-            jsonObjectExtra.put("payload", jsonObjectPayload);
-
-            jsonObjectExtra.put("name", cardGroupInfo.getMerchantName());
-            jsonObjectExtra.put("id", cardGroupInfo.getId());
-            TzyMerchantInfo tzyMerchantInfo = tzyMerchantInfoMapper.selectTzyMerchantInfoById(cardGroupInfo.getMerchantId().longValue());
-            jsonObjectExtra.put("avatar", tzyMerchantInfo.getAvatar());
-            IMMstNoticeInfo imMstNoticeInfo = sysBaseService.buildIMNoticeP2P("operation","TIMCustomElem","mid_"+cardGroupInfo.getMerchantId(),"[自定义内容]", JSON.toJSONString(jsonObjectExtra));
-            sysBaseService.sendIMNotice(imMstNoticeInfo);
-        } catch (Exception e) {
-            log.error("拼团app提交审核参数异常", e);
-        }
-        channel.basicAck(message.getMessageProperties()
-                                .getDeliveryTag(), false);
-    }
-
-}

tzy-sportcard/src/main/java/com/tzy/sportcard/mq/GroupReviewConsumer.java

@@ -1,70 +0,0 @@
-package com.tzy.sportcard.mq;
-
-import com.alibaba.fastjson.JSON;
-import com.alibaba.fastjson.JSONObject;
-import com.rabbitmq.client.Channel;
-import com.tzy.base.dto.base.IMMstNoticeAdditionalInfo;
-import com.tzy.base.dto.base.IMMstNoticeInfo;
-import com.tzy.base.service.SysBaseService;
-import com.tzy.common.constant.MqConstans;
-import com.tzy.goods_act.service.IGoodsActRecordService;
-import com.tzy.sportcard.group.domain.CardGroupInfo;
-import com.tzy.sportcard.group.domain.TzyMerchantInfo;
-import com.tzy.sportcard.group.dto.GroupReviewParam;
-import com.tzy.sportcard.group.mapper.CardGroupGoodsMapper;
-import com.tzy.sportcard.group.mapper.TzyMerchantInfoMapper;
-import com.tzy.sportcard.group.service.GroupActRecordService;
-import com.tzy.sportcard.group.service.ICardGroupInfoService;
-import lombok.extern.slf4j.Slf4j;
-import org.springframework.amqp.core.Message;
-import org.springframework.amqp.rabbit.annotation.Queue;
-import org.springframework.amqp.rabbit.annotation.RabbitHandler;
-import org.springframework.amqp.rabbit.annotation.RabbitListener;
-import org.springframework.beans.factory.annotation.Autowired;
-import org.springframework.stereotype.Component;
-
-import javax.annotation.Resource;
-import java.io.IOException;
-
-/**
- * 拼团审核消费mq
- */
-@Slf4j
-@Component
-public class GroupReviewConsumer {
-
-    @Resource
-    private ICardGroupInfoService cardGroupInfoService;
-    @Resource
-    private IGoodsActRecordService goodsActRecordService;
-    @Resource
-    private CardGroupGoodsMapper cardGroupGoodsMapper;
-    @Resource
-    private GroupActRecordService groupActRecordService;
-    @Resource
-    private TzyMerchantInfoMapper tzyMerchantInfoMapper;
-    @Autowired
-    protected SysBaseService sysBaseService;
-    @RabbitHandler
-    @RabbitListener(queuesToDeclare = @Queue(MqConstans.QUEUE_GROUP_REVIEW))
-    public void groupReview(String groupInfoStr, Channel channel, Message message) throws IOException {
-        log.info("拼团审核参数：{}", groupInfoStr);
-        try {
-            GroupReviewParam param = JSONObject.parseObject(groupInfoStr, GroupReviewParam.class);
-            cardGroupInfoService.groupReviewConsumer(param.getId());
-            CardGroupInfo cardGroupInfo = cardGroupInfoService.selectCardGroupInfoById(param.getId());
-            //发送消息给商家
-            JSONObject jsonObjectPayload = new JSONObject();
-            jsonObjectPayload.put("updateType", "reviewGroupBuying");
-            jsonObjectPayload.put("id", cardGroupInfo.getId());
-            jsonObjectPayload.put("status", "agree");
-            IMMstNoticeInfo imMstNoticeInfo = sysBaseService.buildIMNoticeP2P("mid_"+cardGroupInfo.getMerchantId(),"UPDATE_MESSAGE_STATUS","operation","", JSON.toJSONString(jsonObjectPayload));
-            sysBaseService.sendIMNotice(imMstNoticeInfo);
-        } catch (Exception e) {
-            log.error("拼团审核参数异常", e);
-        }
-        channel.basicAck(message.getMessageProperties()
-                                .getDeliveryTag(), false);
-    }
-
-}

tzy-sportcard/src/main/java/com/tzy/sportcard/mq/GroupReviewRejectConsumer.java

@@ -1,71 +0,0 @@
-package com.tzy.sportcard.mq;
-
-import com.alibaba.fastjson.JSON;
-import com.alibaba.fastjson.JSONObject;
-import com.rabbitmq.client.Channel;
-import com.tzy.base.dto.base.IMMstNoticeAdditionalInfo;
-import com.tzy.base.dto.base.IMMstNoticeInfo;
-import com.tzy.base.service.SysBaseService;
-import com.tzy.common.constant.MqConstans;
-import com.tzy.goods_act.service.IGoodsActRecordService;
-import com.tzy.sportcard.group.domain.CardGroupInfo;
-import com.tzy.sportcard.group.domain.TzyMerchantInfo;
-import com.tzy.sportcard.group.dto.GroupReviewParam;
-import com.tzy.sportcard.group.mapper.CardGroupGoodsMapper;
-import com.tzy.sportcard.group.mapper.TzyMerchantInfoMapper;
-import com.tzy.sportcard.group.service.GroupActRecordService;
-import com.tzy.sportcard.group.service.ICardGroupInfoService;
-import lombok.extern.slf4j.Slf4j;
-import org.springframework.amqp.core.Message;
-import org.springframework.amqp.rabbit.annotation.Queue;
-import org.springframework.amqp.rabbit.annotation.RabbitHandler;
-import org.springframework.amqp.rabbit.annotation.RabbitListener;
-import org.springframework.beans.factory.annotation.Autowired;
-import org.springframework.stereotype.Component;
-
-import javax.annotation.Resource;
-import java.io.IOException;
-
-/**
- * 拼团审核消费mq
- */
-@Slf4j
-@Component
-public class GroupReviewRejectConsumer {
-
-    @Resource
-    private ICardGroupInfoService cardGroupInfoService;
-    @Resource
-    private IGoodsActRecordService goodsActRecordService;
-    @Resource
-    private CardGroupGoodsMapper cardGroupGoodsMapper;
-    @Resource
-    private GroupActRecordService groupActRecordService;
-    @Resource
-    private TzyMerchantInfoMapper tzyMerchantInfoMapper;
-    @Autowired
-    protected SysBaseService sysBaseService;
-    @RabbitHandler
-    @RabbitListener(queuesToDeclare = @Queue(MqConstans.QUEUE_GROUP_REVIEW_REJECT
-    ))
-    public void groupReview(String groupInfoStr, Channel channel, Message message) throws IOException {
-        log.info("拼团审核参数：{}", groupInfoStr);
-        try {
-            GroupReviewParam param = JSONObject.parseObject(groupInfoStr, GroupReviewParam.class);
-            cardGroupInfoService.groupReviewConsumer(param.getId());
-            CardGroupInfo cardGroupInfo = cardGroupInfoService.selectCardGroupInfoById(param.getId());
-            //发送消息给商家
-            JSONObject jsonObjectPayload = new JSONObject();
-            jsonObjectPayload.put("updateType", "reviewGroupBuying");
-            jsonObjectPayload.put("id", cardGroupInfo.getId());
-            jsonObjectPayload.put("status", "refuse");
-            IMMstNoticeInfo imMstNoticeInfo = sysBaseService.buildIMNoticeP2P("mid_"+cardGroupInfo.getMerchantId(),"UPDATE_MESSAGE_STATUS","operation","", JSON.toJSONString(jsonObjectPayload));
-            sysBaseService.sendIMNotice(imMstNoticeInfo);
-        } catch (Exception e) {
-            log.error("拼团审核参数异常", e);
-        }
-        channel.basicAck(message.getMessageProperties()
-                                .getDeliveryTag(), false);
-    }
-
-}

tzy-sportcard/src/main/java/com/tzy/task/CardGroupInfoTask.java

@@ -32,7 +32,7 @@ public class CardGroupInfoTask extends GroupBaseService {
 
 	@Autowired
 	private AsyncAppService asyncAppService;
-	@Autowired
+	//@Autowired
 	private RabbitTemplate rabbitTemplate;
 	@Resource
 	private OrderListTaskMapper orderListTaskMapper;

tzy-sportcard/src/main/java/com/tzy/task/CardGroupOrderTask.java

@@ -38,7 +38,7 @@ public class CardGroupOrderTask {
 
     @Autowired
     private ICardGroupOrderInfoService cardGroupOrderInfoService;
-    @Autowired
+    //@Autowired
     private RabbitTemplate rabbitTemplate;
     @Resource
     private AppBaseUserMapper appBaseUserMapper;