From 68997d3ff6a07deb158ade373ca3eee26c255b0b Mon Sep 17 00:00:00 2001
From: Helius <wangdoubleone@gmail.com>
Date: Sat, 02 Jul 2022 21:01:44 +0800
Subject: [PATCH] fix alpha change database
---
zq-erp/src/main/java/com/matrix/system/hive/service/imp/SysOrderServiceHelper.java | 20 ++++++++++++++++----
1 files changed, 16 insertions(+), 4 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 f2bde3f..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
@@ -12,7 +12,6 @@
import com.google.common.collect.Lists;
import com.matrix.core.constance.MatrixConstance;
import com.matrix.core.exception.GlobleException;
-import com.matrix.core.tools.DateUtil;
import com.matrix.core.tools.LogUtil;
import com.matrix.core.tools.StringUtils;
import com.matrix.core.tools.WebUtil;
@@ -22,6 +21,7 @@
import com.matrix.system.common.dao.BusParameterSettingsDao;
import com.matrix.system.common.service.OperationLogService;
import com.matrix.system.constance.Dictionary;
+import com.matrix.system.enums.BooleanEnum;
import com.matrix.system.enums.OperationButtonEnum;
import com.matrix.system.enums.OperationFunctionEnum;
import com.matrix.system.hive.bean.*;
@@ -31,7 +31,10 @@
import com.matrix.system.hive.plugin.util.CollectionUtils;
import com.matrix.system.hive.plugin.util.MoneyUtil;
import com.matrix.system.hive.pojo.CzXkVo;
-import com.matrix.system.hive.service.*;
+import com.matrix.system.hive.service.CodeService;
+import com.matrix.system.hive.service.MoneyCardUseService;
+import com.matrix.system.hive.service.SysInstoreInfoService;
+import com.matrix.system.hive.service.SysProjUseService;
import com.matrix.system.score.constant.ScoreSettingConstant;
import com.matrix.system.score.entity.ScoreVipDetail;
import com.matrix.system.score.service.ScoreVipDetailService;
@@ -199,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 {
@@ -345,7 +348,8 @@
public void addOutStore(SysOrder order) {
BusParameterSettings manageStockSetting = busParameterSettingsDao.selectCompanyParamByCode(AppConstance.WAREHOUSE_MANAGE_STOCK, order.getCompanyId());
- if (AppConstance.IS_Y.equals(manageStockSetting.getParamValue())) {
+// if (AppConstance.IS_Y.equals(manageStockSetting.getParamValue())) {
+ if (BooleanEnum.TRUE.getValue() == manageStockSetting.getIntParamValue()) {
List<SysOutStoreItem> storeItemList = new ArrayList<>();
@@ -624,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