Merge branch 'dev' of shikejing/wlyy2.0 into dev

svr/svr-cloud-care/src/main/java/com/yihu/jw/care/endpoint/course/PatientCourseEndpoint.java

@@ -227,37 +227,33 @@ public class PatientCourseEndpoint extends EnvelopRestEndpoint {
    @GetMapping("getOrderInfo")
    @ApiOperation(value = "在线报名-获取订单详情（根据orderId）")
    public ObjEnvelop getOrderInfo(
            @ApiParam(name = "根据orderId", value = "订单id", defaultValue = "3ae2673512154d5280d1dcf5ffa5626d") @RequestParam(value = "根据orderId", required = true) String 根据orderId
    public Envelop getOrderInfo(
            @ApiParam(name = "orderId", value = "订单id", defaultValue = "3ae2673512154d5280d1dcf5ffa5626d") @RequestParam(value = "根据orderId", required = true) String orderId
    ) {
        try {
            JSONObject json = courseService.getOrderInfo(根据orderId);
            return ObjEnvelop.getSuccess("获取成功",json);
            return success(courseService.getOrderInfo(orderId));
        } catch (Exception e) {
            e.printStackTrace();
            return ObjEnvelop.getError( "获取失败!" ,-1);
            return failedException(e);
        }
    }
    //购买课程
    @GetMapping("buyCourseOrder")
    @PostMapping("buyCourseOrder")
    @ApiOperation(value = "在线报名-购买课程")
    public ObjEnvelop buyCourseOrder(
    public Envelop buyCourseOrder(
            @ApiParam(name = "patient", value = "居民id", defaultValue = "3ae2673512154d5280d1dcf5ffa5626d") @RequestParam(value = "patient", required = true) String patient,
            @ApiParam(name = "patientName", value = "居民name", defaultValue = "3ae2673512154d5280d1dcf5ffa5626d") @RequestParam(value = "patientName", required = true) String patientName,
            @ApiParam(name = "courseId", value = "课程id", defaultValue = "1") @RequestParam(value = "courseId", required = true) String courseId,
            @ApiParam(name = "courseName", value = "课程name", defaultValue = "1") @RequestParam(value = "courseName", required = true) String courseName,
            @ApiParam(name = "orgCode", value = "机构code", defaultValue = "1") @RequestParam(value = "orgCode", required = true) String orgCode,
            @ApiParam(name = "orgName", value = "机构name", defaultValue = "1") @RequestParam(value = "orgName", required = true) String orgName,
            @ApiParam(name = "price", value = "居民id", defaultValue = "3ae2673512154d5280d1dcf5ffa5626d") @RequestParam(value = "price", required = true) BigDecimal price,
            @ApiParam(name = "patientName", value = "居民name", defaultValue = "白海灵") @RequestParam(value = "patientName", required = true) String patientName,
            @ApiParam(name = "courseId", value = "课程id", defaultValue = "808080eb7983eb630179882b9a540034") @RequestParam(value = "courseId", required = true) String courseId,
            @ApiParam(name = "courseName", value = "课程name", defaultValue = "3") @RequestParam(value = "courseName", required = true) String courseName,
            @ApiParam(name = "orgCode", value = "机构code", defaultValue = "808080eb7861c327017861d18d070011") @RequestParam(value = "orgCode", required = true) String orgCode,
            @ApiParam(name = "orgName", value = "机构name", defaultValue = "厦门托育机构") @RequestParam(value = "orgName", required = true) String orgName,
            @ApiParam(name = "price", value = "价格", defaultValue = "110") @RequestParam(value = "price", required = true) BigDecimal price,
            @ApiParam(name = "payType", value = "1-微信支付，2-线下支付", defaultValue = "1") @RequestParam(value = "payType", required = true) String payType
    ) {
        try {
            int json = courseService.buyCourseOrder(patient,patientName,courseId,courseName,orgCode,orgName,price,payType);
            return ObjEnvelop.getSuccess("获取成功",json);
            return success(courseService.buyCourseOrder(patient,patientName,courseId,courseName,orgCode,orgName,price,payType));
        } catch (Exception e) {
            e.printStackTrace();
            return ObjEnvelop.getError( "获取失败!" ,-1);
            return failedException(e);
        }
    }

svr/svr-cloud-care/src/main/java/com/yihu/jw/care/service/course/CourseService.java

@@ -399,13 +399,29 @@ public class CourseService {
                    }
                });
            }
            List aList = new ArrayList();
            List<Map<String , Object>> aList = new ArrayList();
            if (list.size() > 0){
                for (int i =0;i<list.size();i++){
                    String sql1 = "SELECT * FROM base_course WHERE del = 1 AND org_code = '"+list.get(i).get("code")+"'" ;
                    List<Map<String , Object >> amapList = jdbcTemplate.queryForList(sql1);
                    if (amapList.size() > 0){
                        aList.add(amapList.get(0));
                        for (int j = 0;j<amapList.size();j++){
                            JSONObject o = new JSONObject();
                            o.put("id",amapList.get(j).get("id"));
                            o.put("name",amapList.get(j).get("name"));
                            o.put("orgCode",amapList.get(j).get("org_code"));
                            o.put("orgName",amapList.get(j).get("org_name"));
                            o.put("doctor",amapList.get(j).get("doctor"));
                            o.put("doctorName",amapList.get(j).get("doctor_name"));
                            o.put("liveTime",amapList.get(j).get("live_time"));
                            o.put("liveStatus",amapList.get(j).get("live_status"));
                            o.put("liveDuration",amapList.get(j).get("live_duration"));
                            o.put("courseCover",amapList.get(j).get("course_cover"));
                            o.put("status",amapList.get(j).get("status"));
                            o.put("fee",amapList.get(j).get("fee"));
                            o.put("introduction",amapList.get(j).get("introduction"));
                            aList.add(o);
                        }
                    }
                }
                if (aList.size() > 0 ){
@@ -473,10 +489,11 @@ public class CourseService {
        List<Map<String , Object>> currentPageList = new ArrayList<>();
        if (positionList.size() > 0){
            for (int i=0;i<positionList.size();i++){
                String sql1 = "SELECT id,`name`,longitude,latitude ,funDistance("+positionList.get(i).get("latitude")+","+positionList.get(i).get("longitude")+","+lat2+","+lon2+") funDistance FROM base.base_org where id = '"+positionList.get(i).get("id")+"'";
                String sql1 = "SELECT id,code,`name`,longitude,latitude ,funDistance("+positionList.get(i).get("latitude")+","+positionList.get(i).get("longitude")+","+lat2+","+lon2+") funDistance FROM base.base_org where id = '"+positionList.get(i).get("id")+"'";
                List<Map<String , Object>> mapList = jdbcTemplate.queryForList(sql1);
                JSONObject obj = new JSONObject();
                obj.put("id",mapList.get(0).get("id"));
                obj.put("code",mapList.get(0).get("code"));
                obj.put("name",mapList.get(0).get("name"));
                obj.put("longitude",mapList.get(0).get("longitude"));
                obj.put("latitude",mapList.get(0).get("latitude"));
@@ -490,13 +507,22 @@ public class CourseService {
                    }
                });
            }
            List aList = new ArrayList();
            List<Map<String , Object >> aList = new ArrayList<>();
            if (list.size() > 0){
                for (int i =0;i<list.size();i++){
                    String sql1 = "SELECT id,`name`,job_title_code,job_title_name,visit_hospital,visit_hospital_name FROM base_doctor WHERE doctor_level = 3 AND enabled = 1 AND locked = 0 AND del = 1 and  visit_hospital = '"+list.get(i).get("id")+"'" ;
                    String sql1 = "SELECT id,`name`,job_title_code,job_title_name,visit_hospital,visit_hospital_name FROM base_doctor WHERE doctor_level = 3 AND enabled = 1 AND locked = 0 AND del = 1 and  visit_hospital = '"+list.get(i).get("code")+"'" ;
                    List<Map<String , Object >> amapList = jdbcTemplate.queryForList(sql1);
                    if (amapList.size() > 0){
                        aList.add(amapList.get(0));
                        for (int j=0;j<amapList.size();j++){
                            JSONObject o = new JSONObject();
                            o.put("id",amapList.get(j).get("id"));
                            o.put("name",amapList.get(j).get("name"));
                            o.put("jobTitleCode",amapList.get(j).get("jobTitleCode"));
                            o.put("jobtitlename",amapList.get(j).get("jobtitlename"));
                            o.put("visithospital",amapList.get(j).get("visithospital"));
                            o.put("visitHospitalName",amapList.get(j).get("visitHospitalName"));
                            aList.add(o);
                        }
                    }
                }
            object.put("object",aList);
@@ -648,7 +674,7 @@ public class CourseService {
            sql = "SELECT id,org_code orgCode,org_name orgName,order_no orderNo,pay_type payType,create_time createTime,status FROM base_recruit_students_record WHERE patient = '"+orderId+"'";
            mapList = jdbcTemplate.queryForList(sql);
        }
        if (mapList.size() > 0 && mapList.get(0).get("status").equals(6)){
        if (mapList.size() > 0 && mapList.get(0).get("orderStatus").equals(6)){
            String sql1 = "select status,create_time createTime,refund_price refundPrice,refund_desc refundDesc,enclosure from base_patient_order_refund where order_id = '"+mapList.get(0).get("id")+"' " ;
            List<Map<String , Object>> mapList1 = jdbcTemplate.queryForList(sql1);
            mapList.get(0).put("refundStatus",mapList1.get(0).get("status"));       //退款状态