From 0f7af07b86bded98814fdff197f5a9988037d6ee Mon Sep 17 00:00:00 2001 From: river <1376754470@qq.com> Date: Wed, 24 Feb 2021 11:17:49 +0800 Subject: [PATCH] =?UTF-8?q?=E5=B0=8F=E7=A8=8B=E5=BA=8F=E7=94=B3=E8=AF=B7?= =?UTF-8?q?=E8=AE=B0=E5=BD=95=E4=BB=A5=E5=8F=8A=E8=AF=A6=E6=83=85=E3=80=81?= =?UTF-8?q?=E5=B7=B2=E7=94=B3=E8=AF=B7=E9=A2=9D=E5=BA=A6=E6=98=BE=E7=A4=BA?= MIME-Version: 1.0 Content-Type: text/plain; charset=UTF-8 Content-Transfer-Encoding: 8bit --- .../controller/CustomerAppletController.java | 32 +++++ .../financial/crms/dao/CustomerAppletDao.java | 9 ++ .../model/request/CompanyAppletRequest.java | 5 + .../response/ApplicationRecordResponse.java | 43 +++++++ .../model/response/ApplyDetailResponse.java | 25 ++++ .../crms/service/CustomerAppletService.java | 9 ++ .../impl/CustomerAppletServiceImpl.java | 121 ++++++++++++++++-- .../mapper/crms/CustomerAppletDao.xml | 37 ++++++ .../src/main/resources/bootstrap.properties | 82 ++++++------ .../src/main/resources/bootstrap.properties | 84 ++++++------ .../src/main/resources/bootstrap.properties | 2 +- .../domain/crms/ext/ApplicationRecordPO.java | 50 ++++++++ .../domain/crms/ext/ApplyDetailPO.java | 33 +++++ .../domain/crms/ext/CustomerCompanyDTO.java | 1 - .../domain/crms/response/CrmsCode.java | 5 +- .../src/main/resources/bootstrap.properties | 2 +- 16 files changed, 444 insertions(+), 96 deletions(-) create mode 100644 dq-financial-crms/src/main/java/com/daqing/financial/crms/model/response/ApplicationRecordResponse.java create mode 100644 dq-financial-crms/src/main/java/com/daqing/financial/crms/model/response/ApplyDetailResponse.java create mode 100644 dq-framework-model/src/main/java/com/daqing/framework/domain/crms/ext/ApplicationRecordPO.java create mode 100644 dq-framework-model/src/main/java/com/daqing/framework/domain/crms/ext/ApplyDetailPO.java diff --git a/dq-financial-crms/src/main/java/com/daqing/financial/crms/controller/CustomerAppletController.java b/dq-financial-crms/src/main/java/com/daqing/financial/crms/controller/CustomerAppletController.java index beba46a7..51d94877 100644 --- a/dq-financial-crms/src/main/java/com/daqing/financial/crms/controller/CustomerAppletController.java +++ b/dq-financial-crms/src/main/java/com/daqing/financial/crms/controller/CustomerAppletController.java @@ -3,6 +3,8 @@ package com.daqing.financial.crms.controller; import com.daqing.financial.crms.model.request.CompanyAppletRequest; import com.daqing.financial.crms.model.request.CompanyCustomerRequest; import com.daqing.financial.crms.model.request.PersonalAppletRequest; +import com.daqing.financial.crms.model.response.ApplicationRecordResponse; +import com.daqing.financial.crms.model.response.ApplyDetailResponse; import com.daqing.financial.crms.service.CustomerAppletService; import com.daqing.framework.domain.crms.ext.CustomerPersonalTOI; import com.daqing.framework.model.response.ResponseResult; @@ -94,4 +96,34 @@ public class CustomerAppletController { return result ? ResponseResult.SUCCESS() : ResponseResult.FAIL(); } + + /** + * 申请记录 + */ + @GetMapping("/get/record") + @ApiOperation(value = "获取申请记录", response = ApplicationRecordResponse.class) + public ResponseResult getApplicationRecord(Integer type, Integer status) { + + return ResponseResult.SUCCESS(customerAppletService.getApplicationRecord(type, status)); + } + + /** + * 获取申请额度 + */ + @GetMapping("/get/apply/mount") + @ApiOperation(value = "获取已申请额度") + public ResponseResult getApplyMount(){ + + return ResponseResult.SUCCESS(customerAppletService.getApplyMount()); + } + + /** + * 获取申请记录详情 + */ + @GetMapping("/get/apply/detail") + @ApiOperation(value = "获取申请记录详情", response = ApplyDetailResponse.class) + public ResponseResult getApplyDetail(@RequestParam("id") Integer id) { + + return ResponseResult.SUCCESS(customerAppletService.getApplyDetail(id)); + } } diff --git a/dq-financial-crms/src/main/java/com/daqing/financial/crms/dao/CustomerAppletDao.java b/dq-financial-crms/src/main/java/com/daqing/financial/crms/dao/CustomerAppletDao.java index 5870d53a..de6538e0 100644 --- a/dq-financial-crms/src/main/java/com/daqing/financial/crms/dao/CustomerAppletDao.java +++ b/dq-financial-crms/src/main/java/com/daqing/financial/crms/dao/CustomerAppletDao.java @@ -2,9 +2,13 @@ package com.daqing.financial.crms.dao; import com.baomidou.mybatisplus.core.mapper.BaseMapper; import com.daqing.framework.domain.crms.CustomerEntity; +import com.daqing.framework.domain.crms.ext.ApplicationRecordPO; +import com.daqing.framework.domain.crms.ext.ApplyDetailPO; import org.apache.ibatis.annotations.Mapper; import org.apache.ibatis.annotations.Param; +import java.util.List; + /** * 客户小程序认证(录入) * @@ -23,4 +27,9 @@ public interface CustomerAppletDao extends BaseMapper { Boolean updateCustomer(@Param("customer") CustomerEntity customerEntity); + Integer getCompanyId(Integer customerId); + + List getApplicationRecord(@Param("companyId")Integer companyId, @Param("status")Integer status); + + ApplyDetailPO getApplyDetail(Integer id); } diff --git a/dq-financial-crms/src/main/java/com/daqing/financial/crms/model/request/CompanyAppletRequest.java b/dq-financial-crms/src/main/java/com/daqing/financial/crms/model/request/CompanyAppletRequest.java index ebf11dd2..fa4fa1e3 100644 --- a/dq-financial-crms/src/main/java/com/daqing/financial/crms/model/request/CompanyAppletRequest.java +++ b/dq-financial-crms/src/main/java/com/daqing/financial/crms/model/request/CompanyAppletRequest.java @@ -1,5 +1,6 @@ package com.daqing.financial.crms.model.request; +import com.fasterxml.jackson.annotation.JsonFormat; import io.swagger.annotations.ApiModelProperty; import lombok.Data; import lombok.ToString; @@ -33,6 +34,7 @@ public class CompanyAppletRequest implements Serializable { @ApiModelProperty(value = "联系电话") private String phone; + @JsonFormat(pattern = "yyyy-MM-dd", timezone = "GMT+8") @ApiModelProperty(value = "注册时间") private Date registerTime; @@ -89,4 +91,7 @@ public class CompanyAppletRequest implements Serializable { @ApiModelProperty(value = "关联人id") private List relatedId; + + @ApiModelProperty("企业客户表id,即查询关联人所需的id") + private Integer customerId; } diff --git a/dq-financial-crms/src/main/java/com/daqing/financial/crms/model/response/ApplicationRecordResponse.java b/dq-financial-crms/src/main/java/com/daqing/financial/crms/model/response/ApplicationRecordResponse.java new file mode 100644 index 00000000..3f1fd98c --- /dev/null +++ b/dq-financial-crms/src/main/java/com/daqing/financial/crms/model/response/ApplicationRecordResponse.java @@ -0,0 +1,43 @@ +package com.daqing.financial.crms.model.response; + +import com.fasterxml.jackson.annotation.JsonFormat; +import io.swagger.annotations.ApiModelProperty; +import io.swagger.annotations.ApiOperation; +import lombok.Data; +import lombok.ToString; + +import java.io.Serializable; +import java.util.Date; + +/** + * 申请记录响应类 + * + * @auther River + * @date 2021/2/22 11:33 + */ +@Data +@ToString +public class ApplicationRecordResponse implements Serializable { + + @ApiModelProperty("id") + private Integer id; + + @ApiModelProperty("客户类型") + private Integer type; + + @ApiModelProperty("贷款用途") + private String amountWide; + + @ApiModelProperty("申请额度") + private Double applyAmount; + + @JsonFormat(pattern = "yyyy-MM-dd", timezone = "GMT+8") + @ApiModelProperty("申请日期") + private Date applyDate; + + @ApiModelProperty("申请期限") + private String applyTime; + + @ApiModelProperty("状态,0:已完成,1:已受理,2:审核中,3:拒绝,4:驳回,5:撤销") + private Integer status; +} diff --git a/dq-financial-crms/src/main/java/com/daqing/financial/crms/model/response/ApplyDetailResponse.java b/dq-financial-crms/src/main/java/com/daqing/financial/crms/model/response/ApplyDetailResponse.java new file mode 100644 index 00000000..a585371e --- /dev/null +++ b/dq-financial-crms/src/main/java/com/daqing/financial/crms/model/response/ApplyDetailResponse.java @@ -0,0 +1,25 @@ +package com.daqing.financial.crms.model.response; + +import io.swagger.annotations.ApiModelProperty; +import lombok.Data; +import lombok.ToString; + +import java.io.Serializable; + +/** + * 申请记录详情返回类 + * + * @auther River + * @date 2021/2/24 10:12 + */ +@Data +@ToString +public class ApplyDetailResponse implements Serializable { + + @ApiModelProperty("状态") + private Integer status; + + @ApiModelProperty("审核意见/拒绝、驳回意见") + private String remark; + +} diff --git a/dq-financial-crms/src/main/java/com/daqing/financial/crms/service/CustomerAppletService.java b/dq-financial-crms/src/main/java/com/daqing/financial/crms/service/CustomerAppletService.java index 530eed5b..52b7c817 100644 --- a/dq-financial-crms/src/main/java/com/daqing/financial/crms/service/CustomerAppletService.java +++ b/dq-financial-crms/src/main/java/com/daqing/financial/crms/service/CustomerAppletService.java @@ -3,8 +3,11 @@ package com.daqing.financial.crms.service; import com.baomidou.mybatisplus.extension.service.IService; import com.daqing.financial.crms.model.request.CompanyAppletRequest; import com.daqing.financial.crms.model.request.PersonalAppletRequest; +import com.daqing.financial.crms.model.response.ApplicationRecordResponse; +import com.daqing.financial.crms.model.response.ApplyDetailResponse; import com.daqing.framework.domain.crms.CustomerEntity; +import java.util.List; import java.util.Map; /** @@ -26,4 +29,10 @@ public interface CustomerAppletService extends IService { Boolean updatePersonal(PersonalAppletRequest personalAppletRequest); Boolean updateCompany(CompanyAppletRequest companyAppletRequest); + + List getApplicationRecord(Integer type, Integer status); + + Map getApplyMount(); + + ApplyDetailResponse getApplyDetail(Integer id); } diff --git a/dq-financial-crms/src/main/java/com/daqing/financial/crms/service/impl/CustomerAppletServiceImpl.java b/dq-financial-crms/src/main/java/com/daqing/financial/crms/service/impl/CustomerAppletServiceImpl.java index 996563b4..b76f82d6 100644 --- a/dq-financial-crms/src/main/java/com/daqing/financial/crms/service/impl/CustomerAppletServiceImpl.java +++ b/dq-financial-crms/src/main/java/com/daqing/financial/crms/service/impl/CustomerAppletServiceImpl.java @@ -8,32 +8,28 @@ import com.daqing.financial.crms.dao.CustomerDao; import com.daqing.financial.crms.dao.PersonalCustomerDao; import com.daqing.financial.crms.mapper.CrmsCustomerRelatedMapper; import com.daqing.financial.crms.model.request.CompanyAppletRequest; -import com.daqing.financial.crms.model.request.CompanyCustomerRequest; import com.daqing.financial.crms.model.request.PersonalAppletRequest; +import com.daqing.financial.crms.model.response.ApplicationRecordResponse; +import com.daqing.financial.crms.model.response.ApplyDetailResponse; import com.daqing.financial.crms.service.CustomerAppletService; -import com.daqing.financial.crms.service.CustomerService; import com.daqing.financial.crms.service.ICrmsCustomerRelatedService; import com.daqing.framework.domain.crms.CompanyCustomerEntity; import com.daqing.framework.domain.crms.CrmsCustomerRelated; import com.daqing.framework.domain.crms.CustomerEntity; import com.daqing.framework.domain.crms.PersonalCustomerEntity; +import com.daqing.framework.domain.crms.ext.ApplicationRecordPO; +import com.daqing.framework.domain.crms.ext.ApplyDetailPO; import com.daqing.framework.domain.crms.ext.CrmsConstant; -import com.daqing.framework.domain.crms.ext.CustomerPersonalTOU; import com.daqing.framework.domain.crms.response.CrmsCode; import com.daqing.framework.exception.ExceptionCast; import com.daqing.framework.model.response.CommonCode; import com.daqing.framework.model.response.PromptSuccess; -import com.daqing.framework.model.response.ResponseResult; -import com.daqing.framework.util.RedisUtil; import org.springframework.beans.BeanUtils; import org.springframework.beans.factory.annotation.Autowired; import org.springframework.stereotype.Service; import org.springframework.transaction.annotation.Transactional; -import org.springframework.web.context.request.RequestContextHolder; -import org.springframework.web.context.request.ServletRequestAttributes; import javax.annotation.Resource; -import javax.servlet.http.HttpServletRequest; import java.util.*; /** @@ -208,6 +204,12 @@ public class CustomerAppletServiceImpl extends ServiceImpl getApplicationRecord(Integer type, Integer status) { + List applicationRecordResponseList = new ArrayList<>(); + // 获取客户的登录信息/暂时没有个人类型申请信息,所以个人类型返回空而企业类型返回所有 + if (type == null || (type != 0 && type != 1) || type == 1) { + Integer customerId = this.getBaseMapper().getCustomerId(Integer.parseInt(this.getUserId()), 1); + if (customerId == null) { + ExceptionCast.cast(CrmsCode.CUSTOMER_APPLET_IS_NULL); + } + Integer companyId = this.getBaseMapper().getCompanyId(customerId); + // 查询申请记录信息 + List applicationRecordPOList = this.getBaseMapper().getApplicationRecord(companyId, status); + for (ApplicationRecordPO applicationRecordPO : applicationRecordPOList) { + ApplicationRecordResponse applicationRecordResponse = new ApplicationRecordResponse(); + // 状态为已受理、审核中、拒绝、驳回、已撤销情况 + if (applicationRecordPO.getAuditStatus() != null && (applicationRecordPO.getAuditStatus() == 1 + || applicationRecordPO.getAuditStatus() == 2 || applicationRecordPO.getAuditStatus() == 3 + || applicationRecordPO.getAuditStatus() == 4 || applicationRecordPO.getAuditStatus() == 5)) { + BeanUtils.copyProperties(applicationRecordPO, applicationRecordResponse); + applicationRecordResponse.setStatus(applicationRecordPO.getAuditStatus()); + applicationRecordResponse.setType(1); + } + // 状态为已完成的情况,如果同时存在已完成会覆盖以上情况 + if (applicationRecordPO.getBusinessStatus() != null && applicationRecordPO.getBusinessStatus() == 2) { + BeanUtils.copyProperties(applicationRecordPO, applicationRecordResponse); + applicationRecordResponse.setStatus(0); + applicationRecordResponse.setType(1); + } + applicationRecordResponseList.add(applicationRecordResponse); + } + } + return applicationRecordResponseList; + } + + /** + * 获取申请额度 + */ + @Override + public Map getApplyMount() { + // 个人类型暂时没有 + Integer customerId = this.getBaseMapper().getCustomerId(Integer.parseInt(this.getUserId()), 1); + if (customerId == null) { + ExceptionCast.cast(CrmsCode.CUSTOMER_APPLET_IS_NULL); + } + Integer companyId = this.getBaseMapper().getCompanyId(customerId); + // 查询申请记录信息 + List applicationRecordPOList = this.getBaseMapper().getApplicationRecord(companyId, null); + Double company = 0.00; + for (ApplicationRecordPO applicationRecordPO : applicationRecordPOList) { + company += applicationRecordPO.getApplyAmount(); + } + Map map = new HashMap<>(); + map.put("company", company); + map.put("personal", 0.00); + return map; + } + + /** + * 获取申请记录详情 + */ + @Override + public ApplyDetailResponse getApplyDetail(Integer id) { + if (id == null) { + ExceptionCast.cast(CommonCode.INVALID_PARAM); + } + ApplyDetailResponse applyDetailResponse = new ApplyDetailResponse(); + ApplyDetailPO applyDetail = this.getBaseMapper().getApplyDetail(id); + if (applyDetail == null) { + ExceptionCast.cast(CrmsCode.CUSTOMER_APPLET_STATUS_IS_NULL); + } + // 判断当前申请信息的状态 + if (applyDetail.getBusinessStatus() != null && applyDetail.getBusinessStatus() == 2) { + // 已完成 + applyDetailResponse.setStatus(0); + return applyDetailResponse; + } + if (applyDetail.getAuditStatus() == null) { + ExceptionCast.cast(CrmsCode.CUSTOMER_APPLET_STATUS_IS_NULL); + } + switch (applyDetail.getAuditStatus()) { + case 1: + applyDetailResponse.setStatus(applyDetail.getAuditStatus()); + break; + case 2: + applyDetailResponse.setStatus(applyDetail.getAuditStatus()); + break; + case 3: // 拒绝 + applyDetailResponse.setStatus(applyDetail.getAuditStatus()); + applyDetailResponse.setRemark(applyDetail.getRemark()); + break; + case 4: // 驳回 + applyDetailResponse.setStatus(applyDetail.getAuditStatus()); + applyDetailResponse.setRemark(applyDetail.getRemark()); + break; + default: + ExceptionCast.cast(CrmsCode.CUSTOMER_APPLET_STATUS_IS_NULL); + } + return applyDetailResponse; + } /** * 获取当前登录用户信息 diff --git a/dq-financial-crms/src/main/resources/mapper/crms/CustomerAppletDao.xml b/dq-financial-crms/src/main/resources/mapper/crms/CustomerAppletDao.xml index 4f28ade9..06b37542 100644 --- a/dq-financial-crms/src/main/resources/mapper/crms/CustomerAppletDao.xml +++ b/dq-financial-crms/src/main/resources/mapper/crms/CustomerAppletDao.xml @@ -22,4 +22,41 @@ WHERE id = #{customer.id} + + + + + + + + + \ No newline at end of file diff --git a/dq-financial-guarantee/src/main/resources/bootstrap.properties b/dq-financial-guarantee/src/main/resources/bootstrap.properties index 564738e1..089cb235 100644 --- a/dq-financial-guarantee/src/main/resources/bootstrap.properties +++ b/dq-financial-guarantee/src/main/resources/bootstrap.properties @@ -1,21 +1,21 @@ #服务名称 -#spring.application.name=dq-financial-guarantee -##配置中心地址 -#spring.cloud.nacos.config.server-addr=127.0.0.1:8848 -#spring.cloud.nacos.config.file-extension=yml -##redis配置 -#spring.redis.host=127.0.0.1 -#spring.redis.port=6379 -#spring.redis.password= -#spring.redis.database=0 -#spring.redis.timeout=30000 -#spring.redis.jedis.pool.max-active=8 -#spring.redis.jedis.pool.max-wait=-1 -#spring.redis.jedis.pool.max-idle=8 -#spring.redis.jedis.pool.min-idle=0 +spring.application.name=dq-financial-guarantee +#配置中心地址 +spring.cloud.nacos.config.server-addr=192.168.31.140:8848 +spring.cloud.nacos.config.file-extension=yml +#redis配置 +spring.redis.host=127.0.0.1 +spring.redis.port=6379 +spring.redis.password= +spring.redis.database=0 +spring.redis.timeout=30000 +spring.redis.jedis.pool.max-active=8 +spring.redis.jedis.pool.max-wait=-1 +spring.redis.jedis.pool.max-idle=8 +spring.redis.jedis.pool.min-idle=0 #本地测试环境 -#spring.cloud.nacos.config.namespace=1520c5ea-5f15-4ac1-9eb1-d25924825b99 +spring.cloud.nacos.config.namespace=1520c5ea-5f15-4ac1-9eb1-d25924825b99 #线上测试环境 #spring.cloud.nacos.config.namespace=5698e60a-9d0b-433f-a69f-12b0a2d23128 @@ -36,29 +36,29 @@ spring.servlet.multipart.max-file-size=10MB # ##正式环境（prod） ##服务名称 -spring.application.name=dq-financial-guarantee -#配置中心地址 -spring.cloud.nacos.config.server-addr=120.78.127.12:8848 -spring.cloud.nacos.config.namespace=502bfc93-6e2f-44aa-93ad-f074664c6826 - -spring.cloud.nacos.config.ext-config[0].data-id=dq-financial-guarantee.yml -spring.cloud.nacos.config.ext-config[0].group=prod -spring.cloud.nacos.config.ext-config[0].refresh=true - -spring.cloud.nacos.config.ext-config[1].data-id=datasource.yml -spring.cloud.nacos.config.ext-config[1].group=prod -spring.cloud.nacos.config.ext-config[1].refresh=true - -spring.cloud.nacos.config.ext-config[2].data-id=mybatis.yml -spring.cloud.nacos.config.ext-config[2].group=prod -spring.cloud.nacos.config.ext-config[2].refresh=true - -spring.redis.host=127.0.0.1 -spring.redis.port=6379 -spring.redis.password=dq123456 -spring.redis.database=0 -spring.redis.timeout=30000 -spring.redis.jedis.pool.max-active=8 -spring.redis.jedis.pool.max-wait=-1 -spring.redis.jedis.pool.max-idle=8 -spring.redis.jedis.pool.min-idle=0 +#spring.application.name=dq-financial-guarantee +##配置中心地址 +#spring.cloud.nacos.config.server-addr=120.78.127.12:8848 +#spring.cloud.nacos.config.namespace=502bfc93-6e2f-44aa-93ad-f074664c6826 +# +#spring.cloud.nacos.config.ext-config[0].data-id=dq-financial-guarantee.yml +#spring.cloud.nacos.config.ext-config[0].group=prod +#spring.cloud.nacos.config.ext-config[0].refresh=true +# +#spring.cloud.nacos.config.ext-config[1].data-id=datasource.yml +#spring.cloud.nacos.config.ext-config[1].group=prod +#spring.cloud.nacos.config.ext-config[1].refresh=true +# +#spring.cloud.nacos.config.ext-config[2].data-id=mybatis.yml +#spring.cloud.nacos.config.ext-config[2].group=prod +#spring.cloud.nacos.config.ext-config[2].refresh=true +# +#spring.redis.host=127.0.0.1 +#spring.redis.port=6379 +#spring.redis.password=dq123456 +#spring.redis.database=0 +#spring.redis.timeout=30000 +#spring.redis.jedis.pool.max-active=8 +#spring.redis.jedis.pool.max-wait=-1 +#spring.redis.jedis.pool.max-idle=8 +#spring.redis.jedis.pool.min-idle=0 diff --git a/dq-financial-hrms-auth/src/main/resources/bootstrap.properties b/dq-financial-hrms-auth/src/main/resources/bootstrap.properties index 8c32f2a7..cd3868bc 100644 --- a/dq-financial-hrms-auth/src/main/resources/bootstrap.properties +++ b/dq-financial-hrms-auth/src/main/resources/bootstrap.properties @@ -1,21 +1,21 @@ #服务名称 -#spring.application.name=dq-financial-hrms-auth -##配置中心地址 -#spring.cloud.nacos.config.server-addr=127.0.0.1:8848 -#spring.cloud.nacos.config.file-extension=yml -##redis配置 -#spring.redis.host=127.0.0.1 -#spring.redis.port=6379 -#spring.redis.password= -#spring.redis.database=0 -#spring.redis.timeout=30000 -#spring.redis.jedis.pool.max-active=8 -#spring.redis.jedis.pool.max-wait=-1 -#spring.redis.jedis.pool.max-idle=8 -#spring.redis.jedis.pool.min-idle=0 +spring.application.name=dq-financial-hrms-auth +#配置中心地址 +spring.cloud.nacos.config.server-addr=192.168.31.140:8848 +spring.cloud.nacos.config.file-extension=yml +#redis配置 +spring.redis.host=127.0.0.1 +spring.redis.port=6379 +spring.redis.password= +spring.redis.database=0 +spring.redis.timeout=30000 +spring.redis.jedis.pool.max-active=8 +spring.redis.jedis.pool.max-wait=-1 +spring.redis.jedis.pool.max-idle=8 +spring.redis.jedis.pool.min-idle=0 #本地测试环境 -#spring.cloud.nacos.config.namespace=1520c5ea-5f15-4ac1-9eb1-d25924825b99 +spring.cloud.nacos.config.namespace=1520c5ea-5f15-4ac1-9eb1-d25924825b99 #线上测试环境 #spring.cloud.nacos.config.namespace=5698e60a-9d0b-433f-a69f-12b0a2d23128 @@ -30,30 +30,30 @@ ribbon.ConnectTimeout: 30000 #正式环境（prod） -spring.application.name=dq-financial-hrms-auth - -spring.cloud.nacos.config.server-addr=120.78.127.12:8848 -spring.cloud.nacos.config.namespace=b590c830-7ada-44b7-968f-e8d0c81990c4 -#spring.cloud.nacos.config.group=prod - -spring.cloud.nacos.config.ext-config[0].data-id=datasource.yml -spring.cloud.nacos.config.ext-config[0].group=prod -spring.cloud.nacos.config.ext-config[0].refresh=true - -spring.cloud.nacos.config.ext-config[1].data-id=mybatis.yml -spring.cloud.nacos.config.ext-config[1].group=prod -spring.cloud.nacos.config.ext-config[1].refresh=true - -spring.cloud.nacos.config.ext-config[2].data-id=other.yml -spring.cloud.nacos.config.ext-config[2].group=prod -spring.cloud.nacos.config.ext-config[2].refresh=true - -spring.redis.host=127.0.0.1 -spring.redis.port=6379 -spring.redis.password=dq123456 -spring.redis.database=0 -spring.redis.timeout=30000 -spring.redis.jedis.pool.max-active=8 -spring.redis.jedis.pool.max-wait=-1 -spring.redis.jedis.pool.max-idle=8 -spring.redis.jedis.pool.min-idle=0 \ No newline at end of file +#spring.application.name=dq-financial-hrms-auth +# +#spring.cloud.nacos.config.server-addr=120.78.127.12:8848 +#spring.cloud.nacos.config.namespace=b590c830-7ada-44b7-968f-e8d0c81990c4 +##spring.cloud.nacos.config.group=prod +# +#spring.cloud.nacos.config.ext-config[0].data-id=datasource.yml +#spring.cloud.nacos.config.ext-config[0].group=prod +#spring.cloud.nacos.config.ext-config[0].refresh=true +# +#spring.cloud.nacos.config.ext-config[1].data-id=mybatis.yml +#spring.cloud.nacos.config.ext-config[1].group=prod +#spring.cloud.nacos.config.ext-config[1].refresh=true +# +#spring.cloud.nacos.config.ext-config[2].data-id=other.yml +#spring.cloud.nacos.config.ext-config[2].group=prod +#spring.cloud.nacos.config.ext-config[2].refresh=true +# +#spring.redis.host=127.0.0.1 +#spring.redis.port=6379 +#spring.redis.password=dq123456 +#spring.redis.database=0 +#spring.redis.timeout=30000 +#spring.redis.jedis.pool.max-active=8 +#spring.redis.jedis.pool.max-wait=-1 +#spring.redis.jedis.pool.max-idle=8 +#spring.redis.jedis.pool.min-idle=0 \ No newline at end of file diff --git a/dq-financial-hrms/src/main/resources/bootstrap.properties b/dq-financial-hrms/src/main/resources/bootstrap.properties index 37c6c017..015b8b1d 100644 --- a/dq-financial-hrms/src/main/resources/bootstrap.properties +++ b/dq-financial-hrms/src/main/resources/bootstrap.properties @@ -1,7 +1,7 @@ #服务名称 spring.application.name=dq-financial-hrms #配置中心地址 -spring.cloud.nacos.config.server-addr=127.0.0.1:8848 +spring.cloud.nacos.config.server-addr=192.168.31.140:8848 spring.cloud.nacos.config.file-extension=yml #redis配置 spring.redis.host=127.0.0.1 diff --git a/dq-framework-model/src/main/java/com/daqing/framework/domain/crms/ext/ApplicationRecordPO.java b/dq-framework-model/src/main/java/com/daqing/framework/domain/crms/ext/ApplicationRecordPO.java new file mode 100644 index 00000000..f9bf32f7 --- /dev/null +++ b/dq-framework-model/src/main/java/com/daqing/framework/domain/crms/ext/ApplicationRecordPO.java @@ -0,0 +1,50 @@ +package com.daqing.framework.domain.crms.ext; + +import lombok.Data; +import lombok.ToString; + +import java.io.Serializable; +import java.util.Date; + +/** + * 申请记录接收类 + * + * @auther River + * @date 2021/2/22 14:11 + */ +@Data +@ToString +public class ApplicationRecordPO implements Serializable { + + private Integer id; + + /** + * 申请日期 + */ + private Date applyDate; + + /** + * 申请额度 + */ + private Double applyAmount; + + /** + * 贷款用途 + */ + private String amountWide; + + /** + * 申请期限 + */ + private String applyTime; + + /** + * 业务状态 + */ + private Integer businessStatus; + + /** + * 审批状态(是否受理) + */ + private Integer auditStatus; +} diff --git a/dq-framework-model/src/main/java/com/daqing/framework/domain/crms/ext/ApplyDetailPO.java b/dq-framework-model/src/main/java/com/daqing/framework/domain/crms/ext/ApplyDetailPO.java new file mode 100644 index 00000000..210af651 --- /dev/null +++ b/dq-framework-model/src/main/java/com/daqing/framework/domain/crms/ext/ApplyDetailPO.java @@ -0,0 +1,33 @@ +package com.daqing.framework.domain.crms.ext; + +import lombok.Data; +import lombok.ToString; + +import java.io.Serializable; + +/** + * 获取申请记录详情持久层接收类 + * + * @auther River + * @date 2021/2/24 10:25 + */ +@Data +@ToString +public class ApplyDetailPO implements Serializable { + + /** + * 审核状态 + */ + private Integer auditStatus; + + /** + * 业务状态 + */ + private Integer businessStatus; + + /** + * 审核意见 + */ + private String remark; + +} diff --git a/dq-framework-model/src/main/java/com/daqing/framework/domain/crms/ext/CustomerCompanyDTO.java b/dq-framework-model/src/main/java/com/daqing/framework/domain/crms/ext/CustomerCompanyDTO.java index 464ecb07..3e5d49a9 100644 --- a/dq-framework-model/src/main/java/com/daqing/framework/domain/crms/ext/CustomerCompanyDTO.java +++ b/dq-framework-model/src/main/java/com/daqing/framework/domain/crms/ext/CustomerCompanyDTO.java @@ -132,5 +132,4 @@ public class CustomerCompanyDTO implements Serializable { @ApiModelProperty(value = "是否存在关联人 0->否；1->是") private Integer isExistRelated; - } diff --git a/dq-framework-model/src/main/java/com/daqing/framework/domain/crms/response/CrmsCode.java b/dq-framework-model/src/main/java/com/daqing/framework/domain/crms/response/CrmsCode.java index fa9adece..133ebdbb 100644 --- a/dq-framework-model/src/main/java/com/daqing/framework/domain/crms/response/CrmsCode.java +++ b/dq-framework-model/src/main/java/com/daqing/framework/domain/crms/response/CrmsCode.java @@ -21,8 +21,9 @@ public enum CrmsCode implements ResultCode { NOT_NULL(false,20004,"上传的文件不能为空"), CUSTOMER_IS_NULL(false,20005,"导入数据失败,当前员工不存在!"), CUSTOMER_NAME_REPETITION(false, 20006, "当前客户名称已存在!"), - CUSTOMER_APPLET_IS_NULL(false, 20007,"未查询到你的信息,请先录入(认证)你的信息!"), - CUSTOMER_APPLET_EXIST(false, 20008,"你已认证自己的信息,无需再次认证!"); + CUSTOMER_APPLET_IS_NULL(false, 20007,"未查询到你的认证信息,请先认证你的信息!"), + CUSTOMER_APPLET_EXIST(false, 20008,"你已认证自己的信息,无需再次认证!"), + CUSTOMER_APPLET_STATUS_IS_NULL(false, 20009, "当前申请贷款信息状态异常,请刷新重试!"); /** * 操作是否成功 diff --git a/dq-govern-gateway/src/main/resources/bootstrap.properties b/dq-govern-gateway/src/main/resources/bootstrap.properties index 6dea21cb..9872b12e 100644 --- a/dq-govern-gateway/src/main/resources/bootstrap.properties +++ b/dq-govern-gateway/src/main/resources/bootstrap.properties @@ -1,7 +1,7 @@ #服务名称 spring.application.name=dq-govern-gateway #配置中心地址 -spring.cloud.nacos.config.server-addr=127.0.0.1:8848 +spring.cloud.nacos.config.server-addr=192.168.31.140:8848 spring.cloud.nacos.config.file-extension=yml #redis配置 spring.redis.host=127.0.0.1