From 135e1a36d71ff23a6a4832da6e28e33ce115943c Mon Sep 17 00:00:00 2001
From: Helius <wangdoubleone@gmail.com>
Date: Mon, 28 Jun 2021 10:36:32 +0800
Subject: [PATCH] fix viewJhyOrder.json

---
 gc-shop/src/main/java/com/xzx/gc/shop/service/OrderService.java |   15 +++++++++++++++
 1 files changed, 15 insertions(+), 0 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 6de16dc..606efc2 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
@@ -242,6 +242,7 @@
         scoreDetails.setOriginalScore(score);
         scoreDetails.setCurrentScore(remianScore);
         scoreDetails.setChangeScore(totalPrice);
+        scoreDetails.setCreatedTime(new Date());
         scoreDetailsMapper.insert(scoreDetails);
 
         sku.setStock(sku.getStock() - addGoodsOrderDto.getCnt());
@@ -303,12 +304,26 @@
 
         scoreOrderMapper.updateOrderStatus(id, ScoreOrder.STATUS_CANCEL, userId);
 
+
         // 退积分
         AccountInfo accountInfo = accountInfoMapper.selectAccountInfoByUserId(userId);
         BigDecimal score = new BigDecimal(accountInfo.getCollectScore()).add(order.getTotalPrice()).setScale(0, BigDecimal.ROUND_DOWN);
+
+        ScoreDetails scoreDetails = new ScoreDetails();
+        scoreDetails.setOriginalScore(new BigDecimal(accountInfo.getCollectScore()));
+        scoreDetails.setCurrentScore(score);
+        scoreDetails.setChangeScore(order.getTotalPrice());
+        scoreDetails.setOrderNo(order.getOrderNo());
+        scoreDetails.setType(ScoreDetails.SCORE_TYPE_SHOPPING_RETURN);
+        scoreDetails.setCreatedTime(new Date());
+        scoreDetails.setUserId(userId);
+        scoreDetailsMapper.insert(scoreDetails);
+
         accountInfo.setCollectScore(score.toString());
         accountInfoMapper.updateByPrimaryKey(accountInfo);
 
+
+
         // 减销量 加库存
         List<ScoreOrderDetails> details = scoreOrderDetailsMapper.selectOrderDetailsByOrderId(order.getId());
         if (CollUtil.isNotEmpty(details)) {

--
Gitblit v1.9.1