diff --git a/smart-switch-service/src/main/java/com/ruoyi/ss/transactionBill/domain/vo/TransactionBillVO.java b/smart-switch-service/src/main/java/com/ruoyi/ss/transactionBill/domain/vo/TransactionBillVO.java index 696880c7..a81839b3 100644 --- a/smart-switch-service/src/main/java/com/ruoyi/ss/transactionBill/domain/vo/TransactionBillVO.java +++ b/smart-switch-service/src/main/java/com/ruoyi/ss/transactionBill/domain/vo/TransactionBillVO.java @@ -4,12 +4,8 @@ import com.fasterxml.jackson.annotation.JsonView; import com.ruoyi.common.annotation.Sensitive; import com.ruoyi.common.core.domain.JsonViewProfile; import com.ruoyi.common.enums.DesensitizedType; -import com.ruoyi.ss.bonus.domain.Bonus; -import com.ruoyi.ss.bonus.domain.BonusVO; import com.ruoyi.iot.interfaces.IotDevice; -import com.ruoyi.ss.suit.domain.enums.SuitFeeMode; -import com.ruoyi.ss.suit.domain.enums.SuitFeeType; -import com.ruoyi.ss.suit.domain.enums.SuitTimeUnit; +import com.ruoyi.ss.bonus.domain.BonusVO; import com.ruoyi.ss.transactionBill.domain.TransactionBill; import com.ruoyi.ss.transactionBill.utils.RechargeUtils; import io.swagger.annotations.ApiModel; @@ -17,7 +13,6 @@ import io.swagger.annotations.ApiModelProperty; import lombok.Data; import java.math.BigDecimal; -import java.math.RoundingMode; import java.time.LocalDateTime; import java.util.List; diff --git a/smart-switch-service/src/main/java/com/ruoyi/ss/transactionBill/utils/RechargeUtils.java b/smart-switch-service/src/main/java/com/ruoyi/ss/transactionBill/utils/RechargeUtils.java index a3d2eae2..a55d8d60 100644 --- a/smart-switch-service/src/main/java/com/ruoyi/ss/transactionBill/utils/RechargeUtils.java +++ b/smart-switch-service/src/main/java/com/ruoyi/ss/transactionBill/utils/RechargeUtils.java @@ -1,6 +1,7 @@ package com.ruoyi.ss.transactionBill.utils; import com.ruoyi.ss.suit.domain.enums.SuitFeeMode; +import com.ruoyi.ss.suit.domain.enums.SuitFeeType; import com.ruoyi.ss.suit.domain.enums.SuitTimeUnit; import com.ruoyi.ss.transactionBill.domain.vo.TransactionBillVO; @@ -50,8 +51,11 @@ public class RechargeUtils { */ private static long calcRound(TransactionBillVO bill) { int round = 1; - // 若为智能模式,则计算出押金最大支持多少次,向上取整 - if (SuitFeeMode.SMART.getMode().equals(bill.getSuitFeeMode())) { + if (bill == null || bill.getSuitFeeMode() == null || bill.getSuitFeeType() == null) { + return round; + } + // 若为智能单次,则计算出押金最大支持多少次,向上取整 + if (SuitFeeMode.SMART.getMode().equals(bill.getSuitFeeMode()) && SuitFeeType.singleList().contains(bill.getSuitFeeType())) { round = bill.getSuitDeposit().divide(bill.getSuitPrice(), 0, RoundingMode.UP).intValue(); } return round; diff --git a/smart-switch-web/src/main/resources/application-druid-test.yml b/smart-switch-web/src/main/resources/application-druid-test.yml new file mode 100644 index 00000000..17a9fbb4 --- /dev/null +++ b/smart-switch-web/src/main/resources/application-druid-test.yml @@ -0,0 +1,61 @@ +# 数据源配置 +spring: + datasource: + type: com.alibaba.druid.pool.DruidDataSource + driverClassName: com.mysql.cj.jdbc.Driver + druid: + # 主库数据源 + master: + url: jdbc:mysql://106.75.233.135:3306/smart-switch-test?useUnicode=true&characterEncoding=utf8&zeroDateTimeBehavior=convertToNull&useSSL=true&serverTimezone=GMT%2B8 + username: root + password: 9671e015b05b3f11 + # 从库数据源 + slave: + # 从数据源开关/默认关闭 + enabled: false + url: + username: + password: + # 初始连接数 + initialSize: 5 + # 最小连接池数量 + minIdle: 10 + # 最大连接池数量 + maxActive: 20 + # 配置获取连接等待超时的时间 + maxWait: 60000 + # 配置连接超时时间 + connectTimeout: 30000 + # 配置网络超时时间 + socketTimeout: 60000 + # 配置间隔多久才进行一次检测,检测需要关闭的空闲连接,单位是毫秒 + timeBetweenEvictionRunsMillis: 60000 + # 配置一个连接在池中最小生存的时间,单位是毫秒 + minEvictableIdleTimeMillis: 300000 + # 配置一个连接在池中最大生存的时间,单位是毫秒 + maxEvictableIdleTimeMillis: 900000 + # 配置检测连接是否有效 + validationQuery: SELECT 1 FROM DUAL + testWhileIdle: true + testOnBorrow: false + testOnReturn: false + webStatFilter: + enabled: true + statViewServlet: + enabled: true + # 设置白名单,不填则允许所有访问 + allow: + url-pattern: /druid/* + # 控制台管理用户名和密码 + login-username: ruoyi + login-password: 123456 + filter: + stat: + enabled: true + # 慢SQL记录 + log-slow-sql: true + slow-sql-millis: 1000 + merge-sql: true + wall: + config: + multi-statement-allow: true