修改bug

Pu Zhibing

2025-01-14 60e22397096522ae48bc3af1f756c705f94d2d27

 ruoyi-service/ruoyi-order/src/main/java/com/ruoyi/order/controller/RefundPassController.java

@@ -3,12 +3,15 @@

import com.baomidou.mybatisplus.core.conditions.query.LambdaQueryWrapper;
import com.ruoyi.common.core.domain.R;
import com.ruoyi.common.core.web.controller.BaseController;
import com.ruoyi.common.core.web.page.PageInfo;
import com.ruoyi.common.core.web.page.TableDataInfo;
import com.ruoyi.common.security.service.TokenService;
import com.ruoyi.order.model.Order;
import com.ruoyi.order.model.RefundPass;
import com.ruoyi.order.service.OrderService;
import com.ruoyi.order.service.RefundPassService;
import com.ruoyi.order.vo.ApplyRefundPass;
import com.ruoyi.order.vo.*;
import io.swagger.annotations.ApiImplicitParam;
import io.swagger.annotations.ApiImplicitParams;
import io.swagger.annotations.ApiOperation;
@@ -16,6 +19,8 @@

import javax.annotation.Resource;
import java.util.Arrays;
import java.util.Date;
import java.util.List;

/**
 * <p>
@@ -27,7 +32,7 @@
 */
@RestController
@RequestMapping("/refund-pass")
public class RefundPassController {
public class RefundPassController extends BaseController {


   @Resource
@@ -60,8 +65,9 @@
         return R.fail("权限不足");
      }
      RefundPass one = refundPassService.getOne(new LambdaQueryWrapper<RefundPass>().eq(RefundPass::getOrderId, orderId)
            .eq(RefundPass::getDelFlag, 0).last(" order by createTime desc limit 0,1"));
            .eq(RefundPass::getDelFlag, 0).last(" order by create_time desc limit 0,1"));
      one.setIdStr(one.getId().toString());
      one.setAddressJson(order.getAddressJson());
      return R.ok(one);
   }
   
@@ -87,20 +93,21 @@
      }
      refundPass.setDelFlag(1);
      refundPassService.updateById(refundPass);
      order.setOrderStatus(4);
      order.setOrderStatus(order.getOldOrderStatus());
      orderService.updateById(order);
      return R.ok();
   }
   
   
   @ResponseBody
   @PutMapping("/deliverGoodsRefundPass/{id}")
   @PostMapping("/deliverGoodsRefundPass")
   @ApiOperation(value = "售后已发货操作", tags = {"我的订单-个人中心-小程序"})
   @ApiImplicitParams({
         @ApiImplicitParam(name = "id", value = "售后数据id", required = true, dataType = "long"),
         @ApiImplicitParam(name = "code", value = "快递单号", required = true, dataType = "string"),
   })
   public R deliverGoodsRefundPass(@PathVariable("id") Long id){
      RefundPass refundPass = refundPassService.getById(id);
   public R deliverGoodsRefundPass(@RequestBody DeliverGoodsRefundPass pass){
      RefundPass refundPass = refundPassService.getById(pass.getId());
      if(null == refundPass){
         return R.fail();
      }
@@ -113,9 +120,53 @@
         return R.fail("操作失败");
      }
      refundPass.setStatus(5);
      refundPass.setCode(pass.getCode());
      refundPassService.updateById(refundPass);
      return R.ok();
   }
   
	
	
   @ResponseBody
   @GetMapping("/getOrderRefundPassList")
   @ApiOperation(value = "获取售后列表数据", tags = {"管理后台-售后管理", "门店后台-售后管理"})
   public R<PageInfo<OrderRefundPassList>> getOrderRefundPassList(OrderRefundPassListVo refundPassListVo){
      return R.ok(refundPassService.getOrderRefundPassList(refundPassListVo));
   }


	
   @ResponseBody
   @PostMapping("/authPassStatus")
   @ApiOperation(value = "审核售后", tags = {"管理后台-售后管理", "门店后台-售后管理"})
   public R authPassStatus(@RequestBody AuthPassStatus  authPassStatus){
      return refundPassService.authPassStatus(authPassStatus.getId(), authPassStatus.getStatus(), authPassStatus.getPassRemark());
   }
	
	
   @ResponseBody
   @PutMapping("/refundPassReceive/{id}")
   @ApiOperation(value = "售后确认收货操作", tags = {"管理后台-售后管理"})
   @ApiImplicitParams({
         @ApiImplicitParam(name = "id", value = "售后数据id", required = true, dataType = "long"),
   })
   public R refundPassReceive(@PathVariable("id") Long id){
      return refundPassService.refundPassReceive(id);
   }
	
	
	
   @ResponseBody
   @GetMapping("/getRefundPassInfo/{id}")
   @ApiOperation(value = "获取售后数据详情", tags = {"管理后台-售后管理", "门店后台-售后管理"})
   @ApiImplicitParams({
         @ApiImplicitParam(name = "id", value = "售后数据id", required = true, dataType = "long"),
   })
   public R<RefundPassInfo> getRefundPassInfo(@PathVariable("id") Long id){
      RefundPassInfo refundPassInfo = refundPassService.getRefundPassInfo(id);
      return R.ok(refundPassInfo);
   }
	
	
}