|
|
@@ -14,6 +14,7 @@ import com.xingxi.common.enums.EDelFlag;
|
|
|
import com.xingxi.common.enums.ERoleKey;
|
|
|
import com.xingxi.common.enums.EYesNo;
|
|
|
import com.xingxi.common.utils.DateUtils;
|
|
|
+import com.xingxi.common.utils.RMBUtil;
|
|
|
import com.xingxi.common.utils.StringUtils;
|
|
|
import com.xingxi.master.merchant.domain.MerchantProd;
|
|
|
import com.xingxi.master.merchant.mapper.MerchantProdMapper;
|
|
|
@@ -144,8 +145,9 @@ class CartsApiServiceImpl implements CartsServiceI {
|
|
|
List<ProdAttrPrice> priceList = prodAttrPriceMapper.selectProdAttrPriceList(condPrice);
|
|
|
|
|
|
if (StringUtils.isNotEmpty(priceList)) {
|
|
|
+ cartsResponse.setPrice(RMBUtil.fenToYuan(priceList.get(0).getPrice()));
|
|
|
if (carts.getCheckFlag().equals(EYesNo.YES.getVal())) {
|
|
|
- sum = sum.add(new BigDecimal(carts.getQuantity()).multiply(priceList.get(0).getPrice()));
|
|
|
+ sum = sum.add(new BigDecimal(carts.getQuantity()).multiply(RMBUtil.fenToYuan(priceList.get(0).getPrice())));
|
|
|
}
|
|
|
}
|
|
|
cartsResponseList.add(cartsResponse);
|
|
|
@@ -187,7 +189,7 @@ class CartsApiServiceImpl implements CartsServiceI {
|
|
|
|
|
|
if (StringUtils.isNotEmpty(priceList)) {
|
|
|
if (carts.getCheckFlag().equals(EYesNo.YES.getVal())) {
|
|
|
- sum = sum.add(new BigDecimal(carts.getQuantity()).multiply(priceList.get(0).getPrice()));
|
|
|
+ sum = sum.add(new BigDecimal(carts.getQuantity()).multiply(RMBUtil.fenToYuan(priceList.get(0).getPrice())));
|
|
|
}
|
|
|
}
|
|
|
|
|
|
@@ -199,6 +201,7 @@ class CartsApiServiceImpl implements CartsServiceI {
|
|
|
cartsResponse.setProdAttrId(carts.getProdAttrId());
|
|
|
cartsResponse.setQuantity(carts.getQuantity());
|
|
|
cartsResponse.setCheckFlag(carts.getCheckFlag());
|
|
|
+ cartsResponse.setPrice(RMBUtil.fenToYuan(priceList.get(0).getPrice()));
|
|
|
|
|
|
ProdPic condPic = new ProdPic();
|
|
|
condPic.setProdId(mercProd.getProdId());
|
|
|
@@ -243,7 +246,7 @@ class CartsApiServiceImpl implements CartsServiceI {
|
|
|
List<ProdAttrPrice> priceList = prodAttrPriceMapper.selectProdAttrPriceList(condPrice);
|
|
|
|
|
|
if (StringUtils.isNotEmpty(priceList)) {
|
|
|
- sum = sum.add(new BigDecimal(carts.getQuantity()).multiply(priceList.get(0).getPrice()));
|
|
|
+ sum = sum.add(new BigDecimal(carts.getQuantity()).multiply(RMBUtil.fenToYuan(priceList.get(0).getPrice())));
|
|
|
}
|
|
|
CartsResponse cartsResponse = new CartsResponse();
|
|
|
|
|
|
@@ -253,6 +256,7 @@ class CartsApiServiceImpl implements CartsServiceI {
|
|
|
cartsResponse.setProdAttrId(carts.getProdAttrId());
|
|
|
cartsResponse.setQuantity(carts.getQuantity());
|
|
|
cartsResponse.setCheckFlag(carts.getCheckFlag());
|
|
|
+ cartsResponse.setPrice(RMBUtil.fenToYuan(priceList.get(0).getPrice()));
|
|
|
|
|
|
ProdPic condPic = new ProdPic();
|
|
|
condPic.setProdId(mercProd.getProdId());
|
|
|
@@ -297,6 +301,16 @@ class CartsApiServiceImpl implements CartsServiceI {
|
|
|
cartsResponse.setQuantity(carts.getQuantity());
|
|
|
cartsResponse.setCheckFlag(carts.getCheckFlag());
|
|
|
|
|
|
+ ProdAttrPrice condPrice = new ProdAttrPrice();
|
|
|
+ condPrice.setProdAttrId(carts.getProdAttrId());
|
|
|
+ condPrice.setProdId(mercProd.getProdId());
|
|
|
+ condPrice.setSellerId(mercProd.getMercId());
|
|
|
+ condPrice.setBuyerRoleKey(ERoleKey.CUSTOMER.getCode());
|
|
|
+
|
|
|
+ List<ProdAttrPrice> priceList = prodAttrPriceMapper.selectProdAttrPriceList(condPrice);
|
|
|
+
|
|
|
+ cartsResponse.setPrice(RMBUtil.fenToYuan(priceList.get(0).getPrice()));
|
|
|
+
|
|
|
ProdPic condPic = new ProdPic();
|
|
|
condPic.setProdId(mercProd.getProdId());
|
|
|
condPic.setDelFlag(EDelFlag.NO.getVal());
|
|
|
@@ -338,7 +352,7 @@ class CartsApiServiceImpl implements CartsServiceI {
|
|
|
List<ProdAttrPrice> priceList = prodAttrPriceMapper.selectProdAttrPriceList(condPrice);
|
|
|
|
|
|
if (StringUtils.isNotEmpty(priceList)) {
|
|
|
- sum = sum.add(new BigDecimal(carts.getQuantity()).multiply(priceList.get(0).getPrice()));
|
|
|
+ sum = sum.add(new BigDecimal(carts.getQuantity()).multiply(RMBUtil.fenToYuan(priceList.get(0).getPrice())));
|
|
|
}
|
|
|
|
|
|
CartsResponse cartsResponse = new CartsResponse();
|
|
|
@@ -349,6 +363,7 @@ class CartsApiServiceImpl implements CartsServiceI {
|
|
|
cartsResponse.setProdAttrId(carts.getProdAttrId());
|
|
|
cartsResponse.setQuantity(carts.getQuantity());
|
|
|
cartsResponse.setCheckFlag(carts.getCheckFlag());
|
|
|
+ cartsResponse.setPrice(RMBUtil.fenToYuan(priceList.get(0).getPrice()));
|
|
|
|
|
|
ProdPic condPic = new ProdPic();
|
|
|
condPic.setProdId(mercProd.getProdId());
|