录单退款申请

zhongzheng-admin/src/main/java/com/zhongzheng/controller/order/OrderBillSheetController.java

@@ -106,7 +106,7 @@ public class OrderBillSheetController extends BaseController {
     /**
      * 修改订单计费单
      */
-   @ApiOperation("修改订单计费单")
+   @ApiOperation("修改单个计费单")
     @PreAuthorize("@ss.hasPermi('system:sheet:edit')")
     @Log(title = "订单计费单", businessType = BusinessType.UPDATE)
     @PostMapping("/edit")

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

@@ -0,0 +1,92 @@
+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-04-12
+ */
+@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:list')")
+    @GetMapping("/list")
+    public TableDataInfo<OrderGoodsRefundVo> list(OrderGoodsRefundQueryBo bo) {
+        startPage();
+        List<OrderGoodsRefundVo> list = iOrderGoodsRefundService.queryList(bo);
+        return getDataTable(list);
+    }
+
+
+
+    /**
+     * 获取订单商品退款详细信息
+     */
+    @ApiOperation("获取订单商品退款详细信息")
+    @PreAuthorize("@ss.hasPermi('system:refund:query')")
+    @GetMapping("/{refundId}")
+    public AjaxResult<OrderGoodsRefundVo> getInfo(@PathVariable("refundId" ) Long refundId) {
+        return AjaxResult.success(iOrderGoodsRefundService.queryById(refundId));
+    }
+
+    /**
+     * 新增订单商品退款
+     */
+    @ApiOperation("批量新增录单订单商品退款")
+    @PreAuthorize("@ss.hasPermi('system:refund:add')")
+    @Log(title = "批量新增录单订单商品退款", businessType = BusinessType.INSERT)
+    @PostMapping()
+    public AjaxResult<Void> add(@RequestBody List<OrderGoodsRefundAddBo> bo) {
+        return toAjax(iOrderGoodsRefundService.placeRefundInputOrder(bo) ? 1 : 0);
+    }
+
+    /**
+     * 修改订单商品退款
+     */
+    @ApiOperation("修改订单商品退款")
+    @PreAuthorize("@ss.hasPermi('system:refund:edit')")
+    @Log(title = "订单商品退款", businessType = BusinessType.UPDATE)
+    @PostMapping("/edit")
+    public AjaxResult<Void> edit(@RequestBody OrderGoodsRefundEditBo bo) {
+        return toAjax(iOrderGoodsRefundService.updateByEditBo(bo) ? 1 : 0);
+    }
+
+
+}

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

@@ -69,4 +69,10 @@ public class OrderBillSheetAddBo {
     /** 录单订单编号 */
     @ApiModelProperty("录单订单编号")
     private String inputOrderSn;
+    /** 付款时间 */
+    @ApiModelProperty("付款时间")
+    private Long payTime;
+    /** 收款时间 */
+    @ApiModelProperty("收款时间")
+    private Long collectionTime;
 }

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

@@ -79,5 +79,10 @@ public class OrderBillSheetEditBo {
 
     @ApiModelProperty("录单总编号")
     private String inputOrderSn;
-
+    /** 付款时间 */
+    @ApiModelProperty("付款时间")
+    private Long payTime;
+    /** 收款时间 */
+    @ApiModelProperty("收款时间")
+    private Long collectionTime;
 }

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

@@ -29,7 +29,18 @@ public class OrderGoodsRefundAddBo {
     /** 商品id */
     @ApiModelProperty("商品id")
     private Long goodsId;
-
+    /** 申请退款原因 */
+    @ApiModelProperty("申请退款原因")
+    private String applyReason;
+    /** 申请图片地址 , 拼接 */
+    @ApiModelProperty("申请图片地址 , 拼接")
+    private String applyImgs;
+    /** 退款类型 1小程序 2系统录单 */
+    @ApiModelProperty("退款类型 1小程序 2系统录单")
+    private Integer type;
+    /** 订单商品ID */
+    @ApiModelProperty("订单商品ID")
+    private Long orderGoodsId;
 
 
 }

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

@@ -55,4 +55,17 @@ public class OrderGoodsRefundEditBo {
     @ApiModelProperty("微信退款单号")
     private String wxpayRefundId;
 
+    /** 申请退款原因 */
+    @ApiModelProperty("申请退款原因")
+    private String applyReason;
+    /** 申请图片地址 , 拼接 */
+    @ApiModelProperty("申请图片地址 , 拼接")
+    private String applyImgs;
+    /** 退款类型 1小程序 2系统录单 */
+    @ApiModelProperty("退款类型 1小程序 2系统录单")
+    private Integer type;
+    /** 订单商品ID */
+    @ApiModelProperty("订单商品ID")
+    private Long orderGoodsId;
+
 }

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

