From 01e9dbe69d9196e58d2ea645e05e6a1b69411753 Mon Sep 17 00:00:00 2001
From: Helius <wangdoubleone@gmail.com>
Date: Fri, 24 Jun 2022 11:40:50 +0800
Subject: [PATCH] fix

---
 src/main/java/cc/mrbird/febs/mall/service/impl/AdminMallOrderService.java |   35 +++++++++++++++++++++++++++++++++--
 1 files changed, 33 insertions(+), 2 deletions(-)

diff --git a/src/main/java/cc/mrbird/febs/mall/service/impl/AdminMallOrderService.java b/src/main/java/cc/mrbird/febs/mall/service/impl/AdminMallOrderService.java
index d3e7563..203a7bd 100644
--- a/src/main/java/cc/mrbird/febs/mall/service/impl/AdminMallOrderService.java
+++ b/src/main/java/cc/mrbird/febs/mall/service/impl/AdminMallOrderService.java
@@ -43,6 +43,8 @@
 
     private final MallOrderRefundAddressMapper mallOrderRefundAddressMapper;
 
+    private final MallGoodsCommentMapper mallGoodsCommentMapper;
+
     private final MallMoneyFlowMapper mallMoneyFlowMapper;
 
     private final IApiMallMemberWalletService iApiMallMemberWalletService;
@@ -155,7 +157,7 @@
         mallOrderInfoMapper.updateById(mallOrderInfo);
 
         if(!"微信支付".equals(mallOrderInfo.getPayMethod()) && !"支付宝支付".equals(mallOrderInfo.getPayMethod())){
-            BigDecimal amount = mallOrderInfo.getAmount().add(mallOrderInfo.getCarriage());
+            BigDecimal amount = mallOrderRefund.getAmount();
             //用户钱包增加对应的余额
             iApiMallMemberWalletService.addBalance(amount, mallOrderInfo.getMemberId());
 
@@ -223,7 +225,7 @@
         mallOrderInfo.setStatus(6);
         mallOrderInfoMapper.updateById(mallOrderInfo);
 
-        BigDecimal refundAmount = mallOrderInfo.getAmount();
+        BigDecimal refundAmount = mallOrderRefund.getAmount();
         //用户钱包增加对应的余额
         iApiMallMemberWalletService.addBalance(refundAmount, mallOrderInfo.getMemberId());
 
@@ -363,6 +365,35 @@
     }
 
     @Override
+    public IPage<AdminMallGoodsCommentVo> getCommentListInPage(AdminMallGoodsCommentDto adminMallGoodsCommentDto, QueryRequest request) {
+        Page<AdminMallGoodsCommentVo> page = new Page<>(request.getPageNum(), request.getPageSize());
+        IPage<AdminMallGoodsCommentVo> adminMallGoodsCommentVos = mallGoodsCommentMapper.getCommentListInPage(page, adminMallGoodsCommentDto);
+        return adminMallGoodsCommentVos;
+    }
+
+    @Override
+    public FebsResponse showStateSwitchOn(Long id) {
+        MallGoodsComment mallGoodsComment = mallGoodsCommentMapper.selectById(id);
+        if (ObjectUtil.isEmpty(mallGoodsComment)) {
+            return new FebsResponse().fail().message("评论不存在,请刷新当前页面");
+        }
+        mallGoodsComment.setShowState(MallGoodsComment.SHOW_STATE_ENABLE);
+        mallGoodsCommentMapper.updateById(mallGoodsComment);
+        return new FebsResponse().success();
+    }
+
+    @Override
+    public FebsResponse showStateSwitchOff(Long id) {
+        MallGoodsComment mallGoodsComment = mallGoodsCommentMapper.selectById(id);
+        if (ObjectUtil.isEmpty(mallGoodsComment)) {
+            return new FebsResponse().fail().message("评论不存在,请刷新当前页面");
+        }
+        mallGoodsComment.setShowState(MallGoodsComment.SHOW_STATE_DISABLED);
+        mallGoodsCommentMapper.updateById(mallGoodsComment);
+        return new FebsResponse().success();
+    }
+
+    @Override
     public void deliverGoodsByOrderNo(DeliverGoodsDto deliverGoodsDto) {
         MallOrderInfo mallOrderInfo = mallOrderInfoMapper.selectByOrderNo(deliverGoodsDto.getOrderNo());
         if (mallOrderInfo == null) {

--
Gitblit v1.9.1