From 7a8716132ea660525d4790349e05d59b3c369bb6 Mon Sep 17 00:00:00 2001 From: jyy <jyy> Date: Sat, 22 May 2021 17:31:27 +0800 Subject: [PATCH] Merge branch 'score_shop' into api_score_meger --- zq-erp/src/main/java/com/matrix/system/shopXcx/mqTask/SalesOrderRefundTask.java | 21 ++++++++++++++------- 1 files changed, 14 insertions(+), 7 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 d7eab53..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,13 +45,19 @@ 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)); //如果是积分支付则需要返还积分 -- Gitblit v1.9.1