From b5a122d1a51dc5af9f2f903a5f5acf26cfb7de47 Mon Sep 17 00:00:00 2001
From: taozi <552920369@qq.com>
Date: Fri, 22 Jan 2021 22:25:23 +0800
Subject: [PATCH] =?UTF-8?q?=E7=89=88=E6=9C=AC=E5=8F=B7=E4=BF=AE=E6=94=B9?=
 =?UTF-8?q?=E4=B8=BA3.2?=
MIME-Version: 1.0
Content-Type: text/plain; charset=UTF-8
Content-Transfer-Encoding: 8bit

---
 shell/start.sh                                            | 2 +-
 shell/stop.sh                                             | 2 +-
 yshop-admin/src/main/resources/config/application.yml     | 2 +-
 yshop-app/src/main/resources/config/application.yml       | 2 +-
 .../order/service/impl/YxStoreOrderServiceImpl.java       | 8 ++++++--
 5 files changed, 10 insertions(+), 6 deletions(-)

diff --git a/shell/start.sh b/shell/start.sh
index fa305a27..9ed76c25 100644
--- a/shell/start.sh
+++ b/shell/start.sh
@@ -1 +1 @@
-nohup java -jar yshop-api-2.0.jar --spring.profiles.active=prod &
\ No newline at end of file
+nohup java -jar yshop-app-3.2.jar --spring.profiles.active=prod &
diff --git a/shell/stop.sh b/shell/stop.sh
index f87788a5..3a823cb8 100644
--- a/shell/stop.sh
+++ b/shell/stop.sh
@@ -1,4 +1,4 @@
-PID=$(ps -ef | grep yshop-api-2.0.jar | grep -v grep | awk '{ print $2 }')
+PID=$(ps -ef | grep yshop-app-3.2.jar | grep -v grep | awk '{ print $2 }')
 if [ -z "$PID" ];then
     echo Application is already stopped
 else
diff --git a/yshop-admin/src/main/resources/config/application.yml b/yshop-admin/src/main/resources/config/application.yml
index ed45b869..c9422163 100644
--- a/yshop-admin/src/main/resources/config/application.yml
+++ b/yshop-admin/src/main/resources/config/application.yml
@@ -47,7 +47,7 @@ smms:
 
 yshop:
   # 配置
-  version: 3.1
+  version: 3.2
   apiUrl: http://127.0.0.1:8009/api
 
 logging:
diff --git a/yshop-app/src/main/resources/config/application.yml b/yshop-app/src/main/resources/config/application.yml
index 5d418c80..08663572 100644
--- a/yshop-app/src/main/resources/config/application.yml
+++ b/yshop-app/src/main/resources/config/application.yml
@@ -69,7 +69,7 @@ logging:
 
 yshop:
   #相关配置
-  version: 3.1
+  version: 3.2
 
 # 防止XSS攻击
 xss:
diff --git a/yshop-mall/src/main/java/co/yixiang/modules/order/service/impl/YxStoreOrderServiceImpl.java b/yshop-mall/src/main/java/co/yixiang/modules/order/service/impl/YxStoreOrderServiceImpl.java
index e1b94226..593e1ba2 100644
--- a/yshop-mall/src/main/java/co/yixiang/modules/order/service/impl/YxStoreOrderServiceImpl.java
+++ b/yshop-mall/src/main/java/co/yixiang/modules/order/service/impl/YxStoreOrderServiceImpl.java
@@ -1486,7 +1486,7 @@ public class YxStoreOrderServiceImpl extends BaseServiceImpl<StoreOrderMapper, Y
         YxStoreOrderQueryVo orderInfo = getOrderInfo(orderId,null);
 
         //更新订单状态
-       LambdaQueryWrapper<YxStoreOrder> wrapper = new LambdaQueryWrapper<>();
+        LambdaQueryWrapper<YxStoreOrder> wrapper = new LambdaQueryWrapper<>();
         wrapper.eq(YxStoreOrder::getOrderId,orderId);
         YxStoreOrder storeOrder = new YxStoreOrder();
         storeOrder.setPaid(OrderInfoEnum.PAY_STATUS_1.getValue());
@@ -1508,8 +1508,12 @@ public class YxStoreOrderServiceImpl extends BaseServiceImpl<StoreOrderMapper, Y
         if(orderInfo.getBargainId() > 0) {
             storeBargainUserService.setBargainUserStatus(orderInfo.getBargainId(), orderInfo.getUid());
         }
-
         YxUser userInfo = userService.getById(orderInfo.getUid());
+        //使用了积分扣积分
+        /*if(orderInfo.getUseIntegral().compareTo(BigDecimal.ZERO) > 0){
+            this.decIntegral(userInfo,orderInfo.getUseIntegral().doubleValue(),orderInfo.getDeductionPrice().doubleValue());
+        }*/
+
         //增加流水
         String payTypeMsg = PayTypeEnum.WEIXIN.getDesc();
         if(PayTypeEnum.YUE.getValue().equals(payType)) {