From 9032e2ee7bc4f003164bd905b1df687b4acfc4c3 Mon Sep 17 00:00:00 2001
From: xiaoyong931011 <15274802129@163.com>
Date: Fri, 02 Jul 2021 16:08:41 +0800
Subject: [PATCH] Merge branch 'score-shop' of http://120.27.238.55:7000/r/xzx into score-shop
---
/dev/null | 35 -----------------------------------
gc-shop/src/main/java/com/xzx/gc/shop/service/OrderService.java | 2 +-
2 files changed, 1 insertions(+), 36 deletions(-)
diff --git a/gc-order/src/main/resources/application-xctest.yml b/gc-order/src/main/resources/application-xctest.yml
deleted file mode 100644
index f5befb2..0000000
--- a/gc-order/src/main/resources/application-xctest.yml
+++ /dev/null
@@ -1,35 +0,0 @@
-spring:
- rabbitmq:
- host: 120.27.238.55
- port: 5672
- username: ct_rabbit
- password: 123456
- virtual-host: /
- datasource:
- url: jdbc:mysql://120.27.238.55:3306/db_xzx?useUnicode=true&characterEncoding=utf8&zeroDateTimeBehavior=convertToNull&useSSL=false&useAffectedRows=true
- username: ct_test
- password: 123456
- redis:
- database: 5
- host: 121.37.162.173
- password: d32ncxe@i3#!dV
- port: 6379
-# cluster:
-# nodes: 127.0.0.1:6379
- lettuce:
- pool:
- max-active: 200
- max-idle: 10
- max-wait: -1ms
- min-idle: 5
- timeout: 5000ms
-
-#机器ID编号用于生成分布式ID
-workerId: 0
-
-#极光推送
-jg:
- appkey: 2a733c0c2aad9be329d5be04
- secret: ec70e5f8db9324b27cb8f0df
-
-
diff --git a/gc-pay/src/main/resources/application-xctest.yml b/gc-pay/src/main/resources/application-xctest.yml
deleted file mode 100644
index 96b087e..0000000
--- a/gc-pay/src/main/resources/application-xctest.yml
+++ /dev/null
@@ -1,37 +0,0 @@
-spring:
- rabbitmq:
- host: 120.27.238.55
- port: 5672
- username: ct_rabbit
- password: 123456
- virtual-host: /
- datasource:
- url: jdbc:mysql://120.27.238.55:3306/db_xzx?useUnicode=true&characterEncoding=utf8&zeroDateTimeBehavior=convertToNull&useSSL=false&useAffectedRows=true
- username: ct_test
- password: 123456
- redis:
- database: 5
- host: 121.37.162.173
- password: d32ncxe@i3#!dV
- port: 6379
-# cluster:
-# nodes: 127.0.0.1:6379
- lettuce:
- pool:
- max-active: 200
- max-idle: 10
- max-wait: -1ms
- min-idle: 5
- timeout: 5000ms
-
-#机器ID编号用于生成分布式ID
-workerId: 0
-
-noticeUrl: https://app.cnxzx.com/gc-pay/pay/new/wxProPayNotify/anon
-
-#极光推送
-jg:
- appkey: 2a733c0c2aad9be329d5be04
- secret: ec70e5f8db9324b27cb8f0df
-
-
diff --git a/gc-role/src/main/resources/application-xctest.yml b/gc-role/src/main/resources/application-xctest.yml
deleted file mode 100644
index f5befb2..0000000
--- a/gc-role/src/main/resources/application-xctest.yml
+++ /dev/null
@@ -1,35 +0,0 @@
-spring:
- rabbitmq:
- host: 120.27.238.55
- port: 5672
- username: ct_rabbit
- password: 123456
- virtual-host: /
- datasource:
- url: jdbc:mysql://120.27.238.55:3306/db_xzx?useUnicode=true&characterEncoding=utf8&zeroDateTimeBehavior=convertToNull&useSSL=false&useAffectedRows=true
- username: ct_test
- password: 123456
- redis:
- database: 5
- host: 121.37.162.173
- password: d32ncxe@i3#!dV
- port: 6379
-# cluster:
-# nodes: 127.0.0.1:6379
- lettuce:
- pool:
- max-active: 200
- max-idle: 10
- max-wait: -1ms
- min-idle: 5
- timeout: 5000ms
-
-#机器ID编号用于生成分布式ID
-workerId: 0
-
-#极光推送
-jg:
- appkey: 2a733c0c2aad9be329d5be04
- secret: ec70e5f8db9324b27cb8f0df
-
-
diff --git a/gc-shop/src/main/java/com/xzx/gc/shop/service/OrderService.java b/gc-shop/src/main/java/com/xzx/gc/shop/service/OrderService.java
index a041990..155d6bb 100644
--- a/gc-shop/src/main/java/com/xzx/gc/shop/service/OrderService.java
+++ b/gc-shop/src/main/java/com/xzx/gc/shop/service/OrderService.java
@@ -274,7 +274,7 @@
scoreDetails.setType(ScoreDetails.SCORE_TYPE_SHOPPING);
scoreDetails.setOriginalScore(score);
scoreDetails.setCurrentScore(remianScore);
- scoreDetails.setChangeScore(totalPrice);
+ scoreDetails.setChangeScore(totalPrice.negate());
scoreDetails.setCreatedTime(new Date());
scoreDetailsMapper.insert(scoreDetails);
diff --git a/gc-shop/src/main/resources/application-xctest.yml b/gc-shop/src/main/resources/application-xctest.yml
deleted file mode 100644
index f5befb2..0000000
--- a/gc-shop/src/main/resources/application-xctest.yml
+++ /dev/null
@@ -1,35 +0,0 @@
-spring:
- rabbitmq:
- host: 120.27.238.55
- port: 5672
- username: ct_rabbit
- password: 123456
- virtual-host: /
- datasource:
- url: jdbc:mysql://120.27.238.55:3306/db_xzx?useUnicode=true&characterEncoding=utf8&zeroDateTimeBehavior=convertToNull&useSSL=false&useAffectedRows=true
- username: ct_test
- password: 123456
- redis:
- database: 5
- host: 121.37.162.173
- password: d32ncxe@i3#!dV
- port: 6379
-# cluster:
-# nodes: 127.0.0.1:6379
- lettuce:
- pool:
- max-active: 200
- max-idle: 10
- max-wait: -1ms
- min-idle: 5
- timeout: 5000ms
-
-#机器ID编号用于生成分布式ID
-workerId: 0
-
-#极光推送
-jg:
- appkey: 2a733c0c2aad9be329d5be04
- secret: ec70e5f8db9324b27cb8f0df
-
-
diff --git a/gc-sys/src/main/resources/application-xctest.yml b/gc-sys/src/main/resources/application-xctest.yml
deleted file mode 100644
index f5befb2..0000000
--- a/gc-sys/src/main/resources/application-xctest.yml
+++ /dev/null
@@ -1,35 +0,0 @@
-spring:
- rabbitmq:
- host: 120.27.238.55
- port: 5672
- username: ct_rabbit
- password: 123456
- virtual-host: /
- datasource:
- url: jdbc:mysql://120.27.238.55:3306/db_xzx?useUnicode=true&characterEncoding=utf8&zeroDateTimeBehavior=convertToNull&useSSL=false&useAffectedRows=true
- username: ct_test
- password: 123456
- redis:
- database: 5
- host: 121.37.162.173
- password: d32ncxe@i3#!dV
- port: 6379
-# cluster:
-# nodes: 127.0.0.1:6379
- lettuce:
- pool:
- max-active: 200
- max-idle: 10
- max-wait: -1ms
- min-idle: 5
- timeout: 5000ms
-
-#机器ID编号用于生成分布式ID
-workerId: 0
-
-#极光推送
-jg:
- appkey: 2a733c0c2aad9be329d5be04
- secret: ec70e5f8db9324b27cb8f0df
-
-
diff --git a/gc-user/src/main/resources/application-xctest.yml b/gc-user/src/main/resources/application-xctest.yml
deleted file mode 100644
index f5befb2..0000000
--- a/gc-user/src/main/resources/application-xctest.yml
+++ /dev/null
@@ -1,35 +0,0 @@
-spring:
- rabbitmq:
- host: 120.27.238.55
- port: 5672
- username: ct_rabbit
- password: 123456
- virtual-host: /
- datasource:
- url: jdbc:mysql://120.27.238.55:3306/db_xzx?useUnicode=true&characterEncoding=utf8&zeroDateTimeBehavior=convertToNull&useSSL=false&useAffectedRows=true
- username: ct_test
- password: 123456
- redis:
- database: 5
- host: 121.37.162.173
- password: d32ncxe@i3#!dV
- port: 6379
-# cluster:
-# nodes: 127.0.0.1:6379
- lettuce:
- pool:
- max-active: 200
- max-idle: 10
- max-wait: -1ms
- min-idle: 5
- timeout: 5000ms
-
-#机器ID编号用于生成分布式ID
-workerId: 0
-
-#极光推送
-jg:
- appkey: 2a733c0c2aad9be329d5be04
- secret: ec70e5f8db9324b27cb8f0df
-
-
--
Gitblit v1.9.1