From dda10060b0c6ac4c50fb6307443f2e30ed4590eb Mon Sep 17 00:00:00 2001 From: dimengzhe <251008545@qq.com> Date: Mon, 19 Sep 2022 15:37:44 +0800 Subject: [PATCH] =?UTF-8?q?pc=E7=AB=AF=E6=9C=AA=E5=94=AE=E4=B9=B0=E6=96=AD?= =?UTF-8?q?=E4=BF=AE=E6=94=B9?= MIME-Version: 1.0 Content-Type: text/plain; charset=UTF-8 Content-Transfer-Encoding: 8bit --- .../BaseVehicleActualDetailsMapper.xml | 6 ++++- .../BaseVehicleActualDetailsService.java | 5 ++++ .../BaseVehicleActualPayService.java | 15 +++++++---- .../BaseVehicleActualSalesService.java | 27 +++++++++++++++++++ 4 files changed, 47 insertions(+), 6 deletions(-) diff --git a/anrui-base/anrui-base-biz/src/main/java/com/yxt/anrui/base/biz/basevehicleactualdetails/BaseVehicleActualDetailsMapper.xml b/anrui-base/anrui-base-biz/src/main/java/com/yxt/anrui/base/biz/basevehicleactualdetails/BaseVehicleActualDetailsMapper.xml index 0e1b17297c..f3c4b32d85 100644 --- a/anrui-base/anrui-base-biz/src/main/java/com/yxt/anrui/base/biz/basevehicleactualdetails/BaseVehicleActualDetailsMapper.xml +++ b/anrui-base/anrui-base-biz/src/main/java/com/yxt/anrui/base/biz/basevehicleactualdetails/BaseVehicleActualDetailsMapper.xml @@ -22,7 +22,11 @@ insideCode, vehicleNum, dayNum, - actualMoney + actualMoney, + vehicleVersionValue, + fuelTypeValue, + gearboxTypeValue, + emissionStandardValue from base_vehicle_actual_details where vehicleActualSid = #{sid} diff --git a/anrui-base/anrui-base-biz/src/main/java/com/yxt/anrui/base/biz/basevehicleactualdetails/BaseVehicleActualDetailsService.java b/anrui-base/anrui-base-biz/src/main/java/com/yxt/anrui/base/biz/basevehicleactualdetails/BaseVehicleActualDetailsService.java index ee123d0010..576e8de5c2 100644 --- a/anrui-base/anrui-base-biz/src/main/java/com/yxt/anrui/base/biz/basevehicleactualdetails/BaseVehicleActualDetailsService.java +++ b/anrui-base/anrui-base-biz/src/main/java/com/yxt/anrui/base/biz/basevehicleactualdetails/BaseVehicleActualDetailsService.java @@ -5,11 +5,13 @@ import com.yxt.anrui.base.api.basevehicleactualdetails.BaseVehicleActualDetails; import com.yxt.anrui.base.api.basevehicleactualdetails.BaseVehicleActualDetailsDto; import com.yxt.anrui.base.api.basevehicleactualdetails.BaseVehicleActualDetailsVo; import com.yxt.common.base.service.MybatisBaseService; +import com.yxt.common.base.utils.StringUtils; import com.yxt.common.core.result.ResultBean; import org.springframework.beans.BeanUtils; import org.springframework.stereotype.Service; import org.springframework.transaction.annotation.Transactional; +import java.math.BigDecimal; import java.util.Arrays; import java.util.List; @@ -34,6 +36,9 @@ public class BaseVehicleActualDetailsService extends MybatisBaseService detailsPayList, String sid) { - BaseVehicleActualPay BaseVehicleActualPay = null; + BaseVehicleActualPay baseVehicleActualPay = null; for (BaseVehicleActualPayDto dto : detailsPayList) { - BaseVehicleActualPay = new BaseVehicleActualPay(); - BeanUtils.copyProperties(dto, BaseVehicleActualPay, "sid"); - BaseVehicleActualPay.setVehicleActualSid(sid); - save(BaseVehicleActualPay); + baseVehicleActualPay = new BaseVehicleActualPay(); + BeanUtils.copyProperties(dto, baseVehicleActualPay, "sid"); + baseVehicleActualPay.setVehicleActualSid(sid); + if(StringUtils.isNotBlank(dto.getPayAccount())){ + baseVehicleActualPay.setPayAccount(new BigDecimal(dto.getPayAccount())); + } + save(baseVehicleActualPay); } } diff --git a/anrui-base/anrui-base-biz/src/main/java/com/yxt/anrui/base/biz/basevehicleactualsales/BaseVehicleActualSalesService.java b/anrui-base/anrui-base-biz/src/main/java/com/yxt/anrui/base/biz/basevehicleactualsales/BaseVehicleActualSalesService.java index 841a1b1991..62b7a74539 100644 --- a/anrui-base/anrui-base-biz/src/main/java/com/yxt/anrui/base/biz/basevehicleactualsales/BaseVehicleActualSalesService.java +++ b/anrui-base/anrui-base-biz/src/main/java/com/yxt/anrui/base/biz/basevehicleactualsales/BaseVehicleActualSalesService.java @@ -447,6 +447,33 @@ public class BaseVehicleActualSalesService extends MybatisBaseService stringResultBean = messageFeign.pushMessage(messageFlowableQuery); + } else { + + /* if (busVehicleApply.getCurrentAmount() > 0) { + FinPaymentrecordDto finPaymentrecordDto = new FinPaymentrecordDto(); + finPaymentrecordDto.setApplySid(busVehicleApply.getSid()); + finPaymentrecordDto.setPayCompanySid(busVehicleApply.getCreateOrgSid()); + finPaymentrecordDto.setPayType(1); + finPaymentrecordDto.setCreateOrgSid(stringResultBean.getData()); + finPaymentrecordDto.setUseOrgSid(stringResultBean.getData()); + finPaymentrecordDto.setCost(busVehicleApply.getCurrentAmount().intValue()); + finPaymentrecordDto.setCostTitleKey(ManPurOrderType.CostTitle.DJ_COSTTITLE.getCode()); + finPaymentrecordDto.setCostTitleValue(ManPurOrderType.CostTitle.DJ_COSTTITLE.getRemarks()); + finPaymentrecordDto.setCostTypeKey("001"); + finPaymentrecordDto.setCostTypeValue("排产"); + //查询收款单位和收款账号 + List busVehicleApplyDetailList = busVehicleApplyDetailService.fetchByApplySid(busVehicleApply.getSid()); + String modelSid = busVehicleApplyDetailList.get(0).getVehicleSid(); + //根据车型sid查询账户名称和银行账号 + List busApplyVo = baseManufacturerBankService.selectByApplySid(modelSid); + busApplyVo.removeAll(Collections.singleton(null)); + if (!busApplyVo.isEmpty()) { + finPaymentrecordDto.setReceiveBankAccount(busApplyVo.get(0).getNum()); + finPaymentrecordDto.setReceiveCompany(busApplyVo.get(0).getName()); + } + finPaymentrecordDto.setBusSid(r.getData()); + finPaymentrecordFeign.save(finPaymentrecordDto); + }*/ } return rb.success().setData(resultBean.getData());