Merge remote-tracking branch 'origin/test' into test

pom.xml

@@ -425,7 +425,12 @@
 			<artifactId>restful-sdk</artifactId>
 			<version>1.0.0.1</version>
 		</dependency>
-		<!--<dependency>-->
+        <dependency>
+            <groupId>junit</groupId>
+            <artifactId>junit</artifactId>
+            <scope>test</scope>
+        </dependency>
+        <!--<dependency>-->
 			<!--<groupId>com.baidu.aip</groupId>-->
 <!--            <artifactId>java-sdk</artifactId>-->
 <!--            <version>4.11.3</version>-->

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);

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) {
+
+    }
+}