@@ -63,4 +63,6 @@ public class OrderInputQueryBo extends BaseEntity {
 	private Long startTime;
 	@ApiModelProperty("订单结束时间")
 	private Long endTime;
+	@ApiModelProperty("用户ID")
+	private Long userId;
 }

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

@@ -116,4 +116,7 @@ public class OrderQueryBo extends BaseEntity {
 	/** 录单订单编号 */
 	@ApiModelProperty("录单订单编号")
 	private String inputOrderSn;
+
+	@ApiModelProperty("搜索关键词")
+	private String searchKey;
 }

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

@@ -61,4 +61,8 @@ private static final long serialVersionUID=1L;
     private String createBy;
     /** 录单订单编号 */
     private String inputOrderSn;
+    /** 付款时间 */
+    private Long payTime;
+    /** 收款时间 */
+    private Long collectionTime;
 }

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

@@ -23,6 +23,9 @@ public class OrderGoodsRefund implements Serializable {
 
 private static final long serialVersionUID=1L;
 
+    public static final Integer TYPE_SMALL =1;  //退款类型 1小程序
+    public static final Integer TYPE_INPUT =2;  //退款类型 2系统录单
+
     /** $column.columnComment */
     @TableId(value = "refund_id")
     private Long refundId;
@@ -46,4 +49,12 @@ private static final long serialVersionUID=1L;
     private Integer status;
     /** 微信退款单号 */
     private String wxpayRefundId;
+    /** 申请退款原因 */
+    private String applyReason;
+    /** 申请图片地址 , 拼接 */
+    private String applyImgs;
+    /** 退款类型 1小程序 2系统录单 */
+    private Integer type;
+    /** 订单商品ID */
+    private Long orderGoodsId;
 }

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

