czg_team/cashier-admin-java
7
0
Fork 0
Code Issues Pull Requests Packages Projects Releases Wiki Activity

出入退货单 金额为负数

Browse Source
This commit is contained in:
wangw
2024-06-28 15:45:41 +08:00
parent b04661d0a9
commit 0623562cd0
4 changed files with 15 additions and 14 deletions
Download Patch File Download Diff File Expand all files Collapse all files

12
eladmin-system/src/main/java/cn/ysk/cashier/service/impl/productimpl/TbProductStockOperateServiceImpl.java
View File

@@ -188,9 +188,15 @@ public class TbProductStockOperateServiceImpl implements TbProductStockOperateSe
purveyorTransact.setRemark(resources.getRemark());
purveyorTransact.setCreatedAt(times);
purveyorTransact.setUpdatedAt(times);
purveyorTransact.setTotalAmount(resources.getTotalAmount());
purveyorTransact.setPaidAmount(resources.getPaidAmount());
purveyorTransact.setWaitAmount(resources.getTotalAmount().subtract(resources.getPaidAmount()));
if("reject".equals(resources.getType())){
purveyorTransact.setTotalAmount(resources.getTotalAmount().negate());
purveyorTransact.setPaidAmount(resources.getPaidAmount());
purveyorTransact.setWaitAmount((resources.getTotalAmount().subtract(resources.getPaidAmount())).negate());
}else{
purveyorTransact.setTotalAmount(resources.getTotalAmount());
purveyorTransact.setPaidAmount(resources.getPaidAmount());
purveyorTransact.setWaitAmount((resources.getTotalAmount().subtract(resources.getPaidAmount())));
}
if (resources.getTotalAmount().compareTo(resources.getPaidAmount()) <= 0) {
purveyorTransact.setStatus(1);
} else {

2
eladmin-system/src/main/java/cn/ysk/cashier/service/impl/shopimpl/TbShopPurveyorTransactServiceImpl.java
View File

@@ -63,7 +63,7 @@ public class TbShopPurveyorTransactServiceImpl implements TbShopPurveyorTransact
@Override
public Map<String, Object> queryTransactSum(TbShopPurveyorTransactQueryCriteria criteria) {
Map<String, Object> bySum = tbShopPurveyorTransactRepository.findBySum(criteria.getPurveyorId(), criteria.getType());
Map<String, Object> byStatusSum = tbShopPurveyorTransactRepository.findByStatusSum(criteria.getPurveyorId(), criteria.getType(), 0);
Map<String, Object> byStatusSum = tbShopPurveyorTransactRepository.findByStatusSum(criteria.getPurveyorId(), criteria.getType());
Map<String, Object> sumMap = new HashMap<>(bySum);
sumMap.put("waitNumber", byStatusSum.get("waitNumber"));
return sumMap;