From 09a4918e139ce63439d5b0fc42fd33b8ec5d8772 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:06:51 +0800
Subject: [PATCH 1/2] =?UTF-8?q?=E4=BF=AE=E6=94=B9?=
MIME-Version: 1.0
Content-Type: text/plain; charset=UTF-8
Content-Transfer-Encoding: 8bit

---
 .../chaozhanggui/system/cashierservice/service/PayService.java   | 1 +
 1 file changed, 1 insertion(+)

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 65d5532..d580f6e 100644
--- a/src/main/java/com/chaozhanggui/system/cashierservice/service/PayService.java
+++ b/src/main/java/com/chaozhanggui/system/cashierservice/service/PayService.java
@@ -844,6 +844,7 @@ public class PayService {
         orderInfo.setPayType("cash");
         orderInfo.setStatus("closed");
         orderInfo.setPayOrderNo("cash".concat(SnowFlakeUtil.generateOrderNo()));
+        orderInfo.setMemberId(vipUserId.toString());
         tbOrderInfoMapper.updateByPrimaryKeySelective(orderInfo);
         //更新购物车状态
         int cartCount = tbCashierCartMapper.updateByOrderId(String.valueOf(orderId), "final");

From b8f04c65c0c6353f7e9c2ab5436d1b7b33b9c6bb 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:34:14 +0800
Subject: [PATCH 2/2] =?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, 5 insertions(+), 4 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 d580f6e..35af568 100644
--- a/src/main/java/com/chaozhanggui/system/cashierservice/service/PayService.java
+++ b/src/main/java/com/chaozhanggui/system/cashierservice/service/PayService.java
@@ -841,9 +841,9 @@ public class PayService {
             orderInfo.setPayAmount(orderInfo.getOrderAmount());
         }
 
-        orderInfo.setPayType("cash");
+        orderInfo.setPayType("deposit");
         orderInfo.setStatus("closed");
-        orderInfo.setPayOrderNo("cash".concat(SnowFlakeUtil.generateOrderNo()));
+        orderInfo.setPayOrderNo("deposit".concat(SnowFlakeUtil.generateOrderNo()));
         orderInfo.setMemberId(vipUserId.toString());
         tbOrderInfoMapper.updateByPrimaryKeySelective(orderInfo);
         //更新购物车状态
@@ -1065,7 +1065,7 @@ public class PayService {
         TbShopInfo shopInfo = tbShopInfoMapper.selectByPrimaryKey(Integer.valueOf(orderInfo.getShopId()));
 
 
-        if ("1".equals(shopInfo.getIsReturn())) {
+        if ("0".equals(shopInfo.getIsReturn())) {
             if (ObjectUtil.isEmpty(pwd)) {
                 return Result.fail(CodeEnum.PARAM);
             }
@@ -1156,7 +1156,7 @@ public class PayService {
                     detailPo.setStatus("closed");
 
                 }
-                BigDecimal returnAmount = it.getPriceAmount().divide(new BigDecimal(it.getNum()), 2, RoundingMode.DOWN).multiply(new BigDecimal(map1.get(it.getId())));
+                BigDecimal returnAmount = payAmount;
                 detailPo.setReturnNum(map1.get(it.getId()));
                 detailPos.add(detailPo);
                 it.setNum(map1.get(it.getId()));
@@ -1680,6 +1680,7 @@ public class PayService {
 
 
     public static void main(String[] args) {
+        System.out.println(MD5Util.encrypt("123456".concat("13718478323").concat("10")));
     }
 
 }