yxt_develop
/
anrui
9
0
Fork 0
Code Issues Pull Requests Projects Releases Wiki Activity
Browse Source

Merge remote-tracking branch 'origin/master'

master
yunuo970428 1 year ago
parent
e939c684f4 239880addc
commit
e6d200b176
5 changed files with 30 additions and 50 deletions
Whitespace
Show all changes Ignore whitespace when comparing lines Ignore changes in amount of whitespace Ignore changes in whitespace at EOL
Split View
Diff Options
Show Stats Download Patch File Download Diff File
  1. 3
      anrui-riskcenter/anrui-riskcenter-api/src/main/java/com/yxt/anrui/riskcenter/api/loansecondarysalesapply/LoanSecondarySalesApplyDetailsVo.java
  2. 13
      anrui-riskcenter/anrui-riskcenter-biz/src/main/java/com/yxt/anrui/riskcenter/biz/loansecondarysalesapply/LoanSecondarySalesApplyService.java
  3. 3
      anrui-scm/anrui-scm-api/src/main/java/com/yxt/anrui/scm/api/scmvehrebate/ScmVehRebateQuery.java
  4. 59
      anrui-scm/anrui-scm-biz/src/main/java/com/yxt/anrui/scm/biz/scmvehrebate/ScmVehRebateService.java
  5. 2
      anrui-scm/anrui-scm-biz/src/main/java/com/yxt/anrui/scm/biz/scmvehrebatecheckapplydetail/ScmVehrebateCheckapplydetailMapper.xml

3
anrui-riskcenter/anrui-riskcenter-api/src/main/java/com/yxt/anrui/riskcenter/api/loansecondarysalesapply/LoanSecondarySalesApplyDetailsVo.java
View File

@ -97,5 +97,8 @@ public class LoanSecondarySalesApplyDetailsVo {
@ApiModelProperty("有效期")
private String validityDate;
@ApiModelProperty("是否显示竞价按钮")
private boolean validate;
}

13
anrui-riskcenter/anrui-riskcenter-biz/src/main/java/com/yxt/anrui/riskcenter/biz/loansecondarysalesapply/LoanSecondarySalesApplyService.java
View File

@ -980,6 +980,19 @@ public class LoanSecondarySalesApplyService extends MybatisBaseService<LoanSecon
}
}
loanSecondarySalesApplyDetailsVo.setLoanSecondarySalesCost(loanSecondarySalesCost);
DateFormat sdf = new SimpleDateFormat("yyyy-MM-dd HH:mm:ss");
Date date = new Date();
String nowtime = sdf.format(date);//当前时间
String endtime = loanSecondarySalesApply.getValidityDate(); //到期时间
try {
if (sdf.parse(nowtime).getTime() > sdf.parse(endtime).getTime()) {//转成long类型比较
loanSecondarySalesApplyDetailsVo.setValidate(false);
} else if (sdf.parse(nowtime).getTime() <= sdf.parse(endtime).getTime()) {
loanSecondarySalesApplyDetailsVo.setValidate(true);
}
} catch (ParseException e) {
e.printStackTrace();
}
}
return rb.success().setData(loanSecondarySalesApplyDetailsVo);
}

3
anrui-scm/anrui-scm-api/src/main/java/com/yxt/anrui/scm/api/scmvehrebate/ScmVehRebateQuery.java
View File

