From faaa45bfab3cb28a2851c187e3c2387270c6fc36 Mon Sep 17 00:00:00 2001
From: puzhibing <393733352@qq.com>
Date: 星期一, 29 五月 2023 15:09:54 +0800
Subject: [PATCH] 创建1.1分支

---
 user/guns-admin/src/test/java/com/supersavedriving/user/GunsApplicationTest.java                          |   20 ++++++++++++++++++++
 user/guns-admin/src/main/java/com/supersavedriving/user/modular/system/service/impl/OrderServiceImpl.java |    2 +-
 2 files changed, 21 insertions(+), 1 deletions(-)

diff --git a/user/guns-admin/src/main/java/com/supersavedriving/user/modular/system/service/impl/OrderServiceImpl.java b/user/guns-admin/src/main/java/com/supersavedriving/user/modular/system/service/impl/OrderServiceImpl.java
index a351a6f..8891f9b 100644
--- a/user/guns-admin/src/main/java/com/supersavedriving/user/modular/system/service/impl/OrderServiceImpl.java
+++ b/user/guns-admin/src/main/java/com/supersavedriving/user/modular/system/service/impl/OrderServiceImpl.java
@@ -966,9 +966,9 @@
         }
 
         if(appUser.getHavDiscount() == 1){//9折
-            payMoney = payMoney * 0.9;
             order.setDiscount(9D);
             order.setDiscountAmount(payMoney * 0.1);
+            payMoney = payMoney * 0.9;
         }
 
         order.setPayType(2);
diff --git a/user/guns-admin/src/test/java/com/supersavedriving/user/GunsApplicationTest.java b/user/guns-admin/src/test/java/com/supersavedriving/user/GunsApplicationTest.java
new file mode 100644
index 0000000..0208971
--- /dev/null
+++ b/user/guns-admin/src/test/java/com/supersavedriving/user/GunsApplicationTest.java
@@ -0,0 +1,20 @@
+package com.supersavedriving.user;
+
+import org.junit.runner.RunWith;
+import org.springframework.boot.test.context.SpringBootTest;
+import org.springframework.test.context.junit4.SpringRunner;
+
+/**
+ * @author zhibing.pu
+ * @date 2023/5/29 10:20
+ */
+@RunWith(SpringRunner.class)
+@SpringBootTest
+public class GunsApplicationTest {
+
+
+    public void
+
+
+
+}

--
Gitblit v1.7.1