From 6d06393ca48883cb1273cf1c9fdf314a995bc319 Mon Sep 17 00:00:00 2001
From: "LIONCITYS\\lioncity" <18026623439@163.com>
Date: Tue, 20 Oct 2020 11:27:19 +0800
Subject: [PATCH] =?UTF-8?q?=E6=96=B0=E5=A2=9E=E5=8D=95=E5=93=81=E8=AF=84?=
 =?UTF-8?q?=E4=BB=B7?=
MIME-Version: 1.0
Content-Type: text/plain; charset=UTF-8
Content-Transfer-Encoding: 8bit

---
 .../modules/cart/vo/YxStoreCartQueryVo.java     |  2 +-
 .../service/impl/YxStoreOrderServiceImpl.java   | 17 +++++++++++------
 2 files changed, 12 insertions(+), 7 deletions(-)

diff --git a/yshop-mall/src/main/java/co/yixiang/modules/cart/vo/YxStoreCartQueryVo.java b/yshop-mall/src/main/java/co/yixiang/modules/cart/vo/YxStoreCartQueryVo.java
index ef58c3e4..b3d0e6bb 100644
--- a/yshop-mall/src/main/java/co/yixiang/modules/cart/vo/YxStoreCartQueryVo.java
+++ b/yshop-mall/src/main/java/co/yixiang/modules/cart/vo/YxStoreCartQueryVo.java
@@ -71,7 +71,7 @@ public class YxStoreCartQueryVo implements Serializable {
     @ApiModelProperty(value = "唯一id")
     private String unique;
 
-    @ApiModelProperty(value = "是否回复")
+    @ApiModelProperty(value = "是否评价")
     private Integer isReply;
 
 }
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 8a17a411..9f0ae218 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
@@ -618,12 +618,17 @@ public class YxStoreOrderServiceImpl extends BaseServiceImpl<StoreOrderMapper, Y
                 .build();
 
         productReplyService.save(storeProductReply);
+        //获取评价商品数量
+        int replyCount = productReplyService.count(new LambdaQueryWrapper<YxStoreProductReply>().eq(YxStoreProductReply::getOid, orderCartInfo.getOid()));
+        //购买商品数量
+        int cartCount = storeOrderCartInfoService.count(new LambdaQueryWrapper<YxStoreOrderCartInfo>().eq(YxStoreOrderCartInfo::getOid, orderCartInfo.getOid()));
+        if(replyCount==cartCount){
+            YxStoreOrder storeOrder = new YxStoreOrder();
+            storeOrder.setStatus(OrderInfoEnum.STATUS_3.getValue());
+            storeOrder.setId(orderCartInfo.getOid());
+            yxStoreOrderMapper.updateById(storeOrder);
 
-        YxStoreOrder storeOrder = new YxStoreOrder();
-        storeOrder.setStatus(OrderInfoEnum.STATUS_3.getValue());
-        storeOrder.setId(orderCartInfo.getOid());
-        yxStoreOrderMapper.updateById(storeOrder);
-
+        }
         //增加状态
         orderStatusService.create(orderCartInfo.getOid(),
                 OrderLogEnum.EVAL_ORDER.getValue(),
@@ -1321,7 +1326,7 @@ public class YxStoreOrderServiceImpl extends BaseServiceImpl<StoreOrderMapper, Y
                 .map(cart -> {
                     YxStoreCartQueryVo cartQueryVo = JSON.parseObject(cart.getCartInfo(),YxStoreCartQueryVo.class);
                     cartQueryVo.setUnique(cart.getUnique());
-                    //cartQueryVo.setIsReply(storeProductReplyService.replyCount(cart.getUnique()));
+                    cartQueryVo.setIsReply(productReplyService.replyCount(cart.getUnique()));
                     return cartQueryVo;
                 })
                 .collect(Collectors.toList());