From 6924e965ea3da70823f50f7285b50efab7205415 Mon Sep 17 00:00:00 2001
From: 935090232@qq.com <ak473600000>
Date: Sat, 08 May 2021 22:42:02 +0800
Subject: [PATCH] Merge remote-tracking branch 'origin/api_score_meger' into api_score_meger
---
zq-erp/src/main/java/com/matrix/system/shopXcx/api/service/impl/WxShopRefundRecordServiceImpl.java | 34 ++++------------------------------
1 files changed, 4 insertions(+), 30 deletions(-)
diff --git a/zq-erp/src/main/java/com/matrix/system/shopXcx/api/service/impl/WxShopRefundRecordServiceImpl.java b/zq-erp/src/main/java/com/matrix/system/shopXcx/api/service/impl/WxShopRefundRecordServiceImpl.java
index 7597ba7..28e33f6 100644
--- a/zq-erp/src/main/java/com/matrix/system/shopXcx/api/service/impl/WxShopRefundRecordServiceImpl.java
+++ b/zq-erp/src/main/java/com/matrix/system/shopXcx/api/service/impl/WxShopRefundRecordServiceImpl.java
@@ -16,6 +16,7 @@
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;
@@ -109,7 +110,7 @@
//退款成功后同时把优惠券退回到用户的账号中
if (shopOrder.getDiscountAmount() != null && shopOrder.getDiscountAmount().compareTo(BigDecimal.ZERO) >0) {
ShopCouponRecord shopCouponRecord = new ShopCouponRecord();
- String userIds = shopRefundRecord.getUserId();
+ Long userIds = shopRefundRecord.getUserId();
shopCouponRecord.setUserId(userIds);
shopCouponRecord.setOrderId(shopOrder.getId());
List<ShopCouponRecord> recordList = shopCouponRecordDao.selectByModel(shopCouponRecord);
@@ -143,7 +144,7 @@
modifyMap.put("refundCharge", shopRefundRecord.getRefundMoney());
shopOrderDao.updateByMap(modifyMap);
- rabiitMqTemplate.sendMsg(MQTaskRouting.SHOP_ORDER_REFUND+evn,shopOrder.getId()+"");
+ rabiitMqTemplate.sendMsg(MQTaskRouting.SHOP_ORDER_REFUND+evn,shopRefundRecord.getOrderId()+"");
}catch (Exception e){
@@ -154,34 +155,7 @@
return flag;
}
- /**
- * 退款成功后发送微信提醒
- * @param shopRefundRecord
- * @return
- */
- @Override
- public int sendRefundInfoToUser(ShopRefundRecord shopRefundRecord) {
- ShopOrder order = shopOrderDao.selectById(shopRefundRecord.getOrderId());
- if (order == null) {
- throw new GlobleException("没有找到需要退款的订单信息");
- }
- List<String> msg = new ArrayList<>();
- //退款说明
- String refundExplain = "退款已经原路返回,具体到账时间可能会有1-3天延迟";
- msg.add(order.getOrderNo());
- msg.add(DateUtil.dateToString(shopRefundRecord.getRefundTime(),DateUtil.DATE_FORMAT_SS));
- msg.add(refundExplain);
- String formId = null;
- if(AppConstance.REFUND_GOODS.equals(shopRefundRecord.getRefundType()) && null != shopRefundRecord.getRefundTransactionNo()){
- formId = shopRefundRecord.getRefundTransactionNo();
- }else {
- formId = order.getWxOrderNo().split("=")[1];
- }
- String page = "pages/refunDetail/refunDetail?id=" + shopRefundRecord.getId() + "&&status=1" + "&&inform=1";
- int res = WxTempLateMsgUtil.sendWxTemplateMsg(msg, order.getUserId(),
- page, WxTempLateMsgUtil.REFUND_SUCCESS, formId);
- return res;
- }
+
@Override
public void updateGroupBuyStatus(Long orderId) {
--
Gitblit v1.9.1