From 64da56eefa147eb8a3d075128fb44c6a73758a5b Mon Sep 17 00:00:00 2001 From: God <10745413@qq.com> Date: Tue, 25 Oct 2022 18:06:28 +0800 Subject: [PATCH] =?UTF-8?q?=E9=97=AE=E9=A2=98=E4=BF=AE=E6=94=B9?= MIME-Version: 1.0 Content-Type: text/plain; charset=UTF-8 Content-Transfer-Encoding: 8bit --- .../crmvehicledemand/CrmVehicledemandDto.java | 2 +- .../CrmCustomerTempService.java | 28 +++++++++---------- .../ScmVehicleExamineMapper.java | 4 ++- .../ScmVehicleExamineService.java | 23 ++++++++++++--- 4 files changed, 37 insertions(+), 20 deletions(-) diff --git a/anrui-crm/anrui-crm-api/src/main/java/com/yxt/anrui/crm/api/crmvehicledemand/CrmVehicledemandDto.java b/anrui-crm/anrui-crm-api/src/main/java/com/yxt/anrui/crm/api/crmvehicledemand/CrmVehicledemandDto.java index b15ecfc8b2..456fea74d8 100644 --- a/anrui-crm/anrui-crm-api/src/main/java/com/yxt/anrui/crm/api/crmvehicledemand/CrmVehicledemandDto.java +++ b/anrui-crm/anrui-crm-api/src/main/java/com/yxt/anrui/crm/api/crmvehicledemand/CrmVehicledemandDto.java @@ -74,7 +74,7 @@ public class CrmVehicledemandDto implements Dto { @JsonProperty(value = "configName") private String sketChconfiguration; @ApiModelProperty("其它配置说明") - @NotBlank(message = "参数错误：其他配置说明是必选项") + //@NotBlank(message = "参数错误：其他配置说明是必选项") private String otherConfig; @ApiModelProperty("换选装内容") diff --git a/anrui-crm/anrui-crm-biz/src/main/java/com/yxt/anrui/crm/biz/crmcustomertemp/CrmCustomerTempService.java b/anrui-crm/anrui-crm-biz/src/main/java/com/yxt/anrui/crm/biz/crmcustomertemp/CrmCustomerTempService.java index c3d45501d6..2b24470961 100644 --- a/anrui-crm/anrui-crm-biz/src/main/java/com/yxt/anrui/crm/biz/crmcustomertemp/CrmCustomerTempService.java +++ b/anrui-crm/anrui-crm-biz/src/main/java/com/yxt/anrui/crm/biz/crmcustomertemp/CrmCustomerTempService.java @@ -154,7 +154,11 @@ public class CrmCustomerTempService extends MybatisBaseService qw = new QueryWrapper<>(); String userSid = query.getUserSid(); - String sid = sysOrganizationFeign.getUseOrgByUserSid(userSid).getData().getSid(); + SysOrganizationVo sysOrganizationVo = sysOrganizationFeign.getUseOrgByUserSid(userSid).getData(); + String sid = ""; + if (sysOrganizationVo != null) { + sid = sysOrganizationVo.getSid(); + } String orgSidPath = query.getOrgSidPath(); SysOrganizationVo data = sysOrganizationFeign.selectByOrgSidPath(orgSidPath).getData(); String orgLevelKey = data.getOrgLevelKey(); @@ -179,10 +183,6 @@ public class CrmCustomerTempService extends MybatisBaseService= date_format('" + remindStartDay + "','%Y-%m-%d')"). @@ -425,21 +425,21 @@ public class CrmCustomerTempService extends MybatisBaseService qw = new QueryWrapper<>(); - if(params != null){ - if(StringUtils.isNotBlank(userSid)){ + if (params != null) { + if (StringUtils.isNotBlank(userSid)) { //获取用户的staffSid String staffSid = sysUserFeign.fetchBySid(userSid).getData().getStaffSid(); - qw.eq("cct.staffSid",staffSid); + qw.eq("cct.staffSid", staffSid); } - if(StringUtils.isNotBlank(orgPath)){ + if (StringUtils.isNotBlank(orgPath)) { orgPath = sysStaffOrgFeign.getOrgSidByPath(orgPath).getData(); - qw.eq("cct.createOrgSid",orgPath); - }else{ + qw.eq("cct.createOrgSid", orgPath); + } else { orgPath = sysStaffOrgFeign.getPathSidByUserSid(userSid).getData(); - qw.eq("cct.createOrgSid",orgPath); + qw.eq("cct.createOrgSid", orgPath); } - if(StringUtils.isNotBlank(name)){ - qw.like("cct.name",name); + if (StringUtils.isNotBlank(name)) { + qw.like("cct.name", name); } } qw.orderByDesc("cct.id"); diff --git a/anrui-scm/anrui-scm-biz/src/main/java/com/yxt/anrui/scm/biz/scmvehicleexamine/ScmVehicleExamineMapper.java b/anrui-scm/anrui-scm-biz/src/main/java/com/yxt/anrui/scm/biz/scmvehicleexamine/ScmVehicleExamineMapper.java index 0556d47d7a..308dda2228 100644 --- a/anrui-scm/anrui-scm-biz/src/main/java/com/yxt/anrui/scm/biz/scmvehicleexamine/ScmVehicleExamineMapper.java +++ b/anrui-scm/anrui-scm-biz/src/main/java/com/yxt/anrui/scm/biz/scmvehicleexamine/ScmVehicleExamineMapper.java @@ -89,7 +89,6 @@ public interface ScmVehicleExamineMapper extends BaseMapper { * 手机端-初始化验车单信息 * * @param inspectedSid - * @param useOrgSid * @return */ AppScmVehicleExamineInfoVo getCarInspectedInfo(@Param("inspectedSid") String inspectedSid); @@ -108,4 +107,7 @@ public interface ScmVehicleExamineMapper extends BaseMapper { @Select("SELECT count(*) FROM scm_vehicle_examine WHERE vinNo = #{vinNo} and useOrgSid = #{orgPath} and inspectionResult = '2' ") int getCountByVinNo(@Param("vinNo") String vinNo, @Param("orgPath") String orgPath); + + @Select("SELECT COUNT(*) FROM scm_vehicle_examine WHERE businessSid = #{businessSid}") + int selectCountByBusSid(String businessSid); } \ No newline at end of file diff --git a/anrui-scm/anrui-scm-biz/src/main/java/com/yxt/anrui/scm/biz/scmvehicleexamine/ScmVehicleExamineService.java b/anrui-scm/anrui-scm-biz/src/main/java/com/yxt/anrui/scm/biz/scmvehicleexamine/ScmVehicleExamineService.java index d6c226fd58..8230d47cc3 100644 --- a/anrui-scm/anrui-scm-biz/src/main/java/com/yxt/anrui/scm/biz/scmvehicleexamine/ScmVehicleExamineService.java +++ b/anrui-scm/anrui-scm-biz/src/main/java/com/yxt/anrui/scm/biz/scmvehicleexamine/ScmVehicleExamineService.java @@ -650,11 +650,26 @@ public class ScmVehicleExamineService extends MybatisBaseService 0) { - finPaymentrecordDto.setCost(price - deposit / num);//付款金额 - } else { - finPaymentrecordDto.setCost(price);//付款金额 + String depositUseRuleKey = outsourcingApplicationDetailsVo.getDepositUseRuleKey(); + if (depositUseRuleKey.equals("001")) { + if (deposit > 0) { + finPaymentrecordDto.setCost(price - deposit / num);//付款金额 + finPaymentrecordDto.setPayRemark("订金使用规则为" + outsourcingApplicationDetailsVo.getDepositUseRuleValue() + "," + "金额为" + (price - deposit / num)); + } else { + finPaymentrecordDto.setCost(price);//付款金额 + finPaymentrecordDto.setPayRemark("订金使用规则为" + outsourcingApplicationDetailsVo.getDepositUseRuleValue() + "," + "金额为" + price); + } + } else if (depositUseRuleKey.equals("002")) { + int i = baseMapper.selectCountByBusSid(scmVehicleExamine.getBusinessSid()); + if (i > 1) { + finPaymentrecordDto.setCost(price);//付款金额 + finPaymentrecordDto.setPayRemark("订金使用规则为" + outsourcingApplicationDetailsVo.getDepositUseRuleValue() + "," + "金额为" + price); + } else if (i == 1) { + finPaymentrecordDto.setCost(price - deposit); + finPaymentrecordDto.setPayRemark("订金使用规则为" + outsourcingApplicationDetailsVo.getDepositUseRuleValue() + "," + "金额为" + (price - deposit)); + } } + finPaymentrecordDto.setBusSid(scmVehicleExamine.getBusinessSid());//外采申请sid BaseManufacturerAllVo baseManufacturerAllVo = baseManufacturerFeign.details(outsourcingApplicationDetailsVo.getPurchasingUnitSid()).getData(); if (baseManufacturerAllVo != null) {