feat: 退款审批

wfc-modules/wfc-user/src/main/java/org/wfc/user/controller/UOrderController.java

@@ -20,6 +20,7 @@ import org.wfc.common.security.annotation.InnerAuth;
 import org.wfc.common.security.utils.SecurityUtils;
 import org.wfc.user.domain.UOrder;
 import org.wfc.user.domain.UPackage;
+import org.wfc.user.domain.vo.UOrderPackageVo;
 import org.wfc.user.service.IUOrderService;
 import org.wfc.user.service.IUPackageService;
 import org.wfc.user.service.IURateLimitService;
@@ -77,10 +78,8 @@ public class UOrderController extends BaseController {
     @GetMapping("/packagePage")
     public TableDataInfo packagePage() {
         startPage();
-        List<UOrder> list = uOrderService.list(Wrappers.<UOrder>lambdaQuery()
-                .eq(UOrder::getUserId, SecurityUtils.getUserId()).eq(UOrder::getType, 0)
-                .orderByDesc(UOrder::getCreateTime));
-        for (UOrder uOrder : list) {
+        List<UOrderPackageVo> list = uOrderService.getOrderPackage(SecurityUtils.getUserId());
+        for (UOrderPackageVo uOrder : list) {
             if (ObjectUtil.isNull(uOrder.getPackageId())) {
                 continue;
             }
@@ -117,9 +116,15 @@ public class UOrderController extends BaseController {
     }
 
     @InnerAuth
-    @PostMapping("paySuccess/{id}")
-    public AjaxResult paySuccess(@PathVariable("id") Long id) {
-        return toAjax(uOrderService.paySuccess(id));
+    @PostMapping("paySuccess/{paymentType}/{id}")
+    public AjaxResult paySuccess(@PathVariable("paymentType")Integer paymentType, @PathVariable("id") Long id) {
+        return toAjax(uOrderService.paySuccess(id, paymentType));
+    }
+
+    @InnerAuth
+    @PostMapping("refundSuccess/{paymentType}/{id}")
+    public AjaxResult refundSuccess(@PathVariable("paymentType")Integer paymentType, @PathVariable("id") Long id) {
+        return toAjax(uOrderService.refundSuccess(id, paymentType));
     }
 
     @PostMapping("payBalance/{id}")

wfc-modules/wfc-user/src/main/java/org/wfc/user/controller/URefundController.java

@@ -0,0 +1,77 @@
+package org.wfc.user.controller;
+
+import cn.hutool.core.collection.CollUtil;
+import org.springframework.beans.factory.annotation.Autowired;
+import org.springframework.web.bind.annotation.DeleteMapping;
+import org.springframework.web.bind.annotation.GetMapping;
+import org.springframework.web.bind.annotation.PathVariable;
+import org.springframework.web.bind.annotation.PostMapping;
+import org.springframework.web.bind.annotation.PutMapping;
+import org.springframework.web.bind.annotation.RequestBody;
+import org.springframework.web.bind.annotation.RequestMapping;
+import org.springframework.web.bind.annotation.RestController;
+import org.wfc.common.core.domain.R;
+import org.wfc.common.core.web.controller.BaseController;
+import org.wfc.common.core.web.domain.AjaxResult;
+import org.wfc.common.core.web.page.TableDataInfo;
+import org.wfc.user.domain.URefund;
+import org.wfc.user.domain.bo.URefundApplyBo;
+import org.wfc.user.service.IURefundService;
+
+import java.util.List;
+
+/**
+ * <p>
+ * 用户平台-退款表 前端控制器
+ * </p>
+ *
+ * @author sys
+ * @since 2025-03-26
+ */
+@RestController
+@RequestMapping("/refund")
+public class URefundController extends BaseController {
+
+    @Autowired
+    private IURefundService uRefundService;
+
+    @GetMapping("/page")
+    public TableDataInfo page(URefund uRefund) {
+        startPage();
+        List<URefund> list = uRefundService.queryList(uRefund);
+        return getDataTable(list);
+    }
+
+    @GetMapping("/list")
+    public AjaxResult list(URefund uRefund) {
+        List<URefund> list = uRefundService.queryList(uRefund);
+        return success(list);
+    }
+
+    @GetMapping(value = "/{id}")
+    public AjaxResult getById(@PathVariable("id") Long id) {
+        return success(uRefundService.getById(id));
+    }
+
+    @PostMapping
+    public AjaxResult add(@RequestBody URefund uRefund) {
+        return toAjax(uRefundService.save(uRefund));
+    }
+
+    @PutMapping
+    public AjaxResult edit(@RequestBody URefund uRefund) {
+        return toAjax(uRefundService.updateById(uRefund));
+    }
+
+    @DeleteMapping("/{ids}")
+    public AjaxResult remove(@PathVariable Long[] ids) {
+        return toAjax(uRefundService.removeByIds(CollUtil.newArrayList(ids)));
+    }
+
+    @PutMapping("apply")
+    public R<Boolean> apply(URefundApplyBo refundApplyBo) {
+        uRefundService.apply(refundApplyBo);
+        return R.ok(true);
+    }
+
+}

wfc-modules/wfc-user/src/main/java/org/wfc/user/domain/URefund.java

@@ -0,0 +1,47 @@
+package org.wfc.user.domain;
+
+import com.baomidou.mybatisplus.annotation.TableName;
+import java.math.BigDecimal;
+import java.util.Date;
+import org.wfc.common.mybatis.domain.BaseData;
+import io.swagger.v3.oas.annotations.media.Schema;
+import lombok.Getter;
+import lombok.Setter;
+
+/**
+ * <p>
+ * 用户平台-退款表
+ * </p>
+ *
+ * @author sys
+ * @since 2025-03-26
+ */
+@Getter
+@Setter
+@TableName("u_refund")
+@Schema(name = "URefund", description = "用户平台-退款表")
+public class URefund extends BaseData {
+
+    private static final long serialVersionUID = 1L;
+
+    @Schema(description = "订单ID")
+    private Long orderId;
+
+    @Schema(description = "申请时间")
+    private Date applyTime;
+
+    @Schema(description = "申请原因")
+    private String applyReason;
+
+    @Schema(description = "退款金额")
+    private BigDecimal refundAmount;
+
+    @Schema(description = "退款方式")
+    private Integer refundMethod;
+
+    @Schema(description = "审批状态")
+    private Integer status;
+
+    @Schema(description = "备注")
+    private String remark;
+}

wfc-modules/wfc-user/src/main/java/org/wfc/user/domain/bo/URefundApplyBo.java

@@ -0,0 +1,16 @@
+package org.wfc.user.domain.bo;
+
+import lombok.Data;
+
+/**
+ * @description: 退款申请Bo
+ * @author: cyc
+ * @since: 2025-03-26
+ */
+@Data
+public class URefundApplyBo {
+
+    private String orderId;
+
+    private String applyReason;
+}

wfc-modules/wfc-user/src/main/java/org/wfc/user/domain/constant/OrderStatusEnum.java

@@ -1,22 +0,0 @@
-package org.wfc.user.domain.constant;
-
-import lombok.AllArgsConstructor;
-import lombok.Getter;
-
-/**
- * @description: 订单状态枚举
- * @author: cyc
- * @since: 2024-12-23
- */
-@Getter
-@AllArgsConstructor
-public enum OrderStatusEnum {
-
-    UNPAID(0, "未支付"),
-    PAID(1, "已支付"),
-    CANCELLED(2, "已取消");
-
-    private final Integer code;
-    private final String desc;
-
-}

wfc-modules/wfc-user/src/main/java/org/wfc/user/domain/vo/UOrderPackageVo.java

@@ -0,0 +1,52 @@
+package org.wfc.user.domain.vo;
+
+import com.baomidou.mybatisplus.annotation.TableField;
+import io.swagger.v3.oas.annotations.media.Schema;
+import lombok.Data;
+import org.wfc.user.domain.UPackage;
+
+import java.math.BigDecimal;
+import java.util.Date;
+
+/**
+ * @description: 套餐订单Vo
+ * @author: cyc
+ * @since: 2025-03-26
+ */
+@Data
+@Schema(name = "UOrderPackageVo", description = "套餐订单Vo")
+public class UOrderPackageVo {
+
+    @Schema(description = "用户ID")
+    private Long userId;
+
+    @Schema(description = "套餐ID")
+    private Long packageId;
+
+    @Schema(description = "支付ID")
+    private Long paymentId;
+
+    @Schema(description = "订单编号")
+    private String orderNo;
+
+    @Schema(description = "订单类型（0套餐 1充值）")
+    private Integer type;
+
+    @Schema(description = "订单金额")
+    private BigDecimal orderAmount;
+
+    @Schema(description = "订单状态(0待支付 1已支付 2已取消)")
+    private Integer status;
+
+    @TableField(exist = false)
+    private UPackage uPackage;
+
+    @Schema(description = "套餐名称")
+    private String packageName;
+
+    @Schema(description = "套餐状态(0待生效 1已生效)")
+    private Integer packageStatus;
+
+    @Schema(description = "订单时间")
+    private Date createTime;
+}

wfc-modules/wfc-user/src/main/java/org/wfc/user/mapper/UOrderMapper.java

@@ -1,7 +1,11 @@
 package org.wfc.user.mapper;
 
-import org.wfc.user.domain.UOrder;
 import com.baomidou.mybatisplus.core.mapper.BaseMapper;
+import org.apache.ibatis.annotations.Param;
+import org.wfc.user.domain.UOrder;
+import org.wfc.user.domain.vo.UOrderPackageVo;
+
+import java.util.List;
 
 /**
  * <p>
@@ -13,4 +17,5 @@ import com.baomidou.mybatisplus.core.mapper.BaseMapper;
  */
 public interface UOrderMapper extends BaseMapper<UOrder> {
 
+    List<UOrderPackageVo> getOrderPackage(@Param("userId") Long userId);
 }

wfc-modules/wfc-user/src/main/java/org/wfc/user/mapper/URefundMapper.java

@@ -0,0 +1,16 @@
+package org.wfc.user.mapper;
+
+import org.wfc.user.domain.URefund;
+import com.baomidou.mybatisplus.core.mapper.BaseMapper;
+
+/**
+ * <p>
+ * 用户平台-退款表 Mapper 接口
+ * </p>
+ *
+ * @author sys
+ * @since 2025-03-26
+ */
+public interface URefundMapper extends BaseMapper<URefund> {
+
+}

wfc-modules/wfc-user/src/main/java/org/wfc/user/service/IUOrderService.java

@@ -2,6 +2,9 @@ package org.wfc.user.service;
 
 import org.wfc.user.domain.UOrder;
 import com.baomidou.mybatisplus.extension.service.IService;
+import org.wfc.user.domain.vo.UOrderPackageVo;
+
+import java.util.List;
 
 /**
  * <p>
@@ -15,7 +18,11 @@ public interface IUOrderService extends IService<UOrder> {
 
     Long saveOrder(UOrder order);
 
-    boolean paySuccess(Long orderId);
+    boolean paySuccess(Long orderId, Integer paymentType);
+
+    boolean refundSuccess(Long refundId, Integer paymentType);
 
     boolean payByBalance(Long orderId);
+
+    List<UOrderPackageVo> getOrderPackage(Long userId);
 }

wfc-modules/wfc-user/src/main/java/org/wfc/user/service/IURefundService.java

@@ -0,0 +1,22 @@
+package org.wfc.user.service;
+
+import org.wfc.user.domain.URefund;
+import com.baomidou.mybatisplus.extension.service.IService;
+import org.wfc.user.domain.bo.URefundApplyBo;
+
+import java.util.List;
+
+/**
+ * <p>
+ * 用户平台-退款表 服务类
+ * </p>
+ *
+ * @author sys
+ * @since 2025-03-26
+ */
+public interface IURefundService extends IService<URefund> {
+
+    List<URefund> queryList(URefund uRefund);
+
+    void apply(URefundApplyBo refundApplyBo);
+}

wfc-modules/wfc-user/src/main/java/org/wfc/user/service/impl/UAccountServiceImpl.java

@@ -31,7 +31,7 @@ import org.wfc.user.domain.UAccountPackage;
 import org.wfc.user.domain.UBill;
 import org.wfc.user.domain.UBillRule;
 import org.wfc.user.domain.UClient;
-import org.wfc.user.domain.constant.OrderStatusEnum;
+import org.wfc.common.core.enums.OrderStatusEnum;
 import org.wfc.user.domain.constant.OrderTypeEnum;
 import org.wfc.user.domain.vo.UAccountDashboardVo;
 import org.wfc.user.domain.vo.UCdrUserVo;

wfc-modules/wfc-user/src/main/java/org/wfc/user/service/impl/UOrderServiceImpl.java

@@ -9,6 +9,8 @@ import org.springframework.beans.BeanUtils;
 import org.springframework.beans.factory.annotation.Autowired;
 import org.springframework.stereotype.Service;
 import org.springframework.transaction.annotation.Transactional;
+import org.wfc.common.core.enums.PaymentTypeEnum;
+import org.wfc.common.core.enums.RefundStatusEnum;
 import org.wfc.common.core.exception.ServiceException;
 import org.wfc.common.security.utils.SecurityUtils;
 import org.wfc.user.api.IWifiApi;
@@ -22,12 +24,15 @@ import org.wfc.user.domain.UClient;
 import org.wfc.user.domain.UOrder;
 import org.wfc.user.domain.UPackage;
 import org.wfc.user.domain.URateLimit;
-import org.wfc.user.domain.constant.OrderStatusEnum;
+import org.wfc.common.core.enums.OrderStatusEnum;
+import org.wfc.user.domain.URefund;
 import org.wfc.user.domain.constant.OrderTypeEnum;
+import org.wfc.user.domain.vo.UOrderPackageVo;
 import org.wfc.user.mapper.UAccountPackageMapper;
 import org.wfc.user.mapper.UBillMapper;
 import org.wfc.user.mapper.UBillRuleMapper;
 import org.wfc.user.mapper.UOrderMapper;
+import org.wfc.user.mapper.URefundMapper;
 import org.wfc.user.service.IUAccountService;
 import org.wfc.user.service.IUClientService;
 import org.wfc.user.service.IUOrderService;
@@ -72,18 +77,22 @@ public class UOrderServiceImpl extends ServiceImpl<UOrderMapper, UOrder> impleme
     @Autowired
     private UAccountPackageMapper accountPackageMapper;
 
+    @Autowired
+    private URefundMapper refundMapper;
+
     @Autowired
     private IWifiApi wifiApi;
 
     @Override
     @Transactional(rollbackFor = Exception.class)
-    public boolean paySuccess(Long orderId) {
+    public boolean paySuccess(Long orderId, Integer paymentType) {
         // 支付成功回调
         // 更新当前订单状态为已支付
         UOrder order = this.getById(orderId);
         if (OrderStatusEnum.PAID.getCode().equals(order.getStatus())) {
             return false;
         }
+        order.setPaymentId(paymentType.longValue());
         order.setStatus(OrderStatusEnum.PAID.getCode());
         this.updateById(order);
 
@@ -145,6 +154,31 @@ public class UOrderServiceImpl extends ServiceImpl<UOrderMapper, UOrder> impleme
         return true;
     }
 
+    public boolean refundSuccess(Long refundId, Integer paymentType) {
+        URefund refund = refundMapper.selectById(refundId);
+        if (!RefundStatusEnum.PENDING.getCode().equals(refund.getStatus())) {
+            return false;
+        }
+        // 修改审批状态
+        refund.setStatus(RefundStatusEnum.PASSED.getCode());
+        refundMapper.updateById(refund);
+        // 修改订单状态
+        UOrder order = this.getById(refund.getOrderId());
+        order.setStatus(OrderStatusEnum.REFUNDING.getCode());
+        this.updateById(order);
+        if (PaymentTypeEnum.BALANCE.getCode().equals(paymentType)) {
+            // 余额退款成功时恢复余额
+            UAccount account = accountService.getOne(Wrappers.<UAccount>lambdaQuery().eq(UAccount::getUserId, order.getUserId()), false);
+            if (account != null) {
+                account.setBalance(account.getBalance().add(order.getOrderAmount()));
+                accountService.updateById(account);
+            }
+        }
+        // 删除待生效套餐
+        accountPackageMapper.delete(Wrappers.<UAccountPackage>lambdaQuery().eq(UAccountPackage::getPackageId, refund.getOrderId()));
+        return true;
+    }
+
     @Override
     @Transactional(rollbackFor = Exception.class)
     public boolean payByBalance(Long orderId) {
@@ -164,7 +198,7 @@ public class UOrderServiceImpl extends ServiceImpl<UOrderMapper, UOrder> impleme
         if (order.getOrderAmount().compareTo(balance) > 0) {
             throw new ServiceException("user.order.pay.amount.error");
         }
-        if (paySuccess(orderId)) {
+        if (paySuccess(orderId, PaymentTypeEnum.BALANCE.getCode())) {
             UAccount updateAccount = new UAccount();
             updateAccount.setId(account.getId());
             updateAccount.setBalance(account.getBalance().subtract(order.getOrderAmount()));
@@ -174,6 +208,11 @@ public class UOrderServiceImpl extends ServiceImpl<UOrderMapper, UOrder> impleme
         return true;
     }
 
+    @Override
+    public List<UOrderPackageVo> getOrderPackage(Long userId) {
+        return this.baseMapper.getOrderPackage(userId);
+    }
+
     private void callbackPackage(UOrder order, UAccount account, boolean isValid) {
         if (ObjectUtil.isNull(order.getPackageId())) {
             return;
@@ -197,11 +236,11 @@ public class UOrderServiceImpl extends ServiceImpl<UOrderMapper, UOrder> impleme
             accountPackage.setId(null);
             accountPackage.setCreateTime(null);
             accountPackage.setAccountId(account.getId());
-            accountPackage.setPackageId(order.getPackageId());
+            accountPackage.setPackageId(order.getId());
             accountPackageMapper.insert(accountPackage);
         } else {
             BeanUtils.copyProperties(uPackage, account);
-            account.setPackageId(order.getPackageId());
+            account.setPackageId(order.getId());
             account.setTrafficUsed(0L);
             account.setDurationUsed(0L);
             account.setClientNumUsed(0);

wfc-modules/wfc-user/src/main/java/org/wfc/user/service/impl/URefundServiceImpl.java

@@ -0,0 +1,67 @@
+package org.wfc.user.service.impl;
+
+import cn.hutool.core.util.StrUtil;
+import com.baomidou.mybatisplus.core.conditions.query.LambdaQueryWrapper;
+import com.baomidou.mybatisplus.core.toolkit.Wrappers;
+import com.baomidou.mybatisplus.extension.service.impl.ServiceImpl;
+import org.springframework.beans.factory.annotation.Autowired;
+import org.springframework.stereotype.Service;
+import org.wfc.user.domain.UOrder;
+import org.wfc.user.domain.URefund;
+import org.wfc.user.domain.bo.URefundApplyBo;
+import org.wfc.common.core.enums.OrderStatusEnum;
+import org.wfc.common.core.enums.RefundStatusEnum;
+import org.wfc.user.mapper.UOrderMapper;
+import org.wfc.user.mapper.URefundMapper;
+import org.wfc.user.service.IURefundService;
+
+import java.util.Date;
+import java.util.List;
+
+/**
+ * <p>
+ * 用户平台-退款表 服务实现类
+ * </p>
+ *
+ * @author sys
+ * @since 2025-03-26
+ */
+@Service
+public class URefundServiceImpl extends ServiceImpl<URefundMapper, URefund> implements IURefundService {
+
+    @Autowired
+    private UOrderMapper orderMapper;
+
+    @Override
+    public List<URefund> queryList(URefund uRefund) {
+        return this.list(buildQueryWrapper(uRefund));
+    }
+
+    private LambdaQueryWrapper<URefund> buildQueryWrapper(URefund bo) {
+        LambdaQueryWrapper<URefund> lqw = Wrappers.lambdaQuery();
+        lqw.eq(bo.getOrderId() != null, URefund::getOrderId, bo.getOrderId());
+        lqw.eq(bo.getApplyTime() != null, URefund::getApplyTime, bo.getApplyTime());
+        lqw.like(StrUtil.isNotBlank(bo.getApplyReason()), URefund::getApplyReason, bo.getApplyReason());
+        lqw.eq(bo.getRefundAmount() != null, URefund::getRefundAmount, bo.getRefundAmount());
+        lqw.eq(bo.getRefundMethod() != null, URefund::getRefundMethod, bo.getRefundMethod());
+        lqw.eq(bo.getStatus() != null, URefund::getStatus, bo.getStatus());
+        lqw.like(StrUtil.isNotBlank(bo.getRemark()), URefund::getRemark, bo.getRemark());
+        return lqw;
+    }
+
+
+    public void apply(URefundApplyBo refundApplyBo) {
+        UOrder order = orderMapper.selectById(refundApplyBo.getOrderId());
+        // 发起退款申请
+        URefund refund = new URefund();
+        refund.setOrderId(order.getId());
+        refund.setApplyReason(refundApplyBo.getApplyReason());
+        refund.setApplyTime(new Date());
+        refund.setRefundAmount(order.getOrderAmount());
+        refund.setStatus(RefundStatusEnum.PENDING.getCode());
+        this.save(refund);
+        // 修改订单状态
+        order.setStatus(OrderStatusEnum.REFUNDING.getCode());
+        orderMapper.updateById(order);
+    }
+}

wfc-modules/wfc-user/src/main/resources/mapper/user/UOrderMapper.xml

@@ -1,5 +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="org.wfc.user.mapper.UOrderMapper">
+    
+    <select id="getOrderPackage" resultType="org.wfc.user.domain.vo.UOrderPackageVo">
+        SELECT
+            o.*, p.package_name, if(o.`status` = 1, if(ap.id is null, 1, 0),null) package_status
+        FROM
+            `u_order` o
+                LEFT JOIN u_package p ON o.package_id = p.id
+                AND p.del_flag = 0
+                LEFT JOIN u_account_package ap ON o.id = ap.package_id
+                AND ap.del_flag = 0
+                AND o.type = 1
+        WHERE
+            o.del_flag = 0
+            AND o.user_id = #{userId}
+        ORDER BY o.create_time DESC
+    </select>
 
 </mapper>

wfc-modules/wfc-user/src/main/resources/mapper/user/URefundMapper.xml

@@ -0,0 +1,5 @@
+<?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="org.wfc.user.mapper.URefundMapper">
+
+</mapper>