Public/cf_imes_server
6
0
Fork 0
mirror of http://192.168.1.205:9980/cf_devdept2/cf_imes_server.git synced 2026-08-13 21:32:07 +08:00
Code Issues Packages Projects Releases Wiki Activity

资金管理购买记录、组织资金接口单元测试完善

Browse Source
This commit is contained in:
gaoqr
2025-12-31 15:02:09 +08:00
parent 80e0f329f7
commit 137689e2a4
6 changed files with 1393 additions and 10 deletions
Download Patch File Download Diff File Expand all files Collapse all files
cf-module-system/cf-module-system-biz/src/main/java/com/cf/imes/module/system/dal/mysql/funds/purchase/PurchaseRecordMapper.java
+1 -1
View File
@@ -111,7 +111,7 @@ public interface PurchaseRecordMapper extends BaseMapperX<PurchaseRecordDO> {
* 查询当日销售总额
* @return
*/
BigDecimal getTodaySales();
BigDecimal getTodaySales(@Param("endTime") LocalDateTime endTime);
/**
* 分页查询销售记录
cf-module-system/cf-module-system-biz/src/main/java/com/cf/imes/module/system/service/funds/organamount/OrganAmountServiceImpl.java
+2 -1
View File
@@ -1,5 +1,6 @@
package com.cf.imes.module.system.service.funds.organamount;
import cn.hutool.core.collection.CollUtil;
import cn.hutool.core.date.LocalDateTimeUtil;
import cn.hutool.core.util.ObjectUtil;
import com.cf.imes.framework.security.core.util.SecurityFrameworkUtils;
@@ -116,7 +117,7 @@ public class OrganAmountServiceImpl implements OrganAmountService {
String dateStr = dateList.get(i);
List<OrganAmountGroupByCreateTimeRespVO> organIncomeExpenseGroupByCreateTimeRespVOS = organIncomeExpenseGroupByCreateTimeRespMap.get(dateStr);
amountArr[i] = organIncomeExpenseGroupByCreateTimeRespVOS != null && !organIncomeExpenseGroupByCreateTimeRespVOS.isEmpty() ? organIncomeExpenseGroupByCreateTimeRespVOS.get(0).getAmount() : BigDecimal.ZERO;
amountArr[i] = CollUtil.isNotEmpty(organIncomeExpenseGroupByCreateTimeRespVOS) ? organIncomeExpenseGroupByCreateTimeRespVOS.get(0).getAmount() : BigDecimal.ZERO;
}
orgAmountSeriesItem.put("data", amountArr);
cf-module-system/cf-module-system-biz/src/main/java/com/cf/imes/module/system/service/funds/purchase/PurchaseServiceImpl.java
+6 -7
View File
@@ -183,6 +183,9 @@ public class PurchaseServiceImpl implements PurchaseService {
@Override
public void createOrgInitProductPurchaseRecord(Long organId, List<OrganCreateProductPurchaseReqVO> productPurchaseReqVOS) {
if (CollUtil.isEmpty(productPurchaseReqVOS)) {
return;
}
for (OrganCreateProductPurchaseReqVO purchaseReqVO : productPurchaseReqVOS) {
// 1、校验产品
Long productId = purchaseReqVO.getProductId();
@@ -280,14 +283,10 @@ public class PurchaseServiceImpl implements PurchaseService {
}
// 7、新增
if (CollUtil.isNotEmpty(createList)) {
createOrgInitProductPurchaseRecord(organId, createList);
}
createOrgInitProductPurchaseRecord(organId, createList);
// 8、删除
if (CollUtil.isNotEmpty(deleteIdList)) {
purchaseRecordMapper.deleteByIds(deleteIdList);
}
purchaseRecordMapper.deleteByIds(deleteIdList);
}
@Override
@@ -551,7 +550,7 @@ public class PurchaseServiceImpl implements PurchaseService {
public ManageSalesTotalStatisticRespVO getSalesTotalStatistics() {
ManageSalesTotalStatisticRespVO respVO = new ManageSalesTotalStatisticRespVO();
respVO.setSalesTotal(purchaseRecordMapper.getTotalSales().getAmount());
respVO.setSalesToday(purchaseRecordMapper.getTodaySales());
respVO.setSalesToday(purchaseRecordMapper.getTodaySales(LocalDateTime.now().plusDays(1)));
return respVO;
}
}
cf-module-system/cf-module-system-biz/src/main/resources/mapper/funds/purchase/PurchaseMapper.xml
+1 -1
View File
@@ -62,7 +62,7 @@
from purchase_record
where deleted = false and initial != true
and create_time &gt;= CURDATE()
and create_time &lt; CURDATE() + INTERVAL 1 DAY;
and create_time &lt; #{endTime};
</select>
<sql id="dateCreate">