Merge branch 'score_shop' into api_score_meger

935090232@qq.com

2021-10-21 487e48afd7acf4a2ddddd02f2ec1db7fa1d91e99

 zq-erp/src/main/java/com/matrix/system/hive/action/MoneyCardUseController.java

@@ -1,6 +1,6 @@
package com.matrix.system.hive.action;

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.AjaxResult;
@@ -13,7 +13,7 @@
import com.matrix.system.hive.dao.MoneyCardUseFlowDao;
import com.matrix.system.hive.pojo.CzXkVo;
import com.matrix.system.hive.service.*;
import com.matrix.system.shopXcx.mqTask.MQTaskRouting;
import com.matrix.system.shopXcx.mqTask.AsyncMessageRouting;
import com.matrix.system.wechart.templateMsg.UniformMsgParam;
import org.springframework.beans.factory.annotation.Autowired;
import org.springframework.beans.factory.annotation.Value;
@@ -61,10 +61,9 @@
    @Value("${evn}")
    private  String evn;


    @Autowired
    private RabiitMqTemplate rabiitMqTemplate;


    private AsyncMessageManager asyncMessageManager;
    /**
     * 跳转 充值页面
     *
@@ -94,7 +93,7 @@
        //发送微信公众号提醒
        UniformMsgParam uniformMsgParam=new UniformMsgParam(order.getCompanyId(),UniformMsgParam.GZH_CZCG);
        uniformMsgParam.put("orderId",order.getId());
        rabiitMqTemplate.sendMsg(MQTaskRouting.SEND_UNIFORM_TEMPLATE_MSG+evn,uniformMsgParam.toJSONString());
        asyncMessageManager.sendMsg(AsyncMessageRouting.SEND_UNIFORM_TEMPLATE_MSG ,uniformMsgParam);

        result.putInMap("orderId",order.getId());
        return result;