|
@@ -187,21 +187,20 @@ class CartsApiServiceImpl implements CartsServiceI {
|
|
|
|
|
|
|
|
List<ProdAttrPrice> priceList = prodAttrPriceMapper.selectProdAttrPriceList(condPrice);
|
|
List<ProdAttrPrice> priceList = prodAttrPriceMapper.selectProdAttrPriceList(condPrice);
|
|
|
|
|
|
|
|
|
|
+ CartsResponse cartsResponse = new CartsResponse();
|
|
|
if (StringUtils.isNotEmpty(priceList)) {
|
|
if (StringUtils.isNotEmpty(priceList)) {
|
|
|
if (carts.getCheckFlag().equals(EYesNo.YES.getVal())) {
|
|
if (carts.getCheckFlag().equals(EYesNo.YES.getVal())) {
|
|
|
sum = sum.add(new BigDecimal(carts.getQuantity()).multiply(RMBUtil.fenToYuan(priceList.get(0).getPrice())));
|
|
sum = sum.add(new BigDecimal(carts.getQuantity()).multiply(RMBUtil.fenToYuan(priceList.get(0).getPrice())));
|
|
|
}
|
|
}
|
|
|
|
|
+ cartsResponse.setPrice(RMBUtil.fenToYuan(priceList.get(0).getPrice()));
|
|
|
}
|
|
}
|
|
|
|
|
|
|
|
- CartsResponse cartsResponse = new CartsResponse();
|
|
|
|
|
-
|
|
|
|
|
cartsResponse.setId(carts.getId());
|
|
cartsResponse.setId(carts.getId());
|
|
|
cartsResponse.setUserId(userId);
|
|
cartsResponse.setUserId(userId);
|
|
|
cartsResponse.setMercProdId(carts.getMercProdId());
|
|
cartsResponse.setMercProdId(carts.getMercProdId());
|
|
|
cartsResponse.setProdAttrId(carts.getProdAttrId());
|
|
cartsResponse.setProdAttrId(carts.getProdAttrId());
|
|
|
cartsResponse.setQuantity(carts.getQuantity());
|
|
cartsResponse.setQuantity(carts.getQuantity());
|
|
|
cartsResponse.setCheckFlag(carts.getCheckFlag());
|
|
cartsResponse.setCheckFlag(carts.getCheckFlag());
|
|
|
- cartsResponse.setPrice(RMBUtil.fenToYuan(priceList.get(0).getPrice()));
|
|
|
|
|
|
|
|
|
|
ProdPic condPic = new ProdPic();
|
|
ProdPic condPic = new ProdPic();
|
|
|
condPic.setProdId(mercProd.getProdId());
|
|
condPic.setProdId(mercProd.getProdId());
|
|
@@ -210,7 +209,7 @@ class CartsApiServiceImpl implements CartsServiceI {
|
|
|
List<ProdPic> picList = prodPicServiceImpl.selectProdPicList(condPic);
|
|
List<ProdPic> picList = prodPicServiceImpl.selectProdPicList(condPic);
|
|
|
|
|
|
|
|
cartsResponse.setProdPicList(picList);
|
|
cartsResponse.setProdPicList(picList);
|
|
|
-
|
|
|
|
|
|
|
+ cartsResponseList.add(cartsResponse);
|
|
|
}
|
|
}
|
|
|
|
|
|
|
|
return new CartsListResponse(cartsResponseList, sum.toPlainString());
|
|
return new CartsListResponse(cartsResponseList, sum.toPlainString());
|
|
@@ -245,10 +244,11 @@ class CartsApiServiceImpl implements CartsServiceI {
|
|
|
|
|
|
|
|
List<ProdAttrPrice> priceList = prodAttrPriceMapper.selectProdAttrPriceList(condPrice);
|
|
List<ProdAttrPrice> priceList = prodAttrPriceMapper.selectProdAttrPriceList(condPrice);
|
|
|
|
|
|
|
|
|
|
+ CartsResponse cartsResponse = new CartsResponse();
|
|
|
if (StringUtils.isNotEmpty(priceList)) {
|
|
if (StringUtils.isNotEmpty(priceList)) {
|
|
|
sum = sum.add(new BigDecimal(carts.getQuantity()).multiply(RMBUtil.fenToYuan(priceList.get(0).getPrice())));
|
|
sum = sum.add(new BigDecimal(carts.getQuantity()).multiply(RMBUtil.fenToYuan(priceList.get(0).getPrice())));
|
|
|
|
|
+ cartsResponse.setPrice(RMBUtil.fenToYuan(priceList.get(0).getPrice()));
|
|
|
}
|
|
}
|
|
|
- CartsResponse cartsResponse = new CartsResponse();
|
|
|
|
|
|
|
|
|
|
cartsResponse.setId(carts.getId());
|
|
cartsResponse.setId(carts.getId());
|
|
|
cartsResponse.setUserId(userId);
|
|
cartsResponse.setUserId(userId);
|
|
@@ -256,7 +256,6 @@ class CartsApiServiceImpl implements CartsServiceI {
|
|
|
cartsResponse.setProdAttrId(carts.getProdAttrId());
|
|
cartsResponse.setProdAttrId(carts.getProdAttrId());
|
|
|
cartsResponse.setQuantity(carts.getQuantity());
|
|
cartsResponse.setQuantity(carts.getQuantity());
|
|
|
cartsResponse.setCheckFlag(carts.getCheckFlag());
|
|
cartsResponse.setCheckFlag(carts.getCheckFlag());
|
|
|
- cartsResponse.setPrice(RMBUtil.fenToYuan(priceList.get(0).getPrice()));
|
|
|
|
|
|
|
|
|
|
ProdPic condPic = new ProdPic();
|
|
ProdPic condPic = new ProdPic();
|
|
|
condPic.setProdId(mercProd.getProdId());
|
|
condPic.setProdId(mercProd.getProdId());
|
|
@@ -265,6 +264,7 @@ class CartsApiServiceImpl implements CartsServiceI {
|
|
|
List<ProdPic> picList = prodPicServiceImpl.selectProdPicList(condPic);
|
|
List<ProdPic> picList = prodPicServiceImpl.selectProdPicList(condPic);
|
|
|
|
|
|
|
|
cartsResponse.setProdPicList(picList);
|
|
cartsResponse.setProdPicList(picList);
|
|
|
|
|
+ cartsResponseList.add(cartsResponse);
|
|
|
}
|
|
}
|
|
|
|
|
|
|
|
return new CartsListResponse(cartsResponseList, sum.toPlainString());
|
|
return new CartsListResponse(cartsResponseList, sum.toPlainString());
|
|
@@ -308,8 +308,9 @@ class CartsApiServiceImpl implements CartsServiceI {
|
|
|
condPrice.setBuyerRoleKey(ERoleKey.CUSTOMER.getCode());
|
|
condPrice.setBuyerRoleKey(ERoleKey.CUSTOMER.getCode());
|
|
|
|
|
|
|
|
List<ProdAttrPrice> priceList = prodAttrPriceMapper.selectProdAttrPriceList(condPrice);
|
|
List<ProdAttrPrice> priceList = prodAttrPriceMapper.selectProdAttrPriceList(condPrice);
|
|
|
-
|
|
|
|
|
- cartsResponse.setPrice(RMBUtil.fenToYuan(priceList.get(0).getPrice()));
|
|
|
|
|
|
|
+ if (priceList != null && priceList.size() > 0) {
|
|
|
|
|
+ cartsResponse.setPrice(RMBUtil.fenToYuan(priceList.get(0).getPrice()));
|
|
|
|
|
+ }
|
|
|
|
|
|
|
|
ProdPic condPic = new ProdPic();
|
|
ProdPic condPic = new ProdPic();
|
|
|
condPic.setProdId(mercProd.getProdId());
|
|
condPic.setProdId(mercProd.getProdId());
|
|
@@ -329,7 +330,14 @@ class CartsApiServiceImpl implements CartsServiceI {
|
|
|
SysUser currentUser = userContext.getCurrentUser();
|
|
SysUser currentUser = userContext.getCurrentUser();
|
|
|
Long userId = currentUser.getUserId();
|
|
Long userId = currentUser.getUserId();
|
|
|
|
|
|
|
|
- cartsMapper.logicDeleteCartsById(request.getId());
|
|
|
|
|
|
|
+ if (request.getId() != null) {
|
|
|
|
|
+ cartsMapper.logicDeleteCartsById(request.getId());
|
|
|
|
|
+ }
|
|
|
|
|
+ if (request.getIds() != null) {
|
|
|
|
|
+ for (Long id : request.getIds()) {
|
|
|
|
|
+ cartsMapper.logicDeleteCartsById(id);
|
|
|
|
|
+ }
|
|
|
|
|
+ }
|
|
|
|
|
|
|
|
Carts cond = new Carts();
|
|
Carts cond = new Carts();
|
|
|
cond.setUserId(userId);
|
|
cond.setUserId(userId);
|
|
@@ -351,19 +359,19 @@ class CartsApiServiceImpl implements CartsServiceI {
|
|
|
|
|
|
|
|
List<ProdAttrPrice> priceList = prodAttrPriceMapper.selectProdAttrPriceList(condPrice);
|
|
List<ProdAttrPrice> priceList = prodAttrPriceMapper.selectProdAttrPriceList(condPrice);
|
|
|
|
|
|
|
|
|
|
+ CartsResponse cartsResponse = new CartsResponse();
|
|
|
|
|
+
|
|
|
if (StringUtils.isNotEmpty(priceList)) {
|
|
if (StringUtils.isNotEmpty(priceList)) {
|
|
|
sum = sum.add(new BigDecimal(carts.getQuantity()).multiply(RMBUtil.fenToYuan(priceList.get(0).getPrice())));
|
|
sum = sum.add(new BigDecimal(carts.getQuantity()).multiply(RMBUtil.fenToYuan(priceList.get(0).getPrice())));
|
|
|
|
|
+ cartsResponse.setPrice(RMBUtil.fenToYuan(priceList.get(0).getPrice()));
|
|
|
}
|
|
}
|
|
|
|
|
|
|
|
- CartsResponse cartsResponse = new CartsResponse();
|
|
|
|
|
-
|
|
|
|
|
cartsResponse.setId(carts.getId());
|
|
cartsResponse.setId(carts.getId());
|
|
|
cartsResponse.setUserId(userId);
|
|
cartsResponse.setUserId(userId);
|
|
|
cartsResponse.setMercProdId(carts.getMercProdId());
|
|
cartsResponse.setMercProdId(carts.getMercProdId());
|
|
|
cartsResponse.setProdAttrId(carts.getProdAttrId());
|
|
cartsResponse.setProdAttrId(carts.getProdAttrId());
|
|
|
cartsResponse.setQuantity(carts.getQuantity());
|
|
cartsResponse.setQuantity(carts.getQuantity());
|
|
|
cartsResponse.setCheckFlag(carts.getCheckFlag());
|
|
cartsResponse.setCheckFlag(carts.getCheckFlag());
|
|
|
- cartsResponse.setPrice(RMBUtil.fenToYuan(priceList.get(0).getPrice()));
|
|
|
|
|
|
|
|
|
|
ProdPic condPic = new ProdPic();
|
|
ProdPic condPic = new ProdPic();
|
|
|
condPic.setProdId(mercProd.getProdId());
|
|
condPic.setProdId(mercProd.getProdId());
|
|
@@ -371,7 +379,7 @@ class CartsApiServiceImpl implements CartsServiceI {
|
|
|
|
|
|
|
|
List<ProdPic> picList = prodPicServiceImpl.selectProdPicList(condPic);
|
|
List<ProdPic> picList = prodPicServiceImpl.selectProdPicList(condPic);
|
|
|
cartsResponse.setProdPicList(picList);
|
|
cartsResponse.setProdPicList(picList);
|
|
|
-
|
|
|
|
|
|
|
+ cartsResponseList.add(cartsResponse);
|
|
|
}
|
|
}
|
|
|
|
|
|
|
|
return new CartsListResponse(cartsResponseList, sum.toPlainString());
|
|
return new CartsListResponse(cartsResponseList, sum.toPlainString());
|