From e3f9f96783ca66424ec3a64103b6e1de45db5321 Mon Sep 17 00:00:00 2001 From: dimengzhe <251008545@qq.com> Date: Mon, 16 Jan 2023 17:43:52 +0800 Subject: [PATCH 1/2] =?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 --- .../api/basevehicle/BaseVehicleFeign.java | 2 - .../FinCollectionConfirmationService.java | 125 +++++++++++++++--- .../FinPaymentapplyService.java | 10 +- 3 files changed, 111 insertions(+), 26 deletions(-) diff --git a/anrui-base/anrui-base-api/src/main/java/com/yxt/anrui/base/api/basevehicle/BaseVehicleFeign.java b/anrui-base/anrui-base-api/src/main/java/com/yxt/anrui/base/api/basevehicle/BaseVehicleFeign.java index f1155799bc..0bf2e7d208 100644 --- a/anrui-base/anrui-base-api/src/main/java/com/yxt/anrui/base/api/basevehicle/BaseVehicleFeign.java +++ b/anrui-base/anrui-base-api/src/main/java/com/yxt/anrui/base/api/basevehicle/BaseVehicleFeign.java @@ -40,8 +40,6 @@ import java.util.Map; path = "v1/basevehicle", fallback = BaseVehicleFeignFallback.class) public interface BaseVehicleFeign { - scm/v1/scmwarehouse/fetchByUseOrgSid - /** * 分页列表 * diff --git a/anrui-fin/anrui-fin-biz/src/main/java/com/yxt/anrui/fin/biz/fincollectionconfirmation/FinCollectionConfirmationService.java b/anrui-fin/anrui-fin-biz/src/main/java/com/yxt/anrui/fin/biz/fincollectionconfirmation/FinCollectionConfirmationService.java index 06d5510c2c..09084010ce 100644 --- a/anrui-fin/anrui-fin-biz/src/main/java/com/yxt/anrui/fin/biz/fincollectionconfirmation/FinCollectionConfirmationService.java +++ b/anrui-fin/anrui-fin-biz/src/main/java/com/yxt/anrui/fin/biz/fincollectionconfirmation/FinCollectionConfirmationService.java @@ -179,10 +179,10 @@ public class FinCollectionConfirmationService extends MybatisBaseService listPageVo(PagerQuery pq) { FinCollectionConfirmationQuery query = pq.getParams(); - if(StringUtils.isNotBlank(query.getOrgPath())){ + if (StringUtils.isNotBlank(query.getOrgPath())) { String userOrgSid = sysStaffOrgFeign.getOrgSidByPath(query.getOrgPath()).getData(); query.setUseOrgSid(userOrgSid); - }else{ + } else { //根据用户sid查询分公司sid String createBySid = query.getCreateBySid(); String userOrgSid = sysStaffOrgFeign.getPathSidByUserSid(createBySid).getData(); @@ -284,10 +284,10 @@ public class FinCollectionConfirmationService extends MybatisBaseService userVoResultBean = sysUserFeign.fetchBySid(userSid); - if(userVoResultBean.getData() != null){ + if (userVoResultBean.getData() != null) { confirmation.setConfirmName(userVoResultBean.getData().getName()); } confirmation.setConfirmDate(DateUtil.today()); @@ -1259,7 +1259,7 @@ public class FinCollectionConfirmationService extends MybatisBaseService fEntityList = new ArrayList<>(); ARReceivebill.FRECEIVEBILLENTRY freceivebillentry = new ARReceivebill.FRECEIVEBILLENTRY(); //推送全款车款 - List finSelectedReceivablesDetailedVos1 = finSelectedReceivablesDetailedService.fetchByAuditState1(sid, 1, "车款","1"); + List finSelectedReceivablesDetailedVos1 = finSelectedReceivablesDetailedService.fetchByAuditState1(sid, 1, "车款", "1"); //推送全款订金 - List finSelectedReceivablesDetailedVos2 = finSelectedReceivablesDetailedService.fetchByAuditState1(sid, 1, "订金","1"); + List finSelectedReceivablesDetailedVos2 = finSelectedReceivablesDetailedService.fetchByAuditState1(sid, 1, "订金", "1"); List voListv = finSelectedReceivablesDetailedService.selectDetailsList(sid, 1, "车款"); //查询是否含有车架号 List stringsVin = voListv.stream().filter(v -> StringUtils.isNotBlank(v.getVIN())).map(v -> v.getVIN()).collect(Collectors.toList()); @@ -1486,10 +1486,10 @@ public class FinCollectionConfirmationService extends MybatisBaseService finSelectedReceivablesDetailedVos1_1 = finSelectedReceivablesDetailedService.fetchByAuditState1_1(sid, 1, "车款","2"); + List finSelectedReceivablesDetailedVos1_1 = finSelectedReceivablesDetailedService.fetchByAuditState1_1(sid, 1, "车款", "2"); finSelectedReceivablesDetailedVos1_1.removeAll(Collections.singleton(null)); - if(finSelectedReceivablesDetailedVos1_1.size()>0){ - for(int i = 0;i 0) { + for (int i = 0; i < finSelectedReceivablesDetailedVos1_1.size(); i++) { + FinSelectedReceivablesDetailedVo vvvv = finSelectedReceivablesDetailedVos1_1.get(i); + BdCustomer bdCustomer = createBdCustomer1(confirmation.getUseOrgSid(), vvvv.getCustomerName(), vvvv.getVIN(), sid); + ResultBean resultBeanMiddle = bdCustomerService.draftBdCustomer(bdCustomer); + //往来单位 + arReceivebill.setFCONTACTUNIT(bdCustomer.getFNumber()); + fEntityList = new ArrayList<>(); + String uncollSid = ""; + freceivebillentry = new ARReceivebill.FRECEIVEBILLENTRY(); + //结算方式 + freceivebillentry.setFSETTLETYPEIDKey(confirmation.getCollectionTypeKey()); + freceivebillentry.setFSETTLETYPEIDType("customerPayType"); + //收款金额 + freceivebillentry.setFRECTOTALAMOUNTFOR(vvvv.getSubscriptionMoney()); + //登记日期 + freceivebillentry.setFPOSTDATE(confirmation.getCollectionDate()); + freceivebillentry.setF_PAEZ_Base1(vvvv.getVIN().substring(vvvv.getVIN().length() - 8)); + //收款用途 + freceivebillentry.setFPURPOSEIDKey("001"); + freceivebillentry.setFPURPOSEIDType("cw_skyt"); + freceivebillentry.setFACCOUNTID(confirmation.getCollectionBankNum()); + fEntityList.add(freceivebillentry); + uncollSid = vvvv.getReceivablesSid(); + + //项目类别key、value + arReceivebill.setF_PAEZ_AssistantType("cw_sklb"); + FinUncollectedReceivablesDetailed finUncollectedReceivablesDetailed = finUncollectedReceivablesDetailedService.fetchBySid(uncollSid); + if ("1".equals(finUncollectedReceivablesDetailed.getPayTypeKey())) { + arReceivebill.setF_PAEZ_AssistantKey("001"); + } else if ("2".equals(finUncollectedReceivablesDetailed.getPayTypeKey())) { + arReceivebill.setF_PAEZ_AssistantKey("002"); + } + arReceivebill.setFRECEIVEBILLENTRY(fEntityList); + if (finSelectedReceivablesDetailedVos1_1.size() == 1 && finSelectedReceivablesDetailedVos1.size() == 0 && finSelectedReceivablesDetailedVos2.size() == 0) { + arReceivebill.setFBillNo(confirmation.getBillNo()); + } else { + //单据编号 + carSize = carSize + 1; + arReceivebill.setFBillNo(confirmation.getBillNo() + "-" + carSize); + } + ResultBean resultBean1 = arReceivebillService.draftArReceivebill(arReceivebill); } - - } //贷款推送订金 - List finSelectedReceivablesDetailedVos2_1 = finSelectedReceivablesDetailedService.fetchByAuditState1_1(sid, 1, "订金","2"); + List finSelectedReceivablesDetailedVos2_1 = finSelectedReceivablesDetailedService.fetchByAuditState1_1(sid, 1, "订金", "2"); finSelectedReceivablesDetailedVos2_1.removeAll(Collections.singleton(null)); - if(finSelectedReceivablesDetailedVos2_1.size()>0){ + if (finSelectedReceivablesDetailedVos2_1.size() > 0) { for (int i = 0; i < finSelectedReceivablesDetailedVos2_1.size(); i++) { + FinSelectedReceivablesDetailedVo vvvv = finSelectedReceivablesDetailedVos2_1.get(i); + //先推送客户 + BdCustomer bdCustomer = createBdCustomer1(confirmation.getUseOrgSid(), vvvv.getCustomerName(), vvvv.getVIN(), sid); + ResultBean resultBeanMiddle = bdCustomerService.draftBdCustomer(bdCustomer); + //往来单位 + arReceivebill.setFCONTACTUNIT(bdCustomer.getFNumber()); + fEntityList = new ArrayList<>(); + freceivebillentry = new ARReceivebill.FRECEIVEBILLENTRY(); + //结算方式 + freceivebillentry.setFSETTLETYPEIDKey(confirmation.getCollectionTypeKey()); + freceivebillentry.setFSETTLETYPEIDType("customerPayType"); + //收款金额 + freceivebillentry.setFRECTOTALAMOUNTFOR(vvvv.getSubscriptionMoney()); + //登记日期 + freceivebillentry.setFPOSTDATE(confirmation.getCollectionDate()); + freceivebillentry.setF_PAEZ_Base1(vvvv.getVIN().substring(vvvv.getVIN().length() - 8)); + //收款用途 + freceivebillentry.setFPURPOSEIDKey("002"); + freceivebillentry.setFPURPOSEIDType("cw_skyt"); + freceivebillentry.setFACCOUNTID(confirmation.getCollectionBankNum()); + fEntityList.add(freceivebillentry); + //项目类别key、value + arReceivebill.setF_PAEZ_AssistantType("cw_sklb"); + arReceivebill.setF_PAEZ_AssistantKey("006"); + arReceivebill.setFRECEIVEBILLENTRY(fEntityList); + if (finSelectedReceivablesDetailedVos1.size() == 0 && finSelectedReceivablesDetailedVos2_1.size() == 1 && + finSelectedReceivablesDetailedVos2.size() == 0 && finSelectedReceivablesDetailedVos2_1.size() == 0) { + arReceivebill.setFBillNo(confirmation.getBillNo()); + } else { + //单据编号 + carSize = carSize + 1; + arReceivebill.setFBillNo(confirmation.getBillNo() + "-" + carSize); + } + ResultBean resultBean1 = arReceivebillService.draftArReceivebill(arReceivebill); } @@ -1673,7 +1744,7 @@ public class FinCollectionConfirmationService extends MybatisBaseService userVoResultBean = sysUserFeign.fetchBySid(userSid); - if(userVoResultBean.getData() != null){ + if (userVoResultBean.getData() != null) { confirmation.setConfirmName(userVoResultBean.getData().getName()); } confirmation.setConfirmDate(DateUtil.today()); @@ -1711,6 +1782,22 @@ public class FinCollectionConfirmationService extends MybatisBaseService resultBean = sysOrganizationFeign.fetchBySid(useOrgSid); + if (resultBean.getSuccess()) { + SysOrganizationVo vo = resultBean.getData(); + if (vo != null) { + bdCustomer.setTOrgIds(vo.getOrgCode()); + } + } + String fname = name + vin; + bdCustomer.setFName(fname); + String code = name + vin; + bdCustomer.setFNumber(code); + return bdCustomer; + } + public String getPrefix(String collSid, String name, String mobile) { String customerNoPrefix = ""; FinCollectionConfirmation finCollectionConfirmation = fetchBySid(collSid); 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 e25bc992e6..3e82662965 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 @@ -286,15 +286,15 @@ public class FinPaymentapplyService extends MybatisBaseService userVoResultBean = sysUserFeign.fetchBySid(dto.getCreateBySid()); + if (!userVoResultBean.getSuccess()) { + return rb.setMsg(userVoResultBean.getMsg()); + } if(StringUtils.isNotBlank(dto.getOrgPath())){ orgSidPath = dto.getOrgSidPath(); }else{ - //根据用户sid获取staffSid - ResultBean userVoResultBean = sysUserFeign.fetchBySid(dto.getCreateBySid()); - if (!userVoResultBean.getSuccess()) { - return rb.setMsg(userVoResultBean.getMsg()); - } //根据staffSid获取用户的组织全路径 ResultBean staffOrgResultBean = sysStaffOrgFeign.getOrgByStaffSid(userVoResultBean.getData().getStaffSid()); if (!staffOrgResultBean.getSuccess()) { From 3bfe80dbcb5f4ebbe6cc71bd8e3658eaaecfcc1a Mon Sep 17 00:00:00 2001 From: dimengzhe <251008545@qq.com> Date: Mon, 16 Jan 2023 17:52:36 +0800 Subject: [PATCH 2/2] =?UTF-8?q?=E5=88=87=E6=8D=A2=E6=9C=BA=E6=9E=84?= =?UTF-8?q?=EF=BC=9A=E4=BB=98=E6=AC=BE=E7=94=B3=E8=AF=B7=E6=8F=90=E4=BA=A4?= MIME-Version: 1.0 Content-Type: text/plain; charset=UTF-8 Content-Transfer-Encoding: 8bit --- .../finpaymentapply/FinPaymentapplyService.java | 14 +++++++++++--- 1 file changed, 11 insertions(+), 3 deletions(-) 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 3e82662965..bfb88c522b 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 @@ -64,7 +64,6 @@ import com.yxt.anrui.portal.api.sysstafforg.SysStaffOrgFeign; import com.yxt.anrui.portal.api.sysstaffpost.SysStaffPostFeign; 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.scm.api.scmcollectionrebate.ScmCollectionRebateDto; import com.yxt.anrui.scm.api.scmcollectionrebate.ScmCollectionRebateFeign; import com.yxt.anrui.scm.api.scmcollectionrebateveh.ScmCollectionRebateVehDto; @@ -334,7 +333,7 @@ public class FinPaymentapplyService extends MybatisBaseService sysPostVoResultBean = sysStaffPostFeign.selectPost(userVoResultBean.getData().getStaffSid()); if (!sysPostVoResultBean.getSuccess()) { return rb.setMsg(sysPostVoResultBean.getMsg()); @@ -354,7 +353,16 @@ public class FinPaymentapplyService extends MybatisBaseService orgPathList = Arrays.asList(orgSidPath.split("/")); + SysOrganizationVo sysOrganization = sysOrganizationFeign.fetchBySid(orgPathList.get(orgPathList.size()-1)).getData(); + if(sysOrganization == null){ + return rb.setMsg("当前所在的组织机构不存在"); + } + if(StringUtils.isBlank(sysOrganization.getManagerSid())){ + return rb.setMsg("当前所在的组织机构未设置主管人员"); + } + String nextNodeUserSids_ = sysOrganization.getManagerSid(); bv.setNextNodeUserSids(nextNodeUserSids_); if (r == 1) { ResultBean voResultBean = flowableFeign.startProcess(bv);