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:
韩鹏辉
2024-07-09 10:50:30 +08:00
parent 8245ae9b8c
commit 90bfde259c
5 changed files with 42 additions and 7 deletions
Download Patch File Download Diff File Expand all files Collapse all files

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

@@ -454,7 +454,7 @@ public class SummaryServiceImpl implements SummaryService {
endTime = new Date();
}
TbOrderPayCountVo payCount = tbOrderInfoRepository.queryOrderPayCount(shopId, start, end);
TbOrderPayCountVo refCount = tbOrderInfoRepository.queryTbOrderRefund(shopId, start, end);
TbOrderPayCountVo refCount = tbOrderInfoRepository.queryTbOrderRefund(shopId, null,start, end);
payCount.setPayAmount(new BigDecimal(payCount.getPayAmount().toString()).subtract(new BigDecimal(refCount.getPayAmount().toString())));
payCount.setIcon("el-icon-coin");
list.add(payCount);

30
eladmin-system/src/main/java/cn/ysk/cashier/service/impl/order/TbOrderInfoServiceImpl.java
View File

@@ -150,7 +150,10 @@ public class TbOrderInfoServiceImpl implements TbOrderInfoService {
end = createdAt.get(1);
}
}
List<TbOrderPayCountVo> payCountVoList = tbOrderInfoRepository.queryTbOrderPayCount(criteria.getShopId(), start, end);
if(ObjectUtil.isEmpty(criteria.getTableName())){
criteria.setTableName(null);
}
List<TbOrderPayCountVo> payCountVoList = tbOrderInfoRepository.queryTbOrderPayCount(criteria.getShopId(),criteria.getTableName(), start, end);
BigDecimal totalPayAmount = BigDecimal.ZERO;
for (TbOrderPayCountVo payCount : payCountVoList) {
totalPayAmount = totalPayAmount.add(new BigDecimal(payCount.getPayAmount().toString()));
@@ -167,7 +170,7 @@ public class TbOrderInfoServiceImpl implements TbOrderInfoService {
result.add(payCount);
}
}
TbOrderPayCountVo payRufund = tbOrderInfoRepository.queryTbOrderRefund(criteria.getShopId(), start, end);
TbOrderPayCountVo payRufund = tbOrderInfoRepository.queryTbOrderRefund(criteria.getShopId(),criteria.getTableName(), start, end);
if (payRufund != null) {
totalPayAmount = totalPayAmount.subtract(new BigDecimal(payRufund.getPayAmount().toString()));
payRufund.setPayType("退单");
@@ -400,6 +403,28 @@ public class TbOrderInfoServiceImpl implements TbOrderInfoService {
.collect(Collectors.joining("/"));
map.put("商品信息", productNames);
//
if(ObjectUtil.isNotEmpty(tbOrderInfo.getOrderType())&&ObjectUtil.isNotNull(tbOrderInfo.getOrderType())){
switch (tbOrderInfo.getPayType()){
case "scanCode":
tbOrderInfo.setPayType("收款码支付");
break;
case "deposit":
tbOrderInfo.setPayType("会员卡支付");
break;
case "cash":
tbOrderInfo.setPayType("现金支付");
break;
case "wx_lite":
tbOrderInfo.setPayType("微信支付");
break;
}
}else {
tbOrderInfo.setPayType("");
}
map.put("支付类型", tbOrderInfo.getPayType());
map.put("订单金额", tbOrderInfo.getOrderAmount());
map.put("退单金额", tbOrderInfo.getRefundAmount());
@@ -442,6 +467,7 @@ public class TbOrderInfoServiceImpl implements TbOrderInfoService {
map.put("状态", tbOrderInfo.getStatus());
map.put("创建日期", DateUtil.timeStampFormatyMdHms(tbOrderInfo.getCreatedAt()));
map.put("备注", tbOrderInfo.getRemark());
map.put("台桌",tbOrderInfo.getTableName());
list.add(map);
}
FileUtil.downloadExcel(list, response);