modify

wzy

2021-04-01 d388e2788b7ef088d7cd40f901b0acdcec460bc3

 zq-erp/src/main/java/com/matrix/system/shopXcx/action/ShopRefundRecordAction.java

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

import com.matrix.component.wechat.externalInterface.common.WechatConfigure;
import com.matrix.component.rabbitmq.RabiitMqTemplate;
import com.matrix.component.redis.RedisUserLoginUtils;
import com.matrix.component.tools.WxTempLateMsgUtil;
import com.matrix.component.wechat.externalInterface.weixinUtil.WeixinServiceUtil;
import com.matrix.core.anotations.RemoveRequestToken;
import com.matrix.core.anotations.SaveRequestToken;
import com.matrix.core.constance.MatrixConstance;
@@ -10,20 +13,17 @@
import com.matrix.core.pojo.AjaxResult;
import com.matrix.core.pojo.PaginationVO;
import com.matrix.core.tools.*;
import com.matrix.component.redis.RedisUserLoginUtils;
import com.matrix.system.common.bean.SysUsers;
import com.matrix.system.common.constance.AppConstance;

import com.matrix.component.wechat.externalInterface.weixinUtil.WeixinServiceUtil;
import com.matrix.system.hive.action.util.QueryUtil;
import com.matrix.system.shopXcx.api.service.WXShopOrderService;
import com.matrix.system.shopXcx.api.service.WxShopRefundRecordService;
import com.matrix.system.shopXcx.bean.*;
import com.matrix.system.shopXcx.dao.ShopCouponRecordDao;
import com.matrix.system.shopXcx.dao.ShopDeliveryInfoDao;
import com.matrix.system.shopXcx.dao.ShopOrderDao;
import com.matrix.system.shopXcx.dao.ShopRefundRecordDao;
import com.matrix.component.tools.WxTempLateMsgUtil;
import com.matrix.system.shopXcx.api.service.WXShopOrderService;
import com.matrix.system.shopXcx.mqTask.MQTaskRouting;
import org.apache.commons.collections.CollectionUtils;
import org.springframework.beans.factory.annotation.Autowired;
import org.springframework.beans.factory.annotation.Value;
@@ -73,6 +73,12 @@

   @Value("${wx_pay_debug_onoff}")
   private boolean isDebug;
   @Value("${evn}")
   private  String evn;

   @Autowired
   private RabiitMqTemplate rabiitMqTemplate;


   /**
    * 列表显示
@@ -464,16 +470,14 @@
      int reMoney = b1.multiply(bb).intValue();
      LogUtil.info("退款退款金额{}", reMoney);

      //Double refundMoney = 0.1 * 100;
      //用户ID
      String userId = WechatConfigure.mchID;


      if (isDebug) {
         boolean b = weixinServiceUtil.comRefund(orderNo, refundNo, 1, 1, userId);
         boolean b = weixinServiceUtil.comRefund(orderNo, refundNo, 1, 1, null);
         flag = b;
      } else {
         LogUtil.info("开始调用退款接口。。。退款编号为{}", refundNo);
         boolean b = weixinServiceUtil.comRefund(orderNo, refundNo, orMoney, reMoney, userId);
         boolean b = weixinServiceUtil.comRefund(orderNo, refundNo, orMoney, reMoney, null);
         flag = b;
      }

@@ -524,6 +528,9 @@
            modifyMap.put("orderStatus", ShopOrder.ORDER_STATUS_MONEYBACK_SUCCESS);
            modifyMap.put("refundCharge", shopRefundRecord.getRefundMoney());
            shopOrderDao.updateByMap(modifyMap);

            rabiitMqTemplate.sendMsg(MQTaskRouting.SHOP_ORDER_REFUND+evn,shopOrder.getId()+"");

         }catch (Exception e){
            LogUtil.debug("退款成功，修改退款表和订单表状态出错。。。", id);
            e.printStackTrace();