From 13cbb37d5a38ae764fbe78063de4af61511b33e2 Mon Sep 17 00:00:00 2001 From: 935090232@qq.com <ak473600000> Date: Sat, 23 Oct 2021 21:25:24 +0800 Subject: [PATCH] 修改log4j配置 --- zq-erp/src/main/java/com/matrix/system/shopXcx/action/ShopRefundRecordAction.java | 26 +++++++++----------------- 1 files changed, 9 insertions(+), 17 deletions(-) diff --git a/zq-erp/src/main/java/com/matrix/system/shopXcx/action/ShopRefundRecordAction.java b/zq-erp/src/main/java/com/matrix/system/shopXcx/action/ShopRefundRecordAction.java index e51d52f..dc60310 100644 --- a/zq-erp/src/main/java/com/matrix/system/shopXcx/action/ShopRefundRecordAction.java +++ b/zq-erp/src/main/java/com/matrix/system/shopXcx/action/ShopRefundRecordAction.java @@ -1,5 +1,6 @@ package com.matrix.system.shopXcx.action; +import com.matrix.component.asyncmessage.AsyncMessageManager; import com.matrix.component.rabbitmq.RabiitMqTemplate; import com.matrix.component.redis.RedisUserLoginUtils; import com.matrix.component.wechat.externalInterface.weixinUtil.WeixinServiceUtil; @@ -11,8 +12,10 @@ import com.matrix.core.exception.GlobleException; import com.matrix.core.pojo.AjaxResult; import com.matrix.core.pojo.PaginationVO; -import com.matrix.core.tools.*; -import com.matrix.system.common.bean.BusParameterSettings; +import com.matrix.core.tools.LogUtil; +import com.matrix.core.tools.ModelUtils; +import com.matrix.core.tools.StringUtils; +import com.matrix.core.tools.WebUtil; import com.matrix.system.common.bean.SysUsers; import com.matrix.system.common.constance.AppConstance; import com.matrix.system.common.dao.BusParameterSettingsDao; @@ -24,7 +27,7 @@ import com.matrix.system.shopXcx.dao.ShopDeliveryInfoDao; import com.matrix.system.shopXcx.dao.ShopOrderDao; import com.matrix.system.shopXcx.dao.ShopRefundRecordDao; -import com.matrix.system.shopXcx.mqTask.MQTaskRouting; +import com.matrix.system.shopXcx.mqTask.AsyncMessageRouting; import org.apache.commons.collections.CollectionUtils; import org.springframework.beans.factory.annotation.Autowired; import org.springframework.beans.factory.annotation.Value; @@ -62,7 +65,8 @@ private ShopDeliveryInfoDao shopDeliveryInfoDao; @Autowired private RedisUserLoginUtils redisUserLoginUtils; - + @Autowired + private AsyncMessageManager asyncMessageManager; @Autowired private ShopCouponRecordDao shopCouponRecordDao; @@ -526,19 +530,7 @@ modifyMap.put("refundCharge", shopRefundRecord.getRefundMoney()); shopOrderDao.updateByMap(modifyMap); - //发送退款通知 - BusParameterSettings wxOrderNoticeDingdingToken = parameterSettingsDao.selectCompanyParamByCode(AppConstance.WX_ORDER_NOTICE_DINGDING_TOKEN, shopOrder.getCompanyId()); - if (wxOrderNoticeDingdingToken != null && StringUtils.isNotBlank(wxOrderNoticeDingdingToken.getParamValue())) { - DingDingRobotUtil.sendText(wxOrderNoticeDingdingToken.getParamValue(), - "订单退款,微商城订单编号 "+shopOrder.getOrderNo() - +"; 订单金额:¥"+shopOrder.getOrderMoney() - +";收货电话:"+ shopOrder.getUserTel()+",收货人:"+ shopOrder.getUserName() - ,""); - } - - - rabiitMqTemplate.sendMsg(MQTaskRouting.SHOP_ORDER_REFUND+evn,shopRefundRecord.getOrderId()+""); - + asyncMessageManager.sendMsg(AsyncMessageRouting.SHOP_ORDER_REFUND ,"orderId=%s", shopRefundRecord.getOrderId()); }catch (Exception e){ LogUtil.debug("退款成功,修改退款表和订单表状态出错。。。", id); -- Gitblit v1.9.1