From 9af7a6a7429ea6e0f0a02c5fb60163ea3401c764 Mon Sep 17 00:00:00 2001
From: wangw <1594593906@qq.com>
Date: Fri, 14 Mar 2025 10:01:00 +0800
Subject: [PATCH] =?UTF-8?q?=E7=A7=B0=E9=87=8D=E6=89=93=E5=8C=85=E8=B4=B9?=
 =?UTF-8?q?=E9=97=AE=E9=A2=98=20=E9=80=80=E6=AC=BE=E5=8E=9F=E5=9B=A0?=
MIME-Version: 1.0
Content-Type: text/plain; charset=UTF-8
Content-Transfer-Encoding: 8bit

---
 .../java/com/czg/{config => task}/OTimeTask.java  |  2 +-
 .../order/service/impl/OrderInfoServiceImpl.java  |  6 ++++--
 .../order/service/impl/PayServiceImpl.java        |  3 ++-
 .../service/impl/ProductRpcServiceImpl.java       | 15 ++++++---------
 4 files changed, 13 insertions(+), 13 deletions(-)
 rename cash-api/order-server/src/main/java/com/czg/{config => task}/OTimeTask.java (97%)

diff --git a/cash-api/order-server/src/main/java/com/czg/config/OTimeTask.java b/cash-api/order-server/src/main/java/com/czg/task/OTimeTask.java
similarity index 97%
rename from cash-api/order-server/src/main/java/com/czg/config/OTimeTask.java
rename to cash-api/order-server/src/main/java/com/czg/task/OTimeTask.java
index e7e74cd2..014f66d4 100644
--- a/cash-api/order-server/src/main/java/com/czg/config/OTimeTask.java
+++ b/cash-api/order-server/src/main/java/com/czg/task/OTimeTask.java
@@ -1,4 +1,4 @@
-package com.czg.config;
+package com.czg.task;
 
 import cn.hutool.core.date.DateUtil;
 import com.czg.order.entity.OrderInfo;
diff --git a/cash-service/order-service/src/main/java/com/czg/service/order/service/impl/OrderInfoServiceImpl.java b/cash-service/order-service/src/main/java/com/czg/service/order/service/impl/OrderInfoServiceImpl.java
index e9a5cc91..ddab8268 100644
--- a/cash-service/order-service/src/main/java/com/czg/service/order/service/impl/OrderInfoServiceImpl.java
+++ b/cash-service/order-service/src/main/java/com/czg/service/order/service/impl/OrderInfoServiceImpl.java
@@ -46,7 +46,6 @@ import org.apache.dubbo.config.annotation.DubboReference;
 import org.apache.dubbo.config.annotation.DubboService;
 import org.jetbrains.annotations.NotNull;
 import org.springframework.context.annotation.Lazy;
-import org.springframework.stereotype.Service;
 import org.springframework.transaction.annotation.Transactional;
 
 import java.math.BigDecimal;
