From 710b32a988b8c1881c815595a3d390cd1106c560 Mon Sep 17 00:00:00 2001
From: xiaoyong931011 <15274802129@163.com>
Date: Thu, 22 Apr 2021 16:04:13 +0800
Subject: [PATCH] 20210422 签到
---
zq-erp/src/main/java/com/matrix/system/shopXcx/mqTask/SalesOrderRefundTask.java | 9 ++++++++-
1 files changed, 8 insertions(+), 1 deletions(-)
diff --git a/zq-erp/src/main/java/com/matrix/system/shopXcx/mqTask/SalesOrderRefundTask.java b/zq-erp/src/main/java/com/matrix/system/shopXcx/mqTask/SalesOrderRefundTask.java
index 3077d78..d7eab53 100644
--- a/zq-erp/src/main/java/com/matrix/system/shopXcx/mqTask/SalesOrderRefundTask.java
+++ b/zq-erp/src/main/java/com/matrix/system/shopXcx/mqTask/SalesOrderRefundTask.java
@@ -9,6 +9,7 @@
import com.matrix.system.score.service.ScoreVipDetailService;
import com.matrix.system.shopXcx.bean.ShopOrder;
import com.matrix.system.shopXcx.dao.ShopOrderDao;
+import com.matrix.system.shopXcx.dao.ShopOrderDetailsDao;
import com.rabbitmq.client.DeliverCallback;
import com.rabbitmq.client.Delivery;
import org.springframework.beans.factory.annotation.Autowired;
@@ -32,6 +33,8 @@
@Autowired
private ScoreVipDetailService scoreVipDetailService;
+ @Autowired
+ ShopOrderDetailsDao shopOrderDetailsDao;
@Override
@@ -50,11 +53,15 @@
}
ShopOrder order=shopOrderDao.selectById(Integer.parseInt(orderId));
+ //如果是积分支付则需要返还积分
if(order.getScorePay()!=null && order.getScorePay()>0){
LogUtil.debug("处理积分退款={}", orderId);
- scoreVipDetailService.refundScore(order.getUserId(),null,order.getScorePay(),Long.parseLong(order.getId()+""), ScoreVipDetail.SCORE_VIP_TYPE_CASH);
+ scoreVipDetailService.refundScore(order.getUserId(),order.getScorePay(),Long.parseLong(order.getId()+""), ScoreVipDetail.SCORE_VIP_TYPE_CASH);
}
+ //消费获得积分返还，如果本订单获得了积分则要扣除获得积分
+ scoreVipDetailService.removeByBusinessId(order.getUserId(),Long.parseLong(order.getId()+""));
+
}
--
Gitblit v1.9.1