diff --git a/eladmin-system/src/main/java/cn/ysk/cashier/pojo/order/TbOrderDetail.java b/eladmin-system/src/main/java/cn/ysk/cashier/pojo/order/TbOrderDetail.java index 039ea857..bdb1eef2 100644 --- a/eladmin-system/src/main/java/cn/ysk/cashier/pojo/order/TbOrderDetail.java +++ b/eladmin-system/src/main/java/cn/ysk/cashier/pojo/order/TbOrderDetail.java @@ -99,6 +99,10 @@ public class TbOrderDetail implements Serializable { @ApiModelProperty(value = "打包费") private BigDecimal packAmount; + @Transient + @ApiModelProperty(value = "退单数量") + private Integer refundNumber; + public void copy(TbOrderDetail source){ BeanUtil.copyProperties(source,this, CopyOptions.create().setIgnoreNullValue(true)); } diff --git a/eladmin-system/src/main/java/cn/ysk/cashier/repository/order/TbOrderDetailRepository.java b/eladmin-system/src/main/java/cn/ysk/cashier/repository/order/TbOrderDetailRepository.java index 64053c67..9a8b7401 100644 --- a/eladmin-system/src/main/java/cn/ysk/cashier/repository/order/TbOrderDetailRepository.java +++ b/eladmin-system/src/main/java/cn/ysk/cashier/repository/order/TbOrderDetailRepository.java @@ -31,6 +31,9 @@ public interface TbOrderDetailRepository extends JpaRepository searchDetailByOrderId(@Param("orderId")Integer orderId); + @Query("SELECT cart FROM TbOrderDetail cart WHERE cart.orderId in :ids") + List searchDetailByOrderIds(@Param("ids")List ids); + @Query("SELECT new cn.ysk.cashier.vo.TbOrderSalesCountByDayVo(" + "info.productName, info.productSkuName, cate.name, unit.name,info.price," + diff --git a/eladmin-system/src/main/java/cn/ysk/cashier/repository/order/TbOrderInfoRepository.java b/eladmin-system/src/main/java/cn/ysk/cashier/repository/order/TbOrderInfoRepository.java index 57bcebf9..24d9291b 100644 --- a/eladmin-system/src/main/java/cn/ysk/cashier/repository/order/TbOrderInfoRepository.java +++ b/eladmin-system/src/main/java/cn/ysk/cashier/repository/order/TbOrderInfoRepository.java @@ -58,6 +58,10 @@ public interface TbOrderInfoRepository extends JpaRepository'return' GROUP BY pay_type" ,nativeQuery = true) List countByShopId(@Param("shopId") String shopId, @Param("startTime") Long startTime, @Param("endTime") Long endTime); + @Query("SELECT info FROM TbOrderInfo info WHERE info.source = :source AND info.shopId=:shopId") + List selTbOrdersBysource(@Param("source")Integer source,@Param("shopId") String shopId); + + @Query("SELECT count(1) FROM TbOrderInfo WHERE source = :source AND shopId=:shopId") int isRefund(@Param("source")Integer source,@Param("shopId") String shopId); diff --git a/eladmin-system/src/main/java/cn/ysk/cashier/service/impl/SummaryServiceImpl.java b/eladmin-system/src/main/java/cn/ysk/cashier/service/impl/SummaryServiceImpl.java index 3bc9e8f3..d84f51c6 100644 --- a/eladmin-system/src/main/java/cn/ysk/cashier/service/impl/SummaryServiceImpl.java +++ b/eladmin-system/src/main/java/cn/ysk/cashier/service/impl/SummaryServiceImpl.java @@ -428,12 +428,12 @@ public class SummaryServiceImpl implements SummaryService { map.put("商品名称", all.getProductName()); map.put("单 位", all.getUnitName()); map.put("商品规格", StringUtils.isBlank(all.getProductSkuName()) ? "" : all.getProductSkuName()); + map.put("销 售 额", all.getSalesAmount()); map.put("销 量", all.getSalesNum()); map.put("单 价", all.getPrice()); map.put("退 单 量", all.getRefNum()); - map.put("销 售 额", all.getSalesAmount().subtract(all.getRefAmount())); - map.put("退 单 额", all.getRefAmount().compareTo(BigDecimal.ZERO) == 0 ? BigDecimal.ZERO : "-" + all.getRefAmount()); - map.put("总 量", all.getNum()); + map.put("退 单 额", all.getRefAmount().compareTo(BigDecimal.ZERO)==0?all.getRefAmount():"-"+all.getRefAmount()); + map.put("总 量", all.getNum()-all.getRefNum()); list.add(map); } } @@ -465,8 +465,8 @@ public class SummaryServiceImpl implements SummaryService { list.add(refCount); TbOrderSalesCountByDayVo numCount = detailRepository.queryTbOrderSalesCount(Integer.valueOf(shopId), startTime, endTime); - TbOrderPayCountVo salesNum =new TbOrderPayCountVo("el-icon-goods","销售量","0",numCount.getSalesNum()); - TbOrderPayCountVo refNum =new TbOrderPayCountVo("el-icon-goods","销售量","0",numCount.getRefNum()); + TbOrderPayCountVo salesNum =new TbOrderPayCountVo("el-icon-goods","销售量","0",numCount.getSalesNum()-numCount.getRefNum()); + TbOrderPayCountVo refNum =new TbOrderPayCountVo("el-icon-goods","退单量","0",numCount.getRefNum()); list.add(salesNum); list.add(refNum); return list; diff --git a/eladmin-system/src/main/java/cn/ysk/cashier/service/impl/order/TbOrderInfoServiceImpl.java b/eladmin-system/src/main/java/cn/ysk/cashier/service/impl/order/TbOrderInfoServiceImpl.java index 236fcccc..74b45a39 100644 --- a/eladmin-system/src/main/java/cn/ysk/cashier/service/impl/order/TbOrderInfoServiceImpl.java +++ b/eladmin-system/src/main/java/cn/ysk/cashier/service/impl/order/TbOrderInfoServiceImpl.java @@ -78,7 +78,6 @@ public class TbOrderInfoServiceImpl implements TbOrderInfoService { criteria.setOrderType(null); } } -// Page page = tbOrderInfoRepository.findAll((root, criteriaQuery, criteriaBuilder) -> QueryHelp.getPredicate(root, criteria, criteriaBuilder), pageable); Page page = tbOrderInfoRepository.findAll((root, criteriaQuery, criteriaBuilder) -> { Predicate predicate = QueryHelp.getPredicate(root, criteria, criteriaBuilder); // 追加校验参数 status不为空 且 source不为空 不查询状态为 "refund" 的 @@ -91,16 +90,29 @@ public class TbOrderInfoServiceImpl implements TbOrderInfoService { List orderInfoVoList = new ArrayList<>(); for (TbOrderInfo tbOrderInfo : page.getContent()) { TbOrderInfoVo orderInfoVo = new TbOrderInfoVo(); - List details = tbOrderDetailRepository.searchDetailByOrderId(tbOrderInfo.getId()); BigDecimal refundAmount = BigDecimal.ZERO; - for (TbOrderDetail detail : details) { - if (tbOrderInfo.getStatus().equals("refund")) { - refundAmount = refundAmount.add(detail.getPriceAmount()); + List details = tbOrderDetailRepository.searchDetailByOrderId(tbOrderInfo.getId()); + if (!tbOrderInfo.getOrderType().equals("return")) { + List tbOrderInfos = tbOrderInfoRepository.selTbOrdersBysource(tbOrderInfo.getId(), tbOrderInfo.getShopId()); + Map map; + if (!CollectionUtils.isEmpty(tbOrderInfos)) { + List ids = tbOrderInfos.stream().map(TbOrderInfo::getId).collect(Collectors.toList()); + List refundOrderDetail = tbOrderDetailRepository.searchDetailByOrderIds(ids); + map = refundOrderDetail.stream().collect(Collectors.groupingBy(TbOrderDetail::getProductSkuId, Collectors.summingInt(TbOrderDetail::getNum))); + refundAmount = tbOrderInfos.stream().map(TbOrderInfo::getOrderAmount).reduce(BigDecimal.ZERO, BigDecimal::add); } else { - if (detail.getStatus().equals("refund")) { - refundAmount = refundAmount.add(detail.getPriceAmount()); - } + map = new HashMap<>(); } + details.parallelStream().forEach(detail -> { + Integer refundNumber = map.get(detail.getProductSkuId()); + if (refundNumber != null) { + detail.setRefundNumber(refundNumber); + } + }); + }else { + details.parallelStream().forEach(detail -> { + detail.setRefundNumber(detail.getNum()); + }); } orderInfoVo.setDetailList(details); BeanUtils.copyProperties(tbOrderInfo, orderInfoVo); @@ -150,7 +162,7 @@ public class TbOrderInfoServiceImpl implements TbOrderInfoService { payRufund.setIcon("https://cashier-oss.oss-cn-beijing.aliyuncs.com/upload/20240319/5741608662244b878762c61bb37c95c9.png"); result.add(payRufund); } - payCountVoList.add(0,new TbOrderPayCountVo("el-icon-s-goods","总金额",null,totalPayAmount)); + result.add(0, new TbOrderPayCountVo("https://cashier-oss.oss-cn-beijing.aliyuncs.com/upload/20240625/fa0e5b24884d4ac2a18973b3855e5309.png", "总金额", null, totalPayAmount)); return result; } @@ -193,28 +205,19 @@ public class TbOrderInfoServiceImpl implements TbOrderInfoService { dto.setPayType(tbOrderInfo.getSendType()); break; } - }else { + } else { if (dto.getStatus().equals("refund")) { dto.setPayType("退单"); } } List details = tbOrderDetailRepository.searchDetailByOrderId(tbOrderInfo.getId()); dto.setIsRefund(0); - BigDecimal refundAmount = BigDecimal.ZERO; - for (TbOrderDetail detail : details) { - if (tbOrderInfo.getStatus().equals("refund")) { - refundAmount = refundAmount.add(detail.getPriceAmount()); - } else { - if (detail.getStatus().equals("refund")) { - refundAmount = refundAmount.add(detail.getPriceAmount()); - } - } - } - int refund = tbOrderInfoRepository.isRefund(id, tbOrderInfo.getShopId()); - if (refund > 0) { + dto.setRefundAmount(BigDecimal.ZERO); + List tbOrderInfos = tbOrderInfoRepository.selTbOrdersBysource(tbOrderInfo.getId(), tbOrderInfo.getShopId()); + if(!CollectionUtils.isEmpty(tbOrderInfos)){ dto.setIsRefund(1); + dto.setRefundAmount(tbOrderInfos.stream().map(TbOrderInfo::getOrderAmount).reduce(BigDecimal.ZERO, BigDecimal::add)); } - dto.setRefundAmount(refundAmount); dto.setDetailList(details); return dto; } diff --git a/eladmin-system/src/main/java/cn/ysk/cashier/vo/TbOrderSalesCountByDayVo.java b/eladmin-system/src/main/java/cn/ysk/cashier/vo/TbOrderSalesCountByDayVo.java index 6d04395f..f2644496 100644 --- a/eladmin-system/src/main/java/cn/ysk/cashier/vo/TbOrderSalesCountByDayVo.java +++ b/eladmin-system/src/main/java/cn/ysk/cashier/vo/TbOrderSalesCountByDayVo.java @@ -101,7 +101,8 @@ public class TbOrderSalesCountByDayVo { this.refNum = refNum; } - public TbOrderSalesCountByDayVo(String productName, String productSkuName, String cateName,String unitName,BigDecimal price, Long salesNum, Long refNum, Long num, BigDecimal salesAmount, BigDecimal refAmount) { + public TbOrderSalesCountByDayVo(String productName, String productSkuName, String cateName,String unitName,BigDecimal price, + Long salesNum, Long refNum, Long num, BigDecimal salesAmount, BigDecimal refAmount) { this.productName = productName; this.productSkuName = productSkuName; this.cateName = cateName; @@ -112,5 +113,11 @@ public class TbOrderSalesCountByDayVo { this.salesAmount = salesAmount; this.refAmount = refAmount; this.num = num; + count(); + } + + public void count(){ + salesNum=salesNum-refNum; + salesAmount=salesAmount.subtract(refAmount); } }