购物车商品数量不正确fix
This commit is contained in:
parent
44fc9927b4
commit
4d5937821a
|
|
@ -527,7 +527,11 @@ public class OrderService {
|
||||||
map.put("list", dataList);
|
map.put("list", dataList);
|
||||||
BigDecimal totalAmount = BigDecimal.ZERO;
|
BigDecimal totalAmount = BigDecimal.ZERO;
|
||||||
BigDecimal packAmount = BigDecimal.ZERO;
|
BigDecimal packAmount = BigDecimal.ZERO;
|
||||||
|
int productSum = 0;
|
||||||
|
HashMap<String, Object> productNumMap = new HashMap<>();
|
||||||
for (TbCashierCart cashierCart : list) {
|
for (TbCashierCart cashierCart : list) {
|
||||||
|
productNumMap.putIfAbsent(cashierCart.getProductId() + cashierCart.getSkuId(), 1);
|
||||||
|
productSum += cashierCart.getNumber();
|
||||||
if (StrUtil.isNotBlank(cashierCart.getMasterId())) {
|
if (StrUtil.isNotBlank(cashierCart.getMasterId())) {
|
||||||
masterId = cashierCart.getMasterId();
|
masterId = cashierCart.getMasterId();
|
||||||
}
|
}
|
||||||
|
|
@ -550,12 +554,14 @@ public class OrderService {
|
||||||
}
|
}
|
||||||
|
|
||||||
map.put("masterId", masterId);
|
map.put("masterId", masterId);
|
||||||
QueryCartPo queryCartPo = cashierCartMapper.selectProductNumByMarketId(day, shopId, masterId);
|
QueryCartPo queryCartPo = new QueryCartPo();
|
||||||
queryCartPo.setPackAmount(packAmount);
|
queryCartPo.setPackAmount(packAmount);
|
||||||
queryCartPo.setTotalAmount(totalAmount);
|
queryCartPo.setTotalAmount(totalAmount);
|
||||||
|
queryCartPo.setProductSum(productSum);
|
||||||
|
queryCartPo.setProductNum(productNumMap.size());
|
||||||
map.put("amount", queryCartPo);
|
map.put("amount", queryCartPo);
|
||||||
int num = cashierCartMapper.selectqgList(shopId);
|
// int num = cashierCartMapper.selectqgList(shopId);
|
||||||
map.put("num", num);
|
map.put("num", productNumMap.size());
|
||||||
return Result.success(CodeEnum.SUCCESS, map);
|
return Result.success(CodeEnum.SUCCESS, map);
|
||||||
}
|
}
|
||||||
|
|
||||||
|
|
|
||||||
Loading…
Reference in New Issue