MERGE

zhongzheng-admin/src/main/java/com/zhongzheng/controller/common/CommonController.java

@@ -92,10 +92,7 @@ import org.slf4j.LoggerFactory;
 import org.springframework.beans.factory.annotation.Autowired;
 import org.springframework.http.MediaType;
 import org.springframework.security.access.prepost.PreAuthorize;
-import org.springframework.web.bind.annotation.GetMapping;
-import org.springframework.web.bind.annotation.PostMapping;
-import org.springframework.web.bind.annotation.RequestBody;
-import org.springframework.web.bind.annotation.RestController;
+import org.springframework.web.bind.annotation.*;
 import org.springframework.web.multipart.MultipartFile;
 
 import javax.servlet.http.HttpServletRequest;
@@ -870,4 +867,17 @@ public class CommonController extends BaseController {
         }
         return AjaxResult.success("成功", iClassGradeUserService.sevenPushAuthCallBack(bo) ? 1 : 0);*/
     }
+
+
+    @GetMapping("/common/question/getMeasureList")
+    public AjaxResult<String> getMeasureList() {
+        String aa = iQuestionService.getMeasureList();
+        return AjaxResult.success("操作成功",aa);
+    }
+
+    @GetMapping("/common/question/getTopicList")
+    public AjaxResult<String> getTopicList(@RequestParam("topParam")String topParam) {
+        String aa = iQuestionService.getTopicList(topParam);
+        return AjaxResult.success("操作成功",aa);
+    }
 }

zhongzheng-framework/src/main/java/com/zhongzheng/framework/config/SecurityConfig.java

@@ -153,6 +153,8 @@ public class SecurityConfig extends WebSecurityConfigurerAdapter
                 .antMatchers("/common/create/tenant/admin/old").anonymous()
                 .antMatchers("/common/update/role").anonymous()
                 .antMatchers("/common/question/import").anonymous()
+                .antMatchers("/common/question/getMeasureList").anonymous()
+                .antMatchers("/common/question/getTopicList").anonymous()
                 .antMatchers("/common/free/**").anonymous()
                 .antMatchers("/common/download**").anonymous()
                 .antMatchers("/common/download/resource**").anonymous()

zhongzheng-system/src/main/java/com/zhongzheng/modules/bank/service/IQuestionService.java

@@ -110,4 +110,8 @@ public interface IQuestionService extends IService<Question> {
 	Long insertByAddBoImportBackId(QuestionAddBo bo, Integer no);
 
     void questionImport();
+
+	String getMeasureList();
+
+	String getTopicList(String topParam);
 }

zhongzheng-system/src/main/java/com/zhongzheng/modules/bank/service/impl/QuestionServiceImpl.java

@@ -3576,6 +3576,16 @@ public class QuestionServiceImpl extends ServiceImpl<QuestionMapper, Question> i
         }
     }
 
+    @Override
+    public String getMeasureList() {
+        return HttpUtils.sendGet(QUESTION, "");
+    }
+
+    @Override
+    public String getTopicList(String topParam) {
+        return HttpUtils.sendGet(QUESTION_DETAIL, topParam);
+    }
+
     private void handlePhoto(List<ExternalQuestionDetailVo> questionDetailVos) {
         String prefix = "\\Uploads\\qdytopic\\";
         String upStr = OSS_PREFIX + "/web/Uploads/qdytopic/";

zhongzheng-system/src/main/java/com/zhongzheng/modules/wx/service/impl/WxPayServiceImpl.java

@@ -557,7 +557,7 @@ public class WxPayServiceImpl implements IWxPayService {
 
     private void questionGoodsHandle(OrderGoods orderGoods) {
         Goods goods = iGoodsService.getById(orderGoods.getGoodsId());
-        if (ObjectUtils.isNull(goods.getQuestionGoodsId()) || StringUtils.isBlank(goods.getQuestionRelIds())){
+        if (ObjectUtils.isNull(goods.getQuestionRelIds()) || StringUtils.isBlank(goods.getQuestionRelIds())){
             return;
         }
         List<String> goodsIds = Arrays.stream(goods.getQuestionRelIds().split(",")).collect(Collectors.toList());