@@ -483,11 +482,14 @@ public class OrderInfoServiceImpl extends ServiceImpl<OrderInfoMapper, OrderInfo
                 if (userAllPack != null) {
                     if (userAllPack.equals(1)) {
                         orderDetail.setPackNumber(orderDetail.getNum().subtract(orderDetail.getReturnNum()));
+                        if("weight".equals(orderDetail.getProductType())){
+                            orderDetail.setPackNumber(BigDecimal.ONE);
+                        }
                     } else {
                         orderDetail.setPackNumber(BigDecimal.ZERO);
                     }
                 } else if (isAllPack) {
-                    if ("weigh".equals(orderDetail.getProductType())) {
+                    if ("weight".equals(orderDetail.getProductType())) {
                         orderDetail.setPackNumber(BigDecimal.ONE);
                     } else {
                         orderDetail.setPackNumber(orderDetail.getNum().subtract(orderDetail.getReturnNum()));
diff --git a/cash-service/order-service/src/main/java/com/czg/service/order/service/impl/PayServiceImpl.java b/cash-service/order-service/src/main/java/com/czg/service/order/service/impl/PayServiceImpl.java
index 5e2e78e1..8c8f4b2b 100644
--- a/cash-service/order-service/src/main/java/com/czg/service/order/service/impl/PayServiceImpl.java
+++ b/cash-service/order-service/src/main/java/com/czg/service/order/service/impl/PayServiceImpl.java
@@ -4,6 +4,7 @@ import cn.hutool.core.collection.CollUtil;
 import cn.hutool.core.convert.Convert;
 import cn.hutool.core.exceptions.ValidateException;
 import cn.hutool.core.util.IdUtil;
+import cn.hutool.core.util.StrUtil;
 import com.alibaba.fastjson2.JSONObject;
 import com.czg.account.dto.shopuser.ShopUserMoneyEditDTO;
 import com.czg.account.entity.*;
@@ -590,7 +591,7 @@ public class PayServiceImpl implements PayService {
                 } else if (!orderInfo.getPayType().equals(PayEnums.CASH_PAY.getValue())) {
                     //退款 param.getRefundAmount()
                     refundOrder(orderInfo.getShopId(), orderInfo.getId(), orderInfo.getPayOrderId(),
-                            refPayOrderNo, param.getRefundReason(), param.getRefundAmount());
+                            refPayOrderNo, StrUtil.isBlank(param.getRefundReason()) ? "退款" : param.getRefundReason(), param.getRefundAmount());
                 }
             }
         } else {
diff --git a/cash-service/product-service/src/main/java/com/czg/service/product/service/impl/ProductRpcServiceImpl.java b/cash-service/product-service/src/main/java/com/czg/service/product/service/impl/ProductRpcServiceImpl.java
index 70966228..fb6d9e72 100644
--- a/cash-service/product-service/src/main/java/com/czg/service/product/service/impl/ProductRpcServiceImpl.java
+++ b/cash-service/product-service/src/main/java/com/czg/service/product/service/impl/ProductRpcServiceImpl.java
@@ -62,6 +62,9 @@ public class ProductRpcServiceImpl implements ProductRpcService {
         }
         for (ProductStockSubtractDTO dto : list) {
             Product product = productMapper.selectOneById(dto.getProductId());
+            if (product == null) {
+                continue;
+            }
             productMapper.updateProductStockNum(dto.getProductId(), dto.getShopId(), "sub", dto.getNum());
             // 记录商品库存流水
             ProductStockFlow flow = new ProductStockFlow();
@@ -119,9 +122,7 @@ public class ProductRpcServiceImpl implements ProductRpcService {
                 consStockFlowMapper.insert(consStockFlow);
             }
         }
-        ThreadUtil.execAsync(() -> {
-            rabbitPublisher.sendProductInfoChangeMsg(Convert.toStr(shopId));
-        });
+        ThreadUtil.execAsync(() -> rabbitPublisher.sendProductInfoChangeMsg(Convert.toStr(shopId)));
         log.info("ProductService.--------------------------------------------库存更新成功");
     }
 
@@ -191,9 +192,7 @@ public class ProductRpcServiceImpl implements ProductRpcService {
                 consStockFlowMapper.insert(consStockFlow);
             }
         }
-        ThreadUtil.execAsync(() -> {
-            rabbitPublisher.sendProductInfoChangeMsg(Convert.toStr(shopId));
-        });
+        ThreadUtil.execAsync(() -> rabbitPublisher.sendProductInfoChangeMsg(Convert.toStr(shopId)));
         log.info("ProductService.--------------------------------------------库存更新成功");
     }
 
@@ -266,9 +265,7 @@ public class ProductRpcServiceImpl implements ProductRpcService {
                 consStockFlowMapper.insert(consStockFlow);
             }
         }
-        ThreadUtil.execAsync(() -> {
-            rabbitPublisher.sendProductInfoChangeMsg(Convert.toStr(shopId));
-        });
+        ThreadUtil.execAsync(() -> rabbitPublisher.sendProductInfoChangeMsg(Convert.toStr(shopId)));
         log.info("ProductService.--------------------------------------------库存更新成功");
     }
 }