From 34d15725d851f06f22cfe7e36358d1f252a7bdee Mon Sep 17 00:00:00 2001
From: puzhibing <393733352@qq.com>
Date: 星期一, 05 六月 2023 14:57:11 +0800
Subject: [PATCH] 更新支付功能
---
user/guns-admin/src/test/java/com/supersavedriving/user/GunsApplicationTest.java | 40 ++++++++++----------
user/guns-admin/src/main/resources/redis.properties | 18 ++++----
user/guns-admin/src/main/java/com/supersavedriving/user/modular/system/service/impl/OrderServiceImpl.java | 8 ++--
user/guns-admin/src/main/resources/application.yml | 14 +++----
4 files changed, 39 insertions(+), 41 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 8535c55..ec62628 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
@@ -1016,10 +1016,10 @@
}
}
- if(appUser.getHavDiscount() == 1){//9折
- order.setDiscount(9D);
- order.setDiscountAmount(payMoney * 0.1);
- payMoney = payMoney * 0.9;
+ if(appUser.getHavDiscount() == 1){//9.5折
+ order.setDiscount(9.5D);
+ order.setDiscountAmount(payMoney * 0.05);
+ payMoney = payMoney * 0.95;
}
order.setPayType(2);
diff --git a/user/guns-admin/src/main/resources/application.yml b/user/guns-admin/src/main/resources/application.yml
index 5f2d5d0..21d0d30 100644
--- a/user/guns-admin/src/main/resources/application.yml
+++ b/user/guns-admin/src/main/resources/application.yml
@@ -13,8 +13,8 @@
application:
name: user-server
profiles:
- active: dev
-# active: produce
+# active: dev
+ active: produce
mvc:
static-path-pattern: /static/**
view:
@@ -55,8 +55,8 @@
datasource:
url: jdbc:mysql://127.0.0.1:3306/super_save_driving?useUnicode=true&characterEncoding=utf8&zeroDateTimeBehavior=CONVERT_TO_NULL&useSSL=false&serverTimezone=Asia/Shanghai
username: root
-# password: f4OfRjqoN3jSiNGiUoiNsQdOBtCOKYRj
- password: 123456
+ password: f4OfRjqoN3jSiNGiUoiNsQdOBtCOKYRj
+# password: 123456
db-name: guns #用来搜集数据库的所有表
filters: wall,mergeStat
@@ -130,8 +130,8 @@
spring:
data:
mongodb:
-# uri: mongodb://root:CEtyLdKjPk0yeHNo@127.0.0.1:27017/admin
- uri: mongodb://127.0.0.1:27017/admin
+ uri: mongodb://root:CEtyLdKjPk0yeHNo@127.0.0.1:27017/admin
+# uri: mongodb://127.0.0.1:27017/admin
# mallbook 调起接口参数配置
@@ -148,6 +148,4 @@
merchant_private_key: MIICdgIBADANBgkqhkiG9w0BAQEFAASCAmAwggJcAgEAAoGBAIDGadl1oxP7EJg+/o32vpAMa8cwFevD6xu3FjIh04TOuVTpC9hbAwiyX/9OKQi3nHEISyrtnF6Y49tkmb7X8nDwOahvsyOjgNYp+NtSLAdgPAbd6lv2DPC1lVYYu5IkMz7PRifntROFH6OvE5fpj6GinaFY3TYBjyDcC2VVbq/LAgMBAAECgYATdmlvDWF9Vpe2eubcK+u3N7leXH0jqfOxt6UqJISkcN3/4E0DARZfTR5HJtf60k1ZpAhAT7MvdOoTMYwvFNI2WEFRwND5wBl+OdEN/lyWeISjjg1EnnTLj/azGLgE8Z2q/FodGikqrGrc2tSNIy75afeW2gUTF3DHiwcG76SYeQJBAPOyIzpT3yMfM7iVhjaPfmyxvDXq0cLwiAF0eUbrebPO0EevI+PKYhmN2oRMis6wSJbv+sbkElOXQzDefjw0ieUCQQCHRuFlX9JQYUOoyyirKxpu30uys+ygZqmo4PiKgIaaJJPm2p2o7vzZJANGmkmdwFf2LLzij70InKGvqGTEnvfvAkEAnJOMRuG0sOBPXv3TaiLwW+4mu43QkKvy9txbP9H0NC9ha22AZc+XEEwwZmi3lu109mXifv/zNnot1axe91facQJALExcwQqo32OKeXrVvX+m70m2CzX6NeiIhGHvYcOG0HFL8ZwDZu+j4yN04yjhFISJCXdK/1Icj/ZiyBf3r59zBwJACl7Sya9BcqRo5XJ/A7+T2E3VQT2nIopy0hPRLKWFaOzrCIsn3gcC58KSACXl2QMiG5kp1192QOC26b3o57ZecA==
# mall_book_public_key mallbook测试环境公钥 不需要替换
mall_book_public_key: MIGfMA0GCSqGSIb3DQEBAQUAA4GNADCBiQKBgQD0L2DaHOO8ekhktB6RoHxIcki/0v7OUeOn9tX9VBE+jv6PRjqlZRWL3Qezxz5ADtHEyLv+RFFaceXSep6rWyoQ6DRlvLv5CySUAxAM42LLVe4DI3l/0ccEAIuU5NCpwAAj1zkm2X01DwUCZwymLjlqbDlBvQhpq+1fddtTtA/QLQIDAQAB
- # mall_book_public_key mallbook生产环境公钥 不需要替换
- # mall_book_public_key: MIGfMA0GCSqGSIb3DQEBAQUAA4GNADCBiQKBgQCq6OLZKgUHH5wOk9xSBgN7yC17r3PQwMlY9/IorqrOlaIqrU0eAVZ5+dWrJD/3bdu7Ctq8n8trTm/IUYs7wtMg5SKwyX4/N+KQc2N7LL4yCq4vNl41q9sYgrtA0QnZoucIZcq1mwyu7RTDC8Wp7LGddnlkJsmL8masgMxA6cc9NwIDAQAB
diff --git a/user/guns-admin/src/main/resources/redis.properties b/user/guns-admin/src/main/resources/redis.properties
index 8386340..726be87 100644
--- a/user/guns-admin/src/main/resources/redis.properties
+++ b/user/guns-admin/src/main/resources/redis.properties
@@ -2,19 +2,19 @@
# Redis���ݿ�������Ĭ��Ϊ0��
spring.redis.database=0
-## Redis��������ַ
-#spring.redis.host=127.0.0.1
-## Redis���������Ӷ˿�
-#spring.redis.port=16379
-## Redis�������������루Ĭ��Ϊ�գ�
-#spring.redis.password=cKsEeyffDXG5PzNg8CIbrWxFluXrCprZ
-
# Redis��������ַ
spring.redis.host=127.0.0.1
# Redis���������Ӷ˿�
-spring.redis.port=6379
+spring.redis.port=16379
# Redis�������������루Ĭ��Ϊ�գ�
-spring.redis.password=123456
+spring.redis.password=cKsEeyffDXG5PzNg8CIbrWxFluXrCprZ
+
+## Redis��������ַ
+#spring.redis.host=127.0.0.1
+## Redis���������Ӷ˿�
+#spring.redis.port=6379
+## Redis�������������루Ĭ��Ϊ�գ�
+#spring.redis.password=123456
# ���ӳ������������ʹ�ø�ֵ��ʾû�����ƣ�
spring.redis.jedis.pool.max-active=1024
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
index 2ed8b32..ce79b7d 100644
--- a/user/guns-admin/src/test/java/com/supersavedriving/user/GunsApplicationTest.java
+++ b/user/guns-admin/src/test/java/com/supersavedriving/user/GunsApplicationTest.java
@@ -1,20 +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
-
-
-
-}
+//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