修改bug

Pu Zhibing

2025-01-14 60e22397096522ae48bc3af1f756c705f94d2d27

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

@@ -19,6 +19,7 @@

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

/**
@@ -66,6 +67,7 @@
      RefundPass one = refundPassService.getOne(new LambdaQueryWrapper<RefundPass>().eq(RefundPass::getOrderId, orderId)
            .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);
   }
   
@@ -89,23 +91,23 @@
      if(Arrays.asList(2, 3).contains(refundPass.getStatus())){
         return R.fail("售后取消失败");
      }
//      refundPass.setDelFlag(1);
      refundPassService.removeById(id);
      order.setOrderStatus(4);
      refundPass.setDelFlag(1);
      refundPassService.updateById(refundPass);
      order.setOrderStatus(order.getOldOrderStatus());
      orderService.updateById(order);
      return R.ok();
   }
   
   
   @ResponseBody
   @PutMapping("/deliverGoodsRefundPass/{id}/{code}")
   @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, @PathVariable("code") String code){
      RefundPass refundPass = refundPassService.getById(id);
   public R deliverGoodsRefundPass(@RequestBody DeliverGoodsRefundPass pass){
      RefundPass refundPass = refundPassService.getById(pass.getId());
      if(null == refundPass){
         return R.fail();
      }
@@ -118,7 +120,7 @@
         return R.fail("操作失败");
      }
      refundPass.setStatus(5);
      refundPass.setCode(code);
      refundPass.setCode(pass.getCode());
      refundPassService.updateById(refundPass);
      return R.ok();
   }
@@ -131,7 +133,8 @@
   public R<PageInfo<OrderRefundPassList>> getOrderRefundPassList(OrderRefundPassListVo refundPassListVo){
      return R.ok(refundPassService.getOrderRefundPassList(refundPassListVo));
   }
	


   
   @ResponseBody
   @PostMapping("/authPassStatus")