From ec5f0c69e1b9bb05aef5391f1a89309fba99013f Mon Sep 17 00:00:00 2001
From: liujie <1793218484@qq.com>
Date: 星期三, 31 十二月 2025 13:54:12 +0800
Subject: [PATCH] Merge branch 'master' of http://120.76.84.145:10101/gitblit/r/java/mobile_community
---
ruoyi-applet/src/main/java/com/ruoyi/web/controller/api/InsuranceController.java | 11 ++++++-----
1 files changed, 6 insertions(+), 5 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 59533b4..17af1dc 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
@@ -59,10 +59,10 @@
*/
@GetMapping("/getInsurance")
@ApiOperation(value = "保险模块--获取用户是否有保险",response = TBanner.class)
- public R<UserInsuranceVo> getCourseList() {
+ public R<UserInsuranceVo> getCourseList(int type) {
String userId = tokenService.getLoginUserApplet().getUserId();
UserInsuranceVo insuranceVo = new UserInsuranceVo();
- TInsuranceOrder one = tInsuranceOrderService.getOne(Wrappers.<TInsuranceOrder>lambdaQuery().eq(TInsuranceOrder::getAppUserId, userId).eq(TInsuranceOrder::getStatus, 2).orderByDesc(BaseModel::getCreateTime).last("LIMIT 1"));
+ TInsuranceOrder one = tInsuranceOrderService.getOne(Wrappers.<TInsuranceOrder>lambdaQuery().eq(TInsuranceOrder::getType,type).eq(TInsuranceOrder::getAppUserId, userId).eq(TInsuranceOrder::getStatus, 2).orderByDesc(BaseModel::getCreateTime).last("LIMIT 1"));
if(one!=null){
insuranceVo.setUserId(userId);
insuranceVo.setPayTime(one.getPayTime());
@@ -80,7 +80,7 @@
TAppUser appUser = tAppUserService.getById(userId);
// 查询保险订单
- TInsuranceOrder one = tInsuranceOrderService.getOne(Wrappers.<TInsuranceOrder>lambdaQuery().eq(TInsuranceOrder::getAppUserId, userId).eq(TInsuranceOrder::getStatus, 2).orderByDesc(BaseModel::getCreateTime).last("LIMIT 1"));
+ TInsuranceOrder one = tInsuranceOrderService.getOne(Wrappers.<TInsuranceOrder>lambdaQuery().eq(TInsuranceOrder::getType,dto.getCourseType()).eq(TInsuranceOrder::getAppUserId, userId).eq(TInsuranceOrder::getStatus, 2).orderByDesc(BaseModel::getCreateTime).last("LIMIT 1"));
if(one!=null){
if(one.getEndTime().after(new Date())){
return R.fail("您已购买保险");
@@ -93,12 +93,13 @@
insuranceOrder.setIdCard(dto.getIdCard());
insuranceOrder.setImg(dto.getImg());
insuranceOrder.setPayType(dto.getType());
+ insuranceOrder.setType(dto.getCourseType());
TInsurance insurance = tInsuranceService.getOne(new LambdaQueryWrapper<TInsurance>().eq(TInsurance::getStatus, 1));
if(insurance==null){
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);
@@ -145,7 +146,7 @@
if(payTime==null){
return R.fail("状态不允许退款");
}
- if(payTime.plusDays(2).isBefore(LocalDateTime.now())){
+ if(payTime.plusDays(2).isBefore(LocalDateTime.now()) || order.getPayType()==2){
order1.setBankCardNumber(order.getBankCardNumber());
order1.setCardholderName(order.getCardholderName());
order1.setRefundStatus(1);
--
Gitblit v1.7.1