From 42f401469a43155bd08f4503cfb3bc7784383a23 Mon Sep 17 00:00:00 2001
From: wangw <1594593906@qq.com>
Date: Tue, 19 Mar 2024 17:16:01 +0800
Subject: [PATCH] =?UTF-8?q?=E8=AE=A2=E5=8D=95=E7=AE=A1=E7=90=86=20?=
 =?UTF-8?q?=E5=B1=95=E7=A4=BA=E9=80=80=E5=8D=95=E7=BB=9F=E8=AE=A1?=
MIME-Version: 1.0
Content-Type: text/plain; charset=UTF-8
Content-Transfer-Encoding: 8bit

---
 .../cashier/repository/order/TbOrderInfoRepository.java  | 6 ++++++
 .../service/impl/order/TbOrderInfoServiceImpl.java       | 9 +++++++--
 .../impl/productimpl/TbProductSkuServiceImpl.java        | 2 --
 3 files changed, 13 insertions(+), 4 deletions(-)

diff --git a/eladmin-system/src/main/java/cn/ysk/cashier/repository/order/TbOrderInfoRepository.java b/eladmin-system/src/main/java/cn/ysk/cashier/repository/order/TbOrderInfoRepository.java
index 81b7d18d..2cdfa7ca 100644
--- a/eladmin-system/src/main/java/cn/ysk/cashier/repository/order/TbOrderInfoRepository.java
+++ b/eladmin-system/src/main/java/cn/ysk/cashier/repository/order/TbOrderInfoRepository.java
@@ -40,6 +40,12 @@ public interface TbOrderInfoRepository extends JpaRepository<TbOrderInfo, Intege
             "GROUP BY info.payType")
     List<TbOrderPayCountVo> queryTbOrderPayCount(@Param("shopId")String shopId);
 
+    @Query("SELECT new cn.ysk.cashier.vo.TbOrderPayCountVo('refund', SUM(info.orderAmount)) " +
+            "FROM TbOrderInfo info " +
+            "WHERE info.shopId = :shopId " +
+            "AND info.status = 'refund' AND info.orderType = 'return'")
+    TbOrderPayCountVo queryTbOrderRefund(@Param("shopId")String shopId);
+
     @Query(value = "SELECT COUNT(1) ,pay_type AS payType FROM tb_order_info Where shop_id = :shopId AND  " +
                     " created_at BETWEEN :startTime AND :endTime AND status='closed'AND order_type <>'return' GROUP BY pay_type" ,nativeQuery = true)
     List<Object[]> countByShopId(@Param("shopId") String shopId, @Param("startTime") Long startTime, @Param("endTime") Long endTime);
diff --git a/eladmin-system/src/main/java/cn/ysk/cashier/service/impl/order/TbOrderInfoServiceImpl.java b/eladmin-system/src/main/java/cn/ysk/cashier/service/impl/order/TbOrderInfoServiceImpl.java
index de02bf11..f572e7f6 100644
--- a/eladmin-system/src/main/java/cn/ysk/cashier/service/impl/order/TbOrderInfoServiceImpl.java
+++ b/eladmin-system/src/main/java/cn/ysk/cashier/service/impl/order/TbOrderInfoServiceImpl.java
@@ -72,7 +72,7 @@ public class TbOrderInfoServiceImpl implements TbOrderInfoService {
         Page<TbOrderInfo> page = tbOrderInfoRepository.findAll((root, criteriaQuery, criteriaBuilder) -> {
             Predicate predicate = QueryHelp.getPredicate(root, criteria, criteriaBuilder);
             // 追加校验参数 status不为空 且 source不为空 不查询状态为 "refund" 的
-            if(StringUtils.isBlank(criteria.getStatus()) && StringUtils.isBlank(criteria.getSource())){
+            if (StringUtils.isBlank(criteria.getStatus()) && StringUtils.isBlank(criteria.getSource())) {
                 predicate = criteriaBuilder.and(predicate, criteriaBuilder.notEqual(root.get("orderType"), "return"));
             }
             return predicate;
@@ -118,6 +118,12 @@ public class TbOrderInfoServiceImpl implements TbOrderInfoService {
                 result.add(payCount);
             }
         }
+        TbOrderPayCountVo payRufund = tbOrderInfoRepository.queryTbOrderRefund(shopId);
+        if (payRufund != null) {
+            payRufund.setPayType("退单");
+            payRufund.setIcon("https://cashier-oss.oss-cn-beijing.aliyuncs.com/upload/20240319/5741608662244b878762c61bb37c95c9.png");
+            result.add(payRufund);
+        }
         return result;
     }
 
@@ -158,7 +164,6 @@ public class TbOrderInfoServiceImpl implements TbOrderInfoService {
         if (refund > 0) {
             dto.setIsRefund(1);
         }
-        log.info("退款金额为：{}", refundAmount);
         dto.setRefundAmount(refundAmount);
         dto.setDetailList(details);
         return dto;
diff --git a/eladmin-system/src/main/java/cn/ysk/cashier/service/impl/productimpl/TbProductSkuServiceImpl.java b/eladmin-system/src/main/java/cn/ysk/cashier/service/impl/productimpl/TbProductSkuServiceImpl.java
index 330612ae..e1d0187c 100644
--- a/eladmin-system/src/main/java/cn/ysk/cashier/service/impl/productimpl/TbProductSkuServiceImpl.java
+++ b/eladmin-system/src/main/java/cn/ysk/cashier/service/impl/productimpl/TbProductSkuServiceImpl.java
@@ -82,9 +82,7 @@ public class TbProductSkuServiceImpl implements TbProductSkuService {
     public void update(TbProductSku resources) {
         TbProductSku tbProductSku = tbProductSkuRepository.findById(resources.getId()).orElseGet(TbProductSku::new);
         ValidationUtil.isNull( tbProductSku.getId(),"TbProductSku","id",resources.getId());
-        log.info("入库前{}",tbProductSku);
         tbProductSku.copy(resources);
-        log.info("入库后{}",tbProductSku);
         tbProductSkuRepository.save(tbProductSku);
     }