From d70a4dd7f283351d6ff899fc5472c814424277cb Mon Sep 17 00:00:00 2001
From: =?UTF-8?q?=E5=BC=A0=E6=9D=BE?=
<8605635+zhang3064194730@user.noreply.gitee.com>
Date: Fri, 27 Dec 2024 11:27:10 +0800
Subject: [PATCH 1/2] =?UTF-8?q?fix:=20=E6=B8=A0=E9=81=93=E7=A0=81=E4=B8=BA?=
=?UTF-8?q?=E7=A9=BA=E5=AF=BC=E8=87=B4=E5=A5=96=E5=8A=B1=E4=B8=8D=E5=8F=91?=
=?UTF-8?q?=E6=94=BE=E4=BF=AE=E5=A4=8D?=
MIME-Version: 1.0
Content-Type: text/plain; charset=UTF-8
Content-Transfer-Encoding: 8bit
---
.../com/sqx/modules/pay/controller/app/WuyouController.java | 4 ++--
1 file changed, 2 insertions(+), 2 deletions(-)
diff --git a/src/main/java/com/sqx/modules/pay/controller/app/WuyouController.java b/src/main/java/com/sqx/modules/pay/controller/app/WuyouController.java
index 02b78067..7961ebdd 100644
--- a/src/main/java/com/sqx/modules/pay/controller/app/WuyouController.java
+++ b/src/main/java/com/sqx/modules/pay/controller/app/WuyouController.java
@@ -267,10 +267,10 @@ public class WuyouController {
String qdAward = commonRepository.findOne(915).getValue();
UserMoneyDetails userMoneyDetails4 = new UserMoneyDetails(
- null, sysUser.getUserId(), null, "[分享达标额外奖励]", 6, 1, 2,
+ null, sysUser == null ? null : sysUser.getUserId(), null, "[分享达标额外奖励]", 6, 1, 2,
new BigDecimal(qdAward), "推广人员首次达标,额外奖励现金红包" + qdAward, 2);
- userMoneyService.updateSysAmount(1, sysUser.getUserId(), Double.valueOf(qdAward));
+ userMoneyService.updateSysAmount(1, sysUser == null ? null : sysUser.getUserId(), Double.parseDouble(qdAward));
userMoneyDetailsService.save(userMoneyDetails4);
Invite invite = inviteService.selectInviteByUser(sourceUser.getUserId(), user.getUserId(), 1);
From 2d6c93938c5cd541bd45edb19541f2372bb8a537 Mon Sep 17 00:00:00 2001
From: =?UTF-8?q?=E5=BC=A0=E6=9D=BE?=
<8605635+zhang3064194730@user.noreply.gitee.com>
Date: Fri, 27 Dec 2024 11:30:26 +0800
Subject: [PATCH 2/2] =?UTF-8?q?feat:=20=E5=A2=9E=E5=8A=A0=E5=8D=95?=
=?UTF-8?q?=E5=85=83=E6=B5=8B=E8=AF=95?=
MIME-Version: 1.0
Content-Type: text/plain; charset=UTF-8
Content-Transfer-Encoding: 8bit
---
pom.xml | 7 ++++-
src/test/java/com/sqx/Tets.java | 48 +++++++++++++++++++++++++++++++++
2 files changed, 54 insertions(+), 1 deletion(-)
create mode 100644 src/test/java/com/sqx/Tets.java
diff --git a/pom.xml b/pom.xml
index 74b55bf6..b22e84e9 100644
--- a/pom.xml
+++ b/pom.xml
@@ -425,7 +425,12 @@
restful-sdk
1.0.0.1
-
+
+ junit
+ junit
+ test
+
+
diff --git a/src/test/java/com/sqx/Tets.java b/src/test/java/com/sqx/Tets.java
new file mode 100644
index 00000000..8a754f63
--- /dev/null
+++ b/src/test/java/com/sqx/Tets.java
@@ -0,0 +1,48 @@
+package com.sqx;
+
+import cn.hutool.core.collection.CollUtil;
+import cn.hutool.core.date.DateUtil;
+import cn.hutool.poi.excel.ExcelUtil;
+import cn.hutool.poi.excel.ExcelWriter;
+import com.alibaba.fastjson.JSONArray;
+import com.alibaba.fastjson.JSONObject;
+import com.sqx.modules.app.entity.UserEntity;
+import com.sqx.modules.app.service.UserService;
+import com.sqx.modules.pay.controller.app.WuyouController;
+import org.junit.jupiter.api.Test;
+import org.junit.runner.RunWith;
+import org.springframework.beans.factory.annotation.Autowired;
+import org.springframework.boot.test.context.SpringBootTest;
+import org.springframework.context.ApplicationContext;
+import org.springframework.test.context.ActiveProfiles;
+import org.springframework.test.context.ContextConfiguration;
+import org.springframework.test.context.junit4.SpringJUnit4ClassRunner;
+
+import java.math.BigDecimal;
+import java.math.RoundingMode;
+import java.util.ArrayList;
+import java.util.LinkedHashMap;
+import java.util.Map;
+
+@ActiveProfiles("dev")
+@SpringBootTest(webEnvironment = SpringBootTest.WebEnvironment.RANDOM_PORT)
+public class Tets {
+ @Autowired
+ ApplicationContext applicationContext;
+ @Autowired
+ UserService userService;
+ @Test
+ public void test() {
+// }
+ WuyouController proxy = applicationContext.getBean(WuyouController.class);
+ UserEntity userEntity = userService.selectUserById(26972L);
+ UserEntity byUser = userService.queryByInvitationCode(userEntity.getInviterCode());
+
+ proxy.activities(userEntity, byUser);
+ System.out.println(proxy);
+ }
+
+ public static void main(String[] args) {
+
+ }
+}