@@ -39,6 +39,8 @@ public interface IOrderGoodsRefundService extends IService<OrderGoodsRefund> {
 
 	Boolean placeRefundSmallOrder(OrderGoodsRefundAddBo bo);
 
+	Boolean placeRefundInputOrder(List<OrderGoodsRefundAddBo> bos);
+
 	/**
 	 * 根据编辑业务对象修改订单商品退款
 	 * @param bo 订单商品退款编辑业务对象

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

@@ -171,6 +171,8 @@ public class OrderBillSheetServiceImpl extends ServiceImpl<OrderBillSheetMapper,
         validEntityBeforeSave(add);
         add.setCreateTime(DateUtils.getNowTime());
         add.setUpdateTime(DateUtils.getNowTime());
+        add.setPayTime(DateUtils.getNowTime());
+        add.setCollectionTime(DateUtils.getNowTime());
         //计费订单号
         String sheet_no = DateUtils.getDateOrderSn();
         add.setSheetSn(sheet_no);
@@ -245,6 +247,8 @@ public class OrderBillSheetServiceImpl extends ServiceImpl<OrderBillSheetMapper,
         validEntityBeforeSave(add);
         add.setCreateTime(DateUtils.getNowTime());
         add.setUpdateTime(DateUtils.getNowTime());
+        add.setPayTime(DateUtils.getNowTime());
+        add.setCollectionTime(DateUtils.getNowTime());
         //计费订单号
         String sheet_no = DateUtils.getDateOrderSn();
         add.setSheetSn(sheet_no);

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

@@ -36,6 +36,7 @@ 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 org.springframework.transaction.annotation.Transactional;
 
 import java.util.Collection;
 import java.util.Collections;
@@ -176,6 +177,8 @@ public class OrderGoodsRefundServiceImpl extends ServiceImpl<OrderGoodsRefundMap
             add.setRefundSn(out_trade_no);
             add.setRefundFee(orderGoods.getGoodsReceived());
             add.setUserId(order.getUserId());
+            add.setType(OrderGoodsRefund.TYPE_SMALL);
+            add.setOrderGoodsId(orderGoods.getOrderGoodsId());
             this.save(add);
         }
         Map<String, String> payResult =  iWxPayService.refund(out_trade_no,order.getTransid(),add.getRefundFee(),order.getPayPrice());
@@ -186,6 +189,71 @@ public class OrderGoodsRefundServiceImpl extends ServiceImpl<OrderGoodsRefundMap
         }
     }
 
+    @Override
+    @Transactional(rollbackFor = Exception.class)
+    public Boolean placeRefundInputOrder(List<OrderGoodsRefundAddBo> bos) {
+        for(OrderGoodsRefundAddBo bo : bos){
+            OrderGoods orderGoods = iOrderGoodsService.getOne(new LambdaQueryWrapper<OrderGoods>().eq(OrderGoods::getOrderSn,bo.getOrderSn())
+                    .eq(OrderGoods::getGoodsId, bo.getGoodsId()));
+            if(Validator.isEmpty(orderGoods)){
+                throw new CustomException("订单商品数据错误");
+            }
+            if(orderGoods.getPayStatus()!=3||orderGoods.getPayStatus()!=2){
+                throw new CustomException("订单商品尚未收费");
+            }
+            if(orderGoods.getRefundStatus()==2){
+                throw new CustomException("订单商品已退款");
+            }
+            if(orderGoods.getRefundStatus()!=0){
+                throw new CustomException("订单商品目前正在退款中");
+            }
+            //订单商品
+            Order order = iOrderService.getOne(new LambdaQueryWrapper<Order>().eq(Order::getOrderSn,bo.getOrderSn()));
+            if(order.getStatus()==0){
+                throw new CustomException("订单无效");
+            }
+            if(order.getOrderFrom()!=2){
+                throw new CustomException("不支持非小程序订单退款");
+            }
+            //订单商品
+            Goods goods = iGoodsService.getOne(new LambdaQueryWrapper<Goods>().eq(Goods::getGoodsId,bo.getGoodsId()));
+            if(goods.getGoodsType()==1){
+                //视频商品
+                UserStudyRecordQueryBo userStudyRecordQueryBo = new UserStudyRecordQueryBo();
+                userStudyRecordQueryBo.setGoodsId(goods.getGoodsId());
+                userStudyRecordQueryBo.setUserId(order.getUserId());
+                userStudyRecordQueryBo.setGradeId(orderGoods.getGradeId());
+                Long userSeeTime = iUserStudyRecordService.getUserSeeTime(userStudyRecordQueryBo);
+                if(userSeeTime.longValue()>=(30*60)){ //超30分钟不满足退款
+                    throw new CustomException("不满足退款");
+                }
+            }
+            if(goods.getGoodsType()==2){
+                //题库商品
+                UserExamRecordQueryBo userExamRecordQueryBo = new UserExamRecordQueryBo();
+                userExamRecordQueryBo.setGoodsId(goods.getGoodsId());
+                userExamRecordQueryBo.setUserId(order.getUserId());
+                Long doQuestionNum = iUserExamRecordService.getUserDoQuestionNum(userExamRecordQueryBo);
+                if(doQuestionNum.longValue()>=30){ //超30道题不满足退款
+                    throw new CustomException("不满足退款");
+                }
+            }
+            OrderGoodsRefund add = BeanUtil.toBean(bo, OrderGoodsRefund.class);
+            validEntityBeforeSave(add);
+            add.setCreateTime(DateUtils.getNowTime());
+            add.setUpdateTime(DateUtils.getNowTime());
+            //退款单号
+            String out_trade_no = DateUtils.getDateOrderSn();
+            add.setRefundSn(out_trade_no);
+            add.setRefundFee(orderGoods.getGoodsReceived());
+            add.setUserId(order.getUserId());
+            add.setType(OrderGoodsRefund.TYPE_INPUT);
+            add.setOrderGoodsId(orderGoods.getOrderGoodsId());
+            this.save(add);
+        }
+        return null;
+    }
+
     public Boolean refundCall(String WxpayRefundId,Long refundId,Long orderGoodsId,Order order,Long goodsType,Long gradeId,Long userId,Long goodsId){
         OrderGoodsRefund update = new OrderGoodsRefund();
         update.setRefundId(refundId);

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

@@ -82,4 +82,12 @@ public class OrderBillSheetVo {
 	@Excel(name = "录单订单编号")
 	@ApiModelProperty("录单订单编号")
 	private String inputOrderSn;
+	/** 付款时间 */
+	@Excel(name = "付款时间")
+	@ApiModelProperty("付款时间")
+	private Long payTime;
+	/** 收款时间 */
+	@Excel(name = "收款时间")
+	@ApiModelProperty("收款时间")
+	private Long collectionTime;
 }

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

@@ -59,4 +59,20 @@ public class OrderGoodsRefundVo {
 	private String coverUrl;
 	@ApiModelProperty("创建时间")
 	private Long createTime;
+	/** 申请退款原因 */
+	@Excel(name = "申请退款原因")
+	@ApiModelProperty("申请退款原因")
+	private String applyReason;
+	/** 申请图片地址 , 拼接 */
+	@Excel(name = "申请图片地址 , 拼接")
+	@ApiModelProperty("申请图片地址 , 拼接")
+	private String applyImgs;
+	/** 退款类型 1小程序 2系统录单 */
+	@Excel(name = "退款类型 1小程序 2系统录单")
+	@ApiModelProperty("退款类型 1小程序 2系统录单")
+	private Integer type;
+	/** 订单商品ID */
+	@Excel(name = "订单商品ID")
+	@ApiModelProperty("订单商品ID")
+	private Long orderGoodsId;
 }

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

