From 39976aa4644092389a97bf89a35ee81b9f7b6b22 Mon Sep 17 00:00:00 2001 From: dimengzhe <251008545@qq.com> Date: Thu, 12 Jan 2023 16:55:53 +0800 Subject: [PATCH] =?UTF-8?q?=E4=BF=AE=E6=94=B9=E9=97=AE=E9=A2=98?= MIME-Version: 1.0 Content-Type: text/plain; charset=UTF-8 Content-Transfer-Encoding: 8bit --- .../basevehicle/AppCarConfigSummaryDto.java | 2 + .../BusVehicleInquiryService.java | 36 ++++-- .../bussalesorder/BusSalesOrderService.java | 4 +- .../BusSalesOrderModelMapper.xml | 2 +- .../FinCollectionConfirmationService.java | 119 +----------------- ...UncollectedReceivablesDetailedService.java | 3 + 6 files changed, 34 insertions(+), 132 deletions(-) diff --git a/anrui-base/anrui-base-api/src/main/java/com/yxt/anrui/base/api/basevehicle/AppCarConfigSummaryDto.java b/anrui-base/anrui-base-api/src/main/java/com/yxt/anrui/base/api/basevehicle/AppCarConfigSummaryDto.java index 31df701a22..bd1fddcc38 100644 --- a/anrui-base/anrui-base-api/src/main/java/com/yxt/anrui/base/api/basevehicle/AppCarConfigSummaryDto.java +++ b/anrui-base/anrui-base-api/src/main/java/com/yxt/anrui/base/api/basevehicle/AppCarConfigSummaryDto.java @@ -32,5 +32,7 @@ public class AppCarConfigSummaryDto implements Dto { private String choiceConfig; @ApiModelProperty("换装") private String changeConfig; + + private String orgPath; } diff --git a/anrui-base/anrui-base-biz/src/main/java/com/yxt/anrui/base/biz/busvehicleinquiry/BusVehicleInquiryService.java b/anrui-base/anrui-base-biz/src/main/java/com/yxt/anrui/base/biz/busvehicleinquiry/BusVehicleInquiryService.java index 08969ddaf1..fcab38ddd9 100644 --- a/anrui-base/anrui-base-biz/src/main/java/com/yxt/anrui/base/biz/busvehicleinquiry/BusVehicleInquiryService.java +++ b/anrui-base/anrui-base-biz/src/main/java/com/yxt/anrui/base/biz/busvehicleinquiry/BusVehicleInquiryService.java @@ -31,24 +31,26 @@ import com.baomidou.mybatisplus.core.metadata.IPage; import com.yxt.anrui.base.api.basemodelconfig.BaseModelConfig; import com.yxt.anrui.base.api.basevehicle.AppCarConfigSummaryDto; import com.yxt.anrui.base.api.basevehiclemodel.BaseVehicleModel; -import com.yxt.anrui.base.api.busvehicleinquiry.*; +import com.yxt.anrui.base.api.busvehicleinquiry.BusVehicleInquiry; +import com.yxt.anrui.base.api.busvehicleinquiry.BusVehicleInquiryDto; +import com.yxt.anrui.base.api.busvehicleinquiry.BusVehicleInquiryQuery; +import com.yxt.anrui.base.api.busvehicleinquiry.BusVehicleInquiryVo; import com.yxt.anrui.base.biz.basemodelconfig.BaseModelConfigService; import com.yxt.anrui.base.biz.basevehiclemodel.BaseVehicleModelService; -import com.yxt.anrui.portal.api.sysorganization.SysOrganizationFeign; +import com.yxt.anrui.portal.api.sysstafforg.SysStaffOrgFeign; import com.yxt.anrui.portal.api.sysuser.SysUserFeign; +import com.yxt.anrui.portal.api.sysuser.SysUserVo; import com.yxt.anrui.portal.api.sysuser.app.AppUserOrgInfoVo; -import org.apache.commons.lang3.StringUtils; import com.yxt.common.base.service.MybatisBaseService; import com.yxt.common.base.utils.PagerUtil; import com.yxt.common.core.query.PagerQuery; +import com.yxt.common.core.result.ResultBean; import com.yxt.common.core.vo.PagerVo; - +import org.apache.commons.lang3.StringUtils; import org.springframework.beans.factory.annotation.Autowired; import org.springframework.stereotype.Service; import org.springframework.transaction.annotation.Transactional; -import javax.xml.crypto.Data; -import java.text.SimpleDateFormat; import java.util.Date; import java.util.List; @@ -76,6 +78,8 @@ public class BusVehicleInquiryService extends MybatisBaseService listPageVo(PagerQuery pq) { BusVehicleInquiryQuery query = pq.getParams(); @@ -132,12 +136,20 @@ public class BusVehicleInquiryService extends MybatisBaseService userVoResultBean = sysUserFeign.fetchBySid(dto.getUserSid()); + if(userVoResultBean.getData() != null){ + busVehicleInquiry.setInquirer(userVoResultBean.getData().getName()); + } + }else{ + String userSid = dto.getUserSid(); + AppUserOrgInfoVo data = sysUserFeign.getUserOrgInfoByUserSid(userSid).getData(); + busVehicleInquiry.setInquirer(data.getStaffName()); + busVehicleInquiry.setCreateOrgSid(data.getOrgSid()); + } busVehicleInquiry.setCreateTime(new Date()); BaseVehicleModel baseVehicleModel = baseVehicleModelService.fetchBySid(dto.getModelSid()); busVehicleInquiry.setBrandSid(baseVehicleModel.getCarBrand()); diff --git a/anrui-buscenter/anrui-buscenter-biz/src/main/java/com/yxt/anrui/buscenter/biz/bussalesorder/BusSalesOrderService.java b/anrui-buscenter/anrui-buscenter-biz/src/main/java/com/yxt/anrui/buscenter/biz/bussalesorder/BusSalesOrderService.java index 9b23ad7ee0..46ac0d3017 100644 --- a/anrui-buscenter/anrui-buscenter-biz/src/main/java/com/yxt/anrui/buscenter/biz/bussalesorder/BusSalesOrderService.java +++ b/anrui-buscenter/anrui-buscenter-biz/src/main/java/com/yxt/anrui/buscenter/biz/bussalesorder/BusSalesOrderService.java @@ -2790,7 +2790,7 @@ public class BusSalesOrderService extends MybatisBaseService imagess = Arrays.asList(imagesFile.split(",")); @@ -2980,6 +2980,8 @@ public class BusSalesOrderService extends MybatisBaseService finSelectedReceivablesDetailedVos1 = finSelectedReceivablesDetailedService.fetchByAuditState1(sid, 1, "车款"); - finSelectedReceivablesDetailedVos1.removeAll(Collections.singleton(null)); - if (!finSelectedReceivablesDetailedVos1.isEmpty()) { - for (FinSelectedReceivablesDetailedVo finSelectedReceivablesDetailedVo : finSelectedReceivablesDetailedVos1) { - //先推送客户 - BdCustomer bdCustomer = createBdCustomer(confirmation.getUseOrgSid(), finSelectedReceivablesDetailedVo.getCustomerName(), finSelectedReceivablesDetailedVo.getCustomerPhone()); - ResultBean resultBeanMiddle = bdCustomerService.draftBdCustomer(bdCustomer); - //往来单位 - arReceivebill.setFCONTACTUNIT(bdCustomer.getFNumber()); - //结算方式 - freceivebillentry.setFSETTLETYPEIDKey(confirmation.getCollectionTypeKey()); - freceivebillentry.setFSETTLETYPEIDType("customerPayType"); - //收款金额 - freceivebillentry.setFRECTOTALAMOUNTFOR(finSelectedReceivablesDetailedVo.getSumAll()); - //登记日期 - freceivebillentry.setFPOSTDATE(confirmation.getCollectionDate()); - //收款用途 - freceivebillentry.setFPURPOSEIDKey("001"); - freceivebillentry.setFPURPOSEIDType("cw_skyt"); - freceivebillentry.setFACCOUNTID(confirmation.getCollectionBankNum()); - fEntityList.add(freceivebillentry); - //项目类别key、value - arReceivebill.setF_PAEZ_AssistantType("cw_sklb"); - FinUncollectedReceivablesDetailed finUncollectedReceivablesDetailed = finUncollectedReceivablesDetailedService.fetchBySid(finSelectedReceivablesDetailedVos1.get(0).getReceivablesSid()); - if ("1".equals(finUncollectedReceivablesDetailed.getPayTypeKey())) { - arReceivebill.setF_PAEZ_AssistantKey("001"); - } else if ("2".equals(finUncollectedReceivablesDetailed.getPayTypeKey())) { - arReceivebill.setF_PAEZ_AssistantKey("002"); - } - - arReceivebill.setFRECEIVEBILLENTRY(fEntityList); - ResultBean resultBean1 = arReceivebillService.draftArReceivebill(arReceivebill); - - } - }*/ - + //推送订金 if (finSelectedReceivablesDetailedVos2.size() > 0) { voListv = finSelectedReceivablesDetailedService.selectDetailsList(sid, 1, "订金"); //查询是否含有车架号 @@ -1617,38 +1581,7 @@ public class FinCollectionConfirmationService extends MybatisBaseService finSelectedReceivablesDetailedVos2 = finSelectedReceivablesDetailedService.fetchByAuditState1(sid, 1, "订金"); - fEntityList = new ArrayList<>(); - freceivebillentry = new ARReceivebill.FRECEIVEBILLENTRY(); - finSelectedReceivablesDetailedVos2.removeAll(Collections.singleton(null)); - if (!finSelectedReceivablesDetailedVos2.isEmpty()) { - for (FinSelectedReceivablesDetailedVo finSelectedReceivablesDetailedVo : finSelectedReceivablesDetailedVos2) { - //先推送客户 - BdCustomer bdCustomer = createBdCustomer(confirmation.getUseOrgSid(), finSelectedReceivablesDetailedVo.getCustomerName(), finSelectedReceivablesDetailedVo.getCustomerPhone()); - ResultBean resultBeanMiddle = bdCustomerService.draftBdCustomer(bdCustomer); - //往来单位 - arReceivebill.setFCONTACTUNIT(bdCustomer.getFNumber()); - //结算方式 - freceivebillentry.setFSETTLETYPEIDKey(confirmation.getCollectionTypeKey()); - freceivebillentry.setFSETTLETYPEIDType("customerPayType"); - //收款金额 - freceivebillentry.setFRECTOTALAMOUNTFOR(finSelectedReceivablesDetailedVo.getSumAll()); - //登记日期 - freceivebillentry.setFPOSTDATE(confirmation.getCollectionDate()); - //收款用途 - freceivebillentry.setFPURPOSEIDKey("002"); - freceivebillentry.setFPURPOSEIDType("cw_skyt"); - freceivebillentry.setFACCOUNTID(confirmation.getCollectionBankNum()); - fEntityList.add(freceivebillentry); - arReceivebill.setFRECEIVEBILLENTRY(fEntityList); - //项目类别key、value - arReceivebill.setF_PAEZ_AssistantType("cw_sklb"); - arReceivebill.setF_PAEZ_AssistantKey("006"); - ResultBean resultBean2 = arReceivebillService.draftArReceivebill(arReceivebill); - } - }*/ //简易订单-订金收取 if (finSelectedReceivablesDetailedVos1.isEmpty() && finSelectedReceivablesDetailedVos2.isEmpty()) { //先推送客户 @@ -1769,56 +1702,6 @@ public class FinCollectionConfirmationService extends MybatisBaseService finSelectedReceivablesDetailedVos = finSelectedReceivablesDetailedService.fetchByAuditState(sid, auditState); - for (FinSelectedReceivablesDetailedVo finSelectedReceivablesDetailedVo : finSelectedReceivablesDetailedVos) { - String sid1 = finSelectedReceivablesDetailedVo.getSid(); -// finSelectedReceivablesDetailedService.cashierConfirm(sid1); - //更新审核时间 - finSelectedReceivablesDetailedService.updateAuditDateBySid(sid1, "3"); - //认款金额 - BigDecimal subscriptionMoney = new BigDecimal(finSelectedReceivablesDetailedVo.getSubscriptionMoney()); - totalSubscriptionMoney = totalSubscriptionMoney.add(subscriptionMoney); - String vin = finSelectedReceivablesDetailedVo.getVIN(); - String receivablesName = finSelectedReceivablesDetailedVo.getReceivablesName(); - String useOrgSid = finSelectedReceivablesDetailedVo.getUseOrgSid(); - FinUncollectedReceivablesDetailedVo finUncollectedReceivablesDetailedVo = finUncollectedReceivablesDetailedService.fetchByVinAndRecName(vin, receivablesName); - String sid2 = finUncollectedReceivablesDetailedVo.getSid(); - //应收未收款项-当前应收金额 - BigDecimal currentReceivableMoney = new BigDecimal(finSelectedReceivablesDetailedVo.getCurrentReceivableMoney()); - //已选应收款项-认款金额 - BigDecimal subtract = currentReceivableMoney.subtract(subscriptionMoney); - finUncollectedReceivablesDetailedVo.setCurrentReceivableMoney(String.format("%.0f", subtract)); - FinUncollectedReceivablesDetailedDto finUncollectedReceivablesDetailedDto = new FinUncollectedReceivablesDetailedDto(); - BeanUtil.copyProperties(finUncollectedReceivablesDetailedVo, finUncollectedReceivablesDetailedDto); - finUncollectedReceivablesDetailedService.updateBySid(finUncollectedReceivablesDetailedDto, finUncollectedReceivablesDetailedDto.getSid()); - if (subtract.compareTo(BigDecimal.ZERO) == 0) { - int subscriptionState = 3; - finUncollectedReceivablesDetailedService.updateSubscriptionStateBySid(sid2, subscriptionState); - } else { - int subscriptionState = 2; - finUncollectedReceivablesDetailedService.updateSubscriptionStateBySid(sid2, subscriptionState); - } - } - FinCollectionConfirmation finCollectionConfirmation = fetchBySid(sid); - BigDecimal collectionMoney = finCollectionConfirmation.getCollectionMoney(); - BigDecimal subtract = collectionMoney.subtract(totalSubscriptionMoney); - if (subtract.compareTo(BigDecimal.ZERO) == 0) { - int paymentState = 3; - baseMapper.updatePaymentStateBySid(sid, paymentState); - } else { - int paymentState = 2; - baseMapper.updatePaymentStateBySid(sid, paymentState); - } - //更新余额 - BigDecimal balanceBigDecimal = confirmation.getBalance().subtract(totalSubscriptionMoney); - baseMapper.updateBalanceBySid(sid, balanceBigDecimal); - //删除临时表的数据 - ResultBean deleteResult = baseVehicleTempstateFeign.delByBusSid(sid);*/ return rb.success().setMsg("款项确认成功"); } diff --git a/anrui-fin/anrui-fin-biz/src/main/java/com/yxt/anrui/fin/biz/finuncollectedreceivablesdetailed/FinUncollectedReceivablesDetailedService.java b/anrui-fin/anrui-fin-biz/src/main/java/com/yxt/anrui/fin/biz/finuncollectedreceivablesdetailed/FinUncollectedReceivablesDetailedService.java index fa0308a606..c33c06d65d 100644 --- a/anrui-fin/anrui-fin-biz/src/main/java/com/yxt/anrui/fin/biz/finuncollectedreceivablesdetailed/FinUncollectedReceivablesDetailedService.java +++ b/anrui-fin/anrui-fin-biz/src/main/java/com/yxt/anrui/fin/biz/finuncollectedreceivablesdetailed/FinUncollectedReceivablesDetailedService.java @@ -183,9 +183,12 @@ public class FinUncollectedReceivablesDetailedService extends MybatisBaseService if (resultBean.getData() != null) { String vinNo = resultBean.getData().getLinkNo(); String vinSid = resultBean.getData().getLinkSid(); + String temporaryNo = resultBean.getData().getTemporaryNo(); v.setVIN(vinNo); if(StringUtils.isNotBlank(vinNo)){ v.setVIN(vinNo.substring(vinNo.length()-8)); + }else{ + v.setVIN(temporaryNo); } } }