|
@@ -22,6 +22,7 @@ import org.springframework.stereotype.Service;
|
|
import com.baomidou.mybatisplus.extension.plugins.pagination.Page;
|
|
import com.baomidou.mybatisplus.extension.plugins.pagination.Page;
|
|
|
|
|
|
import java.math.BigDecimal;
|
|
import java.math.BigDecimal;
|
|
|
|
+import java.math.RoundingMode;
|
|
import java.util.ArrayList;
|
|
import java.util.ArrayList;
|
|
import java.util.Date;
|
|
import java.util.Date;
|
|
import java.util.List;
|
|
import java.util.List;
|
|
@@ -190,10 +191,10 @@ public class FinanceFineServiceImpl extends ServiceImpl<FinanceFineMapper, Finan
|
|
FinanceFine financeFine = new FinanceFine();
|
|
FinanceFine financeFine = new FinanceFine();
|
|
financeFine.setOrderFundId(assetsOrder.getOrderFundId());
|
|
financeFine.setOrderFundId(assetsOrder.getOrderFundId());
|
|
financeFine.setProductionFundId(assetsOrder.getProductionFundId());
|
|
financeFine.setProductionFundId(assetsOrder.getProductionFundId());
|
|
- financeFine.setFineAmount(fineAmount);
|
|
|
|
|
|
+ financeFine.setFineAmount(fineAmount.setScale(0, RoundingMode.HALF_UP));
|
|
// 2025-05-23日,修改数据库确认字段默认为已确认,所以新增日期就是确认罚款日期,且实际罚款金额直接设置为罚款金额
|
|
// 2025-05-23日,修改数据库确认字段默认为已确认,所以新增日期就是确认罚款日期,且实际罚款金额直接设置为罚款金额
|
|
financeFine.setConfirmDate(DateUtils.dateToLocalDateTime(new Date()));
|
|
financeFine.setConfirmDate(DateUtils.dateToLocalDateTime(new Date()));
|
|
- financeFine.setRealFineAmount(fineAmount);
|
|
|
|
|
|
+ financeFine.setRealFineAmount(fineAmount.setScale(0, RoundingMode.HALF_UP));
|
|
financeFineList.add(financeFine);
|
|
financeFineList.add(financeFine);
|
|
}
|
|
}
|
|
|
|
|
|
@@ -242,10 +243,10 @@ public class FinanceFineServiceImpl extends ServiceImpl<FinanceFineMapper, Finan
|
|
FinanceFine financeFine = new FinanceFine();
|
|
FinanceFine financeFine = new FinanceFine();
|
|
financeFine.setOrderFundId(majorOrder.getOrderFundId());
|
|
financeFine.setOrderFundId(majorOrder.getOrderFundId());
|
|
financeFine.setProductionFundId(majorOrder.getProductionFundId());
|
|
financeFine.setProductionFundId(majorOrder.getProductionFundId());
|
|
- financeFine.setFineAmount(fineAmount);
|
|
|
|
|
|
+ financeFine.setFineAmount(fineAmount.setScale(0, RoundingMode.HALF_UP));
|
|
// 2025-05-23日,修改数据库确认字段默认为已确认,所以新增日期就是确认罚款日期,且实际罚款金额直接设置为罚款金额
|
|
// 2025-05-23日,修改数据库确认字段默认为已确认,所以新增日期就是确认罚款日期,且实际罚款金额直接设置为罚款金额
|
|
financeFine.setConfirmDate(DateUtils.dateToLocalDateTime(new Date()));
|
|
financeFine.setConfirmDate(DateUtils.dateToLocalDateTime(new Date()));
|
|
- financeFine.setRealFineAmount(fineAmount);
|
|
|
|
|
|
+ financeFine.setRealFineAmount(fineAmount.setScale(0, RoundingMode.HALF_UP));
|
|
financeFineList.add(financeFine);
|
|
financeFineList.add(financeFine);
|
|
}
|
|
}
|
|
|
|
|