zq-erp/src/main/java/com/matrix/system/common/bean/BusParameterSettings.java
@@ -108,6 +108,9 @@ this.paramCode = paramCode; } public Integer getIntParamValue(){ return Integer.parseInt(this.paramValue); } public String getParamValue() { return paramValue; 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() == (Integer.parseInt(busParameterSettings.getParamValue())) && BooleanEnum.TRUE.getValue() == busParameterSettings.getIntParamValue() ); }
@@ -14,6 +14,7 @@ import com.matrix.system.common.bean.BusParameterSettings; import com.matrix.system.common.bean.SysUsers; 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.ShopSalesmanApplyDao; import com.matrix.system.fenxiao.dao.ShopSalesmanGradeDao; @@ -113,7 +114,8 @@ BusParameterSettings busParameterSettings = busParameterSettingsDao.selectCompanyParamByCode(FenxiaoSettingConstant.FX_AUDIT_METHOD, loginUser.getCompanyId()); if(busParameterSettings!=null &&busParameterSettings.getParamValue().equals("1")){ // &&busParameterSettings.getIntParamValue().equals("1")){ && BooleanEnum.TRUE.getValue() == busParameterSettings.getIntParamValue()){ //自动审核 //初始等级ID（公司id，是否为初始等级） QueryWrapper<ShopSalesmanGrade> queryWrapperOrepool = new QueryWrapper<>(); 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() == Integer.parseInt(shopManageAbleCancelDfkOrder.getParamValue())) { && BooleanEnum.TRUE.getValue() == shopManageAbleCancelDfkOrder.getIntParamValue()) { if (!Dictionary.ORDER_STATU_DFK.equals(order.getStatu())) { return new AjaxResult(AjaxResult.STATUS_FAIL, "您只能取消待付款订单"); 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() == Integer.parseInt(shopManageAbleCancelDfkOrder.getParamValue())) { && BooleanEnum.TRUE.getValue() == shopManageAbleCancelDfkOrder.getIntParamValue()) { if (!checkProjServices.getState().equals(Dictionary.SERVICE_STATU_DYY) && !checkProjServices.getState().equals(Dictionary.SERVICE_STATU_DQR)) { 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() == Integer.parseInt(shopManageJjcpasConsume.getParamValue())) { if (BooleanEnum.TRUE.getValue() == shopManageJjcpasConsume.getIntParamValue()) { achieveNew.setHisConsume(achieveNew.getGoodsCash()); }
@@ -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() == Integer.parseInt(manageStockSetting.getParamValue())) { if (BooleanEnum.TRUE.getValue() == manageStockSetting.getIntParamValue()) { List<SysOutStoreItem> storeItemList = new ArrayList<>();
@@ -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() == Integer.parseInt(manageStockSetting.getParamValue())) { if (BooleanEnum.TRUE.getValue() == manageStockSetting.getIntParamValue()) { // 家居产品退库存 if (CollectionUtils.isNotEmpty(returnGoodsList)) { LogUtil.info("订单退款：退产品库存：{}", JSON.toJSONString(returnGoodsList)); 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() == Integer.parseInt(manageStockSetting.getParamValue())) { if (BooleanEnum.TRUE.getValue() == manageStockSetting.getIntParamValue()) { for (SysOutStoreItem item : projServicesVo.getOutStoreItem()) { if (item.getAmount() != null && item.getAmount() > 0) { return true; zq-erp/src/test/java/com/matrix/JyyTests2.java
@@ -104,7 +104,7 @@ Objects.nonNull(busParameterSettings) && StringUtils.isNotBlank(busParameterSettings.getParamValue()) // && AppConstance.IS_Y.equals(busParameterSettings.getParamValue()) && BooleanEnum.TRUE.getValue() == (Integer.parseInt(busParameterSettings.getParamValue())) && BooleanEnum.TRUE.getValue() == busParameterSettings.getIntParamValue() ); }
