From 248f33ff3b981a15b4adf26880e24852809561d9 Mon Sep 17 00:00:00 2001
From: 935090232@qq.com <ak473600000>
Date: Thu, 28 Oct 2021 09:57:22 +0800
Subject: [PATCH] 短信改造延期
---
zq-erp/src/main/java/com/matrix/system/hive/action/MoneyCardUseController.java | 20 +++++++-------------
1 files changed, 7 insertions(+), 13 deletions(-)
diff --git a/zq-erp/src/main/java/com/matrix/system/hive/action/MoneyCardUseController.java b/zq-erp/src/main/java/com/matrix/system/hive/action/MoneyCardUseController.java
index c19da86..e2c6ea7 100644
--- a/zq-erp/src/main/java/com/matrix/system/hive/action/MoneyCardUseController.java
+++ b/zq-erp/src/main/java/com/matrix/system/hive/action/MoneyCardUseController.java
@@ -1,11 +1,10 @@
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;
import com.matrix.core.pojo.PaginationVO;
-import com.matrix.core.tools.DateUtil;
import com.matrix.core.tools.WebUtil;
import com.matrix.system.common.bean.SysUsers;
import com.matrix.system.constance.Dictionary;
@@ -14,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;
@@ -62,10 +61,9 @@
@Value("${evn}")
private String evn;
+
@Autowired
- private RabiitMqTemplate rabiitMqTemplate;
-
-
+ private AsyncMessageManager asyncMessageManager;
/**
* 跳转 充值页面
*
@@ -95,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;
@@ -217,13 +215,11 @@
/**
* 补交
- *
- * @throws GlobleException
* @author jyy
*/
@RequestMapping(value = "/bj")
public @ResponseBody
- AjaxResult bj(@RequestBody SysOrder order) throws GlobleException {
+ AjaxResult bj(@RequestBody SysOrder order){
orderService.updateAfterMoney(order);
return new AjaxResult(AjaxResult.STATUS_SUCCESS, "补交成功");
@@ -299,9 +295,7 @@
break;
//如果是冻结状态则要算出冻结的天数，延长有效期
case Dictionary.TAOCAN_STATUS_DJ:
- MoneyCardUseFreeze freeze = new MoneyCardUseFreeze();
- freeze = moneyCardUseFreezeService.findByMoneyCardUseId(cardUse.getId());
- cardUse.setFailTime(DateUtil.nextNDate(failTime, freeze.getGapDays()));
+
break;
default:
return new AjaxResult(AjaxResult.STATUS_FAIL, "请选择无效或者冻结的充值卡");
--
Gitblit v1.9.1