From 7dc4502634b3b5a982a9899dbf8e36d0b016231c Mon Sep 17 00:00:00 2001
From: Pu Zhibing <393733352@qq.com>
Date: 星期五, 06 十二月 2024 19:31:05 +0800
Subject: [PATCH] 新增售后接口
---
ruoyi-service/ruoyi-order/src/main/java/com/ruoyi/order/service/impl/ShoppingCartServiceImpl.java | 2
ruoyi-service/ruoyi-order/src/main/java/com/ruoyi/order/service/RefundPassService.java | 10 ++
ruoyi-api/ruoyi-api-order/src/main/java/com/ruoyi/order/model/RefundPass.java | 2
ruoyi-service/ruoyi-order/src/main/java/com/ruoyi/order/vo/ApplyRefundPass.java | 25 ++++++
ruoyi-service/ruoyi-order/src/main/java/com/ruoyi/order/controller/RefundPassController.java | 105 +++++++++++++++++++++++++
ruoyi-service/ruoyi-order/src/main/java/com/ruoyi/order/service/impl/RefundPassServiceImpl.java | 50 ++++++++++++
6 files changed, 190 insertions(+), 4 deletions(-)
diff --git a/ruoyi-api/ruoyi-api-order/src/main/java/com/ruoyi/order/model/RefundPass.java b/ruoyi-api/ruoyi-api-order/src/main/java/com/ruoyi/order/model/RefundPass.java
index 9f9db3d..5aeea6e 100644
--- a/ruoyi-api/ruoyi-api-order/src/main/java/com/ruoyi/order/model/RefundPass.java
+++ b/ruoyi-api/ruoyi-api-order/src/main/java/com/ruoyi/order/model/RefundPass.java
@@ -30,6 +30,8 @@
@TableId("id")
private Long id;
+ @TableField(exist = false)
+ private String idStr;
@ApiModelProperty(value = "订单id")
@TableField("order_id")
diff --git a/ruoyi-service/ruoyi-order/src/main/java/com/ruoyi/order/controller/RefundPassController.java b/ruoyi-service/ruoyi-order/src/main/java/com/ruoyi/order/controller/RefundPassController.java
index 7ac38db..2085ad3 100644
--- a/ruoyi-service/ruoyi-order/src/main/java/com/ruoyi/order/controller/RefundPassController.java
+++ b/ruoyi-service/ruoyi-order/src/main/java/com/ruoyi/order/controller/RefundPassController.java
@@ -1,8 +1,21 @@
package com.ruoyi.order.controller;
-import org.springframework.web.bind.annotation.RequestMapping;
-import org.springframework.web.bind.annotation.RestController;
+import com.baomidou.mybatisplus.core.conditions.query.LambdaQueryWrapper;
+import com.ruoyi.common.core.domain.R;
+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 io.swagger.annotations.ApiImplicitParam;
+import io.swagger.annotations.ApiImplicitParams;
+import io.swagger.annotations.ApiOperation;
+import org.springframework.web.bind.annotation.*;
+
+import javax.annotation.Resource;
+import java.util.Arrays;
/**
* <p>
@@ -16,5 +29,93 @@
@RequestMapping("/refund-pass")
public class RefundPassController {
+
+ @Resource
+ private RefundPassService refundPassService;
+
+ @Resource
+ private TokenService tokenService;
+
+ @Resource
+ private OrderService orderService;
+
+
+ @ResponseBody
+ @PostMapping("/applyRefundPass")
+ @ApiOperation(value = "售后申请", tags = {"我的订单-个人中心-小程序"})
+ public R applyRefundPass(@RequestBody ApplyRefundPass applyRefundPass){
+ return refundPassService.applyRefundPass(applyRefundPass);
+ }
+
+ @ResponseBody
+ @GetMapping("/getRefundPass/{orderId}")
+ @ApiOperation(value = "获取售后详情", tags = {"我的订单-个人中心-小程序"})
+ @ApiImplicitParams({
+ @ApiImplicitParam(name = "orderId", value = "订单id", required = true, dataType = "long"),
+ })
+ public R<RefundPass> getRefundPass(@PathVariable("orderId") Long orderId){
+ Long userid = tokenService.getLoginUserApplet().getUserid();
+ Order order = orderService.getById(orderId);
+ if(!order.getAppUserId().equals(userid)){
+ 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"));
+ one.setIdStr(one.getId().toString());
+ return R.ok(one);
+ }
+
+
+ @ResponseBody
+ @PutMapping("/cancelRefundPass/{id}")
+ @ApiOperation(value = "取消售后", tags = {"我的订单-个人中心-小程序"})
+ @ApiImplicitParams({
+ @ApiImplicitParam(name = "id", value = "售后数据id", required = true, dataType = "long"),
+ })
+ public R cancelRefundPass(@PathVariable("id") Long id){
+ RefundPass refundPass = refundPassService.getById(id);
+ if(null == refundPass){
+ return R.fail();
+ }
+ Long userid = tokenService.getLoginUserApplet().getUserid();
+ Order order = orderService.getById(refundPass.getOrderId());
+ if(!order.getAppUserId().equals(userid)){
+ return R.fail("权限不足");
+ }
+ if(Arrays.asList(2, 3).contains(refundPass.getStatus())){
+ return R.fail("售后取消失败");
+ }
+ refundPass.setDelFlag(1);
+ refundPassService.updateById(refundPass);
+ order.setOrderStatus(4);
+ orderService.updateById(order);
+ return R.ok();
+ }
+
+
+ @ResponseBody
+ @PutMapping("/deliverGoodsRefundPass/{id}")
+ @ApiOperation(value = "售后已发货操作", tags = {"我的订单-个人中心-小程序"})
+ @ApiImplicitParams({
+ @ApiImplicitParam(name = "id", value = "售后数据id", required = true, dataType = "long"),
+ })
+ public R deliverGoodsRefundPass(@PathVariable("id") Long id){
+ RefundPass refundPass = refundPassService.getById(id);
+ if(null == refundPass){
+ return R.fail();
+ }
+ Long userid = tokenService.getLoginUserApplet().getUserid();
+ Order order = orderService.getById(refundPass.getOrderId());
+ if(!order.getAppUserId().equals(userid)){
+ return R.fail("权限不足");
+ }
+ if(4 != refundPass.getStatus()){
+ return R.fail("操作失败");
+ }
+ refundPass.setStatus(5);
+ refundPassService.updateById(refundPass);
+ return R.ok();
+ }
+
}
diff --git a/ruoyi-service/ruoyi-order/src/main/java/com/ruoyi/order/service/RefundPassService.java b/ruoyi-service/ruoyi-order/src/main/java/com/ruoyi/order/service/RefundPassService.java
index 57f8f22..d771ad7 100644
--- a/ruoyi-service/ruoyi-order/src/main/java/com/ruoyi/order/service/RefundPassService.java
+++ b/ruoyi-service/ruoyi-order/src/main/java/com/ruoyi/order/service/RefundPassService.java
@@ -1,7 +1,10 @@
package com.ruoyi.order.service;
import com.baomidou.mybatisplus.extension.service.IService;
+import com.ruoyi.common.core.domain.R;
import com.ruoyi.order.model.RefundPass;
+import com.ruoyi.order.vo.ApplyRefundPass;
+import org.springframework.web.bind.annotation.RequestBody;
/**
* <p>
@@ -12,5 +15,12 @@
* @since 2024-11-21
*/
public interface RefundPassService extends IService<RefundPass> {
+
+ /**
+ * 申请售后
+ * @param applyRefundPass
+ * @return
+ */
+ R applyRefundPass(ApplyRefundPass applyRefundPass);
}
diff --git a/ruoyi-service/ruoyi-order/src/main/java/com/ruoyi/order/service/impl/RefundPassServiceImpl.java b/ruoyi-service/ruoyi-order/src/main/java/com/ruoyi/order/service/impl/RefundPassServiceImpl.java
index e729de4..a06c6bb 100644
--- a/ruoyi-service/ruoyi-order/src/main/java/com/ruoyi/order/service/impl/RefundPassServiceImpl.java
+++ b/ruoyi-service/ruoyi-order/src/main/java/com/ruoyi/order/service/impl/RefundPassServiceImpl.java
@@ -1,10 +1,19 @@
package com.ruoyi.order.service.impl;
+import com.baomidou.mybatisplus.core.conditions.query.LambdaQueryWrapper;
import com.baomidou.mybatisplus.extension.service.impl.ServiceImpl;
+import com.ruoyi.common.core.domain.R;
import com.ruoyi.order.mapper.RefundPassMapper;
+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 org.springframework.stereotype.Service;
+
+import javax.annotation.Resource;
+import java.time.LocalDateTime;
+import java.time.ZoneOffset;
/**
* <p>
@@ -16,5 +25,44 @@
*/
@Service
public class RefundPassServiceImpl extends ServiceImpl<RefundPassMapper, RefundPass> implements RefundPassService {
-
+
+ @Resource
+ private OrderService orderService;
+
+
+ /**
+ * 申请售后
+ * @param applyRefundPass
+ * @return
+ */
+ @Override
+ public R applyRefundPass(ApplyRefundPass applyRefundPass) {
+ RefundPass one = this.getOne(new LambdaQueryWrapper<RefundPass>().eq(RefundPass::getOrderId, applyRefundPass.getId()).eq(RefundPass::getDelFlag, 0)
+ .ne(RefundPass::getStatus, 3));
+ if(null != one){
+ return R.fail("不能重复提交售后");
+ }
+ Order order = orderService.getById(applyRefundPass.getId());
+ //判断是都已经超过售后时间
+ LocalDateTime afterSaleTime = order.getAfterSaleTime();
+ if(null != afterSaleTime && afterSaleTime.toEpochSecond(ZoneOffset.UTC) < LocalDateTime.now().toEpochSecond(ZoneOffset.UTC)){
+ return R.fail("已超过售后期间");
+ }
+
+ //构建售后申请数据
+ RefundPass refundPass = new RefundPass();
+ refundPass.setOrderId(applyRefundPass.getId());
+ refundPass.setStatus(1);
+ refundPass.setRefundMethod(applyRefundPass.getRefundMethod());
+ refundPass.setRefundReason(applyRefundPass.getRefundReason());
+ refundPass.setUserRemark(applyRefundPass.getUserRemark());
+ refundPass.setPics(applyRefundPass.getPics());
+ refundPass.setPassStatus(1);
+ refundPass.setDelFlag(0);
+ refundPass.setCreateTime(LocalDateTime.now());
+ this.save(refundPass);
+ order.setOrderStatus(7);
+ orderService.updateById(order);
+ return R.ok();
+ }
}
diff --git a/ruoyi-service/ruoyi-order/src/main/java/com/ruoyi/order/service/impl/ShoppingCartServiceImpl.java b/ruoyi-service/ruoyi-order/src/main/java/com/ruoyi/order/service/impl/ShoppingCartServiceImpl.java
index 23e1522..ac40b11 100644
--- a/ruoyi-service/ruoyi-order/src/main/java/com/ruoyi/order/service/impl/ShoppingCartServiceImpl.java
+++ b/ruoyi-service/ruoyi-order/src/main/java/com/ruoyi/order/service/impl/ShoppingCartServiceImpl.java
@@ -530,7 +530,7 @@
goodsShop.setGoodsId(shoppingCart.getGoodsId());
goodsShop.setShopId(shopId);
GoodsShop goodsShop1 = goodsShopClient.getGoodsShop(goodsShop).getData();
- vo.setVerifiable(null == goodsShop1 ? false : true);
+ vo.setVerifiable(goods.getAppointStore() == 1 && null == goodsShop1 ? false : true);
//判断当前数量是否已经超出限购数量（需要计算已经购买的数量）
if(null == goods.getPurchaseLimit() || -1 == goods.getPurchaseLimit()){
vo.setPurchaseLimit(false);
diff --git a/ruoyi-service/ruoyi-order/src/main/java/com/ruoyi/order/vo/ApplyRefundPass.java b/ruoyi-service/ruoyi-order/src/main/java/com/ruoyi/order/vo/ApplyRefundPass.java
new file mode 100644
index 0000000..651cd12
--- /dev/null
+++ b/ruoyi-service/ruoyi-order/src/main/java/com/ruoyi/order/vo/ApplyRefundPass.java
@@ -0,0 +1,25 @@
+package com.ruoyi.order.vo;
+
+import io.swagger.annotations.ApiModel;
+import io.swagger.annotations.ApiModelProperty;
+import lombok.Data;
+
+/**
+ * @author zhibing.pu
+ * @Date 2024/12/6 18:30
+ */
+@Data
+@ApiModel
+public class ApplyRefundPass {
+ @ApiModelProperty(value = "订单id", required = true)
+ private Long id;
+ @ApiModelProperty(value = "售后类型（1=退货退款，2=仅退款）", required = true)
+ private Integer refundMethod;
+ @ApiModelProperty(value = "申请原因", required = true)
+ private String refundReason;
+ @ApiModelProperty(value = "备注", required = true)
+ private String userRemark;
+ @ApiModelProperty(value = "图片地址，多个逗号分隔", required = true)
+ private String pics;
+
+}
--
Gitblit v1.7.1