退款

zhongzheng-api/src/main/java/com/zhongzheng/controller/order/OrderGoodsRefundController.java

@@ -0,0 +1,58 @@
+package com.zhongzheng.controller.order;
+
+import java.util.List;
+import java.util.Arrays;
+
+import com.zhongzheng.modules.order.bo.OrderGoodsRefundAddBo;
+import com.zhongzheng.modules.order.bo.OrderGoodsRefundEditBo;
+import com.zhongzheng.modules.order.bo.OrderGoodsRefundQueryBo;
+import com.zhongzheng.modules.order.service.IOrderGoodsRefundService;
+import com.zhongzheng.modules.order.vo.OrderGoodsRefundVo;
+import lombok.RequiredArgsConstructor;
+import org.springframework.security.access.prepost.PreAuthorize;
+import org.springframework.beans.factory.annotation.Autowired;
+import org.springframework.web.bind.annotation.GetMapping;
+import org.springframework.web.bind.annotation.PostMapping;
+import org.springframework.web.bind.annotation.PutMapping;
+import org.springframework.web.bind.annotation.DeleteMapping;
+import org.springframework.web.bind.annotation.PathVariable;
+import org.springframework.web.bind.annotation.RequestBody;
+import org.springframework.web.bind.annotation.RequestMapping;
+import org.springframework.web.bind.annotation.RestController;
+import com.zhongzheng.common.annotation.Log;
+import com.zhongzheng.common.core.controller.BaseController;
+import com.zhongzheng.common.core.domain.AjaxResult;
+import com.zhongzheng.common.enums.BusinessType;
+import com.zhongzheng.common.utils.poi.ExcelUtil;
+import com.zhongzheng.common.core.page.TableDataInfo;
+import io.swagger.annotations.Api;
+import io.swagger.annotations.ApiOperation;
+
+/**
+ * 订单商品退款Controller
+ *
+ * @author hjl
+ * @date 2022-01-04
+ */
+@Api(value = "订单商品退款控制器", tags = {"订单商品退款管理"})
+@RequiredArgsConstructor(onConstructor_ = @Autowired)
+@RestController
+@RequestMapping("/order/refund")
+public class OrderGoodsRefundController extends BaseController {
+
+    private final IOrderGoodsRefundService iOrderGoodsRefundService;
+
+
+    /**
+     * 新增订单商品退款
+     */
+    @ApiOperation("新增订单商品退款")
+    @PreAuthorize("@ss.hasPermi('system:refund:add')")
+    @Log(title = "订单商品退款", businessType = BusinessType.INSERT)
+    @PostMapping()
+    public AjaxResult<Void> add(@RequestBody OrderGoodsRefundAddBo bo) {
+        return toAjax(iOrderGoodsRefundService.insertByAddBo(bo) ? 1 : 0);
+    }
+
+
+}

zhongzheng-system/src/main/java/com/zhongzheng/modules/order/bo/OrderGoodsRefundAddBo.java

@@ -0,0 +1,49 @@
+package com.zhongzheng.modules.order.bo;
+
+import io.swagger.annotations.ApiModel;
+import io.swagger.annotations.ApiModelProperty;
+import com.fasterxml.jackson.annotation.JsonFormat;
+import lombok.Data;
+import java.util.Date;
+
+
+import java.math.BigDecimal;
+
+/**
+ * 订单商品退款添加对象 order_goods_refund
+ *
+ * @author hjl
+ * @date 2022-01-04
+ */
+@Data
+@ApiModel("订单商品退款添加对象")
+public class OrderGoodsRefundAddBo {
+
+    /** 退款单号 */
+    @ApiModelProperty("退款单号")
+    private String refundSn;
+    /** 用户ID */
+    @ApiModelProperty("用户ID")
+    private Long userId;
+    /** 订单编号 */
+    @ApiModelProperty("订单编号")
+    private String orderSn;
+    /** 商品id */
+    @ApiModelProperty("商品id")
+    private Long goodsId;
+    /** 退款金额 */
+    @ApiModelProperty("退款金额")
+    private BigDecimal refundFee;
+    /** 添加时间 */
+    @ApiModelProperty("添加时间")
+    private Long createTime;
+    /** 修改时间 */
+    @ApiModelProperty("修改时间")
+    private Long updateTime;
+    /** 状态 1正常 0关闭 */
+    @ApiModelProperty("状态 1正常 0关闭")
+    private Integer status;
+    /** 微信退款单号 */
+    @ApiModelProperty("微信退款单号")
+    private String wxpayRefundId;
+}

