钱包退款相关业务调整

sckw-modules/sckw-payment/src/main/java/com/sckw/payment/controller/WalletController.java

@@ -1,6 +1,7 @@
 package com.sckw.payment.controller;
 
 import com.sckw.core.web.response.HttpResult;
+import com.sckw.payment.model.dto.Id;
 import com.sckw.payment.model.vo.req.*;
 import com.sckw.payment.service.WalletService;
 import jakarta.annotation.Resource;
@@ -236,31 +237,46 @@ public class WalletController {
         return HttpResult.ok(walletService.prePayAppend(prePay));
     }
 
+
+    /*退款*/
+
     /**
-     * 申请退款
+     * 申请退款(预付方)
      *
      * @param refundReq
      * @return
      */
     @PostMapping("applyRefund")
-    public HttpResult applyRefund(@RequestBody @Valid RefundReq refundReq) {
+    public HttpResult applyRefund(@RequestBody @Valid ApplyRefundReq refundReq) {
         return HttpResult.ok(walletService.applyRefund(refundReq));
     }
 
 
     /**
-     * 发起退款余额查询及校验
+     * 查询退款列表(预收方)
      *
-     * @param refundReq
+     * @param refundPage
+     * @return
+     */
+    @PostMapping("refundList")
+    public HttpResult refundList(@RequestBody @Valid RefundPage refundPage) {
+        return HttpResult.ok(walletService.refundList(refundPage));
+    }
+
+
+    /**
+     * 发起退款（预收方）余额查询及校验
+     *
+     * @param id 退款单id
      * @return
      */
     @PostMapping("refundCheck")
-    public HttpResult refundCheck(@RequestBody @Valid RefundCheckReq refundReq) {
-        return HttpResult.ok(walletService.refundCheck(refundReq));
+    public HttpResult refundCheck(@RequestBody @Valid Id id) {
+        return HttpResult.ok(walletService.refundCheck(id.getIdLong()));
     }
 
     /**
-     * 发起退款
+     * 确认退款
      *
      * @param refundReq
      * @return
@@ -276,7 +292,7 @@ public class WalletController {
      * @param refundReq
      * @return
      */
-    @PostMapping("back")
+    @PostMapping("backRefund")
     public HttpResult back(@RequestBody @Valid RefundBackReq refundReq) {
         return HttpResult.ok(walletService.backRefund(refundReq));
     }

sckw-modules/sckw-payment/src/main/java/com/sckw/payment/dao/KwpWalletRefundMapper.java

@@ -2,7 +2,11 @@ package com.sckw.payment.dao;
 
 import com.baomidou.mybatisplus.core.mapper.BaseMapper;
 import com.sckw.payment.model.KwpWalletRefund;
+import com.sckw.payment.model.vo.req.RefundPage;
 import org.apache.ibatis.annotations.Mapper;
+import org.apache.ibatis.annotations.Param;
+
+import java.util.List;
 
 /**
  * @author xucaiqin
@@ -10,4 +14,11 @@ import org.apache.ibatis.annotations.Mapper;
  */
 @Mapper
 public interface KwpWalletRefundMapper extends BaseMapper<KwpWalletRefund> {
+    /**
+     * 查询退款中的 退款单列表
+     *
+     * @param refundPage
+     * @return
+     */
+    List<KwpWalletRefund> pageList(@Param("refundPage") RefundPage refundPage);
 }

sckw-modules/sckw-payment/src/main/java/com/sckw/payment/model/KwpWalletRefund.java

@@ -10,13 +10,10 @@ import java.math.BigDecimal;
 import java.time.LocalDateTime;
 
 /**
+ * 退款记录表
  * @date 2023-09-05 17:53:14
  * @author xucaiqin
  */
-
-/**
- * 退款记录表
- */
 @Data
 @TableName(value = "kwp_wallet_refund")
 public class KwpWalletRefund {

sckw-modules/sckw-payment/src/main/java/com/sckw/payment/model/dto/WalletInfoDto.java

@@ -16,23 +16,10 @@ public class WalletInfoDto implements MoneyChange, Serializable {
      * 是否开通钱包
      */
     private Boolean openFlag;
-    /**
-     * 企业名称
-     */
-    private String name;
-    /**
-     * 钱包名称
-     */
-    @JSONField(name = "wallet_name")
-    private String walletName;
-
     /**
      * 渠道
      */
     private String channel;
-
-    private Integer status;
-
     /**
      * 预付金额(分)
      */
@@ -49,9 +36,15 @@ public class WalletInfoDto implements MoneyChange, Serializable {
     private BigDecimal money;
 
     /**
-     * 退款金额
+     * 申请退款金额
      */
     private BigDecimal refundMoney;
 
 
+    //拓展字段
+    private String channelLabel;
+    private String uid;
+    private String uidName;
+    private String filter;
+    private String filterName;
 }

sckw-modules/sckw-payment/src/main/java/com/sckw/payment/model/vo/req/ApplyRefundReq.java

@@ -0,0 +1,43 @@
+package com.sckw.payment.model.vo.req;
+
+import com.sckw.core.model.base.IdsList;
+import com.sckw.payment.model.vo.res.MoneyChange;
+import jakarta.validation.constraints.Digits;
+import jakarta.validation.constraints.NotBlank;
+import jakarta.validation.constraints.Positive;
+import jakarta.validation.constraints.Size;
+import lombok.Getter;
+import lombok.Setter;
+
+import java.math.BigDecimal;
+
+/**
+ * 申请退款参数
+ *
+ * @author xucaiqin
+ * @date 2023-08-29 09:14:04
+ */
+@Getter
+@Setter
+public class ApplyRefundReq implements MoneyChange, IdsList {
+    @NotBlank(message = "当前企业不能为空")
+    private String uid;
+    /**
+     * 支付通道字典值
+     */
+    @NotBlank(message = "支付通道不能为空")
+    private String channel;
+
+    @NotBlank(message = "合作企业不能为空")
+    private String filter;
+    /**
+     * 单位元
+     */
+    @Positive(message = "退款金额必须大于0")
+    @Digits(message = "小数位数过长或金额过大", integer = 10, fraction = 2)
+    private BigDecimal money;
+
+    @Size(message = "备注不能超过200字")
+    private String remark;
+
+}

sckw-modules/sckw-payment/src/main/java/com/sckw/payment/model/vo/req/RefundBackReq.java

@@ -1,6 +1,8 @@
 package com.sckw.payment.model.vo.req;
 
+import com.sckw.core.model.base.IdsList;
 import jakarta.validation.constraints.NotBlank;
+import jakarta.validation.constraints.Size;
 import lombok.Getter;
 import lombok.Setter;
 
@@ -12,15 +14,11 @@ import lombok.Setter;
  */
 @Getter
 @Setter
-public class RefundBackReq {
-    @NotBlank(message = "当前企业不能为空")
-    private String uid;
-    /**
-     * 支付通道字典值
-     */
-    @NotBlank(message = "支付通道不能为空")
-    private String channel;
+public class RefundBackReq implements IdsList {
+    @NotBlank(message = "退款单id不能为空")
+    private String id;
 
-    @NotBlank(message = "合作企业不能为空")
-    private String filter;
+    @NotBlank(message = "驳回原因不能为空")
+    @Size(message = "驳回原因不能超过200字")
+    private String remark;
 }

sckw-modules/sckw-payment/src/main/java/com/sckw/payment/model/vo/req/RefundPage.java

@@ -0,0 +1,33 @@
+package com.sckw.payment.model.vo.req;
+
+import com.fasterxml.jackson.annotation.JsonFormat;
+import com.sckw.core.model.vo.BasePara;
+import com.sckw.payment.model.vo.res.MoneyChange;
+import jakarta.validation.constraints.NotBlank;
+import lombok.Getter;
+import lombok.Setter;
+
+/**
+ * 退款
+ *
+ * @author xucaiqin
+ * @date 2023-08-29 09:14:04
+ */
+@Getter
+@Setter
+public class RefundPage extends BasePara implements MoneyChange {
+    @NotBlank(message = "当前企业不能为空")
+    private String uid;
+    /**
+     * 支付通道字典值
+     */
+    @NotBlank(message = "支付通道不能为空")
+    private String channel;
+    @NotBlank(message = "合作企业不能为空")
+    private String filter;
+    @JsonFormat(pattern = "yyyy-MM-dd")
+    private String startCreateTime;
+    @JsonFormat(pattern = "yyyy-MM-dd")
+    private String endCreateTime;
+
+}

sckw-modules/sckw-payment/src/main/java/com/sckw/payment/model/vo/req/RefundReq.java

@@ -1,8 +1,8 @@
 package com.sckw.payment.model.vo.req;
 
+import com.sckw.payment.model.dto.Id;
 import com.sckw.payment.model.vo.res.MoneyChange;
 import jakarta.validation.constraints.Digits;
-import jakarta.validation.constraints.NotBlank;
 import jakarta.validation.constraints.Positive;
 import jakarta.validation.constraints.Size;
 import lombok.Getter;
@@ -18,17 +18,7 @@ import java.math.BigDecimal;
  */
 @Getter
 @Setter
-public class RefundReq implements MoneyChange {
-    @NotBlank(message = "当前企业不能为空")
-    private String uid;
-    /**
-     * 支付通道字典值
-     */
-    @NotBlank(message = "支付通道不能为空")
-    private String channel;
-
-    @NotBlank(message = "合作企业不能为空")
-    private String filter;
+public class RefundReq extends Id implements MoneyChange {
 
     @Positive(message = "提现金额必须大于0")
     @Digits(message = "小数位数过长或金额过大", integer = 10, fraction = 2)

sckw-modules/sckw-payment/src/main/java/com/sckw/payment/model/vo/res/WalletRefundVo.java

@@ -0,0 +1,91 @@
+package com.sckw.payment.model.vo.res;
+
+import com.fasterxml.jackson.annotation.JsonFormat;
+import lombok.Data;
+
+import java.math.BigDecimal;
+import java.time.LocalDateTime;
+
+/**
+ * 退款记录表
+ */
+@Data
+public class WalletRefundVo {
+    /**
+     * 主键
+     */
+    private Long id;
+
+    /**
+     * 流水号
+     */
+    private String orderNo;
+
+    /**
+     * uid
+     */
+    private String uid;
+    private String uidName;
+
+    /**
+     * 退款企业id
+     */
+    private Long fromEnt;
+
+    /**
+     * filter
+     */
+    private String filter;
+    private String filterName;
+
+    /**
+     * 收款企业id
+     */
+    private Long toEnt;
+
+    /**
+     * 电子钱包渠道
+     */
+    private String channel;
+    /**
+     * 备注
+     */
+    private String remark;
+
+    /**
+     * 退款金额
+     */
+    private BigDecimal money;
+
+    /**
+     * 实际退款金额
+     */
+    private BigDecimal actualMoney;
+
+    /**
+     * 创建人
+     */
+    private Long createBy;
+
+    /**
+     * 创建时间
+     */
+    @JsonFormat(pattern = "yyyy-MM-dd HH:mm:ss")
+    private LocalDateTime createTime;
+
+    /**
+     * 更新人
+     */
+    private Long updateBy;
+
+    /**
+     * 更新时间
+     */
+    @JsonFormat(pattern = "yyyy-MM-dd HH:mm:ss")
+    private LocalDateTime updateTime;
+
+    /**
+     * 1-申请退款 2-退款中 3-退款失败 4-退款驳回 5-退款成功
+     */
+    private Integer status;
+}

sckw-modules/sckw-payment/src/main/java/com/sckw/payment/service/WalletOrderService.java

@@ -1,14 +1,22 @@
 package com.sckw.payment.service;
 
 import com.baomidou.mybatisplus.core.conditions.query.LambdaQueryWrapper;
+import com.github.pagehelper.PageHelper;
+import com.github.pagehelper.PageInfo;
+import com.sckw.core.model.page.PageRes;
+import com.sckw.core.utils.BeanUtils;
 import com.sckw.payment.dao.KwpWalletRefundMapper;
 import com.sckw.payment.dao.KwpWalletTransferMapper;
 import com.sckw.payment.model.KwpWalletRefund;
 import com.sckw.payment.model.constant.RefundEnum;
+import com.sckw.payment.model.vo.req.RefundPage;
+import com.sckw.payment.model.vo.res.WalletRefundVo;
 import lombok.RequiredArgsConstructor;
 import lombok.extern.slf4j.Slf4j;
 import org.springframework.stereotype.Service;
 
+import java.util.List;
+
 /**
  * 钱包订单相关业务
  *
@@ -28,7 +36,7 @@ public class WalletOrderService {
      * @param change  true-预收，需要转换双方企业
      * @param channel huifu-汇付渠道
      */
-    public KwpWalletRefund query(boolean change, String uid, String filter, String channel) {
+    public List<KwpWalletRefund> query(boolean change, String uid, String filter, String channel) {
         LambdaQueryWrapper<KwpWalletRefund> wrapper = new LambdaQueryWrapper<>();
         //预收时，切换预收预付的双方人员
         if (change) {
@@ -37,9 +45,8 @@ public class WalletOrderService {
             wrapper.eq(KwpWalletRefund::getUid, uid).eq(KwpWalletRefund::getFilter, filter);
         }
         wrapper.eq(KwpWalletRefund::getChannel, channel)
-                .eq(KwpWalletRefund::getStatus, RefundEnum.REFUNDING.getStatus())
-                .orderByDesc(KwpWalletRefund::getCreateTime).last("limit 1");
-        return kwpWalletRefundMapper.selectOne(wrapper);
+                .eq(KwpWalletRefund::getStatus, RefundEnum.REFUNDING.getStatus());
+        return kwpWalletRefundMapper.selectList(wrapper);
     }
 
     /**
@@ -50,12 +57,57 @@ public class WalletOrderService {
      * @param channel
      * @return
      */
-    public KwpWalletRefund queryOne(String uid, String filter, String channel,RefundEnum refundEnum) {
+    public List<KwpWalletRefund> queryList(String uid, String filter, String channel, RefundEnum refundEnum) {
+        LambdaQueryWrapper<KwpWalletRefund> wrapper = new LambdaQueryWrapper<>();
+        wrapper.eq(KwpWalletRefund::getUid, uid).eq(KwpWalletRefund::getFilter, filter);
+        wrapper.eq(KwpWalletRefund::getChannel, channel)
+                .eq(KwpWalletRefund::getStatus, refundEnum.getStatus());
+        return kwpWalletRefundMapper.selectList(wrapper);
+    }
+
+    public KwpWalletRefund queryOne(String uid, String filter, String channel, RefundEnum refundEnum) {
         LambdaQueryWrapper<KwpWalletRefund> wrapper = new LambdaQueryWrapper<>();
         wrapper.eq(KwpWalletRefund::getUid, uid).eq(KwpWalletRefund::getFilter, filter);
         wrapper.eq(KwpWalletRefund::getChannel, channel)
-                .eq(KwpWalletRefund::getStatus, refundEnum.getStatus())
-                .orderByDesc(KwpWalletRefund::getCreateTime).last("limit 1");
+                .eq(KwpWalletRefund::getStatus, refundEnum.getStatus()).last("limit 1");
         return kwpWalletRefundMapper.selectOne(wrapper);
     }
+
+    /**
+     * 通过id查询
+     *
+     * @param id
+     * @return
+     */
+    public KwpWalletRefund queryById(Long id) {
+        return kwpWalletRefundMapper.selectById(id);
+    }
+
+    /**
+     * 更新
+     *
+     * @param kwpWalletRefund
+     * @return
+     */
+    public void updateById(KwpWalletRefund kwpWalletRefund) {
+        kwpWalletRefundMapper.updateById(kwpWalletRefund);
+    }
+
+    /**
+     * 分页查询
+     *
+     * @param refundPage
+     * @return
+     */
+    public PageRes<WalletRefundVo> queryRefundList(RefundPage refundPage) {
+        PageHelper.startPage(refundPage.getPage(), refundPage.getPageSize());
+        List<KwpWalletRefund> kwpWalletRefunds = kwpWalletRefundMapper.pageList(refundPage);
+        PageInfo<KwpWalletRefund> pageInfo = new PageInfo<>(kwpWalletRefunds);
+        List<WalletRefundVo> list = kwpWalletRefunds.stream().map(a -> {
+            WalletRefundVo walletRefundVo = new WalletRefundVo();
+            BeanUtils.copyProperties(a, walletRefundVo);
+            return walletRefundVo;
+        }).toList();
+        return PageRes.build(pageInfo, list);
+    }
 }

sckw-modules/sckw-payment/src/main/java/com/sckw/payment/service/WalletService.java

@@ -9,6 +9,7 @@ import com.sckw.core.model.page.PageRes;
 import com.sckw.core.utils.CollectionUtils;
 import com.sckw.core.utils.IdWorker;
 import com.sckw.core.utils.OrderUtils;
+import com.sckw.core.utils.StringTimeUtil;
 import com.sckw.core.web.context.LoginUserHolder;
 import com.sckw.manage.api.RemoteManageService;
 import com.sckw.manage.api.model.dto.res.FindEntCooperateResVo;
@@ -46,6 +47,7 @@ import org.slf4j.Logger;
 import org.slf4j.LoggerFactory;
 import org.springframework.beans.BeanUtils;
 import org.springframework.stereotype.Service;
+import org.springframework.transaction.annotation.Transactional;
 
 import java.math.BigDecimal;
 import java.text.DecimalFormat;
@@ -69,6 +71,7 @@ public class WalletService {
     private final KwpWalletRefundMapper kwpWalletRefundMapper;
     private final KwpWalletTransferMapper kwpWalletTransferMapper;
     private final RedisLockUtil redisLockUtil;
+    private final KwpWalletRefundSubService kwpWalletRefundSubService;
     @DubboReference(version = "1.0.0", group = "design", check = false)
     private RemoteSystemService remoteSystemService;
     @DubboReference(version = "1.0.0", group = "design", check = false)
@@ -94,6 +97,12 @@ public class WalletService {
         return "";
     }
 
+    /**
+     * 根据中台用户id查询企业id
+     *
+     * @param id 中台用户id
+     * @return
+     */
     private Long getEnt(String id) {
         if (StringUtils.isBlank(id)) {
             return null;
@@ -159,9 +168,15 @@ public class WalletService {
      */
     private void refundMoney(PrePayWallet prePayWallet, PrePayWalletVo prePayWalletVo, boolean change) {
         DecimalFormat df = new DecimalFormat("0.00");
-        KwpWalletRefund kwpWalletRefund = walletOrderService.query(change, prePayWallet.getUid(), prePayWallet.getFilter(), prePayWallet.getChannel());
-        if (Objects.nonNull(kwpWalletRefund)) {
-            prePayWalletVo.setRefundApMoney(df.format(kwpWalletRefund.getActualMoney()));
+        List<KwpWalletRefund> query = walletOrderService.query(change, prePayWallet.getUid(), prePayWallet.getFilter(), prePayWallet.getChannel());
+        if (!CollectionUtils.isEmpty(query)) {
+            BigDecimal reduce = query.stream().map(KwpWalletRefund::getMoney).reduce(BigDecimal.ZERO, (o, n) -> {
+                if (Objects.isNull(n)) {
+                    return o.add(new BigDecimal("0.0"));
+                }
+                return o.add(n);
+            });
+            prePayWalletVo.setRefundApMoney(df.format(reduce));
         } else {
             prePayWalletVo.setRefundApMoney("0.00");
         }
@@ -174,9 +189,15 @@ public class WalletService {
      */
     private void refundMoney2(FundVo fundVo) {
         DecimalFormat df = new DecimalFormat("0.00");
-        KwpWalletRefund kwpWalletRefund = walletOrderService.queryOne(fundVo.getUid(), fundVo.getFilter(), fundVo.getChannel(), RefundEnum.REFUNDING);
-        if (Objects.nonNull(kwpWalletRefund)) {
-            fundVo.setRefundMoney(df.format(kwpWalletRefund.getActualMoney()));
+        List<KwpWalletRefund> kwpWalletRefunds = walletOrderService.queryList(fundVo.getUid(), fundVo.getFilter(), fundVo.getChannel(), RefundEnum.REFUNDING);
+        if (!CollectionUtils.isEmpty(kwpWalletRefunds)) {
+            BigDecimal reduce = kwpWalletRefunds.stream().map(KwpWalletRefund::getMoney).reduce(BigDecimal.ZERO, (o, n) -> {
+                if (Objects.isNull(n)) {
+                    return o.add(new BigDecimal("0.0"));
+                }
+                return o.add(n);
+            });
+            fundVo.setRefundMoney(df.format(reduce));
         } else {
             fundVo.setRefundMoney("0.00");
         }
@@ -895,10 +916,7 @@ public class WalletService {
             throw new BusinessException("不存在交易");
         }
         WalletInfoDto walletInfoDto = new WalletInfoDto();
-        walletInfoDto.setName(data.getName());
-        walletInfoDto.setWalletName(data.getWalletName());
         walletInfoDto.setChannel(data.getChannel());
-        walletInfoDto.setStatus(data.getStatus());
         walletInfoDto.setApMoney(walletInfoDto.smallMoney(data.getApMoney()));
         walletInfoDto.setWdMoney(walletInfoDto.smallMoney(data.getWdMoney()));
         walletInfoDto.setMoney(walletInfoDto.smallMoney(data.getMoney()));
@@ -956,14 +974,37 @@ public class WalletService {
 
     /**
      * 申请退款
+     * 校验预付可用余额和退款金额，退款金额不能大于预付可用余额
      *
      * @return
      */
-    public Object applyRefund(RefundReq refundReq) {
+    @Transactional(rollbackFor = Exception.class)
+    public Object applyRefund(ApplyRefundReq refundReq) {
         ChannelEnum channelEnum = ChannelEnum.getByChannel(refundReq.getChannel());
         if (Objects.isNull(channelEnum)) {
             throw new BusinessException("支付通道不存在");
         }
+        //校验余额
+        R<WalletInfo> walletInfoR = payCenterService.totalInfo(refundReq.getUid(), channelEnum, refundReq.getFilter());
+        if (!walletInfoR.getStatus()) {
+            throw new BusinessException(StringUtils.isNotBlank(walletInfoR.getMsg()) ? walletInfoR.getMsg() : "未找到交易方");
+        }
+        WalletInfo data = walletInfoR.getData();
+        if (Objects.isNull(data)) {
+            throw new BusinessException("不存在交易");
+        }
+        //预付可用余额 分
+        BigDecimal apMoney = data.getApMoney();
+        apMoney = Objects.isNull(apMoney) ? BigDecimal.ZERO : apMoney;
+        //退款金额 元
+        BigDecimal money = refundReq.getMoney();
+        //退款金额 分
+        BigDecimal multiply = money.multiply(new BigDecimal("100"));
+        if (multiply.compareTo(apMoney) > 0) {
+            throw new BusinessException("退款金额不能大于预付可用金额");
+        }
+
+        //新增退款单
         KwpWalletRefund kwpWalletRefundAdd = new KwpWalletRefund();
         kwpWalletRefundAdd.setId(new IdWorker(NumberConstant.ONE).nextId());
         kwpWalletRefundAdd.setOrderNo(OrderUtils.generateOrderNo("RF"));
@@ -982,6 +1023,7 @@ public class WalletService {
         kwpWalletRefundAdd.setDelFlag(0);
         kwpWalletRefundAdd.setStatus(RefundEnum.APPLY.getStatus());
         kwpWalletRefundMapper.insert(kwpWalletRefundAdd);
+        kwpWalletRefundSubService.saveRecord(kwpWalletRefundAdd.getId(), refundReq.getRemark(), RefundEnum.APPLY.getStatus());
         return "提交成功";
     }
 
@@ -995,26 +1037,31 @@ public class WalletService {
      *
      * @return
      */
+    @Transactional(rollbackFor = Exception.class)
+
     public Object launchRefund(RefundReq refundReq) {
-        KwpWalletRefund kwpWalletRefund = walletOrderService.queryOne(refundReq.getUid(), refundReq.getFilter(), refundReq.getChannel(), RefundEnum.APPLY);
+        KwpWalletRefund kwpWalletRefund = walletOrderService.queryById(refundReq.getIdLong());
         if (Objects.isNull(kwpWalletRefund)) {
-            throw new BusinessException("未找到待完成的退款订单");
+            throw new BusinessException("退款订单不存在");
         }
-        ChannelEnum channelEnum = ChannelEnum.getByChannel(refundReq.getChannel());
+        ChannelEnum channelEnum = ChannelEnum.getByChannel(kwpWalletRefund.getChannel());
         if (Objects.isNull(channelEnum)) {
             throw new BusinessException("支付通道不存在");
         }
         // 1.记账
         List<PatchPay> list = new ArrayList<>();
         PatchPay patchPay = new PatchPay();
-        patchPay.setUid(refundReq.getFilter());
+        patchPay.setUid(kwpWalletRefund.getFilter());
         patchPay.setMoney(refundReq.bigMoney(refundReq.getMoney()));
-        patchPay.setRemark(refundReq.getRemark());
+        patchPay.setRemark(StringUtils.isBlank(refundReq.getRemark()) ? "" : refundReq.getRemark());
         list.add(patchPay);
-        R<BusinessNo> businessNoR = payCenterService.payAgentPayV2(refundReq.getUid(), refundReq.getFilter(), channelEnum, refundReq.bigMoney(refundReq.getMoney()), list, OrderUtils.generateOrderNo("SEQ"), "1");
+        R<BusinessNo> businessNoR = payCenterService.payAgentPayV2(kwpWalletRefund.getUid(), kwpWalletRefund.getFilter(), channelEnum, refundReq.bigMoney(refundReq.getMoney()), list, OrderUtils.generateOrderNo("SEQ"), "1");
         if (!businessNoR.getStatus()) {
             throw new BusinessException(StringUtils.isNotBlank(businessNoR.getMsg()) ? businessNoR.getMsg() : "退款失败");
         }
+        //保存操作记录
+        kwpWalletRefundSubService.saveRecord(kwpWalletRefund.getId(), refundReq.getRemark(), RefundEnum.REFUNDING.getStatus());
+
         Long userId = LoginUserHolder.getUserId();
         //异步提交清分退款任务
         AsyncPool.addTask(new Refund(refundReq, kwpWalletRefund, payCenterService, kwpWalletRefundMapper, userId));
@@ -1024,23 +1071,20 @@ public class WalletService {
     /**
      * 发起退款校验
      *
-     * @param refundReq
+     * @param id
      * @return
      */
-    public Object refundCheck(RefundCheckReq refundReq) {
-        LambdaQueryWrapper<KwpWalletRefund> wrapper = new LambdaQueryWrapper<>();
-        wrapper.eq(KwpWalletRefund::getChannel, refundReq.getChannel());
-        wrapper.eq(KwpWalletRefund::getUid, refundReq.getUid()).eq(KwpWalletRefund::getFilter, refundReq.getFilter()).eq(KwpWalletRefund::getStatus, RefundEnum.APPLY.getStatus()).last("limit 1");
-        KwpWalletRefund kwpWalletRefund = kwpWalletRefundMapper.selectOne(wrapper);
+    public WalletInfoDto refundCheck(Long id) {
+        KwpWalletRefund kwpWalletRefund = walletOrderService.queryById(id);
         if (Objects.isNull(kwpWalletRefund)) {
-            throw new BusinessException("未找到待完成的退款订单");
+            throw new BusinessException("退款订单不存在");
         }
-        ChannelEnum channelEnum = ChannelEnum.getByChannel(refundReq.getChannel());
+        ChannelEnum channelEnum = ChannelEnum.getByChannel(kwpWalletRefund.getChannel());
         if (Objects.isNull(channelEnum)) {
             throw new BusinessException("支付通道不存在");
         }
         //发起退款是预收业务，uid和filter是相反的，查询时需要方向查询钱包
-        R<WalletInfo> walletInfoR = payCenterService.totalInfo(refundReq.getFilter(), channelEnum, refundReq.getUid());
+        R<WalletInfo> walletInfoR = payCenterService.totalInfo(kwpWalletRefund.getFilter(), channelEnum, kwpWalletRefund.getUid());
         // 未开通钱包
         if (!walletInfoR.getStatus()) {
             WalletInfoDto walletInfoDto = new WalletInfoDto();
@@ -1055,17 +1099,27 @@ public class WalletService {
         }
         WalletInfoDto walletInfoDto = new WalletInfoDto();
         walletInfoDto.setOpenFlag(true);
-        walletInfoDto.setName(data.getName());
-        walletInfoDto.setWalletName(data.getWalletName());
         walletInfoDto.setChannel(data.getChannel());
-        walletInfoDto.setStatus(data.getStatus());
         walletInfoDto.setApMoney(walletInfoDto.smallMoney(data.getApMoney()));
         walletInfoDto.setWdMoney(walletInfoDto.smallMoney(data.getWdMoney()));
         walletInfoDto.setMoney(walletInfoDto.smallMoney(data.getMoney()));
+        //申请退款金额
         walletInfoDto.setRefundMoney(kwpWalletRefund.getMoney());
+
+        walletInfoDto.setChannelLabel(channelEnum.getDesc());
+        walletInfoDto.setUid(kwpWalletRefund.getUid());
+        walletInfoDto.setUidName(getFirmName(kwpWalletRefund.getUid()));
+        walletInfoDto.setFilter(kwpWalletRefund.getFilter());
+        walletInfoDto.setFilterName(getFirmName(kwpWalletRefund.getFilter()));
         return walletInfoDto;
     }
 
+    /**
+     * 预付追加校验
+     *
+     * @param appendPayCheck
+     * @return
+     */
     public Object appendCheck(AppendPayCheck appendPayCheck) {
         String uid = walletRelationService.getRelation(LoginUserHolder.getEntId());
         if (StringUtils.isBlank(uid)) {
@@ -1086,10 +1140,7 @@ public class WalletService {
         }
         WalletInfoDto walletInfoDto = new WalletInfoDto();
         walletInfoDto.setOpenFlag(true);
-        walletInfoDto.setName(data.getName());
-        walletInfoDto.setWalletName(data.getWalletName());
         walletInfoDto.setChannel(data.getChannel());
-        walletInfoDto.setStatus(data.getStatus());
         walletInfoDto.setApMoney(walletInfoDto.smallMoney(data.getApMoney()));
         walletInfoDto.setWdMoney(walletInfoDto.smallMoney(data.getWdMoney()));
         walletInfoDto.setMoney(walletInfoDto.smallMoney(data.getMoney()));
@@ -1149,8 +1200,45 @@ public class WalletService {
      * @param refundReq
      * @return
      */
+    @Transactional(rollbackFor = Exception.class)
     public String backRefund(RefundBackReq refundReq) {
-        return null;
+        KwpWalletRefund kwpWalletRefund = walletOrderService.queryById(refundReq.getIdLong());
+        if (Objects.isNull(kwpWalletRefund)) {
+            throw new BusinessException("退款订单不存在");
+        }
+        if (kwpWalletRefund.getStatus() != RefundEnum.APPLY.getStatus()) {
+            throw new BusinessException("请勿重复提交");
+        }
+        kwpWalletRefund.setStatus(RefundEnum.BACK.getStatus());
+        kwpWalletRefund.setRemark(refundReq.getRemark());
+        kwpWalletRefund.setUpdateBy(LoginUserHolder.getUserId());
+        kwpWalletRefund.setUpdateTime(LocalDateTime.now());
+        walletOrderService.updateById(kwpWalletRefund);
+        //保存操作记录
+        kwpWalletRefundSubService.saveRecord(kwpWalletRefund.getId(), refundReq.getRemark(), RefundEnum.BACK.getStatus());
+        return "驳回成功";
+    }
+
+    /**
+     * 查询退款列表
+     *
+     * @param refundPage
+     * @return
+     */
+    public Object refundList(RefundPage refundPage) {
+        if (StringUtils.isNotBlank(refundPage.getStartCreateTime())) {
+            refundPage.setStartCreateTime(StringTimeUtil.fillStart(refundPage.getStartCreateTime()));
+        }
+        if (StringUtils.isNotBlank(refundPage.getEndCreateTime())) {
+            refundPage.setEndCreateTime(StringTimeUtil.fillEnd(refundPage.getEndCreateTime()));
+        }
+        PageRes<WalletRefundVo> walletRefundVoPageRes = walletOrderService.queryRefundList(refundPage);
+        List<WalletRefundVo> list = walletRefundVoPageRes.getList();
+        for (WalletRefundVo walletRefundVo : list) {
+            walletRefundVo.setUidName(getFirmName(walletRefundVo.getUid()));
+            walletRefundVo.setFilterName(getFirmName(walletRefundVo.getFilter()));
+        }
+        return walletRefundVoPageRes;
     }
 
     /**
@@ -1168,15 +1256,15 @@ public class WalletService {
 
         @Override
         public void run() {
-            ChannelEnum channelEnum = ChannelEnum.getByChannel(refundReq.getChannel());
+            ChannelEnum channelEnum = ChannelEnum.getByChannel(kwpWalletRefund.getChannel());
             List<PatchPay> list = new ArrayList<>();
             PatchPay patchPay = new PatchPay();
-            patchPay.setUid(refundReq.getFilter());
+            patchPay.setUid(kwpWalletRefund.getFilter());
             patchPay.setMoney(refundReq.bigMoney(refundReq.getMoney()));
             patchPay.setRemark(refundReq.getRemark());
             list.add(patchPay);
             log.info("异步提交清分退款任务");
-            R<BusinessNo> businessNoR1 = payCenterService.payAgentPayV2(refundReq.getFilter(), refundReq.getUid(), channelEnum, refundReq.bigMoney(refundReq.getMoney()), list, OrderUtils.generateOrderNo("SEQ"), "2");
+            R<BusinessNo> businessNoR1 = payCenterService.payAgentPayV2(kwpWalletRefund.getFilter(), kwpWalletRefund.getUid(), channelEnum, refundReq.bigMoney(refundReq.getMoney()), list, OrderUtils.generateOrderNo("SEQ"), "2");
             if (businessNoR1.getStatus()) {
                 kwpWalletRefund.setActualMoney(refundReq.getMoney());
                 kwpWalletRefund.setUpdateBy(userId);

sckw-modules/sckw-payment/src/main/resources/mapper/KwpWalletRefundMapper.xml

@@ -1,29 +1,49 @@
 <?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.sckw.payment.dao.KwpWalletRefundMapper">
-  <resultMap id="BaseResultMap" type="com.sckw.payment.model.KwpWalletRefund">
-    <!--@mbg.generated-->
-    <!--@Table kwp_wallet_refund-->
-    <id column="id" jdbcType="BIGINT" property="id" />
-    <result column="order_no" jdbcType="VARCHAR" property="orderNo" />
-    <result column="uid" jdbcType="VARCHAR" property="uid" />
-    <result column="from_ent" jdbcType="BIGINT" property="fromEnt" />
-    <result column="filter" jdbcType="VARCHAR" property="filter" />
-    <result column="to_ent" jdbcType="BIGINT" property="toEnt" />
-    <result column="channel" jdbcType="VARCHAR" property="channel" />
-    <result column="money" jdbcType="DECIMAL" property="money" />
-    <result column="actual_money" jdbcType="DECIMAL" property="actualMoney" />
-    <result column="remark" jdbcType="VARCHAR" property="remark" />
-    <result column="create_by" jdbcType="BIGINT" property="createBy" />
-    <result column="create_time" jdbcType="TIMESTAMP" property="createTime" />
-    <result column="update_by" jdbcType="BIGINT" property="updateBy" />
-    <result column="update_time" jdbcType="TIMESTAMP" property="updateTime" />
-    <result column="del_flag" jdbcType="INTEGER" property="delFlag" />
-    <result column="status" jdbcType="INTEGER" property="status" />
-  </resultMap>
-  <sql id="Base_Column_List">
-    <!--@mbg.generated-->
-    id, order_no, `uid`, from_ent, `filter`, to_ent, channel, money,actual_money,remark, create_by, create_time,
-    update_by, update_time, del_flag, `status`
-  </sql>
+    <resultMap id="BaseResultMap" type="com.sckw.payment.model.KwpWalletRefund">
+        <!--@mbg.generated-->
+        <!--@Table kwp_wallet_refund-->
+        <id column="id" jdbcType="BIGINT" property="id"/>
+        <result column="order_no" jdbcType="VARCHAR" property="orderNo"/>
+        <result column="uid" jdbcType="VARCHAR" property="uid"/>
+        <result column="from_ent" jdbcType="BIGINT" property="fromEnt"/>
+        <result column="filter" jdbcType="VARCHAR" property="filter"/>
+        <result column="to_ent" jdbcType="BIGINT" property="toEnt"/>
+        <result column="channel" jdbcType="VARCHAR" property="channel"/>
+        <result column="money" jdbcType="DECIMAL" property="money"/>
+        <result column="actual_money" jdbcType="DECIMAL" property="actualMoney"/>
+        <result column="remark" jdbcType="VARCHAR" property="remark"/>
+        <result column="create_by" jdbcType="BIGINT" property="createBy"/>
+        <result column="create_time" jdbcType="TIMESTAMP" property="createTime"/>
+        <result column="update_by" jdbcType="BIGINT" property="updateBy"/>
+        <result column="update_time" jdbcType="TIMESTAMP" property="updateTime"/>
+        <result column="del_flag" jdbcType="INTEGER" property="delFlag"/>
+        <result column="status" jdbcType="INTEGER" property="status"/>
+    </resultMap>
+
+    <select id="pageList" resultMap="BaseResultMap">
+        select kwr.*
+        from kwp_wallet_refund kwr
+        <where>
+            kwr.del_flag = 0
+              and kwr.status = 1
+            <if test="refundPage.uid != null and refundPage.uid != ''">
+                and kwr.uid = #{refundPage.uid,jdbcType=VARCHAR}
+            </if>
+            <if test="refundPage.filter != null and refundPage.filter != ''">
+                and kwr.filter = #{refundPage.filter,jdbcType=VARCHAR}
+            </if>
+            <if test="refundPage.channel != null and refundPage.channel != ''">
+                and kwr.channel = #{refundPage.channel,jdbcType=VARCHAR}
+            </if>
+            <if test="refundPage.keywords != null and refundPage.keywords != ''">
+                and kwr.order_no like concat('%', #{refundPage.keywords,jdbcType=VARCHAR}, '%')
+            </if>
+
+            <if test="refundPage.startCreateTime != null and refundPage.startCreateTime != '' and refundPage.endCreateTime != null and refundPage.endCreateTime != ''">
+                and kwr.create_time between #{refundPage.startCreateTime,jdbcType=TIMESTAMP} and #{refundPage.endCreateTime,jdbcType=TIMESTAMP}
+            </if>
+        </where>
+    </select>
 </mapper>