|
@@ -315,7 +315,7 @@ public class OrderServiceImpl implements OrderService {
|
|
|
List<Goods> goodsList = new ArrayList<>();
|
|
|
for (OrderGoodsEntity orderGoods : orderGoodsEntityList) {
|
|
|
goodsTotal += orderGoods.getNumber();
|
|
|
- total = total.add(orderGoods.getRetailPrice().multiply(new BigDecimal(orderGoods.getNumber())))
|
|
|
+ total = total.add(orderGoods.getMarketPrice().multiply(new BigDecimal(orderGoods.getNumber())))
|
|
|
.setScale(2, BigDecimal.ROUND_HALF_UP);
|
|
|
taxTotal = taxTotal.add(orderGoods.getGoodsRate().multiply(orderGoods.getMarketPrice()).setScale(2, BigDecimal.ROUND_HALF_UP));
|
|
|
Goods goods = new Goods(orderGoods.getGoodsName(), orderGoods.getMarketPrice().toString(),
|
|
@@ -382,7 +382,7 @@ public class OrderServiceImpl implements OrderService {
|
|
|
List<Goods> goodsList = new ArrayList<>();
|
|
|
for (OrderGoodsEntity orderGoods : orderGoodsEntityList) {
|
|
|
goodsTotal += orderGoods.getNumber();
|
|
|
- total = total.add(orderGoods.getRetailPrice().multiply(new BigDecimal(orderGoods.getNumber())))
|
|
|
+ total = total.add(orderGoods.getMarketPrice().multiply(new BigDecimal(orderGoods.getNumber())))
|
|
|
.setScale(2, BigDecimal.ROUND_HALF_UP);
|
|
|
taxTotal = taxTotal.add(orderGoods.getGoodsRate().multiply(orderGoods.getMarketPrice()).setScale(2, BigDecimal.ROUND_HALF_UP));
|
|
|
Goods goods = new Goods(orderGoods.getGoodsName(), orderGoods.getMarketPrice().toString(),
|