From 60da6176964cb65963bd15e8a00772cc33efbf1a Mon Sep 17 00:00:00 2001
From: wzy <wzy19931122ai@163.com>
Date: Fri, 07 Oct 2022 16:04:32 +0800
Subject: [PATCH] 修改退款时无法退款到储值卡的bug
---
zq-erp/src/main/java/com/matrix/system/hive/service/imp/SysOrderServiceImpl.java | 15 ++++++++++++---
1 files changed, 12 insertions(+), 3 deletions(-)
diff --git a/zq-erp/src/main/java/com/matrix/system/hive/service/imp/SysOrderServiceImpl.java b/zq-erp/src/main/java/com/matrix/system/hive/service/imp/SysOrderServiceImpl.java
index 19b45ec..3a6bbe4 100644
--- a/zq-erp/src/main/java/com/matrix/system/hive/service/imp/SysOrderServiceImpl.java
+++ b/zq-erp/src/main/java/com/matrix/system/hive/service/imp/SysOrderServiceImpl.java
@@ -177,7 +177,7 @@
}
//储值卡退款
- sysOrderServiceHelper.returnMoneyCardPay(order);
+ sysOrderServiceHelper.returnMoneyCardPay(order, true);
//套餐项目取消
List<SysOrderItem> sysOrderItems = orderItemDao.selectByOrderId(order.getId());
@@ -346,7 +346,7 @@
double sum = flows.stream().mapToDouble(item -> item.getAmount().doubleValue()).sum();
- if (sum > 0 && cardPayAmount.doubleValue() == 0 && cashPayAmount.doubleValue() == 0) {
+ if (sum > 0 && cardPayAmount.doubleValue() == 0 && cashPayAmount.doubleValue() == 0 && pageOrder.getArrears() == 0) {
throw new GlobleException("订单更新失败，支付金额计算错误，请联系管理员");
}
@@ -517,7 +517,14 @@
@Override
public List<PadOrderDetailVo> findPadApiOrderListInPage(PadOrderListDto orderListDto, PaginationVO pageVo) {
- return sysOrderDao.selectPadApiOrderListInPage(orderListDto, pageVo);
+ List<PadOrderDetailVo> padOrderDetailVos = sysOrderDao.selectPadApiOrderListInPage(orderListDto, pageVo);
+ if(CollUtil.isNotEmpty(padOrderDetailVos)){
+ for(PadOrderDetailVo padOrderDetailVo : padOrderDetailVos){
+ padOrderDetailVo.setItems(orderItemDao.selectApiOrderDetailItemsByOrderId(Long.parseLong(padOrderDetailVo.getOrderId())));
+ }
+ }
+
+ return padOrderDetailVos;
}
@Override
@@ -566,6 +573,8 @@
sysOrderServiceHelper.addOrderFlow(sysOrder, false);
//退款退套餐退项目
refundProjUse(sysOrder);
+
+ sysOrderServiceHelper.returnMoneyCardPay(sysOrder, false);
//删除积分
SysOrder oldOrder = sysOrderDao.selectById(sysOrder.getOldOrderId());
scoreVipDetailService.removeByBusinessId(oldOrder.getVipId(), oldOrder.getId());
--
Gitblit v1.9.1