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

返利模板调整

master
fanzongzhe0036 5 months ago
parent
4bea0798c2
commit
1ad83c2f78
5 changed files with 859 additions and 812 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. 6
      anrui-scm/anrui-scm-api/src/main/java/com/yxt/anrui/scm/api/scmfinanceadjustapply/ScmFinanceAdjustApplyFeign.java
  2. 5
      anrui-scm/anrui-scm-api/src/main/java/com/yxt/anrui/scm/api/scmfinanceadjustapply/ScmFinanceAdjustApplyFeignFallback.java
  3. 8
      anrui-scm/anrui-scm-biz/src/main/java/com/yxt/anrui/scm/biz/scmfinanceadjustapply/ScmFinanceAdjustApplyRest.java
  4. 88
      anrui-scm/anrui-scm-biz/src/main/java/com/yxt/anrui/scm/biz/scmfinanceadjustapply/ScmFinanceAdjustApplyService.java
  5. 2
      anrui-scm/anrui-scm-biz/src/main/java/com/yxt/anrui/scm/biz/scmvehrebate/ScmVehRebateService.java

6
anrui-scm/anrui-scm-api/src/main/java/com/yxt/anrui/scm/api/scmfinanceadjustapply/ScmFinanceAdjustApplyFeign.java
View File

