1

zj

2025-09-25 6287f5366df7a0f13fef767ce7d6505979a13b22

1

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

@@ -298,6 +298,7 @@
            if(ObjectUtil.isEmpty(insuranceAccount)){
                return Result.success(user);
            }
            user.setBalance(userAccount.getBalance());
            user.setAmountClaimed(insuranceAccount.getAmountClaimed());
            user.setAlreadyReceived(insuranceAccount.getAlreadyReceived());
            return Result.success(user);

 ruoyi-admin/src/main/java/com/ruoyi/im/out/UserAccountOut.java

@@ -8,6 +8,7 @@
import lombok.Data;

import java.math.BigDecimal;
import java.time.LocalDate;
import java.util.Date;
import java.util.List;

@@ -53,6 +54,11 @@
    private String signature;

    private Date createTime;
    //职位
    private String position = "普通用户";

    //达成时间
    private LocalDate agreedTime;

    //下级用户
    private List<UserAccountOut> subordinateList;

 ruoyi-admin/src/main/java/com/ruoyi/im/util/RedisDistributedLock.java

@@ -60,17 +60,20 @@
        redisTemplate.delete(key);
    }


    /**
     * 生成锁的key（基于用户ID和产品ID）
     */
    public String generateLockKey(String account, Integer productId) {
        return String.format("purchase:%d:%d", account, productId);
        // 将 %d 改为 %s 来格式化字符串
        return String.format("purchase:%s:%d", account, productId);
    }

    /**
     * 生成基于用户ID的锁key
     */
    public String generateUserLockKey(Integer userId) {
        return String.format("purchase:%d", userId);
    public String generateUserLockKey(String account) {
        // 同样修正这里
        return String.format("purchase:%s", account);
    }
}

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

@@ -9,6 +9,7 @@
import com.ruoyi.common.core.page.TableDataInfo;
import com.ruoyi.common.utils.StringUtils;
import com.ruoyi.im.comm.Result;
import com.ruoyi.im.service.InsuranceProductService;
import com.ruoyi.im.service.MedicalInsuranceAccountService;
import com.ruoyi.im.service.impl.InsurancePositionServiceImpl;
import com.ruoyi.im.util.RedisDistributedLock;
@@ -51,6 +52,9 @@

    @Autowired
    private RedisDistributedLock redisDistributedLock;

    @Autowired
    InsuranceProductService insuranceProductService;

    /**
     * 保险购买申请
@@ -106,7 +110,7 @@
     */
    @GetMapping("/list")
    public TableDataInfo list(@RequestParam(value = "account",required = false) String account,
                              @RequestParam(value = "status",defaultValue = "0") Integer status,
                              @RequestParam(value = "state",defaultValue = "0") Integer state,
                              @RequestParam(value = "productName",required = false) String productName) {
        startPage();

@@ -114,7 +118,7 @@

        // 产品名称模糊查询
        if (org.apache.commons.lang3.StringUtils.isNotBlank(account)) {
            wrapper.like(UserPolicy::getUserId, account);
            wrapper.like(UserPolicy::getAccount, account);
        }

        // 产品代码模糊查询
@@ -123,7 +127,7 @@
        }

        // 审批状态
        if (status != null && status != 3) {
        if (state != null && state == 3) {
            wrapper.ne(UserPolicy::getApprovalStatus, 0);
        }else{
            wrapper.eq(UserPolicy::getApprovalStatus, 0);
@@ -156,6 +160,17 @@
            if(approvalStatus == 2 && StringUtils.isEmpty(message)){
                return AjaxResult.error("驳回理由不能为空！");
            }
            UserAccount userAccount = userAccountService.getById(userPolicy.getUserId());
            if(approvalStatus == 2){
                userPolicy.setApprovalStatus(approvalStatus);
                userPolicy.setMessage(message);
                userPolicy.setUpdatedAt(new Date());
                userPolicyService.updateById(userPolicy);

                userAccount.setBalance(userAccount.getBalance().add(userPolicy.getPremium()));
                userAccountService.updateById(userAccount);
                return AjaxResult.success("审批成功");
            }

            //计算到期时间
            LocalDate expirationTime = calculateInsuranceEndDateToDay(LocalDate.now(), userPolicy.getTerm());
@@ -184,13 +199,9 @@
            medicalInsuranceAccount.setUpdatedAt(new Date());
            medicalInsuranceAccountService.save(medicalInsuranceAccount);


            //判断上级用户职位达成
            if(approvalStatus == 1){
                //查询当前用户
                UserAccount userAccount = userAccountService.getOne(new LambdaQueryWrapper<UserAccount>()
                        .eq(UserAccount::getId, userPolicy.getUserId())
                );
                if(StringUtils.isNotEmpty(userAccount.getInvitationAccount())){
                //上级
                UserAccount superiorUser = userAccountService.getOne(new LambdaQueryWrapper<UserAccount>()
                        .eq(UserAccount::getAccount, userAccount.getInvitationAccount())
@@ -225,6 +236,7 @@
                    }
                });
                userAccountService.updateById(superiorUser);
                }
                return AjaxResult.success("审批成功");
            }
            return AjaxResult.success("审批成功");

 ruoyi-system/src/main/java/com/ruoyi/system/domain/out/UserOut.java

@@ -12,6 +12,9 @@
@Data
public class UserOut {

    // 账户余额
    private BigDecimal balance = BigDecimal.ZERO;

    //领取医疗保险金额
    private BigDecimal amountClaimed = BigDecimal.ZERO;