zhongzheng-system/src/main/java/com/zhongzheng/modules/order/bo/OrderGoodsRefundEditBo.java

@@ -0,0 +1,58 @@
+package com.zhongzheng.modules.order.bo;
+
+import io.swagger.annotations.ApiModel;
+import io.swagger.annotations.ApiModelProperty;
+import com.fasterxml.jackson.annotation.JsonFormat;
+import lombok.Data;
+import java.util.Date;
+
+import java.math.BigDecimal;
+
+/**
+ * 订单商品退款编辑对象 order_goods_refund
+ *
+ * @author hjl
+ * @date 2022-01-04
+ */
+@Data
+@ApiModel("订单商品退款编辑对象")
+public class OrderGoodsRefundEditBo {
+
+    /** $column.columnComment */
+    @ApiModelProperty("$column.columnComment")
+    private Long refundId;
+
+    /** 退款单号 */
+    @ApiModelProperty("退款单号")
+    private String refundSn;
+
+    /** 用户ID */
+    @ApiModelProperty("用户ID")
+    private Long userId;
+
+    /** 订单编号 */
+    @ApiModelProperty("订单编号")
+    private String orderSn;
+
+    /** 商品id */
+    @ApiModelProperty("商品id")
+    private Long goodsId;
+
+    /** 退款金额 */
+    @ApiModelProperty("退款金额")
+    private BigDecimal refundFee;
+
+    /** 修改时间 */
+    @ApiModelProperty("修改时间")
+    private Long updateTime;
+
+
+    /** 状态 1正常 0关闭 */
+    @ApiModelProperty("状态 1正常 0关闭")
+    private Integer status;
+
+    /** 微信退款单号 */
+    @ApiModelProperty("微信退款单号")
+    private String wxpayRefundId;
+
+}

zhongzheng-system/src/main/java/com/zhongzheng/modules/order/bo/OrderGoodsRefundQueryBo.java

@@ -0,0 +1,61 @@
+package com.zhongzheng.modules.order.bo;
+
+import io.swagger.annotations.ApiModel;
+import io.swagger.annotations.ApiModelProperty;
+import lombok.Data;
+import lombok.EqualsAndHashCode;
+
+import java.util.Date;
+import java.util.Map;
+import java.util.HashMap;
+
+import java.math.BigDecimal;
+import com.zhongzheng.common.core.domain.BaseEntity;
+
+/**
+ * 订单商品退款分页查询对象 order_goods_refund
+ *
+ * @author hjl
+ * @date 2022-01-04
+ */
+@Data
+@EqualsAndHashCode(callSuper = true)
+@ApiModel("订单商品退款分页查询对象")
+public class OrderGoodsRefundQueryBo extends BaseEntity {
+
+	/** 分页大小 */
+	@ApiModelProperty("分页大小")
+	private Integer pageSize;
+	/** 当前页数 */
+	@ApiModelProperty("当前页数")
+	private Integer pageNum;
+	/** 排序列 */
+	@ApiModelProperty("排序列")
+	private String orderByColumn;
+	/** 排序的方向desc或者asc */
+	@ApiModelProperty(value = "排序的方向", example = "asc,desc")
+	private String isAsc;
+
+
+	/** 退款单号 */
+	@ApiModelProperty("退款单号")
+	private String refundSn;
+	/** 用户ID */
+	@ApiModelProperty("用户ID")
+	private Long userId;
+	/** 订单编号 */
+	@ApiModelProperty("订单编号")
+	private String orderSn;
+	/** 商品id */
+	@ApiModelProperty("商品id")
+	private Long goodsId;
+	/** 退款金额 */
+	@ApiModelProperty("退款金额")
+	private BigDecimal refundFee;
+	/** 状态 1正常 0关闭 */
+	@ApiModelProperty("状态 1正常 0关闭")
+	private Integer status;
+	/** 微信退款单号 */
+	@ApiModelProperty("微信退款单号")
+	private String wxpayRefundId;
+}

zhongzheng-system/src/main/java/com/zhongzheng/modules/order/domain/OrderGoodsRefund.java

