|
@@ -2,8 +2,10 @@ package com.zhongzheng.modules.pay.service.impl;
|
|
|
|
|
|
import cn.hutool.core.bean.BeanUtil;
|
|
|
import cn.hutool.core.util.StrUtil;
|
|
|
+import com.baomidou.mybatisplus.core.toolkit.CollectionUtils;
|
|
|
import com.zhongzheng.common.utils.DateUtils;
|
|
|
import com.zhongzheng.modules.pay.domain.PayAisle;
|
|
|
+import com.zhongzheng.modules.pay.domain.PayNature;
|
|
|
import org.springframework.stereotype.Service;
|
|
|
import com.baomidou.mybatisplus.extension.service.impl.ServiceImpl;
|
|
|
import com.baomidou.mybatisplus.core.conditions.query.LambdaQueryWrapper;
|
|
@@ -17,6 +19,7 @@ import com.zhongzheng.modules.pay.mapper.PayPayeeMapper;
|
|
|
import com.zhongzheng.modules.pay.vo.PayPayeeVo;
|
|
|
import com.zhongzheng.modules.pay.service.IPayPayeeService;
|
|
|
|
|
|
+import java.util.ArrayList;
|
|
|
import java.util.Collection;
|
|
|
import java.util.Collections;
|
|
|
import java.util.List;
|
|
@@ -69,7 +72,17 @@ public class PayPayeeServiceImpl extends ServiceImpl<PayPayeeMapper, PayPayee> i
|
|
|
@Override
|
|
|
public Boolean insertByAddBo(PayPayeeAddBo bo) {
|
|
|
PayPayee add = BeanUtil.toBean(bo, PayPayee.class);
|
|
|
- validEntityBeforeSave(add);
|
|
|
+ LambdaQueryWrapper<PayPayee> lqw = Wrappers.lambdaQuery();
|
|
|
+ lqw.eq(StrUtil.isNotBlank(bo.getPayeeName()), PayPayee::getPayeeName, bo.getPayeeName());
|
|
|
+ List<Integer> status = new ArrayList<>();
|
|
|
+ status.add(1);
|
|
|
+ status.add(0);
|
|
|
+ lqw.in(bo.getStatus() != null, PayPayee::getStatus, status);
|
|
|
+ List<PayPayee> list = this.list(lqw);
|
|
|
+ if (CollectionUtils.isNotEmpty(list)){
|
|
|
+ throw new RuntimeException("重复收款方名字");
|
|
|
+ }
|
|
|
+ validEntityBeforeSave(add);
|
|
|
add.setCreateTime(DateUtils.getNowTime());
|
|
|
add.setUpdateTime(DateUtils.getNowTime());
|
|
|
return this.save(add);
|
|
@@ -78,6 +91,22 @@ public class PayPayeeServiceImpl extends ServiceImpl<PayPayeeMapper, PayPayee> i
|
|
|
@Override
|
|
|
public Boolean updateByEditBo(PayPayeeEditBo bo) {
|
|
|
PayPayee update = BeanUtil.toBean(bo, PayPayee.class);
|
|
|
+ LambdaQueryWrapper<PayPayee> lqw = Wrappers.lambdaQuery();
|
|
|
+ lqw.eq(StrUtil.isNotBlank(bo.getPayeeName()), PayPayee::getPayeeName, bo.getPayeeName());
|
|
|
+ lqw.like(bo.getPayeeId()!= null, PayPayee::getPayeeId, bo.getPayeeId());
|
|
|
+ List<PayPayee> list = this.list(lqw);
|
|
|
+ if (CollectionUtils.isEmpty(list)){
|
|
|
+ lqw.clear();
|
|
|
+ lqw.eq(StrUtil.isNotBlank(bo.getPayeeName()), PayPayee::getPayeeName, bo.getPayeeName());
|
|
|
+ List<Integer> status = new ArrayList<>();
|
|
|
+ status.add(1);
|
|
|
+ status.add(0);
|
|
|
+ lqw.in(bo.getStatus() != null, PayPayee::getStatus, status);
|
|
|
+ List<PayPayee> list1 = this.list(lqw);
|
|
|
+ if (CollectionUtils.isNotEmpty(list1)){
|
|
|
+ throw new IllegalArgumentException("重复收费性质名字");
|
|
|
+ }
|
|
|
+ }
|
|
|
validEntityBeforeSave(update);
|
|
|
update.setUpdateTime(DateUtils.getNowTime());
|
|
|
return this.updateById(update);
|