@ -60,6 +60,12 @@ import java.util.List;
fallback = ScmFinanceAdjustApplyFeignFallback.class)
public interface ScmFinanceAdjustApplyFeign {
@ApiOperation("重推凭证单据")
@PostMapping("/rePushVoucher")
public ResultBean rePushVoucher(@RequestParam("sid") String sid);
@ApiOperation("根据条件分页查询数据的列表")
@PostMapping("/listPage")
@ResponseBody

5
anrui-scm/anrui-scm-api/src/main/java/com/yxt/anrui/scm/api/scmfinanceadjustapply/ScmFinanceAdjustApplyFeignFallback.java
View File

@ -50,6 +50,11 @@ import java.util.List;
@Component
public class ScmFinanceAdjustApplyFeignFallback implements ScmFinanceAdjustApplyFeign {
@Override
public ResultBean rePushVoucher(String sid) {
return null;
}
@Override
public ResultBean<PagerVo<ScmFinanceAdjustApplyVo>> listPage(PagerQuery<ScmFinanceAdjustApplyQuery> pq){
ResultBean rb = ResultBean.fireFail();

8
anrui-scm/anrui-scm-biz/src/main/java/com/yxt/anrui/scm/biz/scmfinanceadjustapply/ScmFinanceAdjustApplyRest.java
View File

@ -67,6 +67,14 @@ public class ScmFinanceAdjustApplyRest implements ScmFinanceAdjustApplyFeign {
private ScmFileService scmFileService;
@Autowired
private ScmFinanceAdjustDetailsService scmFinanceAdjustDetailsService;
@Override
public ResultBean rePushVoucher(String sid) {
ResultBean rb = ResultBean.fireFail();
scmFinanceAdjustApplyService.rePushVoucher(sid);
return rb.success();
}
@Override
@ApiOperation("根据条件分页查询数据的列表")
@PostMapping("/listPage")

88
anrui-scm/anrui-scm-biz/src/main/java/com/yxt/anrui/scm/biz/scmfinanceadjustapply/ScmFinanceAdjustApplyService.java
View File

@ -147,16 +147,16 @@ public class ScmFinanceAdjustApplyService extends MybatisBaseService<ScmFinanceA
}
}
if (StringUtils.isNotBlank(query.getUseOrgName())) {
qw.like("a.useOrgName",query.getUseOrgName());
qw.like("a.useOrgName", query.getUseOrgName());
}
if (StringUtils.isNotBlank(query.getDeptName())) {
qw.like("a.deptName",query.getDeptName());
qw.like("a.deptName", query.getDeptName());
}
if (StringUtils.isNotBlank(query.getCreateByName())) {
qw.like("a.createByName",query.getCreateByName());
qw.like("a.createByName", query.getCreateByName());
}
if (StringUtils.isNotBlank(query.getBillNo())) {
qw.like("a.billNo",query.getBillNo());
qw.like("a.billNo", query.getBillNo());
}
String applyStartTime = query.getCreateStartDate();
String applyEndTime = query.getCreateEndDate();
@ -198,12 +198,12 @@ public class ScmFinanceAdjustApplyService extends MybatisBaseService<ScmFinanceA
if (StringUtils.isNotBlank(dto.getSid())) {
sid = dto.getSid();
ScmFinanceAdjustApply scmFinanceAdjustApply = fetchBySid(sid);
BeanUtil.copyProperties(dto,scmFinanceAdjustApply,"id","sid");
BeanUtil.copyProperties(dto, scmFinanceAdjustApply, "id", "sid");
baseMapper.updateById(scmFinanceAdjustApply);
} else {
ScmFinanceAdjustApply entity = new ScmFinanceAdjustApply();
sid = entity.getSid();
BeanUtil.copyProperties(dto,entity,"id","sid");
BeanUtil.copyProperties(dto, entity, "id", "sid");
entity.setNodeState("待提交");
String applyCode = getApplyCode(dto.getUseOrgSid());
entity.setBillNo(applyCode);
@ -227,7 +227,7 @@ public class ScmFinanceAdjustApplyService extends MybatisBaseService<ScmFinanceA
if (!dto.getList().isEmpty() && dto.getList().size() > 0) {
for (AdjustDetailsListVo detailsListVo : dto.getList()) {
ScmFinanceAdjustDetails details = new ScmFinanceAdjustDetails();
BeanUtil.copyProperties(detailsListVo,details,"id","sid");
BeanUtil.copyProperties(detailsListVo, details, "id", "sid");
details.setMainSid(sid);
scmFinanceAdjustDetailsService.insert(details);
}
@ -235,7 +235,7 @@ public class ScmFinanceAdjustApplyService extends MybatisBaseService<ScmFinanceA
return sid;
}
public void saveOrUpdateDto(ScmFinanceAdjustApplyDto dto){
public void saveOrUpdateDto(ScmFinanceAdjustApplyDto dto) {
String dtoSid = dto.getSid();
if (StringUtils.isBlank(dtoSid)) {
this.insertByDto(dto);
@ -244,13 +244,13 @@ public class ScmFinanceAdjustApplyService extends MybatisBaseService<ScmFinanceA
this.updateByDto(dto);
}
public void insertByDto(ScmFinanceAdjustApplyDto dto){
public void insertByDto(ScmFinanceAdjustApplyDto dto) {
ScmFinanceAdjustApply entity = new ScmFinanceAdjustApply();
BeanUtil.copyProperties(dto, entity, "id", "sid");
baseMapper.insert(entity);
}
public void updateByDto(ScmFinanceAdjustApplyDto dto){
public void updateByDto(ScmFinanceAdjustApplyDto dto) {
String dtoSid = dto.getSid();
if (StringUtils.isBlank(dtoSid)) {
return;
@ -260,7 +260,7 @@ public class ScmFinanceAdjustApplyService extends MybatisBaseService<ScmFinanceA
baseMapper.updateById(entity);
}
public ScmFinanceAdjustApplyDetailsVo fetchDetailsVoBySid(String sid){
public ScmFinanceAdjustApplyDetailsVo fetchDetailsVoBySid(String sid) {
ScmFinanceAdjustApply entity = fetchBySid(sid);
ScmFinanceAdjustApplyDetailsVo vo = new ScmFinanceAdjustApplyDetailsVo();
List<QueryUrl> filePaths = new ArrayList<>();
@ -287,7 +287,7 @@ public class ScmFinanceAdjustApplyService extends MybatisBaseService<ScmFinanceA
if (!details.isEmpty() && details.size() > 0) {
for (ScmFinanceAdjustDetails detail : details) {
AdjustDetailsListVo detailsListVo = new AdjustDetailsListVo();
BeanUtil.copyProperties(detail,detailsListVo);
BeanUtil.copyProperties(detail, detailsListVo);
listVos.add(detailsListVo);
}
vo.setList(listVos);
@ -300,25 +300,25 @@ public class ScmFinanceAdjustApplyService extends MybatisBaseService<ScmFinanceA
AdjustVehListQuery query = pq.getParams();
QueryWrapper<ScmFinanceAdjustApply> qw = new QueryWrapper<>();
if (StringUtils.isNotBlank(query.getPurchaseSystemName())) {
qw.like("n.purchaseSystemName",query.getPurchaseSystemName());
qw.like("n.purchaseSystemName", query.getPurchaseSystemName());
}
if (StringUtils.isNotBlank(query.getBrandName())) {
qw.like("n.brandName",query.getBrandName());
qw.like("n.brandName", query.getBrandName());
}
if (StringUtils.isNotBlank(query.getVehModel())) {
qw.like("n.vehModelName",query.getVehModel());
qw.like("n.vehModelName", query.getVehModel());
}
if (StringUtils.isNotBlank(query.getVinNo())) {
qw.like("n.vinNo",query.getVinNo());
qw.like("n.vinNo", query.getVinNo());
}
if (StringUtils.isNotBlank(query.getCustomerName())) {
qw.like("bo.customerName",query.getCustomerName());
qw.like("bo.customerName", query.getCustomerName());
}
if (StringUtils.isNotBlank(query.getContractNo())) {
qw.like("bo.contractNo",query.getContractNo());
qw.like("bo.contractNo", query.getContractNo());
}
if (StringUtils.isNotBlank(query.getStaffSid())) {
qw.eq("bo.createBySid",query.getStaffSid());
qw.eq("bo.createBySid", query.getStaffSid());
}
String[] sids = query.getSids();
if (sids != null) {
@ -329,7 +329,7 @@ public class ScmFinanceAdjustApplyService extends MybatisBaseService<ScmFinanceA
}
}
qw.apply("n.nowDiffAmount != 0");
qw.eq("n.useOrgSid",query.getUseOrgSid());
qw.eq("n.useOrgSid", query.getUseOrgSid());
IPage<ScmFinanceAdjustApply> page = PagerUtil.queryToPage(pq);
IPage<AdjustVehListVo> pagging = baseMapper.getAdjustVehList(page, qw);
PagerVo<AdjustVehListVo> p = PagerUtil.pageToVo(pagging, null);
@ -359,30 +359,30 @@ public class ScmFinanceAdjustApplyService extends MybatisBaseService<ScmFinanceA
}
}
if (StringUtils.isNotBlank(query.getPurchaseSystemName())) {
qw.like("n.purchaseSystemName",query.getPurchaseSystemName());
qw.like("n.purchaseSystemName", query.getPurchaseSystemName());
}
if (StringUtils.isNotBlank(query.getBrandName())) {
qw.like("n.brandName",query.getBrandName());
qw.like("n.brandName", query.getBrandName());
}
if (StringUtils.isNotBlank(query.getVehModel())) {
qw.like("n.vehModelName",query.getVehModel());
qw.like("n.vehModelName", query.getVehModel());
}
if (StringUtils.isNotBlank(query.getVinNo())) {
qw.like("n.vinNo",query.getVinNo());
qw.like("n.vinNo", query.getVinNo());
}
if (StringUtils.isNotBlank(query.getCustomerName())) {
qw.like("bo.customerName",query.getCustomerName());
qw.like("bo.customerName", query.getCustomerName());
}
if (StringUtils.isNotBlank(query.getContractNo())) {
qw.like("bo.contractNo",query.getContractNo());
qw.like("bo.contractNo", query.getContractNo());
}
if (StringUtils.isNotBlank(query.getStaffSid())) {
qw.eq("bo.createBySid",query.getStaffSid());
qw.eq("bo.createBySid", query.getStaffSid());
}
if (StringUtils.isNotBlank(query.getState())) {
if (query.getState().equals("未调整")) {
qw.apply("n.alreadyMoney = 0");
} else if (query.getState().equals("已调整")){
} else if (query.getState().equals("已调整")) {
qw.apply("n.nowDiffAmount = 0");
} else {
qw.apply("n.nowDiffAmount != 0 and n.alreadyMoney != 0");
@ -399,7 +399,6 @@ public class ScmFinanceAdjustApplyService extends MybatisBaseService<ScmFinanceA
}
//-------------------------------------流程------------------------------------------------/
/**
@ -646,8 +645,7 @@ public class ScmFinanceAdjustApplyService extends MybatisBaseService<ScmFinanceA
ScmFinanceAdjustApply scmFinanceAdjustApply = fetchBySid(businessSid);
scmFinanceAdjustApply.setClosingDate(new Date());
baseMapper.updateById(scmFinanceAdjustApply);
rePushVoucher(businessSid);//推送调整单、凭证
} else {
//极光推送
entity = fetchBySid(businessSid);
@ -670,6 +668,32 @@ public class ScmFinanceAdjustApplyService extends MybatisBaseService<ScmFinanceA
}
}
public void rePushVoucher(String sid) {
ScmFinanceAdjustApply adjustApply = fetchBySid(sid);
String adjustWay = adjustApply.getAdjustWay();
List<ScmFinanceAdjustDetails> details = scmFinanceAdjustDetailsService.selByMainSid(sid);
if (!details.isEmpty() && details.size() > 0) {
for (ScmFinanceAdjustDetails detail : details) {
if (adjustWay.equals("客户交纳")) {
} else if (adjustWay.equals("公司认损")) {
}
}
}
}
public ResultBean revokeProcess(AdjustTaskQuery query) {
ResultBean rb = ResultBean.fireFail();
@ -913,4 +937,6 @@ public class ScmFinanceAdjustApplyService extends MybatisBaseService<ScmFinanceA
flowFeign.delegate(delegateQuery);
return rb.success();
}
}

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

@ -638,6 +638,7 @@ public class ScmVehRebateService extends MybatisBaseService<ScmVehRebateMapper,
BaseVehicleRebateQuery params = new BaseVehicleRebateQuery();
params.setVinNo(info.getVinNo());
params.setUserSid(userSid);
params.setOrgSid(orgPath);
pq.setParams(params);
PagerVo<BaseVehicleRebateVo> data = baseVehicleFeign.vehicleRebateList(pq).getData();
BaseVehicleRebateVo baseVehicleRebateVo = data.getRecords().get(0);
@ -812,6 +813,7 @@ public class ScmVehRebateService extends MybatisBaseService<ScmVehRebateMapper,
BaseVehicleRebateQuery params = new BaseVehicleRebateQuery();
params.setVinNo(excelInfo.getVinNo());
params.setUserSid(userSid);
params.setOrgSid(orgPath);
pq.setParams(params);
PagerVo<BaseVehicleRebateVo> data = baseVehicleFeign.vehicleRebateList(pq).getData();
if (data.getRecords().size() == 0) {

Write Preview
Loading…
Cancel
Save