From 9be00af38cf1edb85346b1622a70f56069fa397e Mon Sep 17 00:00:00 2001
From: =?UTF-8?q?=E7=89=9B=E5=8F=89=E9=97=AA=E9=97=AA?= <18322780655@163.com>
Date: Thu, 5 Sep 2024 17:39:16 +0800
Subject: [PATCH] =?UTF-8?q?=E4=BF=AE=E6=94=B9?=
MIME-Version: 1.0
Content-Type: text/plain; charset=UTF-8
Content-Transfer-Encoding: 8bit

---
 .../system/cashierservice/service/PayService.java        | 9 +++++++--
 1 file changed, 7 insertions(+), 2 deletions(-)

diff --git a/src/main/java/com/chaozhanggui/system/cashierservice/service/PayService.java b/src/main/java/com/chaozhanggui/system/cashierservice/service/PayService.java
index 35af568..78fce42 100644
--- a/src/main/java/com/chaozhanggui/system/cashierservice/service/PayService.java
+++ b/src/main/java/com/chaozhanggui/system/cashierservice/service/PayService.java
@@ -1065,7 +1065,7 @@ public class PayService {
         TbShopInfo shopInfo = tbShopInfoMapper.selectByPrimaryKey(Integer.valueOf(orderInfo.getShopId()));
 
 
-        if ("0".equals(shopInfo.getIsReturn())) {
+        if ("1".equals(shopInfo.getIsReturn())) {
             if (ObjectUtil.isEmpty(pwd)) {
                 return Result.fail(CodeEnum.PARAM);
             }
@@ -1156,7 +1156,12 @@ public class PayService {
                     detailPo.setStatus("closed");
 
                 }
-                BigDecimal returnAmount = payAmount;
+                BigDecimal returnAmount = it.getPriceAmount().divide(new BigDecimal(it.getNum()), 2, RoundingMode.DOWN).multiply(new BigDecimal(map1.get(it.getId())));;
+
+                if (ObjectUtil.isNotEmpty(orderInfo.getDiscountRatio()) && ObjectUtil.isNotNull(orderInfo.getDiscountRatio())) {
+                    returnAmount = returnAmount.multiply(orderInfo.getDiscountRatio()).setScale(2, BigDecimal.ROUND_DOWN);
+                }
+
                 detailPo.setReturnNum(map1.get(it.getId()));
                 detailPos.add(detailPo);
                 it.setNum(map1.get(it.getId()));