From f2b9a83f75a4345cd42d008f3153c18f8f890cad Mon Sep 17 00:00:00 2001
From: Helius <wangdoubleone@gmail.com>
Date: Mon, 19 Sep 2022 13:54:17 +0800
Subject: [PATCH] fix:退款订单退业绩是订单状态的判断

---
 zq-erp/src/main/java/com/matrix/system/hive/service/imp/SysOrderServiceHelper.java |   12 ++++++++++--
 1 files changed, 10 insertions(+), 2 deletions(-)

diff --git a/zq-erp/src/main/java/com/matrix/system/hive/service/imp/SysOrderServiceHelper.java b/zq-erp/src/main/java/com/matrix/system/hive/service/imp/SysOrderServiceHelper.java
index daf9c9a..8dc52a9 100644
--- a/zq-erp/src/main/java/com/matrix/system/hive/service/imp/SysOrderServiceHelper.java
+++ b/zq-erp/src/main/java/com/matrix/system/hive/service/imp/SysOrderServiceHelper.java
@@ -202,7 +202,7 @@
      */
     private boolean isGiftMoneyPay(SysOrder order) {
         BusParameterSettings giftiIsfree = busParameterSettingsDao.selectCompanyParamByCode(AppConstance.SHOP_MANAGE_GIFTISFREE, order.getCompanyId());
-        if (giftiIsfree.getParamValue().equals("是")) {
+        if (BooleanEnum.TRUE.getValue() == giftiIsfree.getIntParamValue()) {
             return order.getFlows().stream().allMatch(item -> SysOrderFlow.IS_GIFT_Y.equals(item.getIsGift())
                     && item.getAmount().doubleValue() > 0D);
         } else {
@@ -349,7 +349,7 @@
 
         BusParameterSettings manageStockSetting = busParameterSettingsDao.selectCompanyParamByCode(AppConstance.WAREHOUSE_MANAGE_STOCK, order.getCompanyId());
 //        if (AppConstance.IS_Y.equals(manageStockSetting.getParamValue())) {
-        if (BooleanEnum.TRUE.getValue().equals(manageStockSetting.getParamValue())) {
+        if (BooleanEnum.TRUE.getValue() == manageStockSetting.getIntParamValue()) {
 
             List<SysOutStoreItem> storeItemList = new ArrayList<>();
 
@@ -628,11 +628,19 @@
         for (SysOrderItem item : sysOrder.getItems()) {
             ShoppingGoods shoppingGoods = shoppingGoodsDao.selectById(item.getGoodsId());
             item.setType(shoppingGoods.getGoodType());
+            if (item.getZkPrice() == null) {
+                item.setZkPrice(shoppingGoods.getSealPice());
+            }
+
             if (item.getZkPrice() == 0) {
                 item.setIsFree(Dictionary.FLAG_YES);
             }
             Double itemZkTotal = MoneyUtil.mul(item.getZkPrice(), Double.valueOf(item.getCount()));
             zkTotal = MoneyUtil.add(zkTotal, itemZkTotal);
+
+            if (item.getPrice() == null) {
+                item.setPrice(shoppingGoods.getSealPice());
+            }
             item.setStatus(Dictionary.ORDER_STATU_DFK);
             item.setRefundCount(0);
         }

--
Gitblit v1.9.1