diff --git a/mallinkCApi/pom.xml b/mallinkCApi/pom.xml index b46c822f7..7935ee17e 100644 --- a/mallinkCApi/pom.xml +++ b/mallinkCApi/pom.xml @@ -17,6 +17,10 @@ mallinkService 1.0 + + junit + junit + diff --git a/mallinkCApi/src/main/java/com/iformall/controller/WxUserGrantController.java b/mallinkCApi/src/main/java/com/iformall/controller/WxUserGrantController.java index 9a2b335aa..77c139633 100755 --- a/mallinkCApi/src/main/java/com/iformall/controller/WxUserGrantController.java +++ b/mallinkCApi/src/main/java/com/iformall/controller/WxUserGrantController.java @@ -341,7 +341,7 @@ public class WxUserGrantController extends BaseController { userVo.setLevelName("无"); List levelList = wxLevelConfigService.getByTenantId(user.getTenantId()); for(WxLevelConfig levelConfig: levelList) { - if (userVo.getScore() > levelConfig.getPoints()) { + if (userVo.getScore() >= levelConfig.getPoints()) { userVo.setLevelName(levelConfig.getLevel()); } } diff --git a/mallinkCApi/src/test/java/com/iformall/test/appTest.java b/mallinkCApi/src/test/java/com/iformall/test/appTest.java new file mode 100644 index 000000000..068b416d8 --- /dev/null +++ b/mallinkCApi/src/test/java/com/iformall/test/appTest.java @@ -0,0 +1,47 @@ +package com.iformall.test; + +import com.iformall.CApplication; +import com.iformall.domain.po.WxLevelConfig; +import com.iformall.service.WxLevelConfigService; +import org.junit.Before; +import org.junit.Test; +import org.junit.runner.RunWith; +import org.springframework.beans.factory.annotation.Autowired; +import org.springframework.boot.test.context.SpringBootTest; +import org.springframework.test.context.junit4.SpringRunner; +import org.springframework.test.context.web.WebAppConfiguration; +import org.springframework.test.web.servlet.MockMvc; +import org.springframework.test.web.servlet.setup.MockMvcBuilders; +import org.springframework.web.context.WebApplicationContext; + +import java.util.List; + +@RunWith(SpringRunner.class) +@SpringBootTest(classes = CApplication.class)//这里的Application是springboot的启动类名 +@WebAppConfiguration +public class appTest { + @Autowired + private WebApplicationContext wac; + + private MockMvc mockMvc; + + @Autowired + WxLevelConfigService wxLevelConfigService; + + + @Before + public void setupMockMvc() throws Exception { + mockMvc = MockMvcBuilders.webAppContextSetup(wac).build(); + } + + @Test + public void testSend() throws Exception { + Integer score = 2055; + List levelList = wxLevelConfigService.getByTenantId("456"); + for (WxLevelConfig levelConfig : levelList) { + if (score >= levelConfig.getPoints()) { + System.out.println(levelConfig.getLevel()); + } + } + } +} diff --git a/mallinkService/src/main/java/com/iformall/service/impl/WxLevelConfigServiceImpl.java b/mallinkService/src/main/java/com/iformall/service/impl/WxLevelConfigServiceImpl.java index 30a87e41c..46210068a 100644 --- a/mallinkService/src/main/java/com/iformall/service/impl/WxLevelConfigServiceImpl.java +++ b/mallinkService/src/main/java/com/iformall/service/impl/WxLevelConfigServiceImpl.java @@ -30,7 +30,7 @@ public class WxLevelConfigServiceImpl implements WxLevelConfigService { public List getByTenantId(String tenantId) { WxLevelConfig wxLevelConfig = new WxLevelConfig(); wxLevelConfig.setTenantId(tenantId); - wxLevelConfig.setSortColumns(WxLevelConfig.Field.Level_ASC); + wxLevelConfig.setSortColumns(WxLevelConfig.Field.Points_ASC); return wxLevelConfigMapper.findList(wxLevelConfig); }