1

dd

2025-11-06 1e0848427a1f5c771b61a2939af3ff78b9b1d37b

 ruoyi-admin/src/main/java/com/ruoyi/web/controller/product/UserPolicyController.java

@@ -110,6 +110,23 @@
        }
    }

    /**
     * 保险购买申请
     */
    @PostMapping("/updatePolicy")
    public AjaxResult updatePolicy(UserPolicyDto dto) {

        UserPolicy userPolicy = userPolicyService.getById(dto.getId());
        if(ObjectUtil.isNotEmpty(userPolicy)){
            userPolicy.setPhone(dto.getPhone());
            userPolicy.setBirthDate(LocalDate.parse(dto.getBirthDate()));
            userPolicyService.updateById(userPolicy);
            return AjaxResult.success("更新成功");
        }else{
            return AjaxResult.error("保单不存在");
        }
    }



    /**
@@ -399,10 +416,16 @@
                log.error("签名验证失败: {}", callbackDTO.getOrderId());
                return "签名验证失败";
            }

            PaymentRecord paymentRecord = paymentRecordService.getOne(new LambdaQueryWrapper<PaymentRecord>()
                    .eq(PaymentRecord::getPayOrdeNo, callbackDTO.getOrderId())
            );
            if (paymentRecord == null) {
                log.error("支付订单不存在: {}", paymentRecord.getPayOrdeNo());
                return "支付订单不存在";
            }
            // 2. 根据订单号查询保单
            UserPolicy userPolicy = userPolicyService.getOne(new LambdaQueryWrapper<UserPolicy>()
                    .eq(UserPolicy::getOrderNo, callbackDTO.getOrderId()));
                    .eq(UserPolicy::getId, paymentRecord.getOrderId()));
            if (userPolicy == null) {
                log.error("订单不存在: {}", callbackDTO.getOrderId());
                return "订单不存在";
@@ -488,7 +511,7 @@
        }

        userPolicy.setPayStatus(2); // 2-支付成功
        userPolicy.setPolicyStatus(UserPolicy.PolicyStatus.ACTIVE);
//        userPolicy.setPolicyStatus(UserPolicy.PolicyStatus.ACTIVE);
        userPolicy.setUpdatedAt(new Date());

        boolean updateResult = userPolicyService.updateById(userPolicy);
@@ -561,17 +584,16 @@
        }
        if(byId.getPaymentStatus() == 2){
            return AjaxResult.error("订单已支付，禁止删除");
        }else{
            paymentRecordService.removeById(byId);
        }
        UserPolicy userPolicy = userPolicyService.getById(byId.getOrderId());
        if(ObjectUtil.isEmpty(userPolicy)){
            return AjaxResult.error("保单不存在！");
        }
        if(userPolicy.getPayStatus() == 2){
            return AjaxResult.error("订单已支付，禁止删除");
        }

        paymentRecordService.removeById(byId);
        userPolicyService.removeById(userPolicy);
        if(ObjectUtil.isNotEmpty(userPolicy)  && userPolicy.getPayStatus() == 2){
            return AjaxResult.error("订单已支付，禁止删除");
        }else{
            userPolicyService.removeById(userPolicy);
        }
        return AjaxResult.success("删除成功");
    }