Merge remote-tracking branch 'origin/master'

puzhibing

2024-12-10 fb6eee80334ae23a2eca8c37baeef05e86c919ed

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

@@ -60,7 +60,7 @@
         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());
      return R.ok(one);
   }
@@ -85,8 +85,8 @@
      if(Arrays.asList(2, 3).contains(refundPass.getStatus())){
         return R.fail("售后取消失败");
      }
      refundPass.setDelFlag(1);
      refundPassService.updateById(refundPass);
//      refundPass.setDelFlag(1);
      refundPassService.removeById(id);
      order.setOrderStatus(4);
      orderService.updateById(order);
      return R.ok();
@@ -94,12 +94,13 @@
   
   
   @ResponseBody
   @PutMapping("/deliverGoodsRefundPass/{id}")
   @PutMapping("/deliverGoodsRefundPass/{id}/{code}")
   @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){
   public R deliverGoodsRefundPass(@PathVariable("id") Long id, @PathVariable("code") String code){
      RefundPass refundPass = refundPassService.getById(id);
      if(null == refundPass){
         return R.fail();
@@ -113,6 +114,7 @@
         return R.fail("操作失败");
      }
      refundPass.setStatus(5);
      refundPass.setCode(code);
      refundPassService.updateById(refundPass);
      return R.ok();
   }