Browse Source

20260411业绩

milestone-20260401-现金管理四期
sunjiabei 7 hours ago
parent
commit
33ce9824e2
  1. 1
      src/main/java/com/example/demo/serviceImpl/cash/CashCollectionServiceImpl.java
  2. 4
      src/main/resources/cashMapper/CashCollectionMapper.xml

1
src/main/java/com/example/demo/serviceImpl/cash/CashCollectionServiceImpl.java

@ -770,6 +770,7 @@ public class CashCollectionServiceImpl implements CashCollectionService {
for (int j = 0; j < matrix[i].length; j++) { for (int j = 0; j < matrix[i].length; j++) {
// Calculate adjusted value and round to nearest integer // Calculate adjusted value and round to nearest integer
int adjustedValue = (int) (matrix[i][j] * weight); int adjustedValue = (int) (matrix[i][j] * weight);
adjustedValue = adjustedValue*100;
matrix[i][j] = adjustedValue; matrix[i][j] = adjustedValue;
if (i == j) { if (i == j) {
continue; continue;

4
src/main/resources/cashMapper/CashCollectionMapper.xml

@ -329,7 +329,7 @@
<select id="performanceSelect" resultType="com.example.demo.domain.vo.cash.PerformanceVO" parameterType="com.example.demo.domain.DTO.PerformanceDTO"> <select id="performanceSelect" resultType="com.example.demo.domain.vo.cash.PerformanceVO" parameterType="com.example.demo.domain.DTO.PerformanceDTO">
<!-- 原始收款记录 --> <!-- 原始收款记录 -->
select cr.pay_time,cr.order_code,m2.name as receivedMarketName,m1.name as performanceMarketName,cr.name,cr.jwcode,cr.goods_name,cr.remark,cr.good_num,cr.pay_type,r2.rate_name as receivedCurrency,cr.payment_amount,cr.handling_charge,cr.received_amount
select cr.pay_time,cr.order_code,m2.name as receivedMarketName,m1.name as performanceMarketName,cr.name,cr.jwcode,cr.goods_name,cr.remark,cr.good_num,cr.pay_type,r2.rate_name as receivedCurrency,cr.payment_amount/100,cr.handling_charge/100,cr.received_amount/100
from cash_record_collection cr from cash_record_collection cr
left join market m1 on m1.id = cr.performance_market left join market m1 on m1.id = cr.performance_market
left join market m2 on m2.id = cr.received_market left join market m2 on m2.id = cr.received_market
@ -371,7 +371,7 @@
<!-- 当cr.status = 6时,添加退款记录 --> <!-- 当cr.status = 6时,添加退款记录 -->
UNION ALL UNION ALL
select crr.refund_time as pay_time,crr.order_code,m2.name as receivedMarketName,m1.name as performanceMarketName,crr.name,crr.jwcode,cr.goods_name,crr.refund_reason as remark,cr.good_num,cr.pay_type,r3.rate_name as receivedCurrency,-crr.refund_amount as payment_amount,0 as handling_charge,-crr.refund_amount as received_amount
select crr.refund_time as pay_time,crr.order_code,m2.name as receivedMarketName,m1.name as performanceMarketName,crr.name,crr.jwcode,cr.goods_name,crr.refund_reason as remark,cr.good_num,cr.pay_type,r3.rate_name as receivedCurrency,-crr.refund_amount/100 as payment_amount,0 as handling_charge,-crr.refund_amount/100 as received_amount
from cash_record_refund crr from cash_record_refund crr
left join cash_record_collection cr on cr.id = crr.related_id left join cash_record_collection cr on cr.id = crr.related_id
left join market m1 on m1.id = cr.performance_market left join market m1 on m1.id = cr.performance_market

Loading…
Cancel
Save