| @@ -41,7 +41,7 @@ public class WxQuestionController extends BaseController { | |||||
| @ApiOperation("查寻问券") | @ApiOperation("查寻问券") | ||||
| @GetMapping("getQuestion") | @GetMapping("getQuestion") | ||||
| public Result getQuestion(String couponType) { | |||||
| public Result getQuestion(@RequestParam("couponType") String couponType) { | |||||
| WxQuestionConfig wxQuestionConfig = new WxQuestionConfig(); | WxQuestionConfig wxQuestionConfig = new WxQuestionConfig(); | ||||
| wxQuestionConfig.setTenantId(getTenantId()); | wxQuestionConfig.setTenantId(getTenantId()); | ||||
| JSONArray ct = new JSONArray(); | JSONArray ct = new JSONArray(); | ||||
| @@ -50,10 +50,12 @@ public class WxQuestionController extends BaseController { | |||||
| List<WxQuestionConfig> listConfig = wxQuestionService.findConfigList(wxQuestionConfig); | List<WxQuestionConfig> listConfig = wxQuestionService.findConfigList(wxQuestionConfig); | ||||
| if (listConfig.size() > 0) { | if (listConfig.size() > 0) { | ||||
| wxQuestionConfig = listConfig.get(0); | wxQuestionConfig = listConfig.get(0); | ||||
| if (listConfig.get(0).getStatus().equals(EnumQuestionConfigStatus.ON.getCode())) { | |||||
| List<Long> questionIds = JSONObject.parseArray(wxQuestionConfig.getQuestionList(), Long.class); | |||||
| if (wxQuestionConfig.getStatus().equals(EnumQuestionConfigStatus.ON.getCode()) | |||||
| && questionIds.size() > 0) { | |||||
| WxQuestion wxQuestion = new WxQuestion(); | WxQuestion wxQuestion = new WxQuestion(); | ||||
| wxQuestion.setTenantId(getTenantId()); | wxQuestion.setTenantId(getTenantId()); | ||||
| wxQuestion.setIds(JSONObject.parseArray(wxQuestionConfig.getQuestionList(), Long.class)); | |||||
| wxQuestion.setIds(questionIds); | |||||
| List<WxQuestion> listQuestion = wxQuestionService.findList(wxQuestion); | List<WxQuestion> listQuestion = wxQuestionService.findList(wxQuestion); | ||||
| if (listQuestion.size() > 0) { | if (listQuestion.size() > 0) { | ||||
| Iterator<WxQuestion> q = listQuestion.iterator(); | Iterator<WxQuestion> q = listQuestion.iterator(); | ||||