From ba68425fe31bd81b15081a75d4dc0d4602446fd6 Mon Sep 17 00:00:00 2001
From: xuwenbo <717567226@qq.com>
Date: Wed, 9 Sep 2020 10:57:30 +0800
Subject: [PATCH] =?UTF-8?q?bug=E4=B8=8B=E5=8D=95=E6=97=B6=E6=99=AE?=
 =?UTF-8?q?=E9=80=9A=E5=95=86=E5=93=81=E5=BA=93=E5=AD=98=E4=B8=8D=E8=B6=B3?=
MIME-Version: 1.0
Content-Type: text/plain; charset=UTF-8
Content-Transfer-Encoding: 8bit

---
 .../order/rest/StoreOrderController.java        |  2 +-
 .../yixiang/modules/services/AuthService.java   |  2 +-
 .../service/impl/YxStoreProductServiceImpl.java | 17 ++++++++++-------
 3 files changed, 12 insertions(+), 9 deletions(-)

diff --git a/yshop-app/src/main/java/co/yixiang/modules/order/rest/StoreOrderController.java b/yshop-app/src/main/java/co/yixiang/modules/order/rest/StoreOrderController.java
index 3caa4afb..71b582ee 100644
--- a/yshop-app/src/main/java/co/yixiang/modules/order/rest/StoreOrderController.java
+++ b/yshop-app/src/main/java/co/yixiang/modules/order/rest/StoreOrderController.java
@@ -306,7 +306,7 @@ public class StoreOrderController {
     public ApiResult<Boolean> comment(@Valid @RequestBody ProductReplyParam param){
         YxUser user = LocalUser.getUser();
         storeOrderService.orderComment(user,param.getUnique(),
-                EmojiParser.removeAllEmojis(param.getComment()),
+                param.getComment(),
                 param.getPics(),param.getProductScore(),param.getServiceScore());
         return ApiResult.ok();
     }
diff --git a/yshop-app/src/main/java/co/yixiang/modules/services/AuthService.java b/yshop-app/src/main/java/co/yixiang/modules/services/AuthService.java
index 5ca34de8..64a4ee1a 100644
--- a/yshop-app/src/main/java/co/yixiang/modules/services/AuthService.java
+++ b/yshop-app/src/main/java/co/yixiang/modules/services/AuthService.java
@@ -188,7 +188,7 @@ public class AuthService {
             YxUser returnUser = null;
             if(yxUser == null){
                 //过滤掉表情
-                String nickname = EmojiParser.removeAllEmojis(wxMpUser.getNickname());
+                String nickname = wxMpUser.getNickname();
                 log.info("昵称：{}", nickname);
                 //用户保存
                 String ip = IpUtil.getRequestIp();
diff --git a/yshop-mall/src/main/java/co/yixiang/modules/product/service/impl/YxStoreProductServiceImpl.java b/yshop-mall/src/main/java/co/yixiang/modules/product/service/impl/YxStoreProductServiceImpl.java
index f84b97a3..f60ffa0f 100644
--- a/yshop-mall/src/main/java/co/yixiang/modules/product/service/impl/YxStoreProductServiceImpl.java
+++ b/yshop-mall/src/main/java/co/yixiang/modules/product/service/impl/YxStoreProductServiceImpl.java
@@ -148,19 +148,22 @@ public class YxStoreProductServiceImpl extends BaseServiceImpl<StoreProductMappe
         //先处理商品库存，活动商品也要处理，因为共享库存
         int product = storeProductMapper.decStockIncSales(num,productId);
         if(product == 0) {
-            throw new YshopException("商品库存不足");
+            throw new YshopException("共享商品库存不足");
         }
         //处理商品外层显示的库存
-        int res = 0;
         if("combination".equals(type)){
-            res = storeProductMapper.decCombinationStockIncSales(num,productId,activityId);
+            int combinationRes = storeProductMapper.decCombinationStockIncSales(num,productId,activityId);
+            if(combinationRes == 0) {
+                throw new YshopException("拼团商品库存不足");
+            }
         }else if("seckill".equals(type)){
-            res = storeProductMapper.decSeckillStockIncSales(num,productId,activityId);
+           int seckillRes = storeProductMapper.decSeckillStockIncSales(num,productId,activityId);
+            if(seckillRes == 0) {
+                throw new YshopException("秒杀商品库存不足");
+            }
         }
         //todo 处理砍价库存
-        if(res == 0) {
-            throw new YshopException("商品库存不足");
-        }
+
     }