@@ -94,4 +94,6 @@ public class OrderInputVo {
 	private String goodsName;
 	@ApiModelProperty("订单编码")
 	private String orderSn;
+	@ApiModelProperty("订单来源 1业务员普通单 2祥粤云学堂小程序 3祥粤云学堂网站 4祥粤e管证小程序 5业务员录单")
+	private String orderFrom;
 }

zhongzheng-system/src/main/resources/mapper/modules/grade/ClassGradeUserMapper.xml

@@ -466,7 +466,7 @@
         (SELECT
         COUNT(DISTINCT up.course_id,up.module_id,up.chapter_id,up.section_id) FROM user_period up LEFT JOIN user_period_status ups on up.id = ups.period_id where ups.`status`
         =2 and ups.period_status = 1 and up.goods_id=#{goodsId} and up.grade_id = cg.grade_id and up.user_id = #{userId} and up.type = 2) as exam_pending,
-        (SELECT up.key_value FROM user_profile up where up.goods_id = #{goodsId} and up.user_id =#{userId} and up.order_goods_id = cgu.order_goods_id and up.current_status = 1 and up.type_status =1 LIMIT 1) as key_value
+        (SELECT up.key_value FROM user_profile up where up.goods_id = #{goodsId} and up.user_id =#{userId} and up.order_goods_id = cgu.order_goods_id and up.current_status = 1 and up.`status` = 1 and up.type_status =1 LIMIT 1) as key_value
         <if test="userId != null and userId !='' ">
             ,(SELECT MIN(first_start_time) from user_study_record where user_id = #{userId} and grade_id = #{gradeId}) as study_start_time,
             (SELECT MAX(end_time) from user_study_record where user_id = #{userId} and grade_id = #{gradeId}) as study_end_time

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

@@ -22,6 +22,8 @@ PUBLIC "-//mybatis.org//DTD Mapper 3.0//EN"
         <result property="status" column="status"/>
         <result property="createBy" column="create_by"/>
         <result property="inputOrderSn" column="input_order_sn"/>
+        <result property="payTime" column="pay_time"/>
+        <result property="collectionTime" column="collection_time"/>
     </resultMap>
 
 

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

@@ -15,6 +15,10 @@ PUBLIC "-//mybatis.org//DTD Mapper 3.0//EN"
         <result property="updateTime" column="update_time"/>
         <result property="status" column="status"/>
         <result property="wxpayRefundId" column="wxpay_refund_id"/>
+        <result property="applyReason" column="apply_reason"/>
+        <result property="applyImgs" column="apply_imgs"/>
+        <result property="type" column="type"/>
+        <result property="orderGoodsId" column="order_goods_id"/>
     </resultMap>
 
     <resultMap type="com.zhongzheng.modules.order.vo.OrderGoodsRefundVo" id="OrderGoodsRefundVoResult">
@@ -29,6 +33,10 @@ PUBLIC "-//mybatis.org//DTD Mapper 3.0//EN"
         <result property="wxpayRefundId" column="wxpay_refund_id"/>
         <result property="goodsName" column="goods_name"/>
         <result property="coverUrl" column="cover_url"/>
+        <result property="applyReason" column="apply_reason"/>
+        <result property="applyImgs" column="apply_imgs"/>
+        <result property="type" column="type"/>
+        <result property="orderGoodsId" column="order_goods_id"/>
     </resultMap>
 
     <select id="selectList" parameterType="com.zhongzheng.modules.order.bo.OrderGoodsRefundQueryBo" resultMap="OrderGoodsRefundVoResult">

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

@@ -41,6 +41,7 @@ PUBLIC "-//mybatis.org//DTD Mapper 3.0//EN"
         <result property="goodsName" column="goods_name"/>
         <result property="orderSn" column="order_sn"/>
         <result property="userId" column="user_id"/>
+        <result property="orderFrom" column="order_from"/>
     </resultMap>
 
     <select id="selectList" parameterType="com.zhongzheng.modules.order.bo.OrderInputQueryBo" resultMap="OrderInputVoResult">
@@ -131,7 +132,8 @@ PUBLIC "-//mybatis.org//DTD Mapper 3.0//EN"
             o.user_id,
             g.goods_id,
             g.goods_name,
-            o.order_sn
+            o.order_sn,
+            o.order_from
         FROM
             order_input oi
                 LEFT JOIN `order` o ON oi.input_order_sn = o.input_order_sn

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

@@ -170,6 +170,9 @@ PUBLIC "-//mybatis.org//DTD Mapper 3.0//EN"
         <if test="inputOrderSn != null">
             AND o.input_order_sn = #{inputOrderSn}
         </if>
+        <if test="searchKey != null and searchKey != ''">
+            AND (u.realname like concat('%', #{searchKey}, '%') or o.order_sn = #{searchKey} or o.id_card = #{searchKey} or g.goods_name like concat('%', #{searchKey}, '%'))
+        </if>
         ORDER BY o.order_id DESC
     </select>