@@ -0,0 +1,49 @@
+package com.zhongzheng.modules.order.domain;
+
+import com.baomidou.mybatisplus.annotation.*;
+import lombok.Data;
+import lombok.NoArgsConstructor;
+import lombok.experimental.Accessors;
+import java.io.Serializable;
+import java.util.Date;
+import java.math.BigDecimal;
+import com.zhongzheng.common.annotation.Excel;
+
+/**
+ * 订单商品退款对象 order_goods_refund
+ *
+ * @author hjl
+ * @date 2022-01-04
+ */
+@Data
+@NoArgsConstructor
+@Accessors(chain = true)
+@TableName("order_goods_refund")
+public class OrderGoodsRefund implements Serializable {
+
+private static final long serialVersionUID=1L;
+
+    /** $column.columnComment */
+    @TableId(value = "refund_id")
+    private Long refundId;
+    /** 退款单号 */
+    private String refundSn;
+    /** 用户ID */
+    private Long userId;
+    /** 订单编号 */
+    private String orderSn;
+    /** 商品id */
+    private Long goodsId;
+    /** 退款金额 */
+    private BigDecimal refundFee;
+    /** 添加时间 */
+    @TableField(fill = FieldFill.INSERT)
+    private Long createTime;
+    /** 修改时间 */
+    @TableField(fill = FieldFill.INSERT_UPDATE)
+    private Long updateTime;
+    /** 状态 1正常 0关闭 */
+    private Integer status;
+    /** 微信退款单号 */
+    private String wxpayRefundId;
+}

zhongzheng-system/src/main/java/com/zhongzheng/modules/order/mapper/OrderGoodsRefundMapper.java

@@ -0,0 +1,14 @@
+package com.zhongzheng.modules.order.mapper;
+
+import com.baomidou.mybatisplus.core.mapper.BaseMapper;
+import com.zhongzheng.modules.order.domain.OrderGoodsRefund;
+
+/**
+ * 订单商品退款Mapper接口
+ *
+ * @author hjl
+ * @date 2022-01-04
+ */
+public interface OrderGoodsRefundMapper extends BaseMapper<OrderGoodsRefund> {
+
+}

zhongzheng-system/src/main/java/com/zhongzheng/modules/order/service/IOrderGoodsRefundService.java

@@ -0,0 +1,52 @@
+package com.zhongzheng.modules.order.service;
+
+import com.baomidou.mybatisplus.extension.service.IService;
+import com.zhongzheng.modules.order.bo.OrderGoodsRefundAddBo;
+import com.zhongzheng.modules.order.bo.OrderGoodsRefundEditBo;
+import com.zhongzheng.modules.order.bo.OrderGoodsRefundQueryBo;
+import com.zhongzheng.modules.order.domain.OrderGoodsRefund;
+import com.zhongzheng.modules.order.vo.OrderGoodsRefundVo;
+
+import java.util.Collection;
+import java.util.List;
+
+/**
+ * 订单商品退款Service接口
+ *
+ * @author hjl
+ * @date 2022-01-04
+ */
+public interface IOrderGoodsRefundService extends IService<OrderGoodsRefund> {
+	/**
+	 * 查询单个
+	 * @return
+	 */
+	OrderGoodsRefundVo queryById(Long refundId);
+
+	/**
+	 * 查询列表
+	 */
+	List<OrderGoodsRefundVo> queryList(OrderGoodsRefundQueryBo bo);
+
+	/**
+	 * 根据新增业务对象插入订单商品退款
+	 * @param bo 订单商品退款新增业务对象
+	 * @return
+	 */
+	Boolean insertByAddBo(OrderGoodsRefundAddBo bo);
+
+	/**
+	 * 根据编辑业务对象修改订单商品退款
+	 * @param bo 订单商品退款编辑业务对象
+	 * @return
+	 */
+	Boolean updateByEditBo(OrderGoodsRefundEditBo bo);
+
+	/**
+	 * 校验并删除数据
+	 * @param ids 主键集合
+	 * @param isValid 是否校验,true-删除前校验,false-不校验
+	 * @return
+	 */
+	Boolean deleteWithValidByIds(Collection<Long> ids, Boolean isValid);
+}

zhongzheng-system/src/main/java/com/zhongzheng/modules/order/service/impl/OrderGoodsRefundServiceImpl.java

@@ -0,0 +1,105 @@
+package com.zhongzheng.modules.order.service.impl;
+
+import cn.hutool.core.bean.BeanUtil;
+import cn.hutool.core.util.StrUtil;
+import com.zhongzheng.common.utils.DateUtils;
+import com.zhongzheng.modules.order.bo.OrderGoodsRefundAddBo;
+import com.zhongzheng.modules.order.bo.OrderGoodsRefundEditBo;
+import com.zhongzheng.modules.order.bo.OrderGoodsRefundQueryBo;
+import com.zhongzheng.modules.order.domain.OrderGoodsRefund;
+import com.zhongzheng.modules.order.mapper.OrderGoodsRefundMapper;
+import com.zhongzheng.modules.order.service.IOrderGoodsRefundService;
+import com.zhongzheng.modules.order.vo.OrderGoodsRefundVo;
+import org.springframework.stereotype.Service;
+import com.baomidou.mybatisplus.extension.service.impl.ServiceImpl;
+import com.baomidou.mybatisplus.core.conditions.query.LambdaQueryWrapper;
+import com.baomidou.mybatisplus.core.toolkit.Wrappers;
+import com.github.pagehelper.Page;
+
+import java.util.Collection;
+import java.util.Collections;
+import java.util.List;
+import java.util.stream.Collectors;
+
+/**
+ * 订单商品退款Service业务层处理
+ *
+ * @author hjl
+ * @date 2022-01-04
+ */
+@Service
+public class OrderGoodsRefundServiceImpl extends ServiceImpl<OrderGoodsRefundMapper, OrderGoodsRefund> implements IOrderGoodsRefundService {
+
+    @Override
+    public OrderGoodsRefundVo queryById(Long refundId){
+        OrderGoodsRefund db = this.baseMapper.selectById(refundId);
+        return BeanUtil.toBean(db, OrderGoodsRefundVo.class);
+    }
+
+    @Override
+    public List<OrderGoodsRefundVo> queryList(OrderGoodsRefundQueryBo bo) {
+        LambdaQueryWrapper<OrderGoodsRefund> lqw = Wrappers.lambdaQuery();
+        lqw.eq(StrUtil.isNotBlank(bo.getRefundSn()), OrderGoodsRefund::getRefundSn, bo.getRefundSn());
+        lqw.eq(bo.getUserId() != null, OrderGoodsRefund::getUserId, bo.getUserId());
+        lqw.eq(StrUtil.isNotBlank(bo.getOrderSn()), OrderGoodsRefund::getOrderSn, bo.getOrderSn());
+        lqw.eq(bo.getGoodsId() != null, OrderGoodsRefund::getGoodsId, bo.getGoodsId());
+        lqw.eq(bo.getRefundFee() != null, OrderGoodsRefund::getRefundFee, bo.getRefundFee());
+        lqw.eq(bo.getStatus() != null, OrderGoodsRefund::getStatus, bo.getStatus());
+        lqw.eq(StrUtil.isNotBlank(bo.getWxpayRefundId()), OrderGoodsRefund::getWxpayRefundId, bo.getWxpayRefundId());
+        return entity2Vo(this.list(lqw));
+    }
+
+    /**
+    * 实体类转化成视图对象
+    *
+    * @param collection 实体类集合
+    * @return
+    */
+    private List<OrderGoodsRefundVo> entity2Vo(Collection<OrderGoodsRefund> collection) {
+        List<OrderGoodsRefundVo> voList = collection.stream()
+                .map(any -> BeanUtil.toBean(any, OrderGoodsRefundVo.class))
+                .collect(Collectors.toList());
+        if (collection instanceof Page) {
+            Page<OrderGoodsRefund> page = (Page<OrderGoodsRefund>)collection;
+            Page<OrderGoodsRefundVo> pageVo = new Page<>();
+            BeanUtil.copyProperties(page,pageVo);
+            pageVo.addAll(voList);
+            voList = pageVo;
+        }
+        return voList;
+    }
+
+    @Override
+    public Boolean insertByAddBo(OrderGoodsRefundAddBo bo) {
+        OrderGoodsRefund add = BeanUtil.toBean(bo, OrderGoodsRefund.class);
+        validEntityBeforeSave(add);
+        add.setCreateTime(DateUtils.getNowTime());
+        add.setUpdateTime(DateUtils.getNowTime());
+        return this.save(add);
+    }
+
+    @Override
+    public Boolean updateByEditBo(OrderGoodsRefundEditBo bo) {
+        OrderGoodsRefund update = BeanUtil.toBean(bo, OrderGoodsRefund.class);
+        validEntityBeforeSave(update);
+        update.setUpdateTime(DateUtils.getNowTime());
+        return this.updateById(update);
+    }
+
+    /**
+     * 保存前的数据校验
+     *
+     * @param entity 实体类数据
+     */
+    private void validEntityBeforeSave(OrderGoodsRefund entity){
+        //TODO 做一些数据校验,如唯一约束
+    }
+
+    @Override
+    public Boolean deleteWithValidByIds(Collection<Long> ids, Boolean isValid) {
+        if(isValid){
+            //TODO 做一些业务上的校验,判断是否需要校验
+        }
+        return this.removeByIds(ids);
+    }
+}

