From f497103c6fd364b960daa7df7ef249b0498b174e Mon Sep 17 00:00:00 2001
From: xuhy <3313886187@qq.com>
Date: 星期三, 31 十二月 2025 13:53:56 +0800
Subject: [PATCH] 保险
---
ruoyi-applet/src/main/java/com/ruoyi/web/controller/api/InsuranceController.java | 2 +-
ruoyi-system/src/main/java/com/ruoyi/system/model/TInsurance.java | 7 ++++++-
ruoyi-system/src/main/resources/mapper/system/TInsuranceMapper.xml | 5 +++--
ruoyi-system/src/main/java/com/ruoyi/system/service/impl/TInsuranceServiceImpl.java | 9 +++++++--
4 files changed, 17 insertions(+), 6 deletions(-)
diff --git a/ruoyi-applet/src/main/java/com/ruoyi/web/controller/api/InsuranceController.java b/ruoyi-applet/src/main/java/com/ruoyi/web/controller/api/InsuranceController.java
index 436e181..bb7604a 100644
--- a/ruoyi-applet/src/main/java/com/ruoyi/web/controller/api/InsuranceController.java
+++ b/ruoyi-applet/src/main/java/com/ruoyi/web/controller/api/InsuranceController.java
@@ -98,7 +98,7 @@
return R.fail("保险已关闭");
}
insuranceOrder.setInsuranceId(insurance.getId());
- insuranceOrder.setPayMoney(BigDecimal.valueOf(insurance.getInsuranceMoney()).setScale(2, RoundingMode.HALF_UP));
+ insuranceOrder.setPayMoney(insurance.getInsuranceMoney().setScale(2, RoundingMode.HALF_UP));
SimpleDateFormat simpleDateFormat = new SimpleDateFormat("yyyy-MM-dd");
Date date = simpleDateFormat.parse(insurance.getValidityTime());
insuranceOrder.setEndTime(date);
diff --git a/ruoyi-system/src/main/java/com/ruoyi/system/model/TInsurance.java b/ruoyi-system/src/main/java/com/ruoyi/system/model/TInsurance.java
index 406f54c..f73a9e4 100644
--- a/ruoyi-system/src/main/java/com/ruoyi/system/model/TInsurance.java
+++ b/ruoyi-system/src/main/java/com/ruoyi/system/model/TInsurance.java
@@ -7,6 +7,7 @@
import lombok.EqualsAndHashCode;
import java.io.Serializable;
+import java.math.BigDecimal;
import java.time.LocalDateTime;
/**
@@ -34,7 +35,11 @@
@ApiModelProperty(value = "费用")
@TableField("insurance_money")
- private Double insuranceMoney;
+ private BigDecimal insuranceMoney;
+
+ @ApiModelProperty(value = "类型 1=社会大学 2=青少年培训班")
+ @TableField("insurance_type")
+ private Integer insuranceType;
@ApiModelProperty(value = "有效期")
@TableField("validity_time")
diff --git a/ruoyi-system/src/main/java/com/ruoyi/system/service/impl/TInsuranceServiceImpl.java b/ruoyi-system/src/main/java/com/ruoyi/system/service/impl/TInsuranceServiceImpl.java
index b1c45a1..76ced55 100644
--- a/ruoyi-system/src/main/java/com/ruoyi/system/service/impl/TInsuranceServiceImpl.java
+++ b/ruoyi-system/src/main/java/com/ruoyi/system/service/impl/TInsuranceServiceImpl.java
@@ -49,10 +49,15 @@
public boolean isOpen(TInsurance dto) {
if(StringUtils.isNotEmpty(dto.getId())){
// 修改
- return this.count(Wrappers.lambdaQuery(TInsurance.class).ne(TInsurance::getId, dto.getId()).eq(TInsurance::getStatus, 1)) > 0;
+ return this.count(Wrappers.lambdaQuery(TInsurance.class)
+ .ne(TInsurance::getId, dto.getId())
+ .eq(TInsurance::getStatus, 1)
+ .eq(TInsurance::getInsuranceType, dto.getInsuranceType())) > 0;
}else {
// 新增
- return this.count(Wrappers.lambdaQuery(TInsurance.class).eq(TInsurance::getStatus, 1)) > 0;
+ return this.count(Wrappers.lambdaQuery(TInsurance.class)
+ .eq(TInsurance::getStatus, 1)
+ .eq(TInsurance::getInsuranceType, dto.getInsuranceType())) > 0;
}
}
}
diff --git a/ruoyi-system/src/main/resources/mapper/system/TInsuranceMapper.xml b/ruoyi-system/src/main/resources/mapper/system/TInsuranceMapper.xml
index 70daaa8..b40403a 100644
--- a/ruoyi-system/src/main/resources/mapper/system/TInsuranceMapper.xml
+++ b/ruoyi-system/src/main/resources/mapper/system/TInsuranceMapper.xml
@@ -7,6 +7,7 @@
<id column="id" property="id" />
<result column="insurance_title" property="insuranceTitle" />
<result column="insurance_money" property="insuranceMoney" />
+ <result column="insurance_type" property="insuranceType" />
<result column="validity_time" property="validityTime" />
<result column="status" property="status" />
<result column="create_time" property="createTime" />
@@ -18,10 +19,10 @@
<!-- 通用查询结果列 -->
<sql id="Base_Column_List">
- id, insurance_title, insurance_money, validity_time, status, create_time, update_time, create_by, update_by, disabled
+ id, insurance_title, insurance_money,insurance_type, validity_time, status, create_time, update_time, create_by, update_by, disabled
</sql>
<select id="pageList" resultType="com.ruoyi.system.vo.TInsuranceVO">
- select id, insurance_title, insurance_money, validity_time, status, create_time, update_time, create_by, update_by, disabled
+ select id, insurance_title, insurance_money,insurance_type, validity_time, status, create_time, update_time, create_by, update_by, disabled
from t_insurance
<where>
<if test="query.insuranceTitle != null and query.insuranceTitle != ''">
--
Gitblit v1.7.1