From 2443f547c0a981e38c5c6e9229e1068d8f831dd0 Mon Sep 17 00:00:00 2001
From: jyy <jyy>
Date: Tue, 20 Jul 2021 11:25:30 +0800
Subject: [PATCH] 1、服务单打印格式调整
---
zq-erp/src/main/java/com/matrix/system/hive/service/imp/SysOrderServiceImpl.java | 5 +++--
1 files changed, 3 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 a2e5b5e..bb0717b 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
@@ -1392,7 +1392,8 @@
private boolean isGiftMoneyPay(SysOrder order) {
BusParameterSettings giftiIsfree = busParameterSettingsDao.selectCompanyParamByCode(AppConstance.SHOP_MANAGE_GIFTISFREE, order.getCompanyId());
if(giftiIsfree.getParamValue().equals("是")){
- return order.getFlows().stream().allMatch(item -> SysOrderFlow.IS_GIFT_Y.equals(item.getIsGift()));
+ return order.getFlows().stream().allMatch(item -> SysOrderFlow.IS_GIFT_Y.equals(item.getIsGift())
+ && item.getAmount().doubleValue() >0D);
}else{
return false;
}
@@ -1549,7 +1550,7 @@
sourceOrder.setIsHasRefund(SysOrder.IS_HAS_REFUND_Y);
// sourceOrder.setStatu(Dictionary.ORDER_STATU_TK);
sysOrderDao.update(sourceOrder);
- SysOrder oldOrder=sysOrderDao.selectById( sysOrder.getOldOrderId());
+ SysOrder oldOrder=sysOrderDao.selectById(sysOrder.getOldOrderId());
sysOrder.setId(null);
sysOrder.setStaffId(user.getSuId());
--
Gitblit v1.9.1