From d0684dcaa5948e87d70ee3b4e68604928582e628 Mon Sep 17 00:00:00 2001 From: 77 <77@77.com> Date: Sun, 5 May 2024 16:20:28 +0800 Subject: [PATCH] Revert "1123" This reverts commit 9ec8efec12a8b90a0008f6246b9401e1976e3f39. --- .../src/main/resources/application-dev.yml | 14 +++--- .../common/core/domain/entity/Customer.java | 3 -- .../bashi/dk/controller/HomeController.java | 46 ------------------- .../main/java/com/bashi/dk/domain/Borrow.java | 8 +--- .../com/bashi/dk/domain/BorrowStatus.java | 13 +----- .../dto/admin/req/BorrowUpdateStatusReq.java | 1 - .../bashi/dk/dto/admin/resp/BorrowResp.java | 4 -- .../com/bashi/dk/service/BorrowService.java | 2 - .../bashi/dk/service/BorrowStatusService.java | 1 - .../dk/service/impl/BorrowServiceImpl.java | 34 ++++---------- .../service/impl/BorrowStatusServiceImpl.java | 6 --- .../main/resources/mapper/BorrowMapper.xml | 4 +- doc/v1.0/{v1.0.sql => update.sql} | 0 doc/v2.0/v2.0.sql | 9 ---- 14 files changed, 20 insertions(+), 125 deletions(-) delete mode 100644 bashi-dk/src/main/java/com/bashi/dk/controller/HomeController.java rename doc/v1.0/{v1.0.sql => update.sql} (100%) delete mode 100644 doc/v2.0/v2.0.sql diff --git a/bashi-admin/src/main/resources/application-dev.yml b/bashi-admin/src/main/resources/application-dev.yml index d019643..176e1e5 100644 --- a/bashi-admin/src/main/resources/application-dev.yml +++ b/bashi-admin/src/main/resources/application-dev.yml @@ -12,9 +12,9 @@ spring: # 主库数据源 master: driverClassName: com.mysql.cj.jdbc.Driver - url: jdbc:mysql://124.222.254.188:4306/dk?useUnicode=true&characterEncoding=utf8&zeroDateTimeBehavior=convertToNull&useSSL=true&serverTimezone=GMT%2B8&autoReconnect=true - username: root - password: 383200134 + url: jdbc:mysql://localhost:4306/dk?useUnicode=true&characterEncoding=utf8&zeroDateTimeBehavior=convertToNull&useSSL=true&serverTimezone=GMT%2B8&autoReconnect=true + username: dk + password: dk123.com # 从库数据源 slave: driverClassName: com.mysql.cj.jdbc.Driver @@ -66,13 +66,13 @@ spring: # redis 配置 redis: # 地址 - host: 124.222.254.188 + host: localhost # 端口，默认为 6379 - port: 9379 + port: 6379 # 数据库索引 - database: 3 + database: 1 # 密码 - password: 383200134 + password: # 连接超时时间 timeout: 10s # 是否开启ssl diff --git a/bashi-common/src/main/java/com/bashi/common/core/domain/entity/Customer.java b/bashi-common/src/main/java/com/bashi/common/core/domain/entity/Customer.java index f851624..d64ba8b 100644 --- a/bashi-common/src/main/java/com/bashi/common/core/domain/entity/Customer.java +++ b/bashi-common/src/main/java/com/bashi/common/core/domain/entity/Customer.java @@ -99,9 +99,6 @@ public class Customer implements Serializable { @ApiModelProperty("最后登陆IP") private String lastLoginIp; - @ApiModelProperty("当前登录时间") - private LocalDateTime createTime; - @JsonDeserialize(using = LocalDateTimeDeserializer.class) @JsonSerialize(using = LocalDateTimeSerializer.class) @JsonFormat(pattern = DateConstant.PATTERN_DATETIME) diff --git a/bashi-dk/src/main/java/com/bashi/dk/controller/HomeController.java b/bashi-dk/src/main/java/com/bashi/dk/controller/HomeController.java deleted file mode 100644 index a7b43d3..0000000 --- a/bashi-dk/src/main/java/com/bashi/dk/controller/HomeController.java +++ /dev/null @@ -1,46 +0,0 @@ -package com.bashi.dk.controller; - -import com.baomidou.mybatisplus.core.toolkit.Wrappers; -import com.bashi.common.core.domain.AjaxResult; -import com.bashi.common.core.domain.entity.Customer; -import com.bashi.dk.domain.Borrow; -import com.bashi.dk.service.BorrowService; -import com.bashi.dk.service.CustomerService; -import org.springframework.beans.factory.annotation.Autowired; -import org.springframework.web.bind.annotation.GetMapping; -import org.springframework.web.bind.annotation.RequestMapping; -import org.springframework.web.bind.annotation.RestController; - -import java.time.LocalDate; -import java.time.LocalTime; -import java.util.HashMap; -import java.util.Map; - -@RestController -@RequestMapping("/dk/home") -public class HomeController { - - @Autowired - private CustomerService customerService; - @Autowired - private BorrowService borrowService; - - @GetMapping("/index") - public AjaxResult> index() { - Map map = new HashMap<>(); - LocalDate now = LocalDate.now(); - // 今日注册， 总注册 - long todayRegister = customerService.count(Wrappers.lambdaQuery(Customer.class).between(Customer::getCreateTime, - now.atTime(LocalTime.MIN), now.atTime(LocalTime.MAX))); - long totalRegister = customerService.count(); - // 今日订单， 总订单 - long todayBorrow = borrowService.count(Wrappers.lambdaQuery(Borrow.class).between(Borrow::getCreateTime, - now.atTime(LocalTime.MIN), now.atTime(LocalTime.MAX))); - long totalBorrow = borrowService.count(); - map.put("todayRegister",todayRegister); - map.put("totalRegister",totalRegister); - map.put("todayBorrow",todayBorrow); - map.put("totalBorrow",totalBorrow); - return AjaxResult.success(map); - } -} diff --git a/bashi-dk/src/main/java/com/bashi/dk/domain/Borrow.java b/bashi-dk/src/main/java/com/bashi/dk/domain/Borrow.java index 2d18b7b..10c4c12 100644 --- a/bashi-dk/src/main/java/com/bashi/dk/domain/Borrow.java +++ b/bashi-dk/src/main/java/com/bashi/dk/domain/Borrow.java @@ -4,8 +4,6 @@ import com.baomidou.mybatisplus.annotation.FieldFill; import com.baomidou.mybatisplus.annotation.TableField; import com.baomidou.mybatisplus.annotation.TableId; import com.baomidou.mybatisplus.annotation.TableName; -import com.bashi.common.constant.DateConstant; -import com.fasterxml.jackson.annotation.JsonFormat; import io.swagger.annotations.ApiModel; import io.swagger.annotations.ApiModelProperty; import lombok.Data; @@ -36,6 +34,7 @@ public class Borrow implements Serializable { @TableId(value = "id") @ApiModelProperty("ID") private Long id; + @ApiModelProperty("用途说明") private String noteRemark; @@ -93,10 +92,6 @@ public class Borrow implements Serializable { @ApiModelProperty("借款状态") private String borrowName; - /** 借款状态编码 **/ - @ApiModelProperty("借款状态ID") - private Long borrowStatusId; - @ApiModelProperty("借款状态样式") private String borrowNameStyle; @@ -206,7 +201,6 @@ public class Borrow implements Serializable { /** 创建时间 */ @ApiModelProperty("创建时间") - @JsonFormat(pattern = DateConstant.PATTERN_DATETIME) private LocalDateTime createTime; /** 修改时间 */ diff --git a/bashi-dk/src/main/java/com/bashi/dk/domain/BorrowStatus.java b/bashi-dk/src/main/java/com/bashi/dk/domain/BorrowStatus.java index a2501b0..d0bbf68 100644 --- a/bashi-dk/src/main/java/com/bashi/dk/domain/BorrowStatus.java +++ b/bashi-dk/src/main/java/com/bashi/dk/domain/BorrowStatus.java @@ -1,17 +1,14 @@ package com.bashi.dk.domain; -import com.baomidou.mybatisplus.annotation.FieldFill; -import com.baomidou.mybatisplus.annotation.TableField; -import com.baomidou.mybatisplus.annotation.TableId; -import com.baomidou.mybatisplus.annotation.TableName; import io.swagger.annotations.ApiModel; import io.swagger.annotations.ApiModelProperty; +import com.baomidou.mybatisplus.annotation.*; import lombok.Data; import lombok.NoArgsConstructor; import lombok.experimental.Accessors; - import java.io.Serializable; import java.util.Date; +import java.math.BigDecimal; /** * 借款状态对象 dk_borrow_status @@ -38,12 +35,6 @@ public class BorrowStatus implements Serializable { @ApiModelProperty("是否可以打款") private Integer usedRemit; - @ApiModelProperty("借款状态编码") - private String borrowCode; - - @ApiModelProperty("是否允许提现") - private Boolean withdrawFlag; - /** 借款状态 */ @ApiModelProperty("借款状态") private String borrowName; diff --git a/bashi-dk/src/main/java/com/bashi/dk/dto/admin/req/BorrowUpdateStatusReq.java b/bashi-dk/src/main/java/com/bashi/dk/dto/admin/req/BorrowUpdateStatusReq.java index 7e28eb4..310efa1 100644 --- a/bashi-dk/src/main/java/com/bashi/dk/dto/admin/req/BorrowUpdateStatusReq.java +++ b/bashi-dk/src/main/java/com/bashi/dk/dto/admin/req/BorrowUpdateStatusReq.java @@ -7,7 +7,6 @@ public class BorrowUpdateStatusReq { private Long id; private Integer usedRemit; private String borrowName; - private Long borrowStatusId; private String borrowRemark; private String borrowNameStyle; diff --git a/bashi-dk/src/main/java/com/bashi/dk/dto/admin/resp/BorrowResp.java b/bashi-dk/src/main/java/com/bashi/dk/dto/admin/resp/BorrowResp.java index 3dc6ea7..f63a567 100644 --- a/bashi-dk/src/main/java/com/bashi/dk/dto/admin/resp/BorrowResp.java +++ b/bashi-dk/src/main/java/com/bashi/dk/dto/admin/resp/BorrowResp.java @@ -1,14 +1,10 @@ package com.bashi.dk.dto.admin.resp; import com.bashi.dk.domain.Borrow; -import io.swagger.annotations.ApiModelProperty; import lombok.Data; @Data public class BorrowResp extends Borrow { private String customerLoginName; - - @ApiModelProperty("是否允许提现") - private Boolean withdrawFlag; } diff --git a/bashi-dk/src/main/java/com/bashi/dk/service/BorrowService.java b/bashi-dk/src/main/java/com/bashi/dk/service/BorrowService.java index c19d089..ae0b00f 100644 --- a/bashi-dk/src/main/java/com/bashi/dk/service/BorrowService.java +++ b/bashi-dk/src/main/java/com/bashi/dk/service/BorrowService.java @@ -22,8 +22,6 @@ public interface BorrowService extends IService { void withdraw(Double withdrawAmount, Long customerId); - Borrow getByCustomerId(Long customerId); - LoanProcessResp getStepBorrow(Long customerId); LoanProcessResp parseStepBorrow(Borrow one); diff --git a/bashi-dk/src/main/java/com/bashi/dk/service/BorrowStatusService.java b/bashi-dk/src/main/java/com/bashi/dk/service/BorrowStatusService.java index b6f6bc0..c956922 100644 --- a/bashi-dk/src/main/java/com/bashi/dk/service/BorrowStatusService.java +++ b/bashi-dk/src/main/java/com/bashi/dk/service/BorrowStatusService.java @@ -4,5 +4,4 @@ import com.baomidou.mybatisplus.extension.service.IService; import com.bashi.dk.domain.BorrowStatus; public interface BorrowStatusService extends IService { - BorrowStatus getByCode(String borrowStatusCode); } diff --git a/bashi-dk/src/main/java/com/bashi/dk/service/impl/BorrowServiceImpl.java b/bashi-dk/src/main/java/com/bashi/dk/service/impl/BorrowServiceImpl.java index 5881295..0a040bd 100644 --- a/bashi-dk/src/main/java/com/bashi/dk/service/impl/BorrowServiceImpl.java +++ b/bashi-dk/src/main/java/com/bashi/dk/service/impl/BorrowServiceImpl.java @@ -1,6 +1,6 @@ package com.bashi.dk.service.impl; -import com.aliyun.oss.ServiceException; +import cn.hutool.core.annotation.MirroredAnnotationAttribute; import com.baomidou.mybatisplus.core.conditions.update.LambdaUpdateWrapper; import com.baomidou.mybatisplus.core.metadata.IPage; import com.baomidou.mybatisplus.core.toolkit.Wrappers; @@ -12,7 +12,10 @@ import com.bashi.common.exception.CustomException; import com.bashi.common.utils.BeanConvertUtil; import com.bashi.common.utils.JsonUtils; import com.bashi.common.utils.MessageUtils; -import com.bashi.dk.domain.*; +import com.bashi.dk.domain.AgreementSetting; +import com.bashi.dk.domain.Borrow; +import com.bashi.dk.domain.CustomerInfo; +import com.bashi.dk.domain.LoansSetting; import com.bashi.dk.dto.admin.req.BorrowUpdateStatusReq; import com.bashi.dk.dto.admin.resp.BorrowResp; import com.bashi.dk.dto.app.req.BorrowStartReq; @@ -34,6 +37,7 @@ import org.springframework.beans.factory.annotation.Autowired; import org.springframework.stereotype.Service; import org.springframework.transaction.annotation.Transactional; +import java.math.BigDecimal; import java.time.LocalDate; import java.time.format.DateTimeFormatter; import java.util.ArrayList; @@ -55,10 +59,6 @@ public class BorrowServiceImpl extends ServiceImpl impleme private LoansSettingService loansSettingService; @Autowired private RedissonClient redissonClient; - @Autowired - private AgreementSettingService agreementSettingService; - @Autowired - private BorrowStatusService borrowStatusService; @Override public Borrow borrow(BorrowStartReq req) { @@ -161,7 +161,6 @@ public class BorrowServiceImpl extends ServiceImpl impleme if(remit){ update.setRemitFlag(1); } - update.setBorrowStatusId(bo.getBorrowStatusId()); boolean bool = this.updateById(update); if(bool && remit){ customerService.borrowAmount(borrow.getCustomerId(), borrow.getTotalLoanMoney(),borrow.getTotalRepayment()); @@ -192,18 +191,6 @@ public class BorrowServiceImpl extends ServiceImpl impleme @Override public void withdraw(Double withdrawAmount, Long customerId) { - Borrow borrow = this.getByCustomerId(customerId); - if(borrow == null){ - throw new CustomException(MessageUtils.message("dk.withdraw.account.error")); - } - if(borrow.getBorrowStatusId() != null){ - BorrowStatus borrowStatus = borrowStatusService.getById(borrow.getBorrowStatusId()); - if(borrowStatus != null){ - if(BooleanUtils.isFalse(borrowStatus.getWithdrawFlag())){ - throw new CustomException(MessageUtils.message("dk.withdraw.account.error")); - } - } - } Customer customer = customerService.getById(customerId); if(BooleanUtils.isNotTrue(customer.getAllowWithdrawFlag())){ throw new CustomException(MessageUtils.message("dk.withdraw.account.error")); @@ -227,12 +214,6 @@ public class BorrowServiceImpl extends ServiceImpl impleme this.updateById(update); } - @Override - public Borrow getByCustomerId(Long customerId) { - return this.getOne(Wrappers.lambdaQuery(Borrow.class).eq(Borrow::getCustomerId, customerId) - .last("limit 1")); - } - @Override public LoanProcessResp getStepBorrow(Long customerId){ Borrow one = this.getOne(Wrappers.lambdaQuery(Borrow.class).eq(Borrow::getCustomerId,customerId)); @@ -271,6 +252,9 @@ public class BorrowServiceImpl extends ServiceImpl impleme return baseMapper.pageAdmin(Condition.getPage(pageParams),bo); } + @Autowired + private AgreementSettingService agreementSettingService; + @Override public String getContract(String tradeNo) { Borrow borrow = this.getByTradeNo(tradeNo); diff --git a/bashi-dk/src/main/java/com/bashi/dk/service/impl/BorrowStatusServiceImpl.java b/bashi-dk/src/main/java/com/bashi/dk/service/impl/BorrowStatusServiceImpl.java index 6bcc7dd..c8a1bf9 100644 --- a/bashi-dk/src/main/java/com/bashi/dk/service/impl/BorrowStatusServiceImpl.java +++ b/bashi-dk/src/main/java/com/bashi/dk/service/impl/BorrowStatusServiceImpl.java @@ -1,6 +1,5 @@ package com.bashi.dk.service.impl; -import com.baomidou.mybatisplus.core.toolkit.Wrappers; import com.baomidou.mybatisplus.extension.service.impl.ServiceImpl; import com.bashi.dk.domain.BorrowStatus; import com.bashi.dk.mapper.BorrowStatusMapper; @@ -9,9 +8,4 @@ import org.springframework.stereotype.Service; @Service public class BorrowStatusServiceImpl extends ServiceImpl implements BorrowStatusService { - @Override - public BorrowStatus getByCode(String borrowStatusCode) { - return this.getOne(Wrappers.lambdaQuery(BorrowStatus.class).eq(BorrowStatus::getBorrowCode, borrowStatusCode) - .last("limit 1")); - } } diff --git a/bashi-dk/src/main/resources/mapper/BorrowMapper.xml b/bashi-dk/src/main/resources/mapper/BorrowMapper.xml index 8afa34d..9fbb415 100644 --- a/bashi-dk/src/main/resources/mapper/BorrowMapper.xml +++ b/bashi-dk/src/main/resources/mapper/BorrowMapper.xml @@ -2,11 +2,9 @@