Merge remote-tracking branch 'origin/score_shop' into score_shop

935090232@qq.com

2021-10-25 1d8b7df974e1fbdacff7632b05bdc30d78a6a8c1

 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;
@@ -17,6 +18,7 @@
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;
import com.matrix.system.hive.action.util.QueryUtil;
import com.matrix.system.shopXcx.api.service.WXShopOrderService;
import com.matrix.system.shopXcx.api.service.WxShopRefundRecordService;
@@ -25,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;
@@ -63,7 +65,8 @@
   private ShopDeliveryInfoDao shopDeliveryInfoDao;
   @Autowired
   private RedisUserLoginUtils redisUserLoginUtils;

   @Autowired
   private AsyncMessageManager asyncMessageManager;
   @Autowired
   private ShopCouponRecordDao shopCouponRecordDao;

@@ -81,6 +84,8 @@
   @Autowired
   private RabiitMqTemplate rabiitMqTemplate;

   @Autowired
   BusParameterSettingsDao parameterSettingsDao;

   /**
    * 列表显示
@@ -525,7 +530,7 @@
            modifyMap.put("refundCharge", shopRefundRecord.getRefundMoney());
            shopOrderDao.updateByMap(modifyMap);

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