Merge branch 'master' of http://118.31.7.2:3000/tianzeOrg/fund_investment

src/main/java/com/sztzjy/fund_investment/controller/InquiryIssuanceController.java

@@ -164,7 +164,7 @@ public class InquiryIssuanceController {
     }
 
     @AnonymousAccess
-    @GetMapping("/insertQuotation")
+    @PostMapping("/insertQuotation")
     @ApiOperation("投资者参与询价--添加报价")
     public ResultEntity insertQuotation(@RequestBody JSONObject jsonObject){
         InquiryParticipation inquiryParticipation = jsonObject.getObject("InquiryParticipation", InquiryParticipation.class);

src/main/java/com/sztzjy/fund_investment/controller/TopicController.java

@@ -31,8 +31,6 @@ import java.util.List;
 @RequestMapping("/stu/topics")
 @Api(tags = "学生端--答题视频相关接口")
 public class TopicController {
-    @Autowired
-    private TopicsMapper topicsMapper;
     @Autowired
     private TopicService topicService;
     @Autowired

src/main/java/com/sztzjy/fund_investment/controller/UserController.java

@@ -106,7 +106,7 @@ public class UserController {
             String newUUID = IdUtil.simpleUUID();
             if (user != null) {
                 Flow flow = flowMapper.selectByPrimaryKey(user.getUserid());
-                Map<String, Object> map = getStringObjectMap(access_token, un, dis, newUUID, flow.getFlowId());
+                Map<String, Object> map = getStringObjectMap(access_token, un, dis, flow.getUserid(), flow.getFlowId());
                 user.setAccessToken(access_token);
                 userMapper.updateByPrimaryKey(user);
                 return new ResultEntity(HttpStatus.OK, map);
@@ -183,10 +183,11 @@ public class UserController {
             return null;
         }
         performanceScoreMapper.deleteByExample(example);
-        flow.setFlowId(IdUtil.simpleUUID());
+        String id = IdUtil.simpleUUID();
+        flow.setFlowId(id);
         flowMapper.updateByPrimaryKey(flow);
 
-        return new ResultEntity(HttpStatus.OK, "已重新实训！");
+        return new ResultEntity(HttpStatus.OK, "已重新实训！",id);
     }