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