From 7836ee496905742408abb4a6ad9f1f2e27f2e70b Mon Sep 17 00:00:00 2001
From: xiaoyong931011 <15274802129@163.com>
Date: Fri, 02 Jul 2021 10:45:52 +0800
Subject: [PATCH] Merge branch 'score-shop' of http://120.27.238.55:7000/r/xzx into score-shop
---
gc-shop/src/main/java/com/xzx/gc/shop/service/OrderService.java | 25 +++++++++++++------------
1 files changed, 13 insertions(+), 12 deletions(-)
diff --git a/gc-shop/src/main/java/com/xzx/gc/shop/service/OrderService.java b/gc-shop/src/main/java/com/xzx/gc/shop/service/OrderService.java
index 6b000a3..82b33be 100644
--- a/gc-shop/src/main/java/com/xzx/gc/shop/service/OrderService.java
+++ b/gc-shop/src/main/java/com/xzx/gc/shop/service/OrderService.java
@@ -82,18 +82,19 @@
criteria.andEqualTo("orderId",id);
List<ScoreOrderDetails> scoreOrderDetails = scoreOrderDetailsMapper.selectByExample(example);
if(CollUtil.isNotEmpty(scoreOrderDetails)){
- StringBuffer stringBuffer = new StringBuffer();
- for(ScoreOrderDetails scoreOrderDetail : scoreOrderDetails){
- String goodsName = scoreOrderDetail.getGoodsName();
- BigDecimal unitPrice = scoreOrderDetail.getUnitPrice();
- String sku = scoreOrderDetail.getSku();
- Integer cnt = scoreOrderDetail.getCnt();
- BigDecimal totalPriceOrderDetail = scoreOrderDetail.getTotalPrice();
- stringBuffer = stringBuffer.append(goodsName+"(")
- .append("规格:"+sku+","+unitPrice.setScale( 2, BigDecimal.ROUND_DOWN ).toString()+"*"+cnt.toString()+",")
- .append("总价:"+totalPriceOrderDetail.setScale( 2, BigDecimal.ROUND_DOWN ).toString()+";)");
- }
- queryOrderListVo.setOrderDetails(stringBuffer.toString());
+ queryOrderListVo.setOrderDetails(scoreOrderDetails);
+// StringBuffer stringBuffer = new StringBuffer();
+// for(ScoreOrderDetails scoreOrderDetail : scoreOrderDetails){
+// String goodsName = scoreOrderDetail.getGoodsName();
+// BigDecimal unitPrice = scoreOrderDetail.getUnitPrice();
+// String sku = scoreOrderDetail.getSku();
+// Integer cnt = scoreOrderDetail.getCnt();
+// BigDecimal totalPriceOrderDetail = scoreOrderDetail.getTotalPrice();
+// stringBuffer = stringBuffer.append(goodsName+"(")
+// .append("规格:"+sku+","+unitPrice.setScale( 2, BigDecimal.ROUND_DOWN ).toString()+"*"+cnt.toString()+",")
+// .append("总价:"+totalPriceOrderDetail.setScale( 2, BigDecimal.ROUND_DOWN ).toString()+";)");
+// }
+// queryOrderListVo.setOrderDetails(stringBuffer.toString());
}
}
}
--
Gitblit v1.9.1