From c78b81413ca47187fde4076ce7f9dc2f35858b84 Mon Sep 17 00:00:00 2001
From: xiaoyong931011 <15274802129@163.com>
Date: Fri, 02 Jul 2021 10:45:49 +0800
Subject: [PATCH] 20210630 积分拨付
---
gc-shop/src/main/java/com/xzx/gc/shop/vo/QueryOrderListVo.java | 5 ++++-
gc-shop/src/main/java/com/xzx/gc/shop/service/OrderService.java | 25 +++++++++++++------------
2 files changed, 17 insertions(+), 13 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 3d400c2..33cc93a 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());
}
}
}
diff --git a/gc-shop/src/main/java/com/xzx/gc/shop/vo/QueryOrderListVo.java b/gc-shop/src/main/java/com/xzx/gc/shop/vo/QueryOrderListVo.java
index b86fffa..1a46f07 100644
--- a/gc-shop/src/main/java/com/xzx/gc/shop/vo/QueryOrderListVo.java
+++ b/gc-shop/src/main/java/com/xzx/gc/shop/vo/QueryOrderListVo.java
@@ -1,8 +1,11 @@
package com.xzx.gc.shop.vo;
+import com.xzx.gc.entity.ScoreOrderDetails;
import io.swagger.annotations.ApiModel;
import io.swagger.annotations.ApiModelProperty;
import lombok.Data;
+
+import java.util.List;
@Data
@ApiModel(value = "QueryOrderListVo", description = "返回")
@@ -18,7 +21,7 @@
@ApiModelProperty(value="下单时间")
private String createTime;
@ApiModelProperty(value="订单详情")
- private String orderDetails;
+ private List<ScoreOrderDetails> orderDetails;
@ApiModelProperty(value="订单总价")
private String totalPrice;
@ApiModelProperty(value="数量")
--
Gitblit v1.9.1