From d0c47393cbf57134bd539c7cc0804c9c4cddef85 Mon Sep 17 00:00:00 2001
From: xiaoyong931011 <15274802129@163.com>
Date: Wed, 07 Jul 2021 17:31:53 +0800
Subject: [PATCH] 20210707
---
gc-shop/src/main/java/com/xzx/gc/shop/service/OrderService.java | 43 +++++++++++++++++++++++++++----------------
1 files changed, 27 insertions(+), 16 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 86b4f88..f0f17d6 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());
}
}
}
@@ -173,8 +174,13 @@
}
public Long insureOrder(InsureOrderDto model) {
+ long id = model.getId();
+ ScoreOrder scoreOrderBefore = scoreOrderMapper.selectByPrimaryKey(id);
ScoreOrder scoreOrder = new ScoreOrder();
scoreOrder.setId(model.getId());
+ if(ScoreOrder.STATUS_DOING == scoreOrderBefore.getStatus()){
+ scoreOrder.setStatus(ScoreOrder.STATUS_DONE);
+ }
// scoreOrder.setStatus(ScoreOrder.STATUS_DONE);
scoreOrder.setIsFinish(ScoreOrder.ISFINISH_YES);
scoreOrder.setVoucherImg(CollUtil.join(model.getVoucherImgs(),","));
@@ -205,7 +211,6 @@
}
AccountInfo accountInfo = accountInfoMapper.selectAccountInfoByUserId(addGoodsOrderDto.getUserId());
-
if (accountInfo.getCollectScore() == null) {
throw new RestException(-3, "积分不足");
}
@@ -236,6 +241,7 @@
orderDetails.setTotalPrice(totalPrice);
orderDetails.setUnitPrice(sku.getPresentPrice());
orderDetails.setGoodsId(goods.getId());
+ orderDetails.setSkuId(sku.getId());
orderDetails.setThumb(goods.getThumb());
scoreOrderDetailsMapper.insert(orderDetails);
@@ -269,12 +275,12 @@
scoreDetails.setType(ScoreDetails.SCORE_TYPE_SHOPPING);
scoreDetails.setOriginalScore(score);
scoreDetails.setCurrentScore(remianScore);
- scoreDetails.setChangeScore(totalPrice);
+ scoreDetails.setChangeScore(totalPrice.negate());
scoreDetails.setCreatedTime(new Date());
scoreDetailsMapper.insert(scoreDetails);
sku.setStock(sku.getStock() - addGoodsOrderDto.getCnt());
- sku.setQuantity(sku.getQuantity() - addGoodsOrderDto.getCnt());
+ sku.setQuantity(sku.getQuantity() + addGoodsOrderDto.getCnt());
scoreGoodsSkuMapper.updateByPrimaryKey(sku);
}
@@ -352,7 +358,12 @@
throw new RestException(-3, "暂不能确认收货");
}
- scoreOrderMapper.updateOrderStatus(id, ScoreOrder.STATUS_DOING, userId);
+ if (ScoreOrder.ISFINISH_YES.equals(order.getIsFinish())) {
+ scoreOrderMapper.updateOrderStatus(id, ScoreOrder.STATUS_DONE, userId);
+ } else {
+ scoreOrderMapper.updateOrderStatus(id, ScoreOrder.STATUS_DOING, userId);
+ }
+
}
public void cancelOrder(Long id, String userId) {
--
Gitblit v1.9.1