Merge branch 'master' of http://120.76.84.145:10101/gitblit/r/java/qijisheng

无关风月

2025-01-14 6ccd0f9e28c083e5f62d7d5074a85584a77af6bb

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

@@ -4,16 +4,14 @@
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.OrderRefundPassList;
import com.ruoyi.order.vo.OrderRefundPassListVo;
import com.ruoyi.order.vo.RefundPassInfo;
import com.ruoyi.order.vo.*;
import io.swagger.annotations.ApiImplicitParam;
import io.swagger.annotations.ApiImplicitParams;
import io.swagger.annotations.ApiOperation;
@@ -21,6 +19,7 @@

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

/**
@@ -68,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);
   }
   
@@ -91,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();
      }
@@ -120,7 +120,7 @@
         return R.fail("操作失败");
      }
      refundPass.setStatus(5);
      refundPass.setCode(code);
      refundPass.setCode(pass.getCode());
      refundPassService.updateById(refundPass);
      return R.ok();
   }
@@ -130,23 +130,17 @@
   @ResponseBody
   @GetMapping("/getOrderRefundPassList")
   @ApiOperation(value = "获取售后列表数据", tags = {"管理后台-售后管理", "门店后台-售后管理"})
   public TableDataInfo<OrderRefundPassList> getOrderRefundPassList(OrderRefundPassListVo refundPassListVo){
      startPage();
      List<OrderRefundPassList> orderRefundPassList = refundPassService.getOrderRefundPassList(refundPassListVo);
      return getDataTable(orderRefundPassList);
   public R<PageInfo<OrderRefundPassList>> getOrderRefundPassList(OrderRefundPassListVo refundPassListVo){
      return R.ok(refundPassService.getOrderRefundPassList(refundPassListVo));
   }
	


   
   @ResponseBody
   @PostMapping("/authPassStatus/{id}/{status}")
   @PostMapping("/authPassStatus")
   @ApiOperation(value = "审核售后", tags = {"管理后台-售后管理", "门店后台-售后管理"})
   @ApiImplicitParams({
         @ApiImplicitParam(name = "id", value = "售后数据id", required = true, dataType = "long"),
         @ApiImplicitParam(name = "status", value = "审核状态（2=同意，3=拒绝）", required = true, dataType = "int"),
         @ApiImplicitParam(name = "passRemark", value = "审核备注", required = false, dataType = "string"),
   })
   public R authPassStatus(@PathVariable("id") Long id, @PathVariable("status") Integer status, @RequestParam("passRemark") String passRemark){
      return refundPassService.authPassStatus(id, status, passRemark);
   public R authPassStatus(@RequestBody AuthPassStatus  authPassStatus){
      return refundPassService.authPassStatus(authPassStatus.getId(), authPassStatus.getStatus(), authPassStatus.getPassRemark());
   }