|
|
|
@ -30,6 +30,9 @@ import cn.hutool.core.date.DateTime; |
|
|
|
import cn.hutool.core.date.DateUtil; |
|
|
|
import com.baomidou.mybatisplus.core.conditions.query.QueryWrapper; |
|
|
|
import com.baomidou.mybatisplus.core.metadata.IPage; |
|
|
|
import com.yxt.anrui.portal.api.sysorganization.SysOrganizationFeign; |
|
|
|
import com.yxt.anrui.portal.api.sysorganization.SysOrganizationVo; |
|
|
|
import com.yxt.anrui.portal.api.sysstafforg.SysStaffOrgFeign; |
|
|
|
import com.yxt.anrui.portal.api.sysuser.PrivilegeQuery; |
|
|
|
import com.yxt.anrui.portal.api.sysuser.SysUserFeign; |
|
|
|
import com.yxt.anrui.scm.api.scmcollectionrebate.ScmCollectionRebateVo; |
|
|
|
@ -65,13 +68,10 @@ public class ScmVehRebateService extends MybatisBaseService<ScmVehRebateMapper, |
|
|
|
|
|
|
|
@Autowired |
|
|
|
private SysUserFeign sysUserFeign; |
|
|
|
|
|
|
|
private QueryWrapper<ScmVehRebate> createQueryWrapper(ScmVehRebateQuery query) { |
|
|
|
// todo: 这里根据具体业务调整查询条件
|
|
|
|
// 多字段Like示例：qw.and(wrapper -> wrapper.like("name", query.getName()).or().like("remark", query.getName()));
|
|
|
|
QueryWrapper<ScmVehRebate> qw = new QueryWrapper<>(); |
|
|
|
return qw; |
|
|
|
} |
|
|
|
@Autowired |
|
|
|
private SysStaffOrgFeign sysStaffOrgFeign; |
|
|
|
@Autowired |
|
|
|
private SysOrganizationFeign sysOrganizationFeign; |
|
|
|
|
|
|
|
public PagerVo<ScmVehRebateVo> listPageVo(PagerQuery<ScmVehRebateQuery> pq) { |
|
|
|
ScmVehRebateQuery query = pq.getParams(); |
|
|
|
@ -403,16 +403,16 @@ public class ScmVehRebateService extends MybatisBaseService<ScmVehRebateMapper, |
|
|
|
if (scmVehRebateVehs.size() < 1) { |
|
|
|
rb.setMsg("请选择返利车辆"); |
|
|
|
} |
|
|
|
String useOrgSid = sysStaffOrgFeign.getOrgSidByPath(dto.getOrgPath()).getData(); |
|
|
|
SysOrganizationVo sysOrganizationVo = sysOrganizationFeign.fetchBySid(useOrgSid).getData(); |
|
|
|
for (ScmVehRebateVehDto scmVehRebateVeh : scmVehRebateVehs) { |
|
|
|
ScmVehRebate scmVehRebate = new ScmVehRebate(); |
|
|
|
String sid = scmVehRebate.getSid(); |
|
|
|
BeanUtil.copyProperties(scmVehRebateVeh,scmVehRebate); |
|
|
|
BeanUtil.copyProperties(scmVehRebateVeh,scmVehRebate,"sid"); |
|
|
|
String vinNo = scmVehRebateVeh.getVinNo(); |
|
|
|
ScmVehRebateVo scmVehRebateVo = baseMapper.selectByVinNoAndOrgSid(vinNo, dto.getCreateOrgSid()); |
|
|
|
ScmVehRebateVo scmVehRebateVo = baseMapper.selectByVinNoAndOrgSid(vinNo, useOrgSid); |
|
|
|
if (scmVehRebateVo != null){ |
|
|
|
return rb.setMsg("车架号为"+vinNo+"的单车返利信息已存在"); |
|
|
|
} |
|
|
|
scmVehRebate.setSid(sid); |
|
|
|
scmVehRebate.setRebateTypeKey(dto.getRebateTypeKey()); |
|
|
|
scmVehRebate.setRebateTypeValue(dto.getRebateTypeValue()); |
|
|
|
scmVehRebate.setRebateName(dto.getRebateName()); |
|
|
|
@ -420,8 +420,12 @@ public class ScmVehRebateService extends MybatisBaseService<ScmVehRebateMapper, |
|
|
|
scmVehRebate.setCalculationModeKey(dto.getCalculationModeKey()); |
|
|
|
scmVehRebate.setCalculationModeValue(dto.getCalculationModeValue()); |
|
|
|
scmVehRebate.setCalculationStandard(dto.getCalculationStandard()); |
|
|
|
scmVehRebate.setCreateOrgSid(dto.getCreateOrgSid()); |
|
|
|
scmVehRebate.setUseOrgSid(dto.getUseOrgSid()); |
|
|
|
scmVehRebate.setCreateOrgSid(useOrgSid); |
|
|
|
scmVehRebate.setCreateOrgName(sysOrganizationVo.getName()); |
|
|
|
scmVehRebate.setUseOrgSid(useOrgSid); |
|
|
|
scmVehRebate.setUseOrgName(sysOrganizationVo.getName()); |
|
|
|
scmVehRebate.setOrgPath(dto.getOrgPath()); |
|
|
|
scmVehRebate.setCreateBySid(dto.getCreateBySid()); |
|
|
|
scmVehRebate.setState(0); |
|
|
|
save(scmVehRebate); |
|
|
|
} |
|
|
|
|
dimengzhe
1 year ago