@ -67,6 +67,8 @@ public class ScmVehRebateQuery implements Query {
private String rebateName;
@ApiModelProperty("状态")
private String state;
@ApiModelProperty
private String createOrgSid;
@ApiModelProperty("单车返利sid")
private List<String> sidList;
@ -74,4 +76,5 @@ public class ScmVehRebateQuery implements Query {
private String orgPath;
private String menuUrl;
private String menuSid;
}

59
anrui-scm/anrui-scm-biz/src/main/java/com/yxt/anrui/scm/biz/scmvehrebate/ScmVehRebateService.java
View File

@ -283,18 +283,18 @@ public class ScmVehRebateService extends MybatisBaseService<ScmVehRebateMapper,
apply(StringUtils.isNotBlank(createEndTime), "date_format (createTime,'%Y-%m-%d') <= date_format('" + createEndTime + "','%Y-%m-%d')"
);
qw.ne("state", 0);
if (StringUtils.isNotBlank(query.getState())){
qw.eq("state",query.getState());
if (StringUtils.isNotBlank(query.getState())) {
qw.eq("state", query.getState());
}
IPage<ScmVehRebate> page = PagerUtil.queryToPage(pq);
IPage<ScmVehRebateVo> pagging = baseMapper.selectPageVo(page, qw);
for (ScmVehRebateVo record : pagging.getRecords()) {
//上传状态：未上传
if (StringUtils.isBlank(record.getUploadDate()) && StringUtils.isBlank(record.getUploadMoney())){
if (StringUtils.isBlank(record.getUploadDate()) && StringUtils.isBlank(record.getUploadMoney())) {
record.setUploadState("2");
}
//上传状态：已上传
if (StringUtils.isNotBlank(record.getUploadDate()) && StringUtils.isNotBlank(record.getUploadMoney()) && record.getIsAdjustment().equals("否")){
if (StringUtils.isNotBlank(record.getUploadDate()) && StringUtils.isNotBlank(record.getUploadMoney()) && record.getIsAdjustment().equals("否")) {
record.setUploadState("3");
}
}
@ -305,46 +305,7 @@ public class ScmVehRebateService extends MybatisBaseService<ScmVehRebateMapper,
public PagerVo<ScmVehRebateVo> checkApplyGetAlreadyUploadVehRebate(PagerQuery<ScmVehRebateQuery> pq) {
ScmVehRebateQuery query = pq.getParams();
QueryWrapper<ScmVehRebate> qw = new QueryWrapper<>();
//========================================数据授权开始
if (StringUtils.isNotBlank(query.getMenuUrl())) {
PrivilegeQuery privilegeQuery = new PrivilegeQuery();
privilegeQuery.setOrgPath(query.getOrgPath());
privilegeQuery.setMenuUrl(query.getMenuUrl());
privilegeQuery.setMenuSid(query.getMenuSid());
privilegeQuery.setUserSid(query.getUserSid());
ResultBean<String> defaultIdReltBean = sysUserFeign.selectPrivilegeLevel(privilegeQuery);
if (StringUtils.isNotBlank(defaultIdReltBean.getData())) {
//数据权限ID(1集团、2事业部、3分公司、4部门、5个人)
String orgSidPath = query.getOrgPath();
orgSidPath = orgSidPath + "/";
int i1 = orgSidPath.indexOf("/");
int i2 = orgSidPath.indexOf("/", i1 + 1);
int i3 = orgSidPath.indexOf("/", i2 + 1);
int i4 = orgSidPath.indexOf("/", i3 + 1);
String orgLevelKey = defaultIdReltBean.getData();
if ("1".equals(orgLevelKey)) {
orgSidPath = orgSidPath.substring(0, i1);
qw.like("orgPath", orgSidPath);
} else if ("2".equals(orgLevelKey)) {
orgSidPath = orgSidPath.substring(0, i2);
qw.like("orgPath", orgSidPath);
} else if ("3".equals(orgLevelKey)) {
orgSidPath = orgSidPath.substring(0, i3);
qw.like("orgPath", orgSidPath);
} else if ("4".equals(orgLevelKey)) {
orgSidPath = orgSidPath.substring(0, i4);
qw.like("orgPath", orgSidPath);
} else if ("5".equals(orgLevelKey)) {
qw.eq("createBySid", query.getUserSid());
} else {
PagerVo<ScmVehRebateVo> p = new PagerVo<>();
return p;
}
} else {
PagerVo<ScmVehRebateVo> p = new PagerVo<>();
return p;
}
}
qw.eq("createOrgSid", query.getCreateOrgSid());
if (StringUtils.isNotBlank(query.getBrandSid())) {
qw.eq("brandSid", query.getBrandSid());
}
@ -407,11 +368,11 @@ public class ScmVehRebateService extends MybatisBaseService<ScmVehRebateMapper,
SysOrganizationVo sysOrganizationVo = sysOrganizationFeign.fetchBySid(useOrgSid).getData();
for (ScmVehRebateVehDto scmVehRebateVeh : scmVehRebateVehs) {
ScmVehRebate scmVehRebate = new ScmVehRebate();
BeanUtil.copyProperties(scmVehRebateVeh,scmVehRebate,"sid");
BeanUtil.copyProperties(scmVehRebateVeh, scmVehRebate, "sid");
String vinNo = scmVehRebateVeh.getVinNo();
ScmVehRebateVo scmVehRebateVo = baseMapper.selectByVinNoAndOrgSid(vinNo, useOrgSid);
if (scmVehRebateVo != null){
return rb.setMsg("车架号为"+vinNo+"的单车返利信息已存在");
if (scmVehRebateVo != null) {
return rb.setMsg("车架号为" + vinNo + "的单车返利信息已存在");
}
scmVehRebate.setRebateTypeKey(dto.getRebateTypeKey());
scmVehRebate.setRebateTypeValue(dto.getRebateTypeValue());
@ -441,7 +402,7 @@ public class ScmVehRebateService extends MybatisBaseService<ScmVehRebateMapper,
String sid = dto.getSid();
ScmVehRebate scmVehRebate = fetchBySid(sid);
ScmVehRebateVehDto scmVehRebateVehDto = new ScmVehRebateVehDto();
BeanUtil.copyProperties(scmVehRebate,scmVehRebateVehDto);
BeanUtil.copyProperties(scmVehRebate, scmVehRebateVehDto);
scmVehRebateVehDto.setSecondaryUploadDate(dto.getSecondaryUploadDate());
scmVehRebateVehDto.setSecondaryUploadMoney(dto.getSecondaryUploadMoney());
scmVehRebateVehDto.setStayDetermineMoney(dto.getStayDetermineMoney());
@ -450,7 +411,7 @@ public class ScmVehRebateService extends MybatisBaseService<ScmVehRebateMapper,
String money = String.valueOf(mon + cost);
scmVehRebateVehDto.setMoney(money);
scmVehRebateVehDto.setAdjustmentMoney(dto.getAdjustmentMoney());
updateBySid(scmVehRebateVehDto,sid);
updateBySid(scmVehRebateVehDto, sid);
return rb.success().setMsg("调整成功");
}

2
anrui-scm/anrui-scm-biz/src/main/java/com/yxt/anrui/scm/biz/scmvehrebatecheckapplydetail/ScmVehrebateCheckapplydetailMapper.xml
View File

@ -34,7 +34,7 @@
LEFT JOIN scm_veh_rebate svr
ON svr.`sid` = svc.`vehRebateSid`
WHERE svc.`mainSid` = #{sid}
AND DATE_FORMAT(svr.palceGenDate, '%Y%m') = DATE_FORMAT(CURDATE(), '%Y%m')
AND svr.palceGenDate = DATE_FORMAT(CURDATE(), '%Y-%m')
GROUP BY svr.`rebateTypeKey`
</select>

Write Preview
Loading…
Cancel
Save