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

订单管理 展示退单统计

This commit is contained in:
wangw 2024-03-19 17:16:01 +08:00
parent 953fddd16a
commit 42f401469a
3 changed files with 13 additions and 4 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

6
eladmin-system/src/main/java/cn/ysk/cashier/repository/order/TbOrderInfoRepository.java
View File

@ -40,6 +40,12 @@ public interface TbOrderInfoRepository extends JpaRepository<TbOrderInfo, Intege
"GROUP BY info.payType") "GROUP BY info.payType")
List<TbOrderPayCountVo> queryTbOrderPayCount(@Param("shopId")String shopId); List<TbOrderPayCountVo> queryTbOrderPayCount(@Param("shopId")String shopId);
@Query("SELECT new cn.ysk.cashier.vo.TbOrderPayCountVo('refund', SUM(info.orderAmount)) " +
"FROM TbOrderInfo info " +
"WHERE info.shopId = :shopId " +
"AND info.status = 'refund' AND info.orderType = 'return'")
TbOrderPayCountVo queryTbOrderRefund(@Param("shopId")String shopId);
@Query(value = "SELECT COUNT(1) ,pay_type AS payType FROM tb_order_info Where shop_id = :shopId AND " + @Query(value = "SELECT COUNT(1) ,pay_type AS payType FROM tb_order_info Where shop_id = :shopId AND " +
" created_at BETWEEN :startTime AND :endTime AND status='closed'AND order_type <>'return' GROUP BY pay_type" ,nativeQuery = true) " created_at BETWEEN :startTime AND :endTime AND status='closed'AND order_type <>'return' GROUP BY pay_type" ,nativeQuery = true)
List<Object[]> countByShopId(@Param("shopId") String shopId, @Param("startTime") Long startTime, @Param("endTime") Long endTime); List<Object[]> countByShopId(@Param("shopId") String shopId, @Param("startTime") Long startTime, @Param("endTime") Long endTime);

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

@ -72,7 +72,7 @@ public class TbOrderInfoServiceImpl implements TbOrderInfoService {
Page<TbOrderInfo> page = tbOrderInfoRepository.findAll((root, criteriaQuery, criteriaBuilder) -> { Page<TbOrderInfo> page = tbOrderInfoRepository.findAll((root, criteriaQuery, criteriaBuilder) -> {
Predicate predicate = QueryHelp.getPredicate(root, criteria, criteriaBuilder); Predicate predicate = QueryHelp.getPredicate(root, criteria, criteriaBuilder);
// 追加校验参数 status不为空 且 source不为空 不查询状态为 "refund" 的 // 追加校验参数 status不为空 且 source不为空 不查询状态为 "refund" 的
if(StringUtils.isBlank(criteria.getStatus()) && StringUtils.isBlank(criteria.getSource())){ if (StringUtils.isBlank(criteria.getStatus()) && StringUtils.isBlank(criteria.getSource())) {
predicate = criteriaBuilder.and(predicate, criteriaBuilder.notEqual(root.get("orderType"), "return")); predicate = criteriaBuilder.and(predicate, criteriaBuilder.notEqual(root.get("orderType"), "return"));
} }
return predicate; return predicate;
@ -118,6 +118,12 @@ public class TbOrderInfoServiceImpl implements TbOrderInfoService {
result.add(payCount); result.add(payCount);
} }
} }
TbOrderPayCountVo payRufund = tbOrderInfoRepository.queryTbOrderRefund(shopId);
if (payRufund != null) {
payRufund.setPayType("退单");
payRufund.setIcon("https://cashier-oss.oss-cn-beijing.aliyuncs.com/upload/20240319/5741608662244b878762c61bb37c95c9.png");
result.add(payRufund);
}
return result; return result;
} }
@ -158,7 +164,6 @@ public class TbOrderInfoServiceImpl implements TbOrderInfoService {
if (refund > 0) { if (refund > 0) {
dto.setIsRefund(1); dto.setIsRefund(1);
} }
log.info("退款金额为：{}", refundAmount);
dto.setRefundAmount(refundAmount); dto.setRefundAmount(refundAmount);
dto.setDetailList(details); dto.setDetailList(details);
return dto; return dto;

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

@ -82,9 +82,7 @@ public class TbProductSkuServiceImpl implements TbProductSkuService {
public void update(TbProductSku resources) { public void update(TbProductSku resources) {
TbProductSku tbProductSku = tbProductSkuRepository.findById(resources.getId()).orElseGet(TbProductSku::new); TbProductSku tbProductSku = tbProductSkuRepository.findById(resources.getId()).orElseGet(TbProductSku::new);
ValidationUtil.isNull( tbProductSku.getId(),"TbProductSku","id",resources.getId()); ValidationUtil.isNull( tbProductSku.getId(),"TbProductSku","id",resources.getId());
log.info("入库前{}",tbProductSku);
tbProductSku.copy(resources); tbProductSku.copy(resources);
log.info("入库后{}",tbProductSku);
tbProductSkuRepository.save(tbProductSku); tbProductSkuRepository.save(tbProductSku);
} }