From 393d296e43f0e5f11e524cab5446bcd3eee94e89 Mon Sep 17 00:00:00 2001
From: jyy <jyy>
Date: Sat, 12 Jun 2021 17:47:38 +0800
Subject: [PATCH] 新增赠送项目是否计算消耗控制
---
zq-erp/src/main/java/com/matrix/system/shopXcx/mqTask/SalesOrderRefundTask.java | 25 ++++++++++++++++---------
1 files changed, 16 insertions(+), 9 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 b345782..8b52165 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
@@ -16,6 +16,7 @@
import org.springframework.stereotype.Component;
import java.io.IOException;
+import java.util.List;
/**
* 分销订单退款
@@ -44,23 +45,29 @@
LogUtil.debug("收到分销订单退款任务orderId={}", orderId);
QueryWrapper queryWrapper=new QueryWrapper();
queryWrapper.eq("order_id",orderId);
- ShopSalesmanOrder shopSalesmanOrder = shopSalesmanOrderDao.selectOne(queryWrapper);
- if(shopSalesmanOrder!=null){
- shopSalesmanOrder.setOrderStatus(ShopSalesmanOrder.STATUS_YTK);
- shopSalesmanOrderDao.updateById(shopSalesmanOrder);
- }else{
- LogUtil.debug("改订单为生成分销订单={}", orderId);
- }
+ List<ShopSalesmanOrder> list = shopSalesmanOrderDao.selectList(queryWrapper);
+
+ list.forEach(shopSalesmanOrder->{
+
+ if(shopSalesmanOrder!=null){
+ shopSalesmanOrder.setOrderStatus(ShopSalesmanOrder.STATUS_YTK);
+ shopSalesmanOrderDao.updateById(shopSalesmanOrder);
+ }else{
+ LogUtil.debug("改订单为生成分销订单={}", orderId);
+ }
+
+
+ });
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(),null,Long.parseLong(order.getId()+""), ScoreVipDetail.SCORE_VIP_TYPE_CASH);
+ scoreVipDetailService.removeByBusinessId(order.getUserId(),Long.parseLong(order.getId()+""));
}
--
Gitblit v1.9.1