Merge remote-tracking branch 'origin/master'

new-user/src/main/java/com/winsun/controller/StartSelectController.java

@@ -74,6 +74,40 @@ public class StartSelectController {
     }
 
     /**
+     *跟据合伙人id查找融合套餐信息
+     * @param hhrId
+     * @return
+     */
+    @RequestMapping("/getTcInfoByHhrId")
+    public ResponseData<Map<String, Object>> getTcInfoByHhrId(@RequestParam("hhrId") String hhrId){
+        if (StringUtils.isEmpty(hhrId)){
+            return ResponseData.error("请输入合伙人id");
+        }
+        Map<String,Object> objMap = new HashMap<>();
+        Wrapper<UserSchool> usWrapper = new EntityWrapper<>();
+        usWrapper.setSqlSelect(" school_id AS schoolId ");
+        usWrapper.addFilter(" user_id = '" + hhrId +"'");
+        Map<String,Object> usMap = userSchoolMapper.selectMaps(usWrapper).get(0);
+
+        Wrapper<School> schoolWrapper = new EntityWrapper<>();
+        schoolWrapper.setSqlSelect(" id,sub_name AS subName,bandproduct_id AS bandproductId ");
+        schoolWrapper.addFilter(" id = '" + usMap.get("schoolId") +"'");
+        Map<String,Object> schoolMap = schoolMapper.selectMaps(schoolWrapper).get(0);
+
+        Wrapper<Product> productWrapper = new EntityWrapper<>();
+        productWrapper.setSqlSelect(" product_id,product_title,product_region,university_id ");
+        productWrapper.addFilter(" product_id = '" + schoolMap.get("bandproductId") +"'");
+        Map<String,Object> productMap = productMapper.selectMaps(productWrapper).get(0);
+        /*if (CollectionUtils.isEmpty(mapList)){
+            return ResponseData.error("没有查询相关的合伙人id的信息");
+        }
+        Map<String, Object> map = mapList.get(0);*/
+        objMap.put("userMap",usMap);
+        objMap.put("schoolMap",schoolMap);
+        objMap.put("productMap",productMap);
+        return ResponseData.success(objMap);
+    }
+    /**
      *通过学生ID，name和身份证查询学生信息
      * @param stuId 学生ID
      * @param name 用户名