From e936ada53f942eb48f639b2b33bfeca6af0e16a7 Mon Sep 17 00:00:00 2001 From: linfso Date: Tue, 11 Mar 2025 23:32:16 +0800 Subject: [PATCH] md --- .../erp/emis/domain/EmisCreditCustomer.java | 6 +- .../erp/emis/domain/EmisCreditSalesmen.java | 6 +- .../erp/emis/service/EmisBaseService.java | 142 ++---------------- .../mapper/EmisCreditCustomerMapper.xml | 37 +++-- .../mapper/EmisCreditSalesmenMapper.xml | 36 ++--- 5 files changed, 48 insertions(+), 179 deletions(-) diff --git a/emis-biz/src/main/java/com/xdadan/erp/emis/domain/EmisCreditCustomer.java b/emis-biz/src/main/java/com/xdadan/erp/emis/domain/EmisCreditCustomer.java index 13821e016..5f10afb66 100644 --- a/emis-biz/src/main/java/com/xdadan/erp/emis/domain/EmisCreditCustomer.java +++ b/emis-biz/src/main/java/com/xdadan/erp/emis/domain/EmisCreditCustomer.java @@ -41,12 +41,10 @@ public class EmisCreditCustomer extends BaseEntity private String customerCode; /* 月结卡号 */ private String monthlyPayCode; - /* 当前余额 */ - private BigDecimal curMoney; - /* 余额比率 */ - private BigDecimal curMoneyRate; /* 信用额度 */ private BigDecimal creditMoney; + /* 使用额度 */ + private BigDecimal useMoney; /* 币种 */ private String currency; /* 运输方式 */ diff --git a/emis-biz/src/main/java/com/xdadan/erp/emis/domain/EmisCreditSalesmen.java b/emis-biz/src/main/java/com/xdadan/erp/emis/domain/EmisCreditSalesmen.java index 924938522..43eac088a 100644 --- a/emis-biz/src/main/java/com/xdadan/erp/emis/domain/EmisCreditSalesmen.java +++ b/emis-biz/src/main/java/com/xdadan/erp/emis/domain/EmisCreditSalesmen.java @@ -39,12 +39,10 @@ public class EmisCreditSalesmen extends BaseEntity private String accCode; /* 销售名称 */ private String salesmen; - /* 当前余额 */ - private BigDecimal curMoney; - /* 余额比率 */ - private BigDecimal curMoneyRate; /* 信用额度 */ private BigDecimal creditMoney; + /* 使用额度 */ + private BigDecimal useMoney; /* 币种 */ private String currency; /* 运输方式 */ diff --git a/emis-biz/src/main/java/com/xdadan/erp/emis/service/EmisBaseService.java b/emis-biz/src/main/java/com/xdadan/erp/emis/service/EmisBaseService.java index 00f46ca53..d4e6940d0 100644 --- a/emis-biz/src/main/java/com/xdadan/erp/emis/service/EmisBaseService.java +++ b/emis-biz/src/main/java/com/xdadan/erp/emis/service/EmisBaseService.java @@ -236,28 +236,29 @@ public class EmisBaseService { if(!CollectionUtils.isEmpty(listCreditCustomer)){ EmisCreditCustomer item0=listCreditCustomer.get(0); - if(emisWaybill.getFreight().compareTo(item0.getCurMoney()) == 1 ){ + BigDecimal preBalance=item0.getCreditMoney().subtract(item0.getUseMoney()); + + if(emisWaybill.getFreight().compareTo(preBalance) == 1 ){ // 提示异常 throw new EmisBizError(EmisBizErrorType.FAIL, "超出信用额度"); }else{ // 当前余额,变动后余额，变动金额 - BigDecimal curMoney=item0.getCurMoney(); - BigDecimal backBalance=curMoney.subtract(emisWaybill.getFreight()); - BigDecimal changeMoney=BigDecimal.ZERO.subtract(emisWaybill.getFreight()); + BigDecimal backBalance=preBalance.subtract(emisWaybill.getFreight()); + BigDecimal changeMoney=emisWaybill.getFreight(); // 扣减额度，插入扣额度数据明细 EmisCreditCustomerRecord itemRecord=new EmisCreditCustomerRecord(); itemRecord.setAccCode(item0.getAccCode()); itemRecord.setCustomerCode(item0.getCustomerCode()); itemRecord.setBillCode(emisWaybill.getBillCode()); - itemRecord.setPreBalance(curMoney); + itemRecord.setPreBalance(preBalance); itemRecord.setChangeMoney(emisWaybill.getFreight()); itemRecord.setChangeType("2"); itemRecord.setBackBalance(backBalance); emisCreditCustomerRecordMapper.insertEmisCreditCustomerRecord(itemRecord); - // 更新余额 + // 更新使用额度 emisCreditCustomerMapper.changeBalance(item0.getAccCode(),changeMoney); } } @@ -274,22 +275,22 @@ public class EmisBaseService { if(!CollectionUtils.isEmpty(listCreditSalesmen)){ EmisCreditSalesmen item0=listCreditSalesmen.get(0); - if(emisWaybill.getFreight().compareTo(item0.getCurMoney()) == 1 ){ + + BigDecimal preBalance=item0.getCreditMoney().subtract(item0.getUseMoney()); + if(emisWaybill.getFreight().compareTo(preBalance) == 1 ){ // 提示异常 throw new EmisBizError(EmisBizErrorType.FAIL, "超出信用额度"); }else{ // 当前余额,变动后余额，变动金额 - BigDecimal curMoney=item0.getCurMoney(); - BigDecimal backBalance=curMoney.subtract(emisWaybill.getFreight()); - BigDecimal changeMoney=BigDecimal.ZERO.subtract(emisWaybill.getFreight()); - + BigDecimal backBalance=preBalance.subtract(emisWaybill.getFreight()); + BigDecimal changeMoney=emisWaybill.getFreight(); // 扣减额度，插入扣额度数据明细 EmisCreditSalesmenRecord itemRecord=new EmisCreditSalesmenRecord(); itemRecord.setAccCode(item0.getAccCode()); itemRecord.setSalesmen(item0.getSalesmen()); itemRecord.setBillCode(emisWaybill.getBillCode()); - itemRecord.setPreBalance(curMoney); + itemRecord.setPreBalance(preBalance); itemRecord.setChangeMoney(emisWaybill.getFreight()); itemRecord.setChangeType("2"); itemRecord.setBackBalance(backBalance); @@ -302,123 +303,6 @@ public class EmisBaseService { } } - /** - * 更新运单调整信用额度 - * @param emisWaybill - */ - public void ajustUseQuotaCredit(EmisWaybill emisWaybill,EmisWaybill oldEmisWaybill) throws EmisBizError { - - // 删除原来的数据数据 - EmisCreditCustomerRecord queryRecord = new EmisCreditCustomerRecord(); - queryRecord.setBillCode(emisWaybill.getBillCode()); - queryRecord.setChangeType("2"); - List listRecord=emisCreditCustomerRecordMapper.selectEmisCreditCustomerRecordList(queryRecord); - if(!CollectionUtils.isEmpty(listRecord)){ - EmisCreditCustomerRecord item0=listRecord.get(0); - BigDecimal changeMoney=item0.getChangeMoney(); - // 删除扣减数据 - emisCreditCustomerRecordMapper.deleteEmisCreditCustomerRecordById(item0.getId()); - // 增加余额数据 - emisCreditCustomerMapper.changeBalance(item0.getAccCode(),changeMoney); - } - -// // 返回越来现金数据 -// EmisCreditSalesmenRecord queryRecord = new EmisCreditCustomerRecord(); -// queryRecord.setBillCode(emisWaybill.getBillCode()); -// queryRecord.setChangeType("2"); -// List listRecord=emisCreditCustomerRecordMapper.selectEmisCreditCustomerRecordList(queryRecord); -// if(!CollectionUtils.isEmpty(listRecord)){ -// EmisCreditCustomerRecord item0=listRecord.get(0); -// BigDecimal changeMoney=item0.getChangeMoney(); -// // 删除扣减数据 -// emisCreditCustomerRecordMapper.deleteEmisCreditCustomerRecordById(item0.getId()); -// // 增加余额数据 -// emisCreditCustomerMapper.changeBalance(item0.getAccCode(),changeMoney); -// } - - - // 删除原来的占用，重新变更数据 - String paymentType=emisWaybill.getPaymentType(); - // 月结客户 - if("2".equals(paymentType) - || "4".equals(paymentType) - || "5".equals(paymentType) - ){ - // 月结额度占用 - EmisCreditCustomer queryCreditCustomer = new EmisCreditCustomer(); - queryCreditCustomer.setMonthlyPayCode(emisWaybill.getCustNo()); - queryCreditCustomer.getParams().put("sendDate",emisWaybill.getSendDate()); - queryCreditCustomer.setTransType(emisWaybill.getTransType()); - List listCreditCustomer=emisCreditCustomerMapper.selectEmisCreditCustomerList(queryCreditCustomer); - - if(!CollectionUtils.isEmpty(listCreditCustomer)){ - EmisCreditCustomer item0=listCreditCustomer.get(0); - if(emisWaybill.getFreight().compareTo(item0.getCurMoney()) == 1 ){ - // 提示异常 - throw new EmisBizError(EmisBizErrorType.FAIL, "超出信用额度"); - }else{ - - // 当前余额,变动后余额，变动金额 - BigDecimal curMoney=item0.getCurMoney(); - BigDecimal backBalance=curMoney.subtract(emisWaybill.getFreight()); - BigDecimal changeMoney=BigDecimal.ZERO.subtract(emisWaybill.getFreight()); - - // 扣减额度，插入扣额度数据明细 - EmisCreditCustomerRecord itemRecord=new EmisCreditCustomerRecord(); - itemRecord.setAccCode(item0.getAccCode()); - itemRecord.setCustomerCode(item0.getCustomerCode()); - itemRecord.setBillCode(emisWaybill.getBillCode()); - itemRecord.setPreBalance(curMoney); - itemRecord.setChangeMoney(emisWaybill.getFreight()); - itemRecord.setChangeType("2"); - itemRecord.setBackBalance(backBalance); - emisCreditCustomerRecordMapper.insertEmisCreditCustomerRecord(itemRecord); - - // 更新余额 - emisCreditCustomerMapper.changeBalance(item0.getAccCode(),changeMoney); - } - } - }else if("1".equals(paymentType) - || "3".equals(paymentType) - ){ - // 现金额度占用 - EmisCreditSalesmen queryCreditSalesmen= new EmisCreditSalesmen(); - queryCreditSalesmen.setSalesmen(emisWaybill.getSalesmen()); - queryCreditSalesmen.getParams().put("sendDate",emisWaybill.getSendDate()); - queryCreditSalesmen.setTransType(emisWaybill.getTransType()); - List listCreditSalesmen=emisCreditSalesmenMapper.selectEmisCreditSalesmenList(queryCreditSalesmen); - - if(!CollectionUtils.isEmpty(listCreditSalesmen)){ - EmisCreditSalesmen item0=listCreditSalesmen.get(0); - if(emisWaybill.getFreight().compareTo(item0.getCurMoney()) == 1 ){ - // 提示异常 - throw new EmisBizError(EmisBizErrorType.FAIL, "超出信用额度"); - }else{ - - // 当前余额,变动后余额，变动金额 - BigDecimal curMoney=item0.getCurMoney(); - BigDecimal backBalance=curMoney.subtract(emisWaybill.getFreight()); - BigDecimal changeMoney=BigDecimal.ZERO.subtract(emisWaybill.getFreight()); - - // 扣减额度，插入扣额度数据明细 - EmisCreditSalesmenRecord itemRecord=new EmisCreditSalesmenRecord(); - itemRecord.setAccCode(item0.getAccCode()); - itemRecord.setSalesmen(item0.getSalesmen()); - itemRecord.setBillCode(emisWaybill.getBillCode()); - itemRecord.setPreBalance(curMoney); - itemRecord.setChangeMoney(emisWaybill.getFreight()); - itemRecord.setChangeType("2"); - itemRecord.setBackBalance(backBalance); - emisCreditSalesmenRecordMapper.insertEmisCreditSalesmenRecord(itemRecord); - - // 更新余额 - emisCreditSalesmenMapper.changeBalance(item0.getAccCode(),changeMoney); - } - } - } - } - - /** * 录入运单操作日志 * @param billCode diff --git a/emis-biz/src/main/resources/mapper/EmisCreditCustomerMapper.xml b/emis-biz/src/main/resources/mapper/EmisCreditCustomerMapper.xml index 9dac1f964..5e7e239c0 100644 --- a/emis-biz/src/main/resources/mapper/EmisCreditCustomerMapper.xml +++ b/emis-biz/src/main/resources/mapper/EmisCreditCustomerMapper.xml @@ -9,9 +9,8 @@ PUBLIC "-//mybatis.org//DTD Mapper 3.0//EN" - - + @@ -24,13 +23,13 @@ PUBLIC "-//mybatis.org//DTD Mapper 3.0//EN" - select id, acc_code, customer_code, monthly_pay_code, cur_money, cur_money_rate, credit_money, currency, trans_type, start_date, end_date, bl_open, remark, tenant_id, del_flag, create_by, create_time, update_by, update_time, create_site, update_site from emis_credit_customer + select id, acc_code, customer_code, monthly_pay_code, credit_money, use_money, currency, trans_type, start_date, end_date, bl_open, remark, tenant_id, del_flag, create_by, create_time, update_by, update_time, create_site, update_site from emis_credit_customer select - a.id,a.acc_code, a.customer_code,a.monthly_pay_code, a.cur_money, a.cur_money_rate, + a.id,a.acc_code, a.customer_code,a.monthly_pay_code, a.use_money, a.credit_money, a.currency, a.trans_type, a.start_date, a.end_date, a.bl_open, a.remark, a.tenant_id, a.del_flag, a.create_by, a.create_time, a.update_by, a.update_time, a.create_site, a.update_site, @@ -129,12 +127,12 @@ PUBLIC "-//mybatis.org//DTD Mapper 3.0//EN" insert into emis_credit_customer + id, acc_code, customer_code, monthly_pay_code, - cur_money, - cur_money_rate, credit_money, + use_money, currency, trans_type, start_date, @@ -151,12 +149,12 @@ PUBLIC "-//mybatis.org//DTD Mapper 3.0//EN" update_site, + #{id}, #{accCode}, #{customerCode}, #{monthlyPayCode}, - #{curMoney}, - #{curMoneyRate}, #{creditMoney}, + #{useMoney}, #{currency}, #{transType}, #{startDate}, @@ -180,9 +178,8 @@ PUBLIC "-//mybatis.org//DTD Mapper 3.0//EN" acc_code = #{accCode}, customer_code = #{customerCode}, monthly_pay_code = #{monthlyPayCode}, - cur_money = #{curMoney}, - cur_money_rate = #{curMoneyRate}, credit_money = #{creditMoney}, + use_money = #{useMoney}, currency = #{currency}, trans_type = #{transType}, start_date = #{startDate}, @@ -203,7 +200,7 @@ PUBLIC "-//mybatis.org//DTD Mapper 3.0//EN" - update emis_credit_customer set cur_money = cur_money + #{changeMoney} where acc_code = #{accCode} + update emis_credit_customer set use_money = use_money + #{changeMoney} where acc_code = #{accCode} diff --git a/emis-biz/src/main/resources/mapper/EmisCreditSalesmenMapper.xml b/emis-biz/src/main/resources/mapper/EmisCreditSalesmenMapper.xml index 703708344..0ff642cca 100644 --- a/emis-biz/src/main/resources/mapper/EmisCreditSalesmenMapper.xml +++ b/emis-biz/src/main/resources/mapper/EmisCreditSalesmenMapper.xml @@ -8,9 +8,8 @@ PUBLIC "-//mybatis.org//DTD Mapper 3.0//EN" - - + @@ -19,19 +18,17 @@ PUBLIC "-//mybatis.org//DTD Mapper 3.0//EN" - select id, acc_code, salesmen, cur_money, cur_money_rate, credit_money, currency, trans_type, start_date, end_date, bl_open, remark, tenant_id, del_flag, create_by, create_time, update_by, update_time, create_site, update_site from emis_credit_salesmen + select id, acc_code, salesmen, credit_money, use_money, currency, trans_type, start_date, end_date, bl_open, remark, tenant_id, del_flag, create_by, create_time, update_by, update_time, create_site, update_site from emis_credit_salesmen @@ -109,9 +106,8 @@ PUBLIC "-//mybatis.org//DTD Mapper 3.0//EN" acc_code, salesmen, - cur_money, - cur_money_rate, credit_money, + use_money, currency, trans_type, start_date, @@ -130,9 +126,8 @@ PUBLIC "-//mybatis.org//DTD Mapper 3.0//EN" #{accCode}, #{salesmen}, - #{curMoney}, - #{curMoneyRate}, #{creditMoney}, + #{useMoney}, #{currency}, #{transType}, #{startDate}, @@ -153,11 +148,8 @@ PUBLIC "-//mybatis.org//DTD Mapper 3.0//EN" update emis_credit_salesmen - acc_code = #{accCode}, - salesmen = #{salesmen}, - cur_money = #{curMoney}, - cur_money_rate = #{curMoneyRate}, credit_money = #{creditMoney}, + use_money = #{useMoney}, currency = #{currency}, trans_type = #{transType}, start_date = #{startDate}, @@ -178,7 +170,7 @@ PUBLIC "-//mybatis.org//DTD Mapper 3.0//EN" - update emis_credit_salesmen set cur_money = cur_money + #{changeMoney} where acc_code = #{accCode} + update emis_credit_salesmen set use_money = use_money + #{changeMoney} where acc_code = #{accCode}