Merge branch 'pay_master' of ssh://192.168.2.240:29418/kidgrow-microservice...

zhaoxiaohao

2020-09-24 6fd4bdff55620c562e0a22eee3c95924951b04a4

 kidgrow-business/kidgrow-opration-center/kidgrow-opration-center-biz/src/main/java/com/kidgrow/oprationcenter/service/impl/SaasClientPayServiceImpl.java

@@ -5,14 +5,12 @@
import com.kidgrow.common.model.PageResult;
import com.kidgrow.common.model.ResultBody;
import com.kidgrow.common.service.impl.SuperServiceImpl;
import com.kidgrow.common.utils.StringUtils;
import com.kidgrow.oprationcenter.mapper.SaasClientPayMapper;
import com.kidgrow.oprationcenter.model.SaasClientPay;
import com.kidgrow.oprationcenter.service.ISaasClientPayService;
import com.kidgrow.oprationcenter.vo.SaasClientPayExcel;
import com.kidgrow.oprationcenter.vo.SaasClientPayVo;
import com.kidgrow.recordcenter.feign.ChildService;
import com.kidgrow.recordcenter.model.Child;
//import com.kidgrow.recordcenter.feign.ChildService;
import com.kidgrow.usercenter.feign.SysDoctorService;
import com.kidgrow.usercenter.model.SysDoctor;
import lombok.extern.slf4j.Slf4j;
@@ -22,7 +20,6 @@
import org.springframework.stereotype.Service;

import java.util.ArrayList;
import java.util.HashMap;
import java.util.List;
import java.util.Map;

@@ -45,8 +42,8 @@
     */
    @Autowired
    private SysDoctorService sysDoctorService;
    @Autowired
    private ChildService childService;
//    @Autowired
//    private ChildService childService;
    @Override
    public PageResult<SaasClientPayVo> findList(Map<String, Object> params){
        Long doctorId = MapUtils.getLong(params, "doctorId");
@@ -72,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);
            }
        }
@@ -98,6 +82,22 @@
   */
    @Override
    public SaasClientPay findByObject(SaasClientPay saasClientPay){
        return baseMapper.findByObject(saasClientPay);
    }

    /**
     * 查看一个科室的某个诊断的支付状态
     * @param hospitalId
     * @param departmentId
     * @param diaId
     * @return
     */
    @Override
    public SaasClientPay findModelByObject(Long hospitalId,Long departmentId,String diaId) {
        SaasClientPay saasClientPay = new SaasClientPay();
        saasClientPay.setCreateHospitalDepartid(departmentId.toString());
        saasClientPay.setCreateHospitalId(hospitalId);
        saasClientPay.setDiaId(diaId);
        return baseMapper.findByObject(saasClientPay);
    }

@@ -128,19 +128,19 @@
                vo.setPayCustom(vc);
                Double vk = Double.parseDouble(saasClientPay.getPayKidgrow().toString())/100;
                vo.setPayKidgrow(vk);
                if (StringUtils.isNotBlank(saasClientPay.getChildId())) {
                    Map<String,Object> map=new HashMap<>();
                    map.put("id",saasClientPay.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());
                        }
                    }
                }
//                if (StringUtils.isNotBlank(saasClientPay.getChildId())) {
//                    Map<String,Object> map=new HashMap<>();
//                    map.put("id",saasClientPay.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);
            }
        }