Merge branch 'dev' of http://27.154.233.186:10080/Amoy2/wlyy2.0 into dev

common/common-entity/src/main/java/com/yihu/jw/entity/order/BusinessOrderDO.java

@@ -304,6 +304,7 @@ public class BusinessOrderDO extends IntegerIdentityEntity {
        this.traceNo = traceNo;
    }
    @Column(name = "last_pay_time")
    public Long getLastPayTime() {
        return lastPayTime;
    }

svr/svr-cloud-care/src/main/java/com/yihu/jw/care/service/family/PatientFamilyMemberService.java

@@ -255,13 +255,14 @@ public class PatientFamilyMemberService extends BaseJpaService<BasePatientFamily
            return result;
        }
        List<BasePatientDO> addPatients = patientDao.findByNameAndIdcard(name,idcard);
        BasePatientDO addPatient = new BasePatientDO();
        if (2  == type){
            if (addPatients.size()==0){
                BasePatientDO basePatientDO = new BasePatientDO();
                String salt = UUID.randomUUID().toString().substring(0, 5);
                String pw = "";
                if(true){
                if(idcard.length()!=18){
                    pw = idcard.substring(idcard.length()-7,idcard.length()-1);
                }else{
                    pw = idcard.substring(idcard.length()-6);
@@ -275,7 +276,14 @@ public class PatientFamilyMemberService extends BaseJpaService<BasePatientFamily
                basePatientDO.setCreateUserName(relatives);
                basePatientDO.setCreateTime(new Date());
                basePatientDO.setDel("1");
                basePatientDO.setLocked(0);
                basePatientDO.setEnabled(1);
                patientDao.save(basePatientDO);
                addPatient = basePatientDO;
            }else {
                result.put(ResponseContant.resultFlag,ResponseContant.fail);
                result.put(ResponseContant.resultMsg,"添加成员已存在");
                return result;
            }
        }else {
            if (addPatients.size()==0){
@@ -283,10 +291,8 @@ public class PatientFamilyMemberService extends BaseJpaService<BasePatientFamily
                result.put(ResponseContant.resultMsg,"添加成员不存在");
                return result;
            }
            addPatient = addPatients.get(0);
        }
        BasePatientDO addPatient = addPatients.get(0);
        // 添加自己与对方的关系
        BasePatientFamilyMemberDO fm = memberDao.findByPatientAndFamilyMember(patientDO.getId(), addPatient.getId());
        // 家庭关系已存在时，不重复添加

svr/svr-cloud-job/src/main/resources/application.yml

@@ -186,7 +186,7 @@ spring:
      username: wlyy
      password: '0XxS3W*!cRj'
    zhylyjkglxt:
      url: jdbc:mysql://10.71.83.98:3306/gsq_zhjd_zhylyjkglxt?useUnicode:true&characterEncoding=utf-8&autoReconnect=true&useSSL=false
      jdbcUrl: jdbc:mysql://10.71.83.98:3306/gsq_zhjd_zhylyjkglxt?useUnicode:true&characterEncoding=utf-8&autoReconnect=true&useSSL=false
      username: gsq_zhjd_zhylyjkglxt
      password: 'GSQ_YTHPT@2021'
  activemq: