售后订单

ruoyi-admin/src/main/java/com/ruoyi/web/controller/info/OrderRefundController.java

@@ -7,11 +7,11 @@ import com.ruoyi.common.core.controller.BaseController;
 import com.ruoyi.common.core.domain.PageQuery;
 import com.ruoyi.common.core.domain.R;
 import com.ruoyi.common.core.page.TableDataInfo;
-import com.ruoyi.common.core.validate.EditGroup;
 import com.ruoyi.common.core.validate.QueryGroup;
 import com.ruoyi.common.enums.BusinessType;
 import com.ruoyi.info.order.domain.bo.OrderRefundBo;
 import com.ruoyi.info.order.domain.vo.OrderRefundVo;
+import com.ruoyi.info.order.enums.OrderOperatorType;
 import com.ruoyi.info.order.service.IOrderRefundService;
 import io.swagger.annotations.Api;
 import io.swagger.annotations.ApiOperation;
@@ -60,15 +60,17 @@ public class OrderRefundController extends BaseController {
     }
 
     /**
-     * 修改售后订单
+     * 同意或拒绝售后订单
      */
-    @ApiOperation("修改售后订单")
-    @SaCheckPermission("order:orderRefund:edit")
+    @ApiOperation("同意或拒绝售后订单")
+    @SaCheckPermission("order:orderRefund:agreeOrRefuse")
     @Log(title = "售后订单", businessType = BusinessType.UPDATE)
     @RepeatSubmit()
-    @PostMapping("/edit")
-    public R<Void> edit(@Validated(EditGroup.class) @RequestBody OrderRefundBo bo) {
-        return toAjax(iOrderRefundService.updateByBo(bo) ? 1 : 0);
+    @PostMapping("/agreeOrRefuse")
+    public R<Void> agreeOrRefuse(@RequestBody OrderRefundBo bo) {
+        bo.setOperatorId(getUserId());
+        bo.setOperatorType(OrderOperatorType.platform.getCode());
+        return toAjax(iOrderRefundService.agreeOrRefuse(bo) ? 1 : 0);
     }
 
 }

ruoyi-info/ruoyi-info-biz/src/main/java/com/ruoyi/info/order/domain/vo/OrderRefundVo.java

