From 9282dce52ae210e9396bb781fe5281d14a64cd2c Mon Sep 17 00:00:00 2001 From: God <10745413@qq.com> Date: Wed, 16 Oct 2024 17:22:28 +0800 Subject: [PATCH] 1 --- .../FinPaymentapplyDetailVo.java | 2 + .../FinPaymentapplyService.java | 37 +---------- .../FinPaymentapplyDetailsMapper.xml | 15 ++--- .../FinPaymentrecordService.java | 62 ++++++++++++++++--- .../ScmCollectionRebate.java | 29 ++++++--- .../ScmCollectionRebateDetailsVo.java | 29 ++++++--- .../ScmCollectionRebateDto.java | 53 ++++++++++------ .../ScmCollectionRebateQuery.java | 18 +++++- .../ScmCollectionRebateVo.java | 34 ++++++---- .../ScmCollectionRebateService.java | 41 ++++++++---- .../ScmSpecialRebateService.java | 4 +- .../as/biz/astechtitle/AsTechTitleRest.java | 4 +- .../biz/astechtitle/AsTechTitleService.java | 7 ++- 13 files changed, 223 insertions(+), 112 deletions(-) diff --git a/anrui-fin/anrui-fin-api/src/main/java/com/yxt/anrui/fin/api/finpaymentapplydetails/FinPaymentapplyDetailVo.java b/anrui-fin/anrui-fin-api/src/main/java/com/yxt/anrui/fin/api/finpaymentapplydetails/FinPaymentapplyDetailVo.java index b366b1dfba..bb66dd3a33 100644 --- a/anrui-fin/anrui-fin-api/src/main/java/com/yxt/anrui/fin/api/finpaymentapplydetails/FinPaymentapplyDetailVo.java +++ b/anrui-fin/anrui-fin-api/src/main/java/com/yxt/anrui/fin/api/finpaymentapplydetails/FinPaymentapplyDetailVo.java @@ -13,6 +13,8 @@ import lombok.Data; public class FinPaymentapplyDetailVo implements Vo { private static final long serialVersionUID = 2763515857490645883L; + private String sid; + @ApiModelProperty("付款方式key") private String paymentTypeKey; @ApiModelProperty("付款方式") diff --git a/anrui-fin/anrui-fin-biz/src/main/java/com/yxt/anrui/fin/biz/finpaymentapply/FinPaymentapplyService.java b/anrui-fin/anrui-fin-biz/src/main/java/com/yxt/anrui/fin/biz/finpaymentapply/FinPaymentapplyService.java index 5bd306d55e..6cf2020dc5 100644 --- a/anrui-fin/anrui-fin-biz/src/main/java/com/yxt/anrui/fin/biz/finpaymentapply/FinPaymentapplyService.java +++ b/anrui-fin/anrui-fin-biz/src/main/java/com/yxt/anrui/fin/biz/finpaymentapply/FinPaymentapplyService.java @@ -507,6 +507,7 @@ public class FinPaymentapplyService extends MybatisBaseService scmCollectionRebateVehDtos = new ArrayList<>(); - List details = finPaymentapplyDetailsService.getDetails(finPaymentapply.getSid()); - List vehicleList = finPaymentapplyVehicleService.getVehicleList(finPaymentapply.getSid()); - scmCollectionRebateDto.setBrandSid(finPaymentapply.getCarBrandSid()); - scmCollectionRebateDto.setBrandName(finPaymentapply.getCarBrandName()); - scmCollectionRebateDto.setCollectionTypeKey(details.get(0).getPaymentTypeKey()); - scmCollectionRebateDto.setCollectionTypeValue(details.get(0).getPaymentType()); - scmCollectionRebateDto.setManufaSaleChannelValue(details.get(0).getActualPay()); - scmCollectionRebateDto.setCollectionMoney(details.get(0).getPayAccount()); - scmCollectionRebateDto.setCollectionDate(DateUtil.format(new Date(), "yyyy-MM-dd")); - scmCollectionRebateDto.setCreateOrgSid(finPaymentapply.getCreateOrgSid()); - scmCollectionRebateDto.setUseOrgSid(finPaymentapply.getUseOrgSid()); - scmCollectionRebateDto.setOrgPath(finPaymentapply.getOrgSidPath()); - scmCollectionRebateDto.setCreateBySid(finPaymentapply.getCreateBySid()); - if (!vehicleList.isEmpty()) { - for (FinPaymentapplyVehicleVo finPaymentapplyVehicleVo : vehicleList) { - ScmCollectionRebateVehDto scmCollectionRebateVehDto = new ScmCollectionRebateVehDto(); - BaseVehicleSelectVo baseVehicleSelectVo = baseVehicleFeign.details(finPaymentapplyVehicleVo.getVehiSid()).getData(); - scmCollectionRebateVehDto.setCarModelSid(finPaymentapplyVehicleVo.getModelSid()); - scmCollectionRebateVehDto.setCarModelName(finPaymentapplyVehicleVo.getModelName()); - scmCollectionRebateVehDto.setPriceDate(DateUtil.format(baseVehicleSelectVo.getPriceDate(), "yyyy-MM-dd")); - if (baseVehicleSelectVo.getSalesDate() != null) { - scmCollectionRebateVehDto.setSalesDate(DateUtil.format(baseVehicleSelectVo.getSalesDate(), "yyyy-MM-dd")); - } - scmCollectionRebateVehDto.setVehSid(finPaymentapplyVehicleVo.getVehiSid()); - scmCollectionRebateVehDto.setVinNo(finPaymentapplyVehicleVo.getVinNo()); - scmCollectionRebateVehDto.setCostPrice(finPaymentapplyVehicleVo.getMoney()); - scmCollectionRebateVehDtos.add(scmCollectionRebateVehDto); - } - } - scmCollectionRebateDto.setScmCollectionRebateVehs(scmCollectionRebateVehDtos); - scmCollectionRebateFeign.save(scmCollectionRebateDto); - } } else { //极光推送 UpdateFlowFieldVo ufVo = resultBean.getData(); diff --git a/anrui-fin/anrui-fin-biz/src/main/java/com/yxt/anrui/fin/biz/finpaymentapplydetails/FinPaymentapplyDetailsMapper.xml b/anrui-fin/anrui-fin-biz/src/main/java/com/yxt/anrui/fin/biz/finpaymentapplydetails/FinPaymentapplyDetailsMapper.xml index f1ed8f6755..b03180ac49 100644 --- a/anrui-fin/anrui-fin-biz/src/main/java/com/yxt/anrui/fin/biz/finpaymentapplydetails/FinPaymentapplyDetailsMapper.xml +++ b/anrui-fin/anrui-fin-biz/src/main/java/com/yxt/anrui/fin/biz/finpaymentapplydetails/FinPaymentapplyDetailsMapper.xml @@ -19,13 +19,14 @@ diff --git a/anrui-fin/anrui-fin-biz/src/main/java/com/yxt/anrui/fin/biz/finpaymentrecord/FinPaymentrecordService.java b/anrui-fin/anrui-fin-biz/src/main/java/com/yxt/anrui/fin/biz/finpaymentrecord/FinPaymentrecordService.java index d75a64630a..ebc062bef2 100644 --- a/anrui-fin/anrui-fin-biz/src/main/java/com/yxt/anrui/fin/biz/finpaymentrecord/FinPaymentrecordService.java +++ b/anrui-fin/anrui-fin-biz/src/main/java/com/yxt/anrui/fin/biz/finpaymentrecord/FinPaymentrecordService.java @@ -36,27 +36,29 @@ import com.yxt.anrui.base.api.baseoutsourcingapplication.BaseOutsourcingApplicat import com.yxt.anrui.base.api.baseoutsourcingapplication.BaseOutsourcingApplicationFeign; import com.yxt.anrui.base.api.basepurchasesystem.BasePurchaseSystemDetailsVo; import com.yxt.anrui.base.api.basepurchasesystem.BasePurchaseSystemFeign; +import com.yxt.anrui.base.api.basevehicle.BaseVehicleFeign; +import com.yxt.anrui.base.api.basevehicle.BaseVehicleSelectVo; import com.yxt.anrui.base.api.basevehicleactualdetails.BaseVehicleActualDetails; import com.yxt.anrui.base.api.basevehicleactualdetails.BaseVehicleActualDetailsFeign; import com.yxt.anrui.base.api.basevehicleactualpay.BaseVehicleActualPay; import com.yxt.anrui.base.api.basevehicleactualpay.BaseVehicleActualPayFeign; import com.yxt.anrui.base.api.basevehicleactualsales.BaseVehicleActualSalesDetailsVo; import com.yxt.anrui.base.api.basevehicleactualsales.BaseVehicleActualSalesFeign; -import com.yxt.anrui.base.api.basevehiclestate.BaseVehicleStateDto; -import com.yxt.anrui.base.api.basevehiclestate.BaseVehicleStateEnum; import com.yxt.anrui.base.api.busvehicleapply.BusVehicleApplyDetailsVo; import com.yxt.anrui.base.api.busvehicleapply.BusVehicleApplyFeign; import com.yxt.anrui.base.api.commonappendix.CommonAppendixVo; import com.yxt.anrui.base.common.enums.DictCommonEnum; -import com.yxt.anrui.buscenter.api.busdeliveredapplydetails.BusDeliveredApplyDetails; -import com.yxt.anrui.buscenter.api.bussalesorder.app.order.AppOrderDetailsVo; import com.yxt.anrui.fin.api.finmanufacturerbank.FinManufacturerBank; import com.yxt.anrui.fin.api.finpaymentapply.FinPaymentapply; +import com.yxt.anrui.fin.api.finpaymentapplydetails.FinPaymentapplyDetails; +import com.yxt.anrui.fin.api.finpaymentapplyvehicle.FinPaymentapplyVehicleVo; import com.yxt.anrui.fin.api.finpaymentrecord.*; import com.yxt.anrui.fin.api.finuncollectedreceivablesdetailedjr.FinUncollectedReceivablesDetailedJR; import com.yxt.anrui.fin.api.kingdee.appaybill.ApPayBill; import com.yxt.anrui.fin.biz.finmanufacturerbank.FinManufacturerBankService; import com.yxt.anrui.fin.biz.finpaymentapply.FinPaymentapplyService; +import com.yxt.anrui.fin.biz.finpaymentapplydetails.FinPaymentapplyDetailsService; +import com.yxt.anrui.fin.biz.finpaymentapplyvehicle.FinPaymentapplyVehicleService; import com.yxt.anrui.fin.biz.finuncollectedreceivablesdetailedjr.FinUncollectedReceivablesDetailedJRService; import com.yxt.anrui.fin.biz.kingdee.appaybill.ApPayBillService; import com.yxt.anrui.portal.api.flow.FlowableFeign; @@ -69,9 +71,6 @@ import com.yxt.anrui.portal.api.sysstafforg.SysStaffOrgFeign; import com.yxt.anrui.portal.api.sysstafforg.SysStaffOrgVo; import com.yxt.anrui.portal.api.sysuser.SysUserFeign; import com.yxt.anrui.portal.api.sysuser.SysUserVo; -import com.yxt.anrui.portal.api.sysuser.UserQuery; -import com.yxt.anrui.riskcenter.api.loanbepadsincereapply.LoanBePadsincereApply; -import com.yxt.anrui.riskcenter.api.loanbepadsincereapply.LoanBePadsincereApplyDetailsVo; import com.yxt.anrui.riskcenter.api.loanbepadsincereapply.LoanBePadsincereApplyFeign; import com.yxt.anrui.riskcenter.api.loanbepadsincereveh.LoanBePadsincereVehDetailsVo; import com.yxt.anrui.riskcenter.api.loanbepadsincereveh.LoanBePadsincereVehFeign; @@ -80,6 +79,9 @@ import com.yxt.anrui.riskcenter.api.loanrepaymentplandetails.LoanRepaymentPlanDe import com.yxt.anrui.riskcenter.api.loanrepaymentplandetails.LoanRepaymentPlanMoneyVo; import com.yxt.anrui.riskcenter.api.loansettleapply.LoanSettleApplyFeign; import com.yxt.anrui.riskcenter.api.loantransferpaymentapply.LoanTransferPaymentApplyFeign; +import com.yxt.anrui.scm.api.scmcollectionrebate.ScmCollectionRebateDto; +import com.yxt.anrui.scm.api.scmcollectionrebate.ScmCollectionRebateFeign; +import com.yxt.anrui.scm.api.scmcollectionrebateveh.ScmCollectionRebateVehDto; import com.yxt.common.base.config.component.FileUploadComponent; import com.yxt.common.base.service.MybatisBaseService; import com.yxt.common.base.utils.ConstantUtils; @@ -88,7 +90,6 @@ import com.yxt.common.base.utils.WordUtils; import com.yxt.common.core.query.PagerQuery; import com.yxt.common.core.result.ResultBean; import com.yxt.common.core.vo.PagerVo; -import com.yxt.messagecenter.api.message.AppScmMessageFlowableQuery; import com.yxt.messagecenter.api.message.Message; import com.yxt.messagecenter.api.message.MessageFeign; import com.yxt.messagecenter.api.message.PushMessageQuery; @@ -128,9 +129,17 @@ import static java.util.Comparator.comparing; @Service public class FinPaymentrecordService extends MybatisBaseService { + @Autowired + private BaseVehicleFeign baseVehicleFeign; @Autowired private FinPaymentapplyService finPaymentapplyService; @Autowired + private FinPaymentapplyDetailsService finPaymentapplyDetailsService; + @Autowired + private FinPaymentapplyVehicleService finPaymentapplyVehicleService; + @Autowired + private ScmCollectionRebateFeign scmCollectionRebateFeign; + @Autowired private SysStaffOrgFeign sysStaffOrgFeign; @Autowired private BaseManufactorSubscriptionFeign baseManufactorSubscriptionFeign; @@ -375,6 +384,43 @@ public class FinPaymentrecordService extends MybatisBaseService list = new ArrayList<>(); for (int i = 0; i < sids.size(); i++) { FinPaymentrecord finPaymentrecord = fetchBySid(sids.get(i)); + //到回款返利申请 + if (finPaymentrecord.getCostTypeValue().equals("厂家车款") && !finPaymentrecord.getPayWayValue().equals("返利抵车款")) { + ScmCollectionRebateDto scmCollectionRebateDto = new ScmCollectionRebateDto(); + List scmCollectionRebateVehDtos = new ArrayList<>(); + FinPaymentapply finPaymentapply = finPaymentapplyService.fetchBySid(finPaymentrecord.getApplySid()); + FinPaymentapplyDetails finPaymentapplyDetails = finPaymentapplyDetailsService.fetchBySid(finPaymentrecord.getBusSid()); + List vehicleList = finPaymentapplyVehicleService.getVehicleList(finPaymentapply.getSid()); + scmCollectionRebateDto.setBrandSid(finPaymentapply.getCarBrandSid()); + scmCollectionRebateDto.setBrandName(finPaymentapply.getCarBrandName()); + scmCollectionRebateDto.setCollectionTypeKey(finPaymentrecord.getPayWayKey()); + scmCollectionRebateDto.setCollectionTypeValue(finPaymentrecord.getPayWayValue()); + scmCollectionRebateDto.setManufaSaleChannelValue(finPaymentapplyDetails.getActualPay()); + scmCollectionRebateDto.setCollectionMoney(finPaymentrecord.getCost()); + scmCollectionRebateDto.setCollectionDate(DateUtil.formatDate(finPaymentrecord.getPayDate())); + scmCollectionRebateDto.setCreateOrgSid(finPaymentrecord.getCreateOrgSid()); + scmCollectionRebateDto.setUseOrgSid(finPaymentrecord.getUseOrgSid()); + scmCollectionRebateDto.setOrgPath(finPaymentapply.getOrgSidPath()); + scmCollectionRebateDto.setCreateBySid(finPaymentrecord.getCreateBySid()); + if (!vehicleList.isEmpty()) { + for (FinPaymentapplyVehicleVo finPaymentapplyVehicleVo : vehicleList) { + ScmCollectionRebateVehDto scmCollectionRebateVehDto = new ScmCollectionRebateVehDto(); + BaseVehicleSelectVo baseVehicleSelectVo = baseVehicleFeign.details(finPaymentapplyVehicleVo.getVehiSid()).getData(); + scmCollectionRebateVehDto.setCarModelSid(finPaymentapplyVehicleVo.getModelSid()); + scmCollectionRebateVehDto.setCarModelName(finPaymentapplyVehicleVo.getModelName()); + scmCollectionRebateVehDto.setPriceDate(DateUtil.format(baseVehicleSelectVo.getPriceDate(), "yyyy-MM-dd")); + if (baseVehicleSelectVo.getSalesDate() != null) { + scmCollectionRebateVehDto.setSalesDate(DateUtil.format(baseVehicleSelectVo.getSalesDate(), "yyyy-MM-dd")); + } + scmCollectionRebateVehDto.setVehSid(finPaymentapplyVehicleVo.getVehiSid()); + scmCollectionRebateVehDto.setVinNo(finPaymentapplyVehicleVo.getVinNo()); + scmCollectionRebateVehDto.setCostPrice(finPaymentapplyVehicleVo.getMoney()); + scmCollectionRebateVehDtos.add(scmCollectionRebateVehDto); + } + } + scmCollectionRebateDto.setScmCollectionRebateVehs(scmCollectionRebateVehDtos); + scmCollectionRebateFeign.save(scmCollectionRebateDto); + } //更新还款计划表垫款金额和逾期利息 if ("007".equals(finPaymentrecord.getCostTypeKey())) { List loanBePadsincereVehDetailsVos = loanBePadsincereVehFeign.selByBankCont(finPaymentrecord.getApplySid(),finPaymentrecord.getBusSid()).getData(); diff --git a/anrui-scm/anrui-scm-api/src/main/java/com/yxt/anrui/scm/api/scmcollectionrebate/ScmCollectionRebate.java b/anrui-scm/anrui-scm-api/src/main/java/com/yxt/anrui/scm/api/scmcollectionrebate/ScmCollectionRebate.java index dbe2dbe555..0a8eafcffd 100644 --- a/anrui-scm/anrui-scm-api/src/main/java/com/yxt/anrui/scm/api/scmcollectionrebate/ScmCollectionRebate.java +++ b/anrui-scm/anrui-scm-api/src/main/java/com/yxt/anrui/scm/api/scmcollectionrebate/ScmCollectionRebate.java @@ -31,6 +31,9 @@ import io.swagger.annotations.ApiModel; import io.swagger.annotations.ApiModelProperty; import lombok.Data; +import java.math.BigDecimal; +import java.util.Date; + /** * Project: anrui-scm(回款返利)
* File: ScmCollectionRebate.java
@@ -50,6 +53,10 @@ import lombok.Data; public class ScmCollectionRebate extends BaseEntity { private static final long serialVersionUID = 1L; + @ApiModelProperty("采购系统sid") + private String purchaseSystemSid; + @ApiModelProperty("采购系统名称") + private String purchaseSystemName; @ApiModelProperty("品牌sid") private String brandSid; // 品牌sid @ApiModelProperty("品牌名称") @@ -63,23 +70,31 @@ public class ScmCollectionRebate extends BaseEntity { @ApiModelProperty("厂家销售通路value") private String manufaSaleChannelValue; // 厂家销售通路value @ApiModelProperty("回款金额") - private String collectionMoney; // 回款金额 + private BigDecimal collectionMoney; // 回款金额 @ApiModelProperty("运费") - private String freight; // 运费 + private BigDecimal freight; // 运费 @ApiModelProperty("回款日期") - private String collectionDate; // 回款日期 + private Date collectionDate; // 回款日期 + @ApiModelProperty("上装金额") + private BigDecimal topAmount; + @ApiModelProperty("返利类型key") + private String rebateTypeKey; // 返利类型key + @ApiModelProperty("返利类型value") + private String rebateTypeValue; // 返利类型value + @ApiModelProperty("返利名称") + private String rebateName; @ApiModelProperty("计算标准") private String calculationStandard; // 计算标准 @ApiModelProperty("预计返利") - private String estimateRebate; // 预计返利 + private BigDecimal estimateRebate; // 预计返利 @ApiModelProperty("预提日期") private String withholdingDate; // 预提日期 @ApiModelProperty("上传日期") - private String uploadDate; // 上传日期 + private Date uploadDate; // 上传日期 @ApiModelProperty("上传金额") - private String uploadMoney; // 上传金额 + private BigDecimal uploadMoney; // 上传金额 @ApiModelProperty("调整金额") - private String adjustmentMoney; // 调整金额 + private BigDecimal adjustmentMoney; // 调整金额 @ApiModelProperty("调整说明") private String adjustmentRemarks; // 调整说明 @ApiModelProperty("使用组织sid") diff --git a/anrui-scm/anrui-scm-api/src/main/java/com/yxt/anrui/scm/api/scmcollectionrebate/ScmCollectionRebateDetailsVo.java b/anrui-scm/anrui-scm-api/src/main/java/com/yxt/anrui/scm/api/scmcollectionrebate/ScmCollectionRebateDetailsVo.java index 47d540c0c4..61c1cbb135 100644 --- a/anrui-scm/anrui-scm-api/src/main/java/com/yxt/anrui/scm/api/scmcollectionrebate/ScmCollectionRebateDetailsVo.java +++ b/anrui-scm/anrui-scm-api/src/main/java/com/yxt/anrui/scm/api/scmcollectionrebate/ScmCollectionRebateDetailsVo.java @@ -35,6 +35,7 @@ import io.swagger.annotations.ApiModel; import io.swagger.annotations.ApiModelProperty; import lombok.Data; +import java.math.BigDecimal; import java.util.Date; import java.util.List; @@ -66,6 +67,10 @@ public class ScmCollectionRebateDetailsVo implements Vo { private Date createTime; // 创建日期 @ApiModelProperty("备注") private String remarks; // 备注 + @ApiModelProperty("采购系统sid") + private String purchaseSystemSid; + @ApiModelProperty("采购系统名称") + private String purchaseSystemName; @ApiModelProperty("品牌sid") private String brandSid; // 品牌sid @ApiModelProperty("品牌名称") @@ -81,23 +86,33 @@ public class ScmCollectionRebateDetailsVo implements Vo { @ApiModelProperty("厂家收款账号") private String manufaBankAccount; // 厂家收款账号 @ApiModelProperty("回款金额") - private String collectionMoney; // 回款金额 + private BigDecimal collectionMoney; // 回款金额 @ApiModelProperty("运费") - private String freight; // 运费 + private BigDecimal freight; // 运费 @ApiModelProperty("回款日期") - private String collectionDate; // 回款日期 + @JsonFormat(pattern = "yyyy-MM-dd", timezone = "GMT+8") + private Date collectionDate; // 回款日期 + @ApiModelProperty("上装金额") + private BigDecimal topAmount; + @ApiModelProperty("返利类型key") + private String rebateTypeKey; // 返利类型key + @ApiModelProperty("返利类型value") + private String rebateTypeValue; // 返利类型value + @ApiModelProperty("返利名称") + private String rebateName; @ApiModelProperty("计算标准") private String calculationStandard; // 计算标准 @ApiModelProperty("预计返利") - private String estimateRebate; // 预计返利 + private BigDecimal estimateRebate; // 预计返利 @ApiModelProperty("预提日期") private String withholdingDate; // 预提日期 @ApiModelProperty("上传日期") - private String uploadDate; // 上传日期 + @JsonFormat(pattern = "yyyy-MM-dd", timezone = "GMT+8") + private Date uploadDate; // 上传日期 @ApiModelProperty("上传金额") - private String uploadMoney; // 上传金额 + private BigDecimal uploadMoney; // 上传金额 @ApiModelProperty("调整金额") - private String adjustmentMoney; // 调整金额 + private BigDecimal adjustmentMoney; // 调整金额 @ApiModelProperty("调整说明") private String adjustmentRemarks; // 调整说明 @ApiModelProperty("使用组织sid") diff --git a/anrui-scm/anrui-scm-api/src/main/java/com/yxt/anrui/scm/api/scmcollectionrebate/ScmCollectionRebateDto.java b/anrui-scm/anrui-scm-api/src/main/java/com/yxt/anrui/scm/api/scmcollectionrebate/ScmCollectionRebateDto.java index 9ae7c24044..82568b2e62 100644 --- a/anrui-scm/anrui-scm-api/src/main/java/com/yxt/anrui/scm/api/scmcollectionrebate/ScmCollectionRebateDto.java +++ b/anrui-scm/anrui-scm-api/src/main/java/com/yxt/anrui/scm/api/scmcollectionrebate/ScmCollectionRebateDto.java @@ -26,6 +26,7 @@ package com.yxt.anrui.scm.api.scmcollectionrebate; +import com.fasterxml.jackson.annotation.JsonFormat; import com.yxt.anrui.scm.api.scmcollectionrebateveh.ScmCollectionRebateVehDto; import com.yxt.common.core.dto.Dto; @@ -33,6 +34,8 @@ import io.swagger.annotations.ApiModel; import io.swagger.annotations.ApiModelProperty; import lombok.Data; +import java.math.BigDecimal; +import java.util.Date; import java.util.List; /** @@ -60,6 +63,10 @@ public class ScmCollectionRebateDto implements Dto { private String state; // 状态 @ApiModelProperty("备注") private String remarks; // 备注 + @ApiModelProperty("采购系统sid") + private String purchaseSystemSid; + @ApiModelProperty("采购系统名称") + private String purchaseSystemName; @ApiModelProperty("品牌sid") private String brandSid; // 品牌sid @ApiModelProperty("品牌名称") @@ -72,33 +79,41 @@ public class ScmCollectionRebateDto implements Dto { private String manufaSaleChannel; // 厂家销售通路key @ApiModelProperty("厂家销售通路value") private String manufaSaleChannelValue; // 厂家销售通路value - @ApiModelProperty("回款金额") - private String collectionMoney; // 回款金额 - @ApiModelProperty("运费") - private String freight; // 运费 - @ApiModelProperty("回款日期") + @ApiModelProperty("回款金额") + private BigDecimal collectionMoney; // 回款金额 + @ApiModelProperty("运费") + private BigDecimal freight; // 运费 + @ApiModelProperty("回款日期") private String collectionDate; // 回款日期 - @ApiModelProperty("计算标准") + @ApiModelProperty("上装金额") + private BigDecimal topAmount; + @ApiModelProperty("返利类型key") + private String rebateTypeKey; // 返利类型key + @ApiModelProperty("返利类型value") + private String rebateTypeValue; // 返利类型value + @ApiModelProperty("返利名称") + private String rebateName; + @ApiModelProperty("计算标准") private String calculationStandard; // 计算标准 - @ApiModelProperty("预计返利") - private String estimateRebate; // 预计返利 - @ApiModelProperty("预提日期") + @ApiModelProperty("预计返利") + private BigDecimal estimateRebate; // 预计返利 + @ApiModelProperty("预提日期") private String withholdingDate; // 预提日期 - @ApiModelProperty("上传日期") + @ApiModelProperty("上传日期") private String uploadDate; // 上传日期 - @ApiModelProperty("上传金额") - private String uploadMoney; // 上传金额 - @ApiModelProperty("调整金额") - private String adjustmentMoney; // 调整金额 - @ApiModelProperty("调整说明") + @ApiModelProperty("上传金额") + private BigDecimal uploadMoney; // 上传金额 + @ApiModelProperty("调整金额") + private BigDecimal adjustmentMoney; // 调整金额 + @ApiModelProperty("调整说明") private String adjustmentRemarks; // 调整说明 - @ApiModelProperty("使用组织sid") + @ApiModelProperty("使用组织sid") private String useOrgSid; // 使用组织sid - @ApiModelProperty("使用组织名称") + @ApiModelProperty("使用组织名称") private String useOrgName; // 使用组织名称 - @ApiModelProperty("创建组织sid") + @ApiModelProperty("创建组织sid") private String createOrgSid; // 创建组织sid - @ApiModelProperty("创建组织名称") + @ApiModelProperty("创建组织名称") private String createOrgName; // 创建组织名称 @ApiModelProperty("是否减运费") private String isReduceFreight; // 是否减运费 diff --git a/anrui-scm/anrui-scm-api/src/main/java/com/yxt/anrui/scm/api/scmcollectionrebate/ScmCollectionRebateQuery.java b/anrui-scm/anrui-scm-api/src/main/java/com/yxt/anrui/scm/api/scmcollectionrebate/ScmCollectionRebateQuery.java index c9b525b1b0..9341bbdfd2 100644 --- a/anrui-scm/anrui-scm-api/src/main/java/com/yxt/anrui/scm/api/scmcollectionrebate/ScmCollectionRebateQuery.java +++ b/anrui-scm/anrui-scm-api/src/main/java/com/yxt/anrui/scm/api/scmcollectionrebate/ScmCollectionRebateQuery.java @@ -51,18 +51,34 @@ import java.util.List; @ApiModel(value = "回款返利表 查询条件", description = "回款返利表 查询条件") public class ScmCollectionRebateQuery implements Query { + @ApiModelProperty("分公司") + private String createOrgName; + @ApiModelProperty("采购系统名称") + private String purchaseSystemName; + @ApiModelProperty("品牌名称") + private String brandName; @ApiModelProperty("回款方式key") private String collectionTypeKey; @ApiModelProperty("回款开始日期") private String collectionStartDate; @ApiModelProperty("回款结束日期") private String collectionEndDate; + @ApiModelProperty("返利类型key") + private String rebateTypeKey; + @ApiModelProperty("返利名称") + private String rebateName; + @ApiModelProperty("状态") + private String state; + @ApiModelProperty("上传开始日期") + private String uploadStartDate; + @ApiModelProperty("上传结束日期") + private String uploadEndDate; @ApiModelProperty("创建开始日期") private String createStartTime; @ApiModelProperty("创建结束日期") private String createEndTime; - private String createOrgSid; + private String createOrgSid; private String userSid; private String orgPath; private String menuUrl; diff --git a/anrui-scm/anrui-scm-api/src/main/java/com/yxt/anrui/scm/api/scmcollectionrebate/ScmCollectionRebateVo.java b/anrui-scm/anrui-scm-api/src/main/java/com/yxt/anrui/scm/api/scmcollectionrebate/ScmCollectionRebateVo.java index 96f2680b7c..c4d67fd72f 100644 --- a/anrui-scm/anrui-scm-api/src/main/java/com/yxt/anrui/scm/api/scmcollectionrebate/ScmCollectionRebateVo.java +++ b/anrui-scm/anrui-scm-api/src/main/java/com/yxt/anrui/scm/api/scmcollectionrebate/ScmCollectionRebateVo.java @@ -33,6 +33,7 @@ import io.swagger.annotations.ApiModel; import io.swagger.annotations.ApiModelProperty; import lombok.Data; +import java.math.BigDecimal; import java.util.Date; /** @@ -56,6 +57,10 @@ public class ScmCollectionRebateVo implements Vo { @ApiModelProperty("状态") private String state; + @ApiModelProperty("分公司") + private String createOrgName; + @ApiModelProperty("采购系统名称") + private String purchaseSystemName; @ApiModelProperty("品牌名称") private String brandName; @ApiModelProperty("回款方式value") @@ -63,26 +68,33 @@ public class ScmCollectionRebateVo implements Vo { @ApiModelProperty("厂家回款通路") private String manufaSaleChannelValue; @ApiModelProperty("回款金额") - private String collectionMoney; + private BigDecimal collectionMoney; // 回款金额 @ApiModelProperty("运费") - private String freight; + private BigDecimal freight; // 运费 @ApiModelProperty("回款日期") - private String collectionDate; + @JsonFormat(pattern = "yyyy-MM-dd", timezone = "GMT+8") + private Date collectionDate; // 回款日期 + @ApiModelProperty("上装金额") + private BigDecimal topAmount; + @ApiModelProperty("返利类型value") + private String rebateTypeValue; // 返利类型value + @ApiModelProperty("返利名称") + private String rebateName; @ApiModelProperty("计算标准") - private String calculationStandard; + private String calculationStandard; // 计算标准 @ApiModelProperty("预计返利") - private String estimateRebate; + private BigDecimal estimateRebate; // 预计返利 @ApiModelProperty("预提日期") - private String withholdingDate; + private String withholdingDate; // 预提日期 @ApiModelProperty("上传日期") - private String uploadDate; + @JsonFormat(pattern = "yyyy-MM-dd", timezone = "GMT+8") + private Date uploadDate; // 上传日期 @ApiModelProperty("上传金额") - private String uploadMoney; + private BigDecimal uploadMoney; // 上传金额 @ApiModelProperty("调整金额") - private String adjustmentMoney; + private BigDecimal adjustmentMoney; // 调整金额 @ApiModelProperty("调整说明") - private String adjustmentRemarks; - + private String adjustmentRemarks; // 调整说明 /*其他返回参数*/ @ApiModelProperty("品牌sid") private String brandSid; diff --git a/anrui-scm/anrui-scm-biz/src/main/java/com/yxt/anrui/scm/biz/scmcollectionrebate/ScmCollectionRebateService.java b/anrui-scm/anrui-scm-biz/src/main/java/com/yxt/anrui/scm/biz/scmcollectionrebate/ScmCollectionRebateService.java index e564aed1fc..5ce3c4828a 100644 --- a/anrui-scm/anrui-scm-biz/src/main/java/com/yxt/anrui/scm/biz/scmcollectionrebate/ScmCollectionRebateService.java +++ b/anrui-scm/anrui-scm-biz/src/main/java/com/yxt/anrui/scm/biz/scmcollectionrebate/ScmCollectionRebateService.java @@ -50,6 +50,7 @@ import com.yxt.common.core.vo.PagerVo; import org.springframework.beans.factory.annotation.Autowired; import org.springframework.stereotype.Service; +import java.math.BigDecimal; import java.util.ArrayList; import java.util.Date; import java.util.List; @@ -125,15 +126,34 @@ public class ScmCollectionRebateService extends MybatisBaseService=" + "'" + withholdingStartDate + "'"). + apply(StringUtils.isNotBlank(withholdingEndDate), "withholdingDate <=" + "'" + withholdingEndDate + "'"); String collectionStartDate = query.getCollectionStartDate(); String collectionEndDate = query.getCollectionEndDate(); qw.apply(StringUtils.isNotBlank(collectionStartDate), "date_format (collectionDate,'%Y-%m-%d') >= date_format('" + collectionStartDate + "','%Y-%m-%d')"). apply(StringUtils.isNotBlank(collectionEndDate), "date_format (collectionDate,'%Y-%m-%d') <= date_format('" + collectionEndDate + "','%Y-%m-%d')" ); - String createStartTime = query.getCreateStartTime(); - String createEndTime = query.getCreateEndTime(); - qw.apply(StringUtils.isNotEmpty(createStartTime), "date_format (createTime,'%Y-%m-%d') >= date_format('" + createStartTime + "','%Y-%m-%d')"). - apply(StringUtils.isNotEmpty(createEndTime), "date_format (createTime,'%Y-%m-%d') <= date_format('" + createEndTime + "','%Y-%m-%d')" + String uploadStartDate = query.getUploadStartDate(); + String uploadEndDate = query.getUploadEndDate(); + qw.apply(StringUtils.isNotEmpty(uploadStartDate), "date_format (uploadDate,'%Y-%m-%d') >= date_format('" + uploadStartDate + "','%Y-%m-%d')"). + apply(StringUtils.isNotEmpty(uploadEndDate), "date_format (uploadDate,'%Y-%m-%d') <= date_format('" + uploadEndDate + "','%Y-%m-%d')" ); IPage page = PagerUtil.queryToPage(pq); IPage pagging = baseMapper.selectPageVo(page, qw); @@ -159,7 +179,7 @@ public class ScmCollectionRebateService extends MybatisBaseService records = pagging.getRecords(); for (ScmCollectionRebateVo record : records) { //上传状态：未上传 - if (StringUtils.isBlank(record.getUploadDate()) && StringUtils.isBlank(record.getUploadMoney())) { + if (record.getUploadDate() == null) { record.setUploadState("2"); - } - //上传状态：已上传 - if (StringUtils.isNotBlank(record.getUploadDate()) && StringUtils.isNotBlank(record.getUploadMoney())) { + }else { + //上传状态：已上传 record.setUploadState("3"); } String withholdingDate = record.getWithholdingDate(); @@ -338,8 +357,8 @@ public class ScmCollectionRebateService extends MybatisBaseService qw = new QueryWrapper<>(); //========================================数据授权开始 - if (StringUtils.isNotBlank(query.getMenuUrl())) { + if (StringUtils.isBlank(query.getOrgPath())){ + qw.eq("createOrgSid", query.getCreateOrgSid()); + }else if (StringUtils.isNotBlank(query.getMenuUrl())) { PrivilegeQuery privilegeQuery = new PrivilegeQuery(); privilegeQuery.setOrgPath(query.getOrgPath()); privilegeQuery.setMenuUrl(query.getMenuUrl()); diff --git a/yxt-as/src/main/java/com/yxt/anrui/as/biz/astechtitle/AsTechTitleRest.java b/yxt-as/src/main/java/com/yxt/anrui/as/biz/astechtitle/AsTechTitleRest.java index 21f1d2e6ea..4d3dbc3ee3 100644 --- a/yxt-as/src/main/java/com/yxt/anrui/as/biz/astechtitle/AsTechTitleRest.java +++ b/yxt-as/src/main/java/com/yxt/anrui/as/biz/astechtitle/AsTechTitleRest.java @@ -76,9 +76,7 @@ public class AsTechTitleRest { @ApiOperation("根据sid批量删除") @DeleteMapping("/delBySids") public ResultBean delBySids(@RequestBody String[] sids){ - ResultBean rb = ResultBean.fireFail(); - asTechTitleService.delete(sids); - return rb.success(); + return asTechTitleService.delete(sids); } @ApiOperation("根据SID获取一条记录") diff --git a/yxt-as/src/main/java/com/yxt/anrui/as/biz/astechtitle/AsTechTitleService.java b/yxt-as/src/main/java/com/yxt/anrui/as/biz/astechtitle/AsTechTitleService.java index e43f2d84b4..a0a63e3d8a 100644 --- a/yxt-as/src/main/java/com/yxt/anrui/as/biz/astechtitle/AsTechTitleService.java +++ b/yxt-as/src/main/java/com/yxt/anrui/as/biz/astechtitle/AsTechTitleService.java @@ -28,6 +28,7 @@ package com.yxt.anrui.as.biz.astechtitle; import cn.hutool.core.bean.BeanUtil; import com.baomidou.mybatisplus.core.conditions.query.QueryWrapper; import com.baomidou.mybatisplus.core.metadata.IPage; +import com.baomidou.mybatisplus.extension.api.R; import com.yxt.anrui.as.api.asservicegroup.AsServiceGroup; import com.yxt.anrui.as.biz.astechtitleapply.AsTechTitleApplyService; import com.yxt.anrui.as.feign.portal.privilege.PrivilegeQuery; @@ -211,13 +212,17 @@ public class AsTechTitleService extends MybatisBaseService