From 04f9d0857969531f13ccd296717a718f2cd702cf Mon Sep 17 00:00:00 2001
From: Helius <wangdoubleone@gmail.com>
Date: Tue, 12 Jan 2021 16:34:24 +0800
Subject: [PATCH] modify
---
zq-erp/src/main/java/com/matrix/system/hive/service/imp/SysOrderServiceImpl.java | 14 ++++++++++++--
1 files changed, 12 insertions(+), 2 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 42ea6ff..51536f3 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
@@ -159,6 +159,12 @@
// 计算订单折扣金额,收款情况下 计算订单总额
double zkTotal = 0.0;
+ // 判断是否为退款
+ String orderStatus = Dictionary.ORDER_STATU_DFK;
+ if (Dictionary.ORDER_STATU_TK.equals(sysOrder.getStatu())) {
+ orderStatus = Dictionary.ORDER_STATU_TK;
+ }
+
// 页面的pageOrder 参数只包含支付金额信息，不带有购买商品
for (SysOrderItem item : sysOrder.getItems()) {
@@ -171,12 +177,12 @@
// 订单欠款减去支付金额 设置实际欠款
Double itemZkTotal = MoneyUtil.mul(item.getZkPrice(), Double.valueOf(item.getCount()));
zkTotal=MoneyUtil.add(zkTotal, itemZkTotal);
- item.setStatus(Dictionary.ORDER_STATU_DFK);
+ item.setStatus(orderStatus);
}
SysUsers user = (SysUsers) WebUtil.getSession().getAttribute(MatrixConstance.LOGIN_KEY);
sysOrder.setZkTotal(zkTotal);
- sysOrder.setStatu(Dictionary.ORDER_STATU_DFK);
+ sysOrder.setStatu(orderStatus);
sysOrder.setStaffId(user.getSuId());
sysOrder.setCompanyId(user.getCompanyId());
@@ -496,6 +502,10 @@
i++;
}
+ if (Dictionary.ORDER_STATU_TK.equals(sourceOrder.getStatu())) {
+ orderStatus = Dictionary.ORDER_STATU_TK;
+ }
+
// 更新收款状态
sourceOrder.setStatu(orderStatus);
sourceOrder.setCardPay(cardPayTotal);
--
Gitblit v1.9.1