From 81a3369395a7cccceb7cd36f5238cc6fe2aa88e5 Mon Sep 17 00:00:00 2001
From: 935090232@qq.com <ak473600000>
Date: Fri, 19 Mar 2021 00:22:01 +0800
Subject: [PATCH] 优化代码
---
zq-erp/src/main/java/com/matrix/system/shopXcx/api/service/ShoppingCartService.java | 33 +++++++++------------------------
1 files changed, 9 insertions(+), 24 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 f790cc8..4cb582a 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;
@@ -84,10 +79,10 @@
* @return
* @param shopId
*/
- public List<ShopCartVo> findUserCartList(Long shopId) {
+ public List<ShopCartVo> findUserCartList(Long shopId,Integer cartType) {
BizUser loginUser = redisUserLoginUtils.getLoginUser(BizUser.class);
String userId = loginUser.getOpenId();
- List<ShopShoppingCart> list = shoppingCartDao.selectByCartUserId(shopId,userId);
+ List<ShopShoppingCart> list = shoppingCartDao.selectByCartUserId(shopId,userId,cartType);
List<ShopCartVo> cartList = buildShopCart(list);
return cartList;
}
@@ -108,11 +103,7 @@
// 1表示没有优惠的默认分组
ShopCartVo def = new ShopCartVo();
- /**
- * 同城配送标题
- * //DataDictionary qsfy = dataDictionaryDao.selectByTypeCode(AppConstance.QSFY);
- * //def.setMsg("2公里内满" + qsfy.getValue() + "元免配送费");
- */
+
def.setMsg("商城");
def.setCartList(new ArrayList<>());
@@ -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