From 087cd794187727bf9a34fcef3027cd56f6dec436 Mon Sep 17 00:00:00 2001
From: Helius <wangdoubleone@gmail.com>
Date: Wed, 10 Mar 2021 15:20:54 +0800
Subject: [PATCH] Merge branch 'api' of http://120.27.238.55:7000/r/beauty-erp into api
---
zq-erp/src/main/java/com/matrix/system/shopXcx/api/service/ShoppingCartService.java | 31 ++++++++-----------------------
1 files changed, 8 insertions(+), 23 deletions(-)
diff --git a/zq-erp/src/main/java/com/matrix/system/shopXcx/api/service/ShoppingCartService.java b/zq-erp/src/main/java/com/matrix/system/shopXcx/api/service/ShoppingCartService.java
index 4f9f35a..5180721 100644
--- a/zq-erp/src/main/java/com/matrix/system/shopXcx/api/service/ShoppingCartService.java
+++ b/zq-erp/src/main/java/com/matrix/system/shopXcx/api/service/ShoppingCartService.java
@@ -1,19 +1,14 @@
package com.matrix.system.shopXcx.api.service;
-import com.matrix.core.tools.LogUtil;
import com.matrix.biz.bean.BizUser;
-import com.matrix.system.common.bean.BusParameterSettings;
-import com.matrix.system.common.bean.CustomerDataDictionary;
-import com.matrix.system.common.dao.BusParameterSettingsDao;
-import com.matrix.system.common.dao.CustomerDataDictionaryDao;
import com.matrix.component.redis.RedisUserLoginUtils;
-import com.matrix.system.common.constance.AppConstance;
-
+import com.matrix.core.tools.LogUtil;
+import com.matrix.system.common.dao.BusParameterSettingsDao;
+import com.matrix.system.shopXcx.api.vo.ShopCartBillVo;
+import com.matrix.system.shopXcx.api.vo.ShopCartVo;
import com.matrix.system.shopXcx.bean.ShopCoupon;
import com.matrix.system.shopXcx.bean.ShopShoppingCart;
import com.matrix.system.shopXcx.dao.ShopShoppingCartDao;
-import com.matrix.system.shopXcx.api.vo.ShopCartBillVo;
-import com.matrix.system.shopXcx.api.vo.ShopCartVo;
import org.apache.commons.collections.CollectionUtils;
import org.springframework.beans.factory.annotation.Autowired;
import org.springframework.stereotype.Service;
@@ -108,13 +103,9 @@
// 1表示没有优惠的默认分组
ShopCartVo def = new ShopCartVo();
- /**
- * 同城配送标题
- * //DataDictionary qsfy = dataDictionaryDao.selectByTypeCode(AppConstance.QSFY);
- * //def.setMsg("2公里内满" + qsfy.getValue() + "元免配送费");
- */
- def.setMsg("肽研官方商城");
+
+ def.setMsg("商城");
def.setCartList(new ArrayList<>());
// 组合默认分组
cartList.add(def);
@@ -316,15 +307,9 @@
}
}
} else {
- BusParameterSettings qsfy= busParameterSettingsDao.selectCompanyParamByCode(AppConstance.IN_PROVINCE_PACKAGE_LIST,17L);
-
- shopCartVo.setSubtotal(selectSum);
- shopCartVo.setSrcPrice(selectSum);
- if (selectSum.compareTo(new BigDecimal(qsfy.getParamValue())) < 0) {
- shopCartVo.setSatisfactionCoupon(false);
- } else {
+ shopCartVo.setSubtotal(selectSum);
+ shopCartVo.setSrcPrice(selectSum);
shopCartVo.setSatisfactionCoupon(true);
- }
}
}
}
--
Gitblit v1.9.1