1

zj

2025-10-13 1cf34bf75b4b6b091f0aea3d7f97f1c689e40fe5

1

 ruoyi-admin/src/main/java/com/ruoyi/im/ImApiController.java

@@ -404,7 +404,7 @@
            long count = userPolicyService.count(new LambdaQueryWrapper<>(UserPolicy.class)
                    .eq(UserPolicy::getUserId, userAccount.getId())
                    .eq(UserPolicy::getProductId,f.getId())
                    .and(a->a.ne(UserPolicy::getPayStatus,2).or().ne(UserPolicy::getPayStatus,1))
                    .eq(UserPolicy::getPayStatus,2)
                    .ne(UserPolicy::getApprovalStatus,2)
            );
            if(count > 0){

 ruoyi-admin/src/main/java/com/ruoyi/im/task/MedicalInsuranceTask.java

@@ -128,10 +128,10 @@
            List<PaymentRecord> records = paymentRecordService.list(new LambdaQueryWrapper<PaymentRecord>()
                    .in(PaymentRecord::getOrderId, ids)
            );
            userPolicyService.removeByIds(records);
            paymentRecordService.removeByIds(records);
        }
        if(!CollectionUtils.isEmpty(list)){
            paymentRecordService.removeByIds(list);
            userPolicyService.removeByIds(list);
        }
    }
}

 ruoyi-system/src/main/java/com/ruoyi/system/domain/UserPolicy.java

@@ -97,7 +97,7 @@
    //支付订单号
    private String orderNo;

    //支付失败原因
    //支付失败原因getProduct
    private String payMsg;

    //支付方式  1 支付宝 2微信  3余额