zhongzheng-system/src/main/java/com/zhongzheng/modules/order/service/impl/OrderServiceImpl.java

@@ -478,7 +478,7 @@ public class OrderServiceImpl extends ServiceImpl<OrderMapper, Order> implements
         gradeUserTempQueryBo.setStatus(ClassGradeUserTemp.STATUS_LOCK);
         List<ClassGradeUserTempVo> list1 = iClassGradeUserTempService.queryList(gradeUserTempQueryBo);
         if(list1!=null&&list1.size()>0){
-            throw new CustomException("待支付包含购买商品班级尚未过期");
+            throw new CustomException("购买商品尚有订单未支付");
         }
         return true;
     }

zhongzheng-system/src/main/java/com/zhongzheng/modules/order/vo/OrderGoodsRefundVo.java

@@ -0,0 +1,56 @@
+package com.zhongzheng.modules.order.vo;
+
+import com.zhongzheng.common.annotation.Excel;
+import com.fasterxml.jackson.annotation.JsonFormat;
+import java.math.BigDecimal;
+import io.swagger.annotations.ApiModel;
+import io.swagger.annotations.ApiModelProperty;
+import lombok.Data;
+import java.util.Date;
+
+
+
+/**
+ * 订单商品退款视图对象 mall_package
+ *
+ * @author hjl
+ * @date 2022-01-04
+ */
+@Data
+@ApiModel("订单商品退款视图对象")
+public class OrderGoodsRefundVo {
+	private static final long serialVersionUID = 1L;
+
+	/** $pkColumn.columnComment */
+	@ApiModelProperty("$pkColumn.columnComment")
+	private Long refundId;
+
+	/** 退款单号 */
+	@Excel(name = "退款单号")
+	@ApiModelProperty("退款单号")
+	private String refundSn;
+	/** 用户ID */
+	@Excel(name = "用户ID")
+	@ApiModelProperty("用户ID")
+	private Long userId;
+	/** 订单编号 */
+	@Excel(name = "订单编号")
+	@ApiModelProperty("订单编号")
+	private String orderSn;
+	/** 商品id */
+	@Excel(name = "商品id")
+	@ApiModelProperty("商品id")
+	private Long goodsId;
+	/** 退款金额 */
+	@Excel(name = "退款金额")
+	@ApiModelProperty("退款金额")
+	private BigDecimal refundFee;
+	/** 状态 1正常 0关闭 */
+	@Excel(name = "状态 1正常 0关闭")
+	@ApiModelProperty("状态 1正常 0关闭")
+	private Integer status;
+	/** 微信退款单号 */
+	@Excel(name = "微信退款单号")
+	@ApiModelProperty("微信退款单号")
+	private String wxpayRefundId;
+}

zhongzheng-system/src/main/resources/mapper/modules/order/OrderGoodsRefundMapper.xml

@@ -0,0 +1,21 @@
+<?xml version="1.0" encoding="UTF-8" ?>
+<!DOCTYPE mapper
+PUBLIC "-//mybatis.org//DTD Mapper 3.0//EN"
+"http://mybatis.org/dtd/mybatis-3-mapper.dtd">
+<mapper namespace="com.zhongzheng.modules.order.mapper.OrderGoodsRefundMapper">
+
+    <resultMap type="com.zhongzheng.modules.order.domain.OrderGoodsRefund" id="OrderGoodsRefundResult">
+        <result property="refundId" column="refund_id"/>
+        <result property="refundSn" column="refund_sn"/>
+        <result property="userId" column="user_id"/>
+        <result property="orderSn" column="order_sn"/>
+        <result property="goodsId" column="goods_id"/>
+        <result property="refundFee" column="refund_fee"/>
+        <result property="createTime" column="create_time"/>
+        <result property="updateTime" column="update_time"/>
+        <result property="status" column="status"/>
+        <result property="wxpayRefundId" column="wxpay_refund_id"/>
+    </resultMap>
+
+
+</mapper>