From 3818d03e7e911a02531806241b34b0c51b277944 Mon Sep 17 00:00:00 2001
From: xiaoyong931011 <15274802129@163.com>
Date: Mon, 28 Mar 2022 15:33:04 +0800
Subject: [PATCH] 20220324
---
zq-erp/src/test/java/com/matrix/JyyTests2.java | 35 ++++++++++++++++++++++++-----------
zq-erp/src/main/java/com/matrix/system/hive/action/OrderController.java | 2 +-
zq-erp/src/main/java/com/matrix/system/hive/service/imp/SysProjServicesServiceImpl.java | 4 ++--
zq-erp/src/main/java/com/matrix/system/hive/action/ProjServiceController.java | 2 +-
zq-erp/src/main/java/com/matrix/system/hive/service/imp/SysOrderServiceHelper.java | 2 +-
zq-erp/src/main/java/com/matrix/system/common/service/BusParameterSettingService.java | 2 +-
zq-erp/src/main/java/com/matrix/system/hive/service/imp/AchieveNewServiceImpl.java | 2 +-
zq-erp/src/main/java/com/matrix/system/hive/service/imp/SysOrderServiceImpl.java | 2 +-
8 files changed, 32 insertions(+), 19 deletions(-)
diff --git a/zq-erp/src/main/java/com/matrix/system/common/service/BusParameterSettingService.java b/zq-erp/src/main/java/com/matrix/system/common/service/BusParameterSettingService.java
index 864e80a..16c1ea2 100644
--- a/zq-erp/src/main/java/com/matrix/system/common/service/BusParameterSettingService.java
+++ b/zq-erp/src/main/java/com/matrix/system/common/service/BusParameterSettingService.java
@@ -25,7 +25,7 @@
Objects.nonNull(busParameterSettings)
&& StringUtils.isNotBlank(busParameterSettings.getParamValue())
// && AppConstance.IS_Y.equals(busParameterSettings.getParamValue())
- && BooleanEnum.TRUE.getValue().equals(busParameterSettings.getParamValue())
+ && BooleanEnum.TRUE.getValue() == (Integer.parseInt(busParameterSettings.getParamValue()))
);
}
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 e39392b..473e1a4 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
@@ -505,7 +505,7 @@
// if (StringUtils.isNotBlank(shopManageAbleCancelDfkOrder.getParamValue())
// && shopManageAbleCancelDfkOrder.getParamValue().equals(Dictionary.FLAG_YES)) {
if (StringUtils.isNotBlank(shopManageAbleCancelDfkOrder.getParamValue())
- && BooleanEnum.TRUE.getValue().equals(shopManageAbleCancelDfkOrder.getParamValue())) {
+ && BooleanEnum.TRUE.getValue() == Integer.parseInt(shopManageAbleCancelDfkOrder.getParamValue())) {
if (!Dictionary.ORDER_STATU_DFK.equals(order.getStatu())) {
return new AjaxResult(AjaxResult.STATUS_FAIL, "您只能取消待付款订单");
diff --git a/zq-erp/src/main/java/com/matrix/system/hive/action/ProjServiceController.java b/zq-erp/src/main/java/com/matrix/system/hive/action/ProjServiceController.java
index 6e6c453..82e1217 100644
--- a/zq-erp/src/main/java/com/matrix/system/hive/action/ProjServiceController.java
+++ b/zq-erp/src/main/java/com/matrix/system/hive/action/ProjServiceController.java
@@ -550,7 +550,7 @@
// if (StringUtils.isNotBlank(shopManageAbleCancelDfkOrder.getParamValue())
// && shopManageAbleCancelDfkOrder.getParamValue().equals(Dictionary.FLAG_YES)) {
if (StringUtils.isNotBlank(shopManageAbleCancelDfkOrder.getParamValue())
- && BooleanEnum.TRUE.getValue().equals(shopManageAbleCancelDfkOrder.getParamValue())) {
+ && BooleanEnum.TRUE.getValue() == Integer.parseInt(shopManageAbleCancelDfkOrder.getParamValue())) {
if (!checkProjServices.getState().equals(Dictionary.SERVICE_STATU_DYY)
&& !checkProjServices.getState().equals(Dictionary.SERVICE_STATU_DQR)) {
diff --git a/zq-erp/src/main/java/com/matrix/system/hive/service/imp/AchieveNewServiceImpl.java b/zq-erp/src/main/java/com/matrix/system/hive/service/imp/AchieveNewServiceImpl.java
index 261aa62..e97946f 100644
--- a/zq-erp/src/main/java/com/matrix/system/hive/service/imp/AchieveNewServiceImpl.java
+++ b/zq-erp/src/main/java/com/matrix/system/hive/service/imp/AchieveNewServiceImpl.java
@@ -384,7 +384,7 @@
// if (AppConstance.IS_Y.equals(shopManageJjcpasConsume.getParamValue())) {
// achieveNew.setHisConsume(achieveNew.getGoodsCash());
// }
- if (BooleanEnum.TRUE.getValue().equals(shopManageJjcpasConsume.getParamValue())) {
+ if (BooleanEnum.TRUE.getValue() == Integer.parseInt(shopManageJjcpasConsume.getParamValue())) {
achieveNew.setHisConsume(achieveNew.getGoodsCash());
}
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..8987c11 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
@@ -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() == Integer.parseInt(manageStockSetting.getParamValue())) {
List<SysOutStoreItem> storeItemList = new ArrayList<>();
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 2c067db..2c997c6 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
@@ -618,7 +618,7 @@
BusParameterSettings manageStockSetting = busParameterSettingsDao.selectCompanyParamByCode(AppConstance.WAREHOUSE_MANAGE_STOCK, sysOrder.getCompanyId());
// if (AppConstance.IS_Y.equals(manageStockSetting.getParamValue())) {
- if (BooleanEnum.TRUE.getValue().equals(manageStockSetting.getParamValue())) {
+ if (BooleanEnum.TRUE.getValue() == Integer.parseInt(manageStockSetting.getParamValue())) {
// 家居产品退库存
if (CollectionUtils.isNotEmpty(returnGoodsList)) {
LogUtil.info("订单退款：退产品库存：{}", JSON.toJSONString(returnGoodsList));
diff --git a/zq-erp/src/main/java/com/matrix/system/hive/service/imp/SysProjServicesServiceImpl.java b/zq-erp/src/main/java/com/matrix/system/hive/service/imp/SysProjServicesServiceImpl.java
index ef4002c..d2cb939 100644
--- a/zq-erp/src/main/java/com/matrix/system/hive/service/imp/SysProjServicesServiceImpl.java
+++ b/zq-erp/src/main/java/com/matrix/system/hive/service/imp/SysProjServicesServiceImpl.java
@@ -1027,7 +1027,7 @@
if (CollectionUtils.isNotEmpty(projServicesVo.getOutStoreItem())) {
BusParameterSettings manageStockSetting = busParameterSettingsDao.selectCompanyParamByCode(AppConstance.WAREHOUSE_MANAGE_STOCK, projServicesVo.getCompanyId());
// if (AppConstance.IS_Y.equals(manageStockSetting.getParamValue())) {
- if (BooleanEnum.TRUE.getValue().equals(manageStockSetting.getParamValue())) {
+ if (BooleanEnum.TRUE.getValue() == Integer.parseInt(manageStockSetting.getParamValue())) {
for (SysOutStoreItem item : projServicesVo.getOutStoreItem()) {
if (item.getAmount() != null && item.getAmount() > 0) {
return true;
@@ -1170,7 +1170,7 @@
// flag = true;
// break;
// }
- if (step.equals(setting.getCode()) && BooleanEnum.TRUE.getValue().equals(setting.getUserValue())) {
+ if (step.equals(setting.getCode()) && BooleanEnum.TRUE.getValue() == Integer.parseInt(setting.getUserValue())) {
flag = true;
break;
}
diff --git a/zq-erp/src/test/java/com/matrix/JyyTests2.java b/zq-erp/src/test/java/com/matrix/JyyTests2.java
index 0304fff..7e3ff18 100644
--- a/zq-erp/src/test/java/com/matrix/JyyTests2.java
+++ b/zq-erp/src/test/java/com/matrix/JyyTests2.java
@@ -2,16 +2,14 @@
import cn.hutool.core.util.ObjectUtil;
import cn.hutool.core.util.StrUtil;
-import cn.hutool.json.JSONArray;
-import cn.hutool.json.JSONObject;
-import cn.hutool.json.JSONUtil;
import com.baomidou.mybatisplus.core.conditions.query.QueryWrapper;
-import com.matrix.component.redis.RedisClient;
import com.matrix.core.constance.MatrixConstance;
import com.matrix.core.tools.LogUtil;
+import com.matrix.core.tools.StringUtils;
import com.matrix.system.common.bean.BusParameterSettings;
-import com.matrix.system.common.bean.SysFunction;
+import com.matrix.system.common.constance.AppConstance;
import com.matrix.system.common.dao.BusParameterSettingsDao;
+import com.matrix.system.enums.BooleanEnum;
import com.matrix.system.fenxiao.constant.FenxiaoSettingConstant;
import com.matrix.system.fenxiao.dao.ShopSalesmanGradeDao;
import com.matrix.system.fenxiao.dao.ShopSalesmanOrderDao;
@@ -25,17 +23,12 @@
import com.matrix.system.hive.service.ShoppingGoodsService;
import com.matrix.system.hive.service.SysOrderService;
import com.matrix.system.hive.service.SysVipInfoService;
-import com.matrix.system.hive.service.imp.SysVipInfoServiceImpl;
-import com.matrix.system.score.dao.ScoreVipDetailDao;
-import com.matrix.system.score.service.ScoreVipDetailService;
import com.matrix.system.shopXcx.bean.ShopOrder;
import com.matrix.system.shopXcx.bean.ShopOrderDetails;
import com.matrix.system.shopXcx.bean.ShopProduct;
import com.matrix.system.shopXcx.dao.ShopOrderDao;
import com.matrix.system.shopXcx.dao.ShopOrderDetailsDao;
-import com.matrix.system.shopXcx.dao.ShopOrderV2Dao;
import com.matrix.system.shopXcx.dao.ShopSkuDao;
-import com.matrix.system.shopXcx.mqTask.OrderDingDingNoticeTask;
import org.junit.Test;
import org.junit.runner.RunWith;
import org.springframework.beans.BeanUtils;
@@ -45,7 +38,8 @@
import org.springframework.test.context.junit4.SpringRunner;
import java.io.IOException;
-import java.util.*;
+import java.util.Date;
+import java.util.Objects;
/**
* 测试类示例
@@ -101,6 +95,25 @@
@Autowired
private ShopSalesmanGradeDao shopSalesmanGradeDao;
+ @Autowired
+ private BusParameterSettingsDao busParameterSettingsDao;
+
+ public boolean isSettingOpen(String settingKey,Long companyId) {
+ BusParameterSettings busParameterSettings = busParameterSettingsDao.selectCompanyParamByCode(settingKey, companyId);
+ return (
+ Objects.nonNull(busParameterSettings)
+ && StringUtils.isNotBlank(busParameterSettings.getParamValue())
+// && AppConstance.IS_Y.equals(busParameterSettings.getParamValue())
+ && BooleanEnum.TRUE.getValue() == (Integer.parseInt(busParameterSettings.getParamValue()))
+ );
+ }
+
+ @Test
+ public void testBoolean(){
+ boolean settingOpen = isSettingOpen(AppConstance.OPEN_SERVICE_ORDER_AUTO_BATCHING, 17L);
+ System.out.println("----------------------------"+settingOpen);
+ }
+
@Test
@Rollback
--
Gitblit v1.9.1