From 5df7e1b117d15f3ac1cf398ce2b0c17290774ade Mon Sep 17 00:00:00 2001 From: xin <1099200748@qq.com> Date: Mon, 14 Jul 2025 21:07:01 +0800 Subject: [PATCH] 订单流程 --- oying-system/src/main/java/com/oying/modules/sh/service/impl/OrderReturnServiceImpl.java | 44 +++++++++++++++++++++++++++++++++++--------- 1 files changed, 35 insertions(+), 9 deletions(-) diff --git a/oying-system/src/main/java/com/oying/modules/sh/service/impl/OrderReturnServiceImpl.java b/oying-system/src/main/java/com/oying/modules/sh/service/impl/OrderReturnServiceImpl.java index e78b192..f8fe21d 100644 --- a/oying-system/src/main/java/com/oying/modules/sh/service/impl/OrderReturnServiceImpl.java +++ b/oying-system/src/main/java/com/oying/modules/sh/service/impl/OrderReturnServiceImpl.java @@ -1,7 +1,9 @@ package com.oying.modules.sh.service.impl; import com.oying.modules.sh.domain.OrderReturn; +import com.oying.modules.sh.domain.request.AuditOrderReturn; import com.oying.utils.FileUtil; +import com.oying.utils.enums.ReturnAuditEnum; import lombok.RequiredArgsConstructor; import com.baomidou.mybatisplus.extension.plugins.pagination.Page; import com.baomidou.mybatisplus.extension.service.impl.ServiceImpl; @@ -11,19 +13,21 @@ import org.springframework.stereotype.Service; import org.springframework.transaction.annotation.Transactional; import com.oying.utils.PageUtil; + import java.util.List; import java.util.Map; import java.io.IOException; import javax.servlet.http.HttpServletResponse; import java.util.ArrayList; import java.util.LinkedHashMap; + import com.oying.utils.PageResult; /** -* @description 服务实现 -* @author lixin -* @date 2025-06-11 -**/ + * @author lixin + * @description 服务实现 + * @date 2025-06-11 + **/ @Service @RequiredArgsConstructor public class OrderReturnServiceImpl extends ServiceImpl<OrderReturnMapper, OrderReturn> implements OrderReturnService { @@ -31,13 +35,26 @@ private final OrderReturnMapper orderReturnMapper; @Override - public PageResult<OrderReturn> queryAll(OrderReturnQueryCriteria criteria, Page<Object> page){ - return PageUtil.toPage(orderReturnMapper.findAll(criteria, page)); + public PageResult<OrderReturn> queryAll(OrderReturnQueryCriteria criteria, Page<Object> page) { + criteria.setOffset(page.offset()); + List<OrderReturn> list = orderReturnMapper.findAll(criteria, criteria.getBlurry()); + Long total = orderReturnMapper.countAll(criteria, criteria.getBlurry()); + return PageUtil.toPage(list, total); } @Override - public List<OrderReturn> queryAll(OrderReturnQueryCriteria criteria){ - return orderReturnMapper.findAll(criteria); + public List<OrderReturn> queryAll(OrderReturnQueryCriteria criteria) { + return orderReturnMapper.findAll(criteria, criteria.getBlurry()); + } + + @Override + public OrderReturn getByReturnNum(String returnNum) { + return orderReturnMapper.getByReturnNum(returnNum); + } + + @Override + public void updatePayStatus(String returnNum, String status, String time) { + orderReturnMapper.updatePayStatus(returnNum, status, time); } @Override @@ -52,6 +69,12 @@ OrderReturn orderReturn = getById(resources.getReturnId()); orderReturn.copy(resources); orderReturnMapper.updateById(orderReturn); + } + + @Override + @Transactional(rollbackFor = Exception.class) + public void audit(AuditOrderReturn resources) { + } @Override @@ -75,8 +98,11 @@ map.put("退款价格", orderReturn.getRefundPrice()); map.put("退款状态", orderReturn.getRefundStatus()); map.put("退款成功时间", orderReturn.getSuccessTime()); - map.put("退款渠道ORIGINAL: 原路退款BALANCE: 退回到余额OTHER_BALANCE: 原账户异常退到其他余额账户OTHER_BANKCARD: 原银行卡异常退到其他银行卡", orderReturn.getChannel()); + map.put("退款渠道", orderReturn.getChannel()); map.put("退款原因", orderReturn.getReason()); + map.put("备注", orderReturn.getRemark()); + map.put("图片", orderReturn.getPhotos()); + map.put("审核状态", ReturnAuditEnum.getValue(orderReturn.getAuditStatus())); map.put("审核人", orderReturn.getAuditUser()); map.put("审核时间", orderReturn.getAuditTime()); map.put("审核信息", orderReturn.getAuditMessage()); -- Gitblit v1.9.3