forked from kidgrow-microservices-platform

zhaoxiaohao
2020-09-24 cc51b41fa3dd6c51eef9028fbbb72ec3e7139d74
添加字段
4 files modified
38 ■■■■■ changed files
kidgrow-business/kidgrow-opration-center/kidgrow-opration-center-api/src/main/java/com/kidgrow/oprationcenter/model/SaasClientPay.java 13 ●●●●● patch | view | raw | blame | history
kidgrow-business/kidgrow-opration-center/kidgrow-opration-center-biz/src/main/java/com/kidgrow/oprationcenter/service/impl/SaasClientPayServiceImpl.java 13 ●●●●● patch | view | raw | blame | history
kidgrow-business/kidgrow-opration-center/kidgrow-opration-center-biz/src/main/resources/mapper/SaasClientPayMapper.xml 10 ●●●● patch | view | raw | blame | history
kidgrow-web/kidgrow-web-manager/src/main/resources/static/pages/opration/saasClientPay.html 2 ●●● patch | view | raw | blame | history
kidgrow-business/kidgrow-opration-center/kidgrow-opration-center-api/src/main/java/com/kidgrow/oprationcenter/model/SaasClientPay.java
@@ -51,6 +51,13 @@
     */
    private String createHospitalName;
    /**
     * 医生id
     */
    private String createDoctorId; /**
     * 医生姓名
     */
    private String createDoctorName;
    /**
     * 金额 (单位为分)
     */
    @NotEmpty(message = "金额 (单位为分)不能为空")
@@ -77,6 +84,12 @@
     */
    @NotEmpty(message = "关联诊断记录ID不能为空")
    private String diaId;
    /**
     * 诊断人姓名
     */
    @NotEmpty(message = "关联诊断记录ID不能为空")
    private String diaName;
    /**
     * 孩子的id
     */
kidgrow-business/kidgrow-opration-center/kidgrow-opration-center-biz/src/main/java/com/kidgrow/oprationcenter/service/impl/SaasClientPayServiceImpl.java
@@ -69,19 +69,6 @@
                beanCopier.copy(saasClientPay,vo,null);
                double v = Double.parseDouble(vo.getPayPrice().toString())/100;
                vo.setPrice(v+"");
//                if (StringUtils.isNotBlank(vo.getChildId())) {
//                    Map<String,Object> map=new HashMap<>();
//                    map.put("id",vo.getChildId());
//                    ResultBody byId = childService.findById(map);
//                    if(byId.getCode()==0){
//                        Child parse = JSON.parseObject(JSON.toJSONString(byId.getData()), Child.class);
//                        if(parse!=null){
//                            vo.setChildName(parse.getChildName());
//                            vo.setChildSex(parse.getChildSex());
//                            vo.setChildBirthday(parse.getChildBirthday());
//                        }
//                    }
//                }
                listVo.add(vo);
            }
        }
kidgrow-business/kidgrow-opration-center/kidgrow-opration-center-biz/src/main/resources/mapper/SaasClientPayMapper.xml
@@ -52,7 +52,7 @@
                and prepay_id = #{p.prepayId}
            </if>
            <if test="p.type != null ">
                and  type =  #{p.type}
                and type = #{p.type}
            </if>
            <if test="p.createUserId != null and p.createUserId !=''">
                and create_user_id = #{p.createUserId}
@@ -92,6 +92,12 @@
            <if test="p.createHospitalName != null and p.createHospitalName !=''">
                and create_hospital_name = #{p.createHospitalName}
            </if>
            <if test="p.createDoctorId != null and p.createDoctorId !=''">
                and create_doctor_id = #{p.createDoctorId}
            </if>
            <if test="p.createDoctorIdName != null and p.createDoctorIdName !=''">
                and create_doctor_name like '%${p.createDoctorIdName}%'
            </if>
            <if test="p.payPrice != null and p.payPrice !=''">
                and pay_price = #{p.payPrice}
            </if>
@@ -123,7 +129,7 @@
                and prepay_id = #{p.prepayId}
            </if>
            <if test="p.type != null ">
                and  type =  #{p.type}
                and type = #{p.type}
            </if>
            <if test="p.createUserId != null and p.createUserId !=''">
                and create_user_id = #{p.createUserId}
kidgrow-web/kidgrow-web-manager/src/main/resources/static/pages/opration/saasClientPay.html
@@ -189,7 +189,7 @@
                type:0,
                createHospitalId: $("#hospitalId").val(),
                createHospitalDepartid: departmentId,
                doctorId: doctorId,
                createDoctorId: doctorId,
                startTime: startTime,
                endTime: endTime
            }