From ef68ec442cb69971177564c5c9eae8e4ab2e37ea Mon Sep 17 00:00:00 2001
From: taochengbo <552920369@qq.com>
Date: Sun, 24 Jan 2021 17:24:36 +0800
Subject: [PATCH] =?UTF-8?q?=E5=8E=BB=E6=8E=89=E6=97=A0=E7=94=A8=E4=BB=A3?=
 =?UTF-8?q?=E7=A0=81?=
MIME-Version: 1.0
Content-Type: text/plain; charset=UTF-8
Content-Transfer-Encoding: 8bit

---
 .../order/service/impl/YxStoreOrderServiceImpl.java   | 11 +----------
 1 file changed, 1 insertion(+), 10 deletions(-)

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 593e1ba2..ba94567a 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
@@ -67,7 +67,6 @@ import co.yixiang.modules.order.vo.OrderDataVo;
 import co.yixiang.modules.order.vo.ShoperOrderTimeDataVo;
 import co.yixiang.modules.order.vo.UserOrderCountVo;
 import co.yixiang.modules.order.vo.YxStoreOrderQueryVo;
-import co.yixiang.modules.product.domain.YxStoreProduct;
 import co.yixiang.modules.product.domain.YxStoreProductReply;
 import co.yixiang.modules.product.service.YxStoreProductReplyService;
 import co.yixiang.modules.product.service.YxStoreProductService;
@@ -157,14 +156,10 @@ public class YxStoreOrderServiceImpl extends BaseServiceImpl<StoreOrderMapper, Y
     @Autowired
     private YxStoreCouponUserService couponUserService;
     @Autowired
-    private YxStoreSeckillService storeSeckillService;
-    @Autowired
     private YxUserService userService;
     @Autowired
     private YxStoreProductService productService;
     @Autowired
-    private YxStoreCombinationService combinationService;
-    @Autowired
     private YxStorePinkService pinkService;
     @Autowired
     private YxStoreBargainUserService storeBargainUserService;
@@ -1508,12 +1503,8 @@ 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());
-        }*/
 
+        YxUser userInfo = userService.getById(orderInfo.getUid());
         //增加流水
         String payTypeMsg = PayTypeEnum.WEIXIN.getDesc();
         if(PayTypeEnum.YUE.getValue().equals(payType)) {