@@ -120,6 +120,12 @@ public class OrderRefundVo {
     @ExcelProperty(value = "操作人")
     @ApiModelProperty("操作人")
     private Long operatorId;
+    @ExcelProperty(value = "操作人名称")
+    @ApiModelProperty("操作人名称")
+    private String operatorName;
+    @ExcelProperty(value = "操作人手机号")
+    @ApiModelProperty("操作人手机号")
+    private String operatorMobile;
 
     /**
      * 退款交易号

ruoyi-info/ruoyi-info-biz/src/main/java/com/ruoyi/info/order/service/impl/OrderRefundServiceImpl.java

@@ -7,15 +7,19 @@ import com.baomidou.mybatisplus.core.conditions.query.LambdaQueryWrapper;
 import com.baomidou.mybatisplus.core.toolkit.Wrappers;
 import com.baomidou.mybatisplus.extension.plugins.pagination.Page;
 import com.ruoyi.common.core.domain.PageQuery;
+import com.ruoyi.common.core.domain.entity.SysUser;
 import com.ruoyi.common.core.page.TableDataInfo;
 import com.ruoyi.common.exception.ServiceException;
 import com.ruoyi.common.utils.BeanCopyUtils;
 import com.ruoyi.common.utils.StringUtils;
+import com.ruoyi.info.management.domain.vo.ManagementTeacherVo;
+import com.ruoyi.info.management.service.IManagementTeacherService;
 import com.ruoyi.info.order.domain.Order;
 import com.ruoyi.info.order.domain.OrderRefund;
 import com.ruoyi.info.order.domain.bo.OrderRefundBo;
 import com.ruoyi.info.order.domain.bo.OrderRefundCountBo;
 import com.ruoyi.info.order.domain.vo.OrderRefundVo;
+import com.ruoyi.info.order.enums.OrderOperatorType;
 import com.ruoyi.info.order.enums.OrderStatus;
 import com.ruoyi.info.order.enums.RefundStatus;
 import com.ruoyi.info.order.exception.OrderRefundExceptionEnum;
@@ -24,6 +28,7 @@ import com.ruoyi.info.order.service.IOrderRefundService;
 import com.ruoyi.info.order.service.IOrderService;
 import com.ruoyi.system.enums.SequencePrefixEnum;
 import com.ruoyi.system.service.ISysSequenceService;
+import com.ruoyi.system.service.ISysUserService;
 import lombok.RequiredArgsConstructor;
 import org.springframework.stereotype.Service;
 
@@ -46,6 +51,8 @@ public class OrderRefundServiceImpl implements IOrderRefundService {
     private final OrderRefundMapper baseMapper;
     private final IOrderService orderService;
     private final ISysSequenceService sysSequenceService;
+    private final ISysUserService sysUserService;
+    private final IManagementTeacherService managementTeacherService;
 
     /**
      * 查询售后订单分页
@@ -106,6 +113,19 @@ public class OrderRefundServiceImpl implements IOrderRefundService {
             return null;
         }
         orderRefundVo.setOrderVo(orderService.queryById(orderRefundVo.getOrderId()));
+        if (OrderOperatorType.platform.getCode().equals(orderRefundVo.getOperatorType())) {
+            SysUser sysUser = sysUserService.selectBaseUserById(orderRefundVo.getOperatorId());
+            if (ObjectUtil.isNotNull(sysUser)) {
+                orderRefundVo.setOperatorName(sysUser.getNickName());
+                orderRefundVo.setOperatorMobile(sysUser.getPhonenumber());
+            }
+        } else if (OrderOperatorType.teacher.getCode().equals(orderRefundVo.getOperatorType())) {
+            ManagementTeacherVo managementTeacherVo = managementTeacherService.queryDelById(orderRefundVo.getOperatorId());
+            if (ObjectUtil.isNotNull(managementTeacherVo)) {
+                orderRefundVo.setOperatorName(managementTeacherVo.getName());
+                orderRefundVo.setOperatorMobile(managementTeacherVo.getPhoneNumber());
+            }
+        }
         return orderRefundVo;
     }
 

ruoyi-system/src/main/java/com/ruoyi/system/service/ISysUserService.java

@@ -4,7 +4,6 @@ import com.ruoyi.common.core.domain.PageQuery;
 import com.ruoyi.common.core.domain.entity.SysUser;
 import com.ruoyi.common.core.page.TableDataInfo;
 
-import javax.validation.constraints.NotNull;
 import java.util.List;
 
 /**
@@ -205,4 +204,5 @@ public interface ISysUserService {
 
     void importSqlite();
 
+    SysUser selectBaseUserById(Long userId);
 }

ruoyi-system/src/main/java/com/ruoyi/system/service/impl/SysUserServiceImpl.java

@@ -1,7 +1,6 @@
 package com.ruoyi.system.service.impl;
 
 import cn.hutool.core.collection.CollUtil;
-import cn.hutool.core.map.MapUtil;
 import cn.hutool.core.util.ObjectUtil;
 import com.baomidou.mybatisplus.core.conditions.query.LambdaQueryWrapper;
 import com.baomidou.mybatisplus.core.conditions.update.LambdaUpdateWrapper;
@@ -11,7 +10,6 @@ import com.ruoyi.common.core.domain.PageQuery;
 import com.ruoyi.common.core.domain.entity.SysRole;
 import com.ruoyi.common.core.domain.entity.SysUser;
 import com.ruoyi.common.core.page.TableDataInfo;
-import com.ruoyi.common.enums.SystemRoleKey;
 import com.ruoyi.common.enums.UserStatus;
 import com.ruoyi.common.exception.ServiceException;
 import com.ruoyi.common.helper.LoginHelper;
@@ -28,11 +26,10 @@ import lombok.extern.slf4j.Slf4j;
 import org.springframework.stereotype.Service;
 import org.springframework.transaction.annotation.Transactional;
 
-import java.sql.Connection;
-import java.sql.PreparedStatement;
-import java.sql.ResultSet;
-import java.sql.SQLException;
-import java.util.*;
+import java.util.ArrayList;
+import java.util.Arrays;
+import java.util.List;
+import java.util.Vector;
 import java.util.stream.Collectors;
 
 /**
@@ -554,4 +551,9 @@ public class SysUserServiceImpl implements ISysUserService {
 //        }
     }
 
+    @Override
+    public SysUser selectBaseUserById(Long userId) {
+        return baseMapper.selectVoById(userId);
+    }
+
 }