From 05d446a212b83005d75a4268dba20255ee3737ee Mon Sep 17 00:00:00 2001 From: =?UTF-8?q?=E5=BC=A0=E6=9D=BE?= <8605635+zhang3064194730@user.noreply.gitee.com> Date: Thu, 26 Dec 2024 17:52:08 +0800 Subject: [PATCH 1/7] =?UTF-8?q?fix:=20=E8=AE=A2=E5=8D=95=E7=8A=B6=E6=80=81?= =?UTF-8?q?=E5=AE=9A=E6=97=B6=E4=BB=BB=E5=8A=A1=E5=A2=9E=E5=8A=A0=E5=A4=B1?= =?UTF-8?q?=E8=B4=A5=E7=8A=B6=E6=80=81?= MIME-Version: 1.0 Content-Type: text/plain; charset=UTF-8 Content-Transfer-Encoding: 8bit --- src/main/java/com/sqx/modules/job/task/TempOrdersTask.java | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-) diff --git a/src/main/java/com/sqx/modules/job/task/TempOrdersTask.java b/src/main/java/com/sqx/modules/job/task/TempOrdersTask.java index 26895c6c..550c44bc 100644 --- a/src/main/java/com/sqx/modules/job/task/TempOrdersTask.java +++ b/src/main/java/com/sqx/modules/job/task/TempOrdersTask.java @@ -103,7 +103,7 @@ public class TempOrdersTask implements ITask { updateOrderStatus(payDetails, order); }else { order.setStatus(3); - payDetails.setState(3); + payDetails.setState(2); ordersDao.updateById(order); payDetailsDao.updateById(payDetails); } From 22b6065950c5a10561988d2091dc60d38fa77f01 Mon Sep 17 00:00:00 2001 From: =?UTF-8?q?=E5=BC=A0=E6=9D=BE?= <8605635+zhang3064194730@user.noreply.gitee.com> Date: Thu, 26 Dec 2024 17:56:34 +0800 Subject: [PATCH 2/7] =?UTF-8?q?fix:=20=E8=AE=A2=E5=8D=95=E7=8A=B6=E6=80=81?= =?UTF-8?q?=E5=AE=9A=E6=97=B6=E4=BB=BB=E5=8A=A1=E5=A2=9E=E5=8A=A0=E5=A4=B1?= =?UTF-8?q?=E8=B4=A5=E7=8A=B6=E6=80=81?= MIME-Version: 1.0 Content-Type: text/plain; charset=UTF-8 Content-Transfer-Encoding: 8bit --- src/main/java/com/sqx/modules/job/task/TempOrdersTask.java | 1 + 1 file changed, 1 insertion(+) diff --git a/src/main/java/com/sqx/modules/job/task/TempOrdersTask.java b/src/main/java/com/sqx/modules/job/task/TempOrdersTask.java index 550c44bc..81846da0 100644 --- a/src/main/java/com/sqx/modules/job/task/TempOrdersTask.java +++ b/src/main/java/com/sqx/modules/job/task/TempOrdersTask.java @@ -85,6 +85,7 @@ public class TempOrdersTask implements ITask { PayDetails payDetails = payDetailsDao.selectByOrderId(order.getOrdersNo()); if (payDetails == null) { order.setStatus(3); + ordersDao.updateById(order); continue; } if (payDetails.getState() == 1) { From aaa87b6d50c7629f57a402215737de1f1382107c Mon Sep 17 00:00:00 2001 From: =?UTF-8?q?=E5=BC=A0=E6=9D=BE?= <8605635+zhang3064194730@user.noreply.gitee.com> Date: Thu, 26 Dec 2024 18:05:19 +0800 Subject: [PATCH 3/7] =?UTF-8?q?fix:=20tomcat=E7=BA=BF=E7=A8=8B=E6=95=B0?= =?UTF-8?q?=E9=87=8F=E4=BF=AE=E6=94=B9?= MIME-Version: 1.0 Content-Type: text/plain; charset=UTF-8 Content-Transfer-Encoding: 8bit --- src/main/resources/application.yml | 5 +++-- 1 file changed, 3 insertions(+), 2 deletions(-) diff --git a/src/main/resources/application.yml b/src/main/resources/application.yml index 0b893a71..f6355dbd 100644 --- a/src/main/resources/application.yml +++ b/src/main/resources/application.yml @@ -6,9 +6,10 @@ logging: server: tomcat: uri-encoding: UTF-8 - max-threads: 1000 - min-spare-threads: 30 connection-timeout: 5000ms + threads: + max: 1000 + min-spare: 30 port: 8100 servlet: context-path: /czg From faf89c5a9e9ca73b6567b0f309ddb0ef771b94b8 Mon Sep 17 00:00:00 2001 From: =?UTF-8?q?=E5=BC=A0=E6=9D=BE?= <8605635+zhang3064194730@user.noreply.gitee.com> Date: Thu, 26 Dec 2024 18:08:52 +0800 Subject: [PATCH 4/7] =?UTF-8?q?fix:=20tomcat=E7=BA=BF=E7=A8=8B=E6=95=B0?= =?UTF-8?q?=E9=87=8F=E4=BF=AE=E6=94=B9?= MIME-Version: 1.0 Content-Type: text/plain; charset=UTF-8 Content-Transfer-Encoding: 8bit --- src/main/resources/application.yml | 4 ++-- 1 file changed, 2 insertions(+), 2 deletions(-) diff --git a/src/main/resources/application.yml b/src/main/resources/application.yml index f6355dbd..396bb479 100644 --- a/src/main/resources/application.yml +++ b/src/main/resources/application.yml @@ -8,8 +8,8 @@ server: uri-encoding: UTF-8 connection-timeout: 5000ms threads: - max: 1000 - min-spare: 30 + max: 1600 + min-spare: 50 port: 8100 servlet: context-path: /czg From e3c5a96ed2d42a6227a4d6eb3b1fb0d9bfe2b13f Mon Sep 17 00:00:00 2001 From: =?UTF-8?q?=E5=BC=A0=E6=9D=BE?= <8605635+zhang3064194730@user.noreply.gitee.com> Date: Thu, 26 Dec 2024 18:11:44 +0800 Subject: [PATCH 5/7] =?UTF-8?q?fix:=20tomcat=E7=BA=BF=E7=A8=8B=E6=95=B0?= =?UTF-8?q?=E9=87=8F=E4=BF=AE=E6=94=B9?= MIME-Version: 1.0 Content-Type: text/plain; charset=UTF-8 Content-Transfer-Encoding: 8bit --- src/main/resources/application-prod.yml | 4 ++-- src/main/resources/application.yml | 2 +- 2 files changed, 3 insertions(+), 3 deletions(-) diff --git a/src/main/resources/application-prod.yml b/src/main/resources/application-prod.yml index 6e735fc3..6015fe79 100644 --- a/src/main/resources/application-prod.yml +++ b/src/main/resources/application-prod.yml @@ -7,8 +7,8 @@ spring: username: video_user password: VideoUser@1 initial-size: 10 - max-active: 100 - min-idle: 10 + max-active: 200 + min-idle: 50 max-wait: 60000 pool-prepared-statements: true max-pool-prepared-statement-per-connection-size: 20 diff --git a/src/main/resources/application.yml b/src/main/resources/application.yml index 396bb479..3c9ca3c1 100644 --- a/src/main/resources/application.yml +++ b/src/main/resources/application.yml @@ -6,7 +6,7 @@ logging: server: tomcat: uri-encoding: UTF-8 - connection-timeout: 5000ms + connection-timeout: 50000ms threads: max: 1600 min-spare: 50 From db5ea43238c23c7736ac7faf97f1bee4c83dcbe0 Mon Sep 17 00:00:00 2001 From: =?UTF-8?q?=E5=BC=A0=E6=9D=BE?= <8605635+zhang3064194730@user.noreply.gitee.com> Date: Thu, 26 Dec 2024 18:55:00 +0800 Subject: [PATCH 6/7] =?UTF-8?q?fix:=20=E5=9C=B0=E5=9D=80=E6=9B=B4=E6=8D=A2?= MIME-Version: 1.0 Content-Type: text/plain; charset=UTF-8 Content-Transfer-Encoding: 8bit --- src/main/resources/application-prod.yml | 6 +++--- 1 file changed, 3 insertions(+), 3 deletions(-) diff --git a/src/main/resources/application-prod.yml b/src/main/resources/application-prod.yml index 6015fe79..514fe275 100644 --- a/src/main/resources/application-prod.yml +++ b/src/main/resources/application-prod.yml @@ -6,7 +6,7 @@ spring: url: jdbc:mysql://rm-gc7xx913734hv5w5q.mysql.cn-chengdu.rds.aliyuncs.com/duanju?useUnicode=true&characterEncoding=utf-8&useSSL=false&serverTimezone=CTT username: video_user password: VideoUser@1 - initial-size: 10 + initial-size: 50 max-active: 200 min-idle: 50 max-wait: 60000 @@ -36,5 +36,5 @@ swagger: enabled: false pay: h5BaseUrl: https://dj-h5.hnsiyao.cn/me/detail/detail?allId= - orderNotifyUrl: https://dj-api.hnsiyao.cn/czg/app/wuyou/notify - extractNotifyUrl: https://dj-api.hnsiyao.cn/czg/app/wuyou/extractNotify + orderNotifyUrl: https://pay.hnsiyao.cn/czg/app/wuyou/notify + extractNotifyUrl: https://pay.hnsiyao.cn/czg/app/wuyou/extractNotify From 409c3cc81cd97ee323e779bf96e25d882b427229 Mon Sep 17 00:00:00 2001 From: =?UTF-8?q?=E5=BC=A0=E6=9D=BE?= <8605635+zhang3064194730@user.noreply.gitee.com> Date: Thu, 26 Dec 2024 19:13:26 +0800 Subject: [PATCH 7/7] =?UTF-8?q?fix:=20=E4=BD=93=E7=8E=B0=E6=B3=A8=E9=87=8A?= =?UTF-8?q?=E6=94=BE=E5=BC=80?= MIME-Version: 1.0 Content-Type: text/plain; charset=UTF-8 Content-Transfer-Encoding: 8bit --- .../sqx/modules/app/service/impl/UserServiceImpl.java | 10 +++++----- .../service/impl/DiscSpinningServiceImpl.java | 8 ++++---- 2 files changed, 9 insertions(+), 9 deletions(-) diff --git a/src/main/java/com/sqx/modules/app/service/impl/UserServiceImpl.java b/src/main/java/com/sqx/modules/app/service/impl/UserServiceImpl.java index ba435901..2de000d5 100644 --- a/src/main/java/com/sqx/modules/app/service/impl/UserServiceImpl.java +++ b/src/main/java/com/sqx/modules/app/service/impl/UserServiceImpl.java @@ -1495,11 +1495,11 @@ public class UserServiceImpl extends ServiceImpl implements userMoneyDetails.setCreateTime(DateUtil.format(new Date(System.currentTimeMillis() - 1000), "yyyy-MM-dd HH:mm:ss")); userMoneyDetails.setMoneyType(1); boolean ret = userMoneyDetailsService.save(userMoneyDetails); -// if (ret) { -// ThreadUtil.execAsync(()->{ -// discSpinningService.withdrawAsync(entity, money.doubleValue(), "[提现]"); -// },true); -// } + if (ret) { + ThreadUtil.execAsync(()->{ + discSpinningService.withdrawAsync(entity, money.doubleValue(), "[提现]"); + },true); + } } catch (Exception e) { log.error("首绑支付宝发放奖励异常，用户信息：{}", JSONUtil.toJsonStr(entity)); log.error("首绑支付宝发放奖励异常：", e); diff --git a/src/main/java/com/sqx/modules/discSpinning/service/impl/DiscSpinningServiceImpl.java b/src/main/java/com/sqx/modules/discSpinning/service/impl/DiscSpinningServiceImpl.java index 5b4d0c92..d5e5f373 100644 --- a/src/main/java/com/sqx/modules/discSpinning/service/impl/DiscSpinningServiceImpl.java +++ b/src/main/java/com/sqx/modules/discSpinning/service/impl/DiscSpinningServiceImpl.java @@ -95,10 +95,10 @@ public class DiscSpinningServiceImpl extends ServiceImpl 0 && StringUtils.isNotBlank(userInfo.getZhiFuBao()) && StringUtils.isNotBlank(userInfo.getZhiFuBaoName())) { -// //提现 -// withdraw(userInfo, receive.getNumber().doubleValue()); -// } + if (receive.getNumber().compareTo(new BigDecimal("0.1")) > 0 && StringUtils.isNotBlank(userInfo.getZhiFuBao()) && StringUtils.isNotBlank(userInfo.getZhiFuBaoName())) { + //提现 + withdraw(userInfo, receive.getNumber().doubleValue()); + } } @Override