版本号修改为3.2

shell/start.sh

@@ -1 +1 @@
-nohup java -jar yshop-api-2.0.jar --spring.profiles.active=prod &
+nohup java -jar yshop-app-3.2.jar --spring.profiles.active=prod &

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

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:

yshop-app/src/main/resources/config/application.yml

@@ -69,7 +69,7 @@ logging:
 
 yshop:
   #相关配置
-  version: 3.1
+  version: 3.2
 
 # 防止XSS攻击
 xss:

yshop-mall/src/main/java/co/yixiang/modules/order/service/impl/YxStoreOrderServiceImpl.java

@@ -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)) {