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

订单管理-支付统计(不统计支付类型为空的 通过shopid和支付类型做中文回显 微信小程序支付图标是写死的)

Browse Source 
订单管理-列表(不再展示退单订单)
This commit is contained in:
wangw
2024-03-18 17:29:00 +08:00
parent 594ba6af86
commit 896d5fa3cb
4 changed files with 61 additions and 25 deletions
Download Patch File Download Diff File Expand all files Collapse all files

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

@@ -18,8 +18,10 @@ package cn.ysk.cashier.service.impl.order;
import cn.ysk.cashier.dto.order.TbOrderInfoDto;
import cn.ysk.cashier.dto.order.TbOrderInfoQueryCriteria;
import cn.ysk.cashier.mapper.order.TbOrderInfoMapper;
import cn.ysk.cashier.pojo.TbShopPayType;
import cn.ysk.cashier.pojo.order.TbOrderDetail;
import cn.ysk.cashier.pojo.order.TbOrderInfo;
import cn.ysk.cashier.repository.TbShopPayTypeRepository;
import cn.ysk.cashier.repository.order.TbOrderDetailRepository;
import cn.ysk.cashier.repository.order.TbOrderInfoRepository;
import cn.ysk.cashier.service.order.TbOrderInfoService;
@@ -30,13 +32,11 @@ import lombok.RequiredArgsConstructor;
import lombok.extern.slf4j.Slf4j;
import org.apache.commons.lang3.StringUtils;
import org.springframework.beans.BeanUtils;
import org.springframework.data.domain.Page;
import org.springframework.data.domain.PageRequest;
import org.springframework.data.domain.Pageable;
import org.springframework.data.domain.Sort;
import org.springframework.data.domain.*;
import org.springframework.stereotype.Service;
import org.springframework.transaction.annotation.Transactional;
import javax.persistence.criteria.Predicate;
import javax.servlet.http.HttpServletResponse;
import java.io.IOException;
import java.math.BigDecimal;
@@ -58,6 +58,7 @@ public class TbOrderInfoServiceImpl implements TbOrderInfoService {
private final TbOrderInfoMapper tbOrderInfoMapper;
private final TbOrderDetailRepository tbOrderDetailRepository;
private final TbShopPayTypeRepository payTypeRepository;
@Override
public Map<String, Object> queryAllPage(TbOrderInfoQueryCriteria criteria) {
@@ -67,16 +68,25 @@ public class TbOrderInfoServiceImpl implements TbOrderInfoService {
criteria.setOrderType(null);
}
}
Page<TbOrderInfo> page = tbOrderInfoRepository.findAll((root, criteriaQuery, criteriaBuilder) -> QueryHelp.getPredicate(root, criteria, criteriaBuilder), pageable);
// Page<TbOrderInfo> page = tbOrderInfoRepository.findAll((root, criteriaQuery, criteriaBuilder) -> QueryHelp.getPredicate(root, criteria, criteriaBuilder), pageable);
Page<TbOrderInfo> page = tbOrderInfoRepository.findAll((root, criteriaQuery, criteriaBuilder) -> {
Predicate predicate = QueryHelp.getPredicate(root, criteria, criteriaBuilder);
// 追加校验参数 status不为空时 不查询状态为 "refund" 的
if(StringUtils.isBlank(criteria.getStatus())){
predicate = criteriaBuilder.and(predicate, criteriaBuilder.notEqual(root.get("status"), "refund"));
}
return predicate;
}, pageable);
List<TbOrderInfoVo> orderInfoVoList = new ArrayList<>();
for (TbOrderInfo tbOrderInfo : page.getContent()) {
TbOrderInfoVo orderInfoVo = new TbOrderInfoVo();
List<TbOrderDetail> details = tbOrderDetailRepository.searchDetailByOrderId(tbOrderInfo.getId());
BigDecimal refundAmount = BigDecimal.ZERO;
for (TbOrderDetail detail : details) {
if(tbOrderInfo.getStatus().equals("refund")){
if (tbOrderInfo.getStatus().equals("refund")) {
refundAmount = refundAmount.add(detail.getPriceAmount());
}else{
} else {
if (detail.getStatus().equals("refund")) {
refundAmount = refundAmount.add(detail.getPriceAmount());
}
@@ -92,7 +102,23 @@ public class TbOrderInfoServiceImpl implements TbOrderInfoService {
@Override
public List<TbOrderPayCountVo> queryTbOrderPayCount(String shopId) {
return tbOrderInfoRepository.queryTbOrderPayCount(shopId);
List<TbOrderPayCountVo> result=new ArrayList<>();
List<TbOrderPayCountVo> payCountVoList = tbOrderInfoRepository.queryTbOrderPayCount(shopId);
for (TbOrderPayCountVo payCount : payCountVoList) {
if(StringUtils.isNotBlank(payCount.getPayType())){
TbShopPayType byPayType = payTypeRepository.findByPayType(payCount.getPayType(), shopId);
if (byPayType != null) {
payCount.setPayType(byPayType.getPayName());
payCount.setIcon(byPayType.getIcon());
}
if(payCount.getPayType().equals("wx_lite")){
payCount.setPayType("微信小程序支付");
payCount.setIcon("https://cashier-oss.oss-cn-beijing.aliyuncs.com/upload/20240318/ecf9e234aad8426ab0b1c4d5b8e50c9d.jpg");
}
result.add(payCount);
}
}
return result;
}
@Override
@@ -120,9 +146,9 @@ public class TbOrderInfoServiceImpl implements TbOrderInfoService {
dto.setIsRefund(0);
BigDecimal refundAmount = BigDecimal.ZERO;
for (TbOrderDetail detail : details) {
if(tbOrderInfo.getStatus().equals("refund")){
if (tbOrderInfo.getStatus().equals("refund")) {
refundAmount = refundAmount.add(detail.getPriceAmount());
}else{
} else {
if (detail.getStatus().equals("refund")) {
refundAmount = refundAmount.add(detail.getPriceAmount());
}
@@ -132,7 +158,7 @@ public class TbOrderInfoServiceImpl implements TbOrderInfoService {
if (refund > 0) {
dto.setIsRefund(1);
}
log.info("退款金额为：{}",refundAmount);
log.info("退款金额为：{}", refundAmount);
dto.setRefundAmount(refundAmount);
dto.setDetailList(details);
return dto;

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

@@ -173,7 +173,7 @@ public class TbProductServiceImpl implements TbProductService {
Threads.call(tbShopUnits, tbProductSkus, tbProductSpec);
//组装
TbProductVo tbProductVo = new TbProductVo();
tbProductVo.setCategoryId(Integer.valueOf(tbProduct.getCategoryId()));
tbProductVo.setCategoryId(tbProduct.getCategoryId());
//单位
if (tbProduct.getUnitId() == null) {
tbProductVo.setUnitId(null);