|
|
@@ -247,32 +247,33 @@ public class InsFeeAuditServiceImpl extends ServiceImpl<InsFeeAuditMapper, InsFe
|
|
|
AssertionUtils.isFail(true, "订单审核驳回,刷新订单列表");
|
|
|
}
|
|
|
// 未审核
|
|
|
+ }
|
|
|
+ String userName = baseController.getUserName();
|
|
|
+ if(StringUtils.isNotBlank(audit.getReceiveUser())){
|
|
|
+ if(userName.equals(audit.getReceiveUser())){
|
|
|
+ // redis 锁定按钮
|
|
|
+ RBucket<Object> bucket = redissonClient.getBucket(ORDER_LOCK_PREFIX + orderNo);
|
|
|
+ bucket.set(1, 30, TimeUnit.MINUTES);
|
|
|
+ }else{
|
|
|
+ AssertionUtils.isFail(true, "订单已被" + audit.getReceiveUser() + "领取!");
|
|
|
+ }
|
|
|
}else{
|
|
|
- String userName = baseController.getUserName();
|
|
|
- if(StringUtils.isNotBlank(audit.getReceiveUser())){
|
|
|
- if(userName.equals(audit.getReceiveUser())){
|
|
|
- // redis 锁定按钮
|
|
|
- RBucket<Object> bucket = redissonClient.getBucket(ORDER_LOCK_PREFIX + orderNo);
|
|
|
- bucket.set(1, 30, TimeUnit.MINUTES);
|
|
|
- }else{
|
|
|
- AssertionUtils.isFail(true, "订单已被" + audit.getReceiveUser() + "领取!");
|
|
|
- }
|
|
|
+ LambdaQueryWrapper<InsFeeAudit> wrapper = new LambdaQueryWrapper<>();
|
|
|
+ // modify by lipf 2026年5月23日10:15:32 判断是领取限制,需要添加一个未审核的状态
|
|
|
+ wrapper.eq(InsFeeAudit::getAuditStatus,0);
|
|
|
+ wrapper.like(InsFeeAudit::getReceiveUser, userName);
|
|
|
+ long count = this.count(wrapper);
|
|
|
+ if(count >= 10){
|
|
|
+ AssertionUtils.isFail(true, "超出10次领取限制,请先审核后再领取订单!");
|
|
|
}else{
|
|
|
- LambdaQueryWrapper<InsFeeAudit> wrapper = new LambdaQueryWrapper<>();
|
|
|
- wrapper.like(InsFeeAudit::getReceiveUser, userName);
|
|
|
- long count = this.count(wrapper);
|
|
|
- if(count >= 10){
|
|
|
- AssertionUtils.isFail(true, "超出10次领取限制,请先审核后再领取订单!");
|
|
|
- }else{
|
|
|
- // 领取订单
|
|
|
- audit.setReceiveUser(userName);
|
|
|
- audit.setReceiveTime(LocalDateTime.now());
|
|
|
- this.updateById(audit);
|
|
|
-
|
|
|
- // redis 锁定按钮
|
|
|
- RBucket<Object> bucket = redissonClient.getBucket(ORDER_LOCK_PREFIX + orderNo);
|
|
|
- bucket.set(1, 30, TimeUnit.MINUTES);
|
|
|
- }
|
|
|
+ // 领取订单
|
|
|
+ audit.setReceiveUser(userName);
|
|
|
+ audit.setReceiveTime(LocalDateTime.now());
|
|
|
+ this.updateById(audit);
|
|
|
+
|
|
|
+ // redis 锁定按钮
|
|
|
+ RBucket<Object> bucket = redissonClient.getBucket(ORDER_LOCK_PREFIX + orderNo);
|
|
|
+ bucket.set(1, 30, TimeUnit.MINUTES);
|
|
|
}
|
|
|
}
|
|
|
}
|