aike/emis-service
1
0
Fork 0
Code Issues Pull Requests Actions Packages Projects Releases Wiki Activity

md

Browse Source
This commit is contained in:
linfso 2025-03-12 18:15:26 +08:00
parent d0cda8aec1
commit 835db2f786
6 changed files with 32 additions and 13 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

4
emis-biz/src/main/java/com/xdadan/erp/emis/mapper/EmisCreditCustomerMapper.java
View File

@ -12,6 +12,8 @@ package com.xdadan.erp.emis.mapper;
import java.math.BigDecimal;
import java.util.List;
import java.util.Map;
import com.baomidou.mybatisplus.core.mapper.BaseMapper;
import com.xdadan.erp.emis.domain.EmisCreditCustomer;
import com.xdadan.erp.emis.domain.EmisCreditSalesmen;
@ -55,7 +57,7 @@ public interface EmisCreditCustomerMapper extends BaseMapper<EmisCreditCustomer>
* @param emisCreditCustomer
* @return
*/
public BigDecimal getUseMoney(EmisCreditCustomer emisCreditCustomer);
public Map getUseMoneyMap(EmisCreditCustomer emisCreditCustomer);
/**

4
emis-biz/src/main/java/com/xdadan/erp/emis/mapper/EmisCreditSalesmenMapper.java
View File

@ -12,6 +12,8 @@ package com.xdadan.erp.emis.mapper;
import java.math.BigDecimal;
import java.util.List;
import java.util.Map;
import com.baomidou.mybatisplus.core.mapper.BaseMapper;
import com.xdadan.erp.emis.domain.EmisCreditSalesmen;
import org.apache.ibatis.annotations.Param;
@ -44,7 +46,7 @@ public interface EmisCreditSalesmenMapper extends BaseMapper<EmisCreditSalesmen>
* @param emisCreditSalesmen
* @return
*/
public BigDecimal getUseMoney(EmisCreditSalesmen emisCreditSalesmen);
public Map getUseMoneyMap(EmisCreditSalesmen emisCreditSalesmen);
/**
* 检查是否重复

10
emis-biz/src/main/java/com/xdadan/erp/emis/service/impl/EmisCreditCustomerServiceImpl.java
View File

@ -12,6 +12,7 @@ package com.xdadan.erp.emis.service.impl;
import java.math.BigDecimal;
import java.util.List;
import java.util.Map;
import cn.hutool.core.collection.CollectionUtil;
import com.xdadan.erp.emis.domain.EmisQuotePrice;
@ -99,8 +100,10 @@ public class EmisCreditCustomerServiceImpl implements IEmisCreditCustomerService
emisCreditCustomer.setAccCode(accCode);
// 获取已使用金额
BigDecimal useMoney=emisCreditCustomerMapper.getUseMoney(emisCreditCustomer);
Map useMoneyMap=emisCreditCustomerMapper.getUseMoneyMap(emisCreditCustomer);
BigDecimal useMoney = (BigDecimal)useMoneyMap.get("useMoney");
emisCreditCustomer.setUseMoney(useMoney);
log.error("=====>useMoney=1111====>{}",useMoney);
return emisCreditCustomerMapper.insertEmisCreditCustomer(emisCreditCustomer);
}
@ -125,9 +128,10 @@ public class EmisCreditCustomerServiceImpl implements IEmisCreditCustomerService
}
// 获取已使用金额
BigDecimal useMoney=emisCreditCustomerMapper.getUseMoney(emisCreditCustomer);
log.error("=====>useMoney=1111====>{}",useMoney.toString());
Map useMoneyMap=emisCreditCustomerMapper.getUseMoneyMap(emisCreditCustomer);
BigDecimal useMoney = (BigDecimal)useMoneyMap.get("useMoney");
emisCreditCustomer.setUseMoney(useMoney);
log.error("=====>useMoney=1111====>{}",useMoney);
return emisCreditCustomerMapper.updateEmisCreditCustomer(emisCreditCustomer);
}

17
emis-biz/src/main/java/com/xdadan/erp/emis/service/impl/EmisCreditSalesmenServiceImpl.java
View File

@ -12,8 +12,10 @@ package com.xdadan.erp.emis.service.impl;
import java.math.BigDecimal;
import java.util.List;
import java.util.Map;
import cn.hutool.core.collection.CollectionUtil;
import com.alibaba.fastjson.JSON;
import com.xdadan.erp.emis.domain.EmisCreditCustomer;
import com.xdadan.erp.emis.domain.enumtype.EmisBizErrorType;
import com.xdadan.erp.emis.domain.exception.EmisBizError;
@ -93,10 +95,13 @@ public class EmisCreditSalesmenServiceImpl implements IEmisCreditSalesmenService
emisCreditSalesmen.setAccCode(accCode);
// 获取已使用金额
BigDecimal useMoney=emisCreditSalesmenMapper.getUseMoney(emisCreditSalesmen);
log.error("=====>useMoney=1111====>{}",useMoney.toString());
Map useMoneyMap=emisCreditSalesmenMapper.getUseMoneyMap(emisCreditSalesmen);
BigDecimal useMoney = (BigDecimal)useMoneyMap.get("useMoney");
emisCreditSalesmen.setUseMoney(useMoney);
log.error("=====>useMoneyMap=1111====>{}", JSON.toJSONString(useMoneyMap));
log.error("=====>useMoney=1111====>{}",useMoney.toString());
return emisCreditSalesmenMapper.insertEmisCreditSalesmen(emisCreditSalesmen);
}
@ -119,11 +124,13 @@ public class EmisCreditSalesmenServiceImpl implements IEmisCreditSalesmenService
}
// 获取已使用金额
BigDecimal useMoney=emisCreditSalesmenMapper.getUseMoney(emisCreditSalesmen);
Map useMoneyMap=emisCreditSalesmenMapper.getUseMoneyMap(emisCreditSalesmen);
BigDecimal useMoney = (BigDecimal)useMoneyMap.get("useMoney");
emisCreditSalesmen.setUseMoney(useMoney);
log.error("=====>useMoneyMap=1111====>{}", JSON.toJSONString(useMoneyMap));
log.error("=====>useMoney=1111====>{}",useMoney.toString());
return emisCreditSalesmenMapper.updateEmisCreditSalesmen(emisCreditSalesmen);
}

4
emis-biz/src/main/resources/mapper/EmisCreditCustomerMapper.xml
View File

@ -104,8 +104,10 @@ PUBLIC "-//mybatis.org//DTD Mapper 3.0//EN"
</select>
<!-- 计算已使用金额 -->
<select id="getUseMoney" parameterType="EmisCreditCustomer" resultType="bigDecimal">
<select id="getUseMoneyMap" parameterType="EmisCreditCustomer" resultType="map">
SELECT
COALESCE(sum(bill_fee),0.00) as totalBillFee,
COALESCE(sum(reced_money),0.00) as totalRecedMoney,
COALESCE(sum(bill_fee-reced_money),0.00) as useMoney
FROM
emis_settle_sub_bill b,

6
emis-biz/src/main/resources/mapper/EmisCreditSalesmenMapper.xml
View File

@ -89,9 +89,11 @@ PUBLIC "-//mybatis.org//DTD Mapper 3.0//EN"
</select>
<!-- 计算已使用金额 -->
<select id="getUseMoney" parameterType="EmisCreditSalesmen" resultType="map">
<select id="getUseMoneyMap" parameterType="EmisCreditSalesmen" resultType="map">
SELECT
COALESCE(sum(bill_fee-reced_money),0.00) as useMoney
COALESCE(sum(bill_fee),0.00) as totalBillFee,
COALESCE(sum(reced_money),0.00) as totalRecedMoney,
COALESCE(sum(bill_fee-reced_money),0.00) as useMoney
FROM
emis_settle_sub_bill b,
emis_waybill a,