~jiangyouyao/beauty-erp.git

			@@ -1,20 +1,22 @@
			package com.matrix.system.shopXcx.api.service.impl;

			import com.matrix.component.wechat.externalInterface.common.WechatConfigure;
			import com.matrix.component.rabbitmq.RabiitMqTemplate;
			import com.matrix.component.tools.WxTempLateMsgUtil;
			import com.matrix.component.wechat.externalInterface.weixinUtil.WeixinServiceUtil;
			import com.matrix.core.exception.GlobleException;
			import com.matrix.core.tools.DateUtil;
			import com.matrix.core.tools.LogUtil;
			import com.matrix.system.common.constance.AppConstance;
			import com.matrix.component.wechat.externalInterface.weixinUtil.WeixinServiceUtil;
			import com.matrix.system.shopXcx.bean.*;
			import com.matrix.system.shopXcx.dao.*;
			import com.matrix.component.tools.WxTempLateMsgUtil;
			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.*;
			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;
			import org.springframework.stereotype.Service;
			import org.springframework.transaction.annotation.Transactional;

			import java.math.BigDecimal;
			import java.util.ArrayList;
			@@ -49,7 +51,15 @@

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

			@Autowired
			private RabiitMqTemplate rabiitMqTemplate;


			@Override
			@Transactional
			public Boolean refundToUser(String id, ShopRefundRecord shopRefundRecord) {
			LogUtil.debug("进入退款接口进行退款。。。", id);
			Boolean flag = false;
			@@ -78,14 +88,13 @@

			//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;
			}

			@@ -135,6 +144,10 @@
			modifyMap.put("orderStatus", ShopOrder.ORDER_STATUS_MONEYBACK_SUCCESS);
			modifyMap.put("refundCharge", shopRefundRecord.getRefundMoney());
			shopOrderDao.updateByMap(modifyMap);

			rabiitMqTemplate.sendMsg(MQTaskRouting.SHOP_ORDER_REFUND+evn,shopRefundRecord.getOrderId()+"");


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