From ca8a2fc9f8bf6d3701ecd11be7fc5f7aab226a71 Mon Sep 17 00:00:00 2001
From: jyy <935090232@qq.com>
Date: Thu, 28 Jan 2021 17:15:28 +0800
Subject: [PATCH] 1、修复充值问题
---
zq-erp/src/main/java/com/matrix/system/hive/action/OrderController.java | 15 +++++++++++++++
1 files changed, 15 insertions(+), 0 deletions(-)
diff --git a/zq-erp/src/main/java/com/matrix/system/hive/action/OrderController.java b/zq-erp/src/main/java/com/matrix/system/hive/action/OrderController.java
index ffe1a96..55f0ffd 100644
--- a/zq-erp/src/main/java/com/matrix/system/hive/action/OrderController.java
+++ b/zq-erp/src/main/java/com/matrix/system/hive/action/OrderController.java
@@ -22,6 +22,7 @@
import com.matrix.system.hive.dao.SysOrderItemDao;
import com.matrix.system.hive.dao.SysShopInfoDao;
import com.matrix.core.tools.DateUtil;
+import com.matrix.system.hive.plugin.util.CollectionUtils;
import com.matrix.system.hive.pojo.ShoppingCarItem;
import com.matrix.system.hive.pojo.ShoppingCarItemsVo;
import com.matrix.system.hive.service.*;
@@ -151,10 +152,24 @@
@ResponseBody
@Transactional(rollbackFor = Exception.class)
public AjaxResult refundOrder(@RequestBody SysOrder sysOrder) {
+ //储值卡订单不能通过退款渠道退款
+ if(CollectionUtils.isNotEmpty(sysOrder.getItems())){
+ List<SysOrderItem> orderItem = orderItemService.findByOrderId(sysOrder.getItems().get(0).getOrderId());
+ if(orderItem.size()==1){
+ if(orderItem.get(0).getShoppingGoods().getCode().equals("vipCzk")){
+ return AjaxResult.buildFailInstance("充值订单请直接冲负数金额退款！");
+ }
+ }
+ }
+
+
+
SysUsers user = getMe();
sysOrder.setShopId(user.getShopId());
sysOrder.setStatu(Dictionary.ORDER_STATU_TK);
sysOrder.setOrderTime(new Date());
+
+
//校验订单是否满足结算调价，新订单则保存订单，已有订单则删除后更新
sysOrder = orderService.checkAndSaveOrder(sysOrder);
orderService.refundOrderMoney(sysOrder);
--
Gitblit v1.9.1