feature: 微信充值

1.充值订单创建与展示

ruoyi-modules/ruoyi-backstage/src/main/java/org/dromara/backstage/business/payments/ThirdPayBusiness.java

@@ -0,0 +1,87 @@
+package org.dromara.backstage.business.payments;
+
+import cn.hutool.json.JSONUtil;
+import lombok.RequiredArgsConstructor;
+import lombok.extern.slf4j.Slf4j;
+import org.dromara.backstage.payment.domain.bo.PayOrderBo;
+import org.dromara.backstage.payment.domain.bo.PurseInOutBo;
+import org.dromara.backstage.payment.domain.vo.PayOrderVo;
+import org.dromara.backstage.payment.service.IPayOrderService;
+import org.dromara.common.core.domain.R;
+import org.dromara.common.core.enums.BalanceUpdateEnum;
+import org.dromara.common.core.enums.CreditStatusEnum;
+import org.dromara.common.core.enums.CreditTypeEnum;
+import org.springframework.stereotype.Service;
+
+import java.text.MessageFormat;
+
+/**
+ * name: ThirdPayBusiness
+ * package: org.dromara.backstage.business.payments
+ * description: 第三方支付业务处理
+ * date: 2025-01-13 19:18:14 19:18
+ *
+ * @author luoyibo
+ * @version 0.1
+ * @since JDK 1.8
+ */
+@RequiredArgsConstructor
+@Service
+@Slf4j
+public class ThirdPayBusiness {
+    private final IPayOrderService payOrderService;
+    private final PayOrderBusiness payOrderBusiness;
+
+    public R<String> createWechatQrCode(PayOrderBo bo) {
+        R<PayOrderVo> result = createThirdPayOrder(bo);
+        if (R.isError(result)) {
+            return R.fail(result.getMsg());
+        }
+        // TODO 2025-01-13 19:36:29 luoyibo 生成微信收款码
+        return R.ok();
+    }
+    public R<String> payCallBackHandler(PayOrderBo bo){
+        // TODO 2025-01-13 19:38:22 luoyibo 根据支付成功与否处理
+        R<Void> postResult = postThirdPayOrder(bo);
+        return R.ok();
+    }
+
+    /**
+     * 生成第三方支付订单
+     * @param bo 订单信息
+     * @return 订单信息
+     */
+    public R<PayOrderVo> createThirdPayOrder(PayOrderBo bo) {
+        if (payOrderService.insertByBo(bo)) {
+            return R.ok(payOrderService.queryById(bo.getOrderId()));
+        }
+        log.error("[{}]-[订单创建失败]-[{}]", CreditTypeEnum.getMessage(bo.getCreditType()), JSONUtil.toJsonStr(bo));
+        return R.fail(MessageFormat.format("[{0}]-[订单创建失败]", CreditTypeEnum.getMessage(bo.getCreditType())));
+    }
+
+    public R<Void> postThirdPayOrder(PayOrderBo bo) {
+        payOrderService.updateByBo(bo);
+        // 将支付订单信息转换成一卡通充值数据进行充值
+        PurseInOutBo purseInOutBo = new PurseInOutBo();
+        purseInOutBo.setUserId(bo.getUserId());
+        purseInOutBo.setPayStyle(bo.getPayStyle());
+        purseInOutBo.setTakeCommission("0");
+        purseInOutBo.setReceiptMoney(bo.getReceiptMoney());
+        purseInOutBo.setOperationMode(BalanceUpdateEnum.RECHARGE);
+        purseInOutBo.setCreditType(CreditTypeEnum.valueOf(CreditTypeEnum.getMessage(bo.getCreditType())));
+        //purseInOutBo.setStationId();
+        purseInOutBo.setOperatorId(bo.getUserId());
+        purseInOutBo.setOperatorName(bo.getRealName());
+        purseInOutBo.setCustomerSn(bo.getOrderId().toString());
+        purseInOutBo.setPayeeSn(bo.getPaySn());
+
+        R<PurseInOutBo> rechargeResult = payOrderBusiness.recharge(purseInOutBo);
+        if (R.isSuccess(rechargeResult)) {
+            // 更新支付订单表的入账状态
+            bo.setCreditStatus(CreditStatusEnum.SUCCESS.code().toString());
+            bo.setOriginalId(purseInOutBo.getOriginalId());
+            payOrderService.updateByBo(bo);
+        }
+        return R.ok();
+    }
+}

ruoyi-modules/ruoyi-backstage/src/main/java/org/dromara/backstage/business/self/SelfBusiness.java

@@ -13,9 +13,9 @@ import org.dromara.backstage.consumption.domain.bo.XfCreditAccountBackBo;
 import org.dromara.backstage.consumption.domain.vo.XfCreditAccountBackVo;
 import org.dromara.backstage.consumption.service.IXfCreditAccountBackService;
 import org.dromara.backstage.domain.convert.YcVoConvert;
-import org.dromara.backstage.payment.domain.bo.WxOrderBo;
-import org.dromara.backstage.payment.domain.vo.WxOrderVo;
-import org.dromara.backstage.payment.service.IWxOrderService;
+import org.dromara.backstage.payment.domain.bo.PayOrderBo;
+import org.dromara.backstage.payment.domain.vo.PayOrderVo;
+import org.dromara.backstage.payment.service.IPayOrderService;
 import org.dromara.backstage.task.AsyncTaskService;
 import org.dromara.common.core.api.ReturnResult;
 import org.dromara.common.core.enums.CreditStatusEnum;
@@ -61,7 +61,7 @@ public class SelfBusiness {
     String messageHasRoom;
 
     private final AsyncTaskService asyncTaskService;
-    private final IWxOrderService wxOrderService;
+    private final IPayOrderService wxOrderService;
     private final IXfCreditAccountBackService creditAccountBackService;
 
     /**
@@ -145,17 +145,17 @@ public class SelfBusiness {
      * @return 支付结果
      */
     public ReturnResult queryPayResultByUserAndDept(Long deptId,Long userId){
-        WxOrderBo bo = new WxOrderBo();
+        PayOrderBo bo = new PayOrderBo();
         bo.setUserId(userId);
         bo.setDeptId(deptId);
 
-        List<WxOrderVo> vos = wxOrderService.queryList(bo);
+        List<PayOrderVo> vos = wxOrderService.queryList(bo);
         if(CollectionUtil.isEmpty(vos)){
             return ReturnResult.failure(ResultCodeEnum.DATA_NOT_FOUND,
                                         MessageFormat.format("无对应的支付订单,部门Id:{0},人员Id:{1}", deptId, userId));
         }
         String errMsg = String.format("[支付结果查询]-[deptId:%s,userId:%s]-[订单尚未支付成功]", deptId, userId);
-        WxOrderVo vo = vos.stream().filter(p-> ObjectUtil.equals(p.getCreditStatus(),"Y")).findFirst()
+        PayOrderVo vo = vos.stream().filter(p-> ObjectUtil.equals(p.getCreditStatus(),"Y")).findFirst()
                            .orElseThrow(() -> new ApiException(errMsg));
 
        return ReturnResult.success(YcVoConvert.ycWxOrderConvert(vo));

ruoyi-modules/ruoyi-backstage/src/main/java/org/dromara/backstage/config/WechatPayConfig.java

@@ -0,0 +1,19 @@
+package org.dromara.backstage.config;
+
+import lombok.Data;
+import org.springframework.context.annotation.Configuration;
+
+/**
+ * name: WechatPayConfig
+ * package: org.dromara.backstage.config
+ * description: 微信支付配置
+ * date: 2025-01-13 19:19:53 19:19
+ *
+ * @author luoyibo
+ * @version 0.1
+ * @since JDK 1.8
+ */
+@Configuration
+@Data
+public class WechatPayConfig {
+}

ruoyi-modules/ruoyi-backstage/src/main/java/org/dromara/backstage/domain/convert/YcVoConvert.java

@@ -6,9 +6,9 @@ import org.dromara.backstage.domain.vo.account.AccountInfoVo;
 import org.dromara.backstage.domain.vo.card.InitCardVo;
 import org.dromara.backstage.domain.vo.card.PtCardVo;
 import org.dromara.backstage.domain.vo.yc.*;
+import org.dromara.backstage.payment.domain.vo.PayOrderVo;
 import org.dromara.backstage.payment.domain.vo.PtBagVo;
 import org.dromara.backstage.payment.domain.vo.PtUserAccountVo;
-import org.dromara.backstage.payment.domain.vo.WxOrderVo;
 import org.dromara.common.core.constant.DefaultConstants;
 import org.dromara.common.core.enums.CardStatusEnum;
 import org.dromara.common.core.enums.UserAccountStatusEnum;
@@ -151,7 +151,7 @@ public class YcVoConvert {
         return ycUserAccount;
     }
 
-    public static ycWxOrder ycWxOrderConvert(WxOrderVo vo) {
+    public static ycWxOrder ycWxOrderConvert(PayOrderVo vo) {
         ycWxOrder ycWxOrder = new ycWxOrder();
         ycWxOrder.setCustSn(vo.getOrderId().toString());
         ycWxOrder.setBankSn(vo.getPaySn());

ruoyi-modules/ruoyi-backstage/src/main/java/org/dromara/backstage/payment/controller/WxOrderController.java → ruoyi-modules/ruoyi-backstage/src/main/java/org/dromara/backstage/payment/controller/PayOrderController.java

@@ -6,6 +6,7 @@ import lombok.RequiredArgsConstructor;
 import jakarta.servlet.http.HttpServletResponse;
 import jakarta.validation.constraints.*;
 import cn.dev33.satoken.annotation.SaCheckPermission;
+import org.dromara.backstage.payment.domain.vo.PayOrderVo;
 import org.springframework.web.bind.annotation.*;
 import org.springframework.validation.annotation.Validated;
 import org.dromara.common.idempotent.annotation.RepeatSubmit;
@@ -17,9 +18,8 @@ import org.dromara.common.core.validate.AddGroup;
 import org.dromara.common.core.validate.EditGroup;
 import org.dromara.common.log.enums.BusinessType;
 import org.dromara.common.excel.utils.ExcelUtil;
-import org.dromara.backstage.payment.domain.vo.WxOrderVo;
-import org.dromara.backstage.payment.domain.bo.WxOrderBo;
-import org.dromara.backstage.payment.service.IWxOrderService;
+import org.dromara.backstage.payment.domain.bo.PayOrderBo;
+import org.dromara.backstage.payment.service.IPayOrderService;
 import org.dromara.common.mybatis.core.page.TableDataInfo;
 
 /**
@@ -32,17 +32,17 @@ import org.dromara.common.mybatis.core.page.TableDataInfo;
 @Validated
 @RequiredArgsConstructor
 @RestController
-@RequestMapping("/payment/wxOrder")
-public class WxOrderController extends BaseController {
+@RequestMapping("/payment/payOrder")
+public class PayOrderController extends BaseController {
 
-    private final IWxOrderService wxOrderService;
+    private final IPayOrderService wxOrderService;
 
     /**
      * 查询微信支付订单列表
      */
     @SaCheckPermission("payment:wxOrder:list")
     @GetMapping("/list")
-    public TableDataInfo<WxOrderVo> list(WxOrderBo bo, PageQuery pageQuery) {
+    public TableDataInfo<PayOrderVo> list(PayOrderBo bo, PageQuery pageQuery) {
         return wxOrderService.queryPageList(bo, pageQuery);
     }
 
@@ -52,9 +52,9 @@ public class WxOrderController extends BaseController {
     @SaCheckPermission("payment:wxOrder:export")
     @Log(title = "微信支付订单", businessType = BusinessType.EXPORT)
     @PostMapping("/export")
-    public void export(WxOrderBo bo, HttpServletResponse response) {
-        List<WxOrderVo> list = wxOrderService.queryList(bo);
-        ExcelUtil.exportExcel(list, "微信支付订单", WxOrderVo.class, response);
+    public void export(PayOrderBo bo, HttpServletResponse response) {
+        List<PayOrderVo> list = wxOrderService.queryList(bo);
+        ExcelUtil.exportExcel(list, "微信支付订单", PayOrderVo.class, response);
     }
 
     /**
@@ -64,7 +64,7 @@ public class WxOrderController extends BaseController {
      */
     @SaCheckPermission("payment:wxOrder:query")
     @GetMapping("/{orderId}")
-    public R<WxOrderVo> getInfo(@NotNull(message = "主键不能为空")
+    public R<PayOrderVo> getInfo(@NotNull(message = "主键不能为空")
                                      @PathVariable Long orderId) {
         return R.ok(wxOrderService.queryById(orderId));
     }
@@ -73,31 +73,31 @@ public class WxOrderController extends BaseController {
      * 新增微信支付订单
      */
     @SaCheckPermission("payment:wxOrder:add")
-    @Log(title = "微信支付订单", businessType = BusinessType.INSERT)
+    @Log(title = "第三方支付订单", businessType = BusinessType.INSERT)
     @RepeatSubmit()
     @PostMapping()
-    public R<Void> add(@Validated(AddGroup.class) @RequestBody WxOrderBo bo) {
+    public R<Void> add(@Validated(AddGroup.class) @RequestBody PayOrderBo bo) {
         return toAjax(wxOrderService.insertByBo(bo));
     }
 
     /**
-     * 修改微信支付订单
+     * 修改第三方支付订单
      */
     @SaCheckPermission("payment:wxOrder:edit")
-    @Log(title = "微信支付订单", businessType = BusinessType.UPDATE)
+    @Log(title = "第三方支付订单", businessType = BusinessType.UPDATE)
     @RepeatSubmit()
     @PutMapping()
-    public R<Void> edit(@Validated(EditGroup.class) @RequestBody WxOrderBo bo) {
+    public R<Void> edit(@Validated(EditGroup.class) @RequestBody PayOrderBo bo) {
         return toAjax(wxOrderService.updateByBo(bo));
     }
 
     /**
-     * 删除微信支付订单
+     * 删除第三方支付订单
      *
      * @param orderIds 主键串
      */
     @SaCheckPermission("payment:wxOrder:remove")
-    @Log(title = "微信支付订单", businessType = BusinessType.DELETE)
+    @Log(title = "第三方支付订单", businessType = BusinessType.DELETE)
     @DeleteMapping("/{orderIds}")
     public R<Void> remove(@NotEmpty(message = "主键不能为空")
                           @PathVariable Long[] orderIds) {

ruoyi-modules/ruoyi-backstage/src/main/java/org/dromara/backstage/payment/controller/ThirdPayController.java

@@ -0,0 +1,26 @@
+package org.dromara.backstage.payment.controller;
+
+import lombok.RequiredArgsConstructor;
+import org.dromara.common.core.api.ResponseResult;
+import org.dromara.common.web.core.BaseController;
+import org.springframework.validation.annotation.Validated;
+import org.springframework.web.bind.annotation.RequestMapping;
+import org.springframework.web.bind.annotation.RestController;
+
+/**
+ * name: ThirdPayController
+ * package: org.dromara.backstage.payment.controller
+ * description: 第三方支付Controller
+ * date: 2025-01-13 19:05:09 19:05
+ *
+ * @author luoyibo
+ * @version 0.1
+ * @since JDK 1.8
+ */
+@Validated
+@RequiredArgsConstructor
+@RestController
+@ResponseResult
+@RequestMapping("/third-pay")
+public class ThirdPayController extends BaseController {
+}

ruoyi-modules/ruoyi-backstage/src/main/java/org/dromara/backstage/payment/domain/WxOrder.java → ruoyi-modules/ruoyi-backstage/src/main/java/org/dromara/backstage/payment/domain/PayOrder.java

@@ -12,15 +12,15 @@ import java.math.BigDecimal;
 import java.util.Date;
 
 /**
- * 微信支付订单对象 t_wx_order
+ * 第三方支付订单对象 t_pay_order
  *
  * @author LionLi
  * @date 2024-11-13
  */
 @Data
 @EqualsAndHashCode(callSuper = true)
-@TableName("t_wx_order")
-public class WxOrder extends TenantEntity {
+@TableName("t_pay_order")
+public class PayOrder extends TenantEntity {
 
     @Serial
     private static final long serialVersionUID = 1L;
@@ -47,17 +47,22 @@ public class WxOrder extends TenantEntity {
     private String creditType;
 
     /**
-     * 资金来源,见PAYSTYLE字典类型
+     * 支付方式,见PAYSTYLE字典类型
      */
     private String payStyle;
 
+    /**
+     * 支付状态 见PAY_STATUS字典类型
+     */
+    private String payStatus;
+
     /**
      * 交易金额
      */
     private BigDecimal receiptMoney;
 
     /**
-     * 交易状态,见 sys_yes_no字典类别
+     * 交易状态,见CREDIT_STATUS字典类别
      */
     private String creditStatus;
 
@@ -102,5 +107,9 @@ public class WxOrder extends TenantEntity {
     @TableLogic
     private String delFlag;
 
+    /**
+     * 订单入账流水号，对应 t_xf_consumeDetailOriginal 表中的original_id
+     */
+    private String originalId;
 
 }

ruoyi-modules/ruoyi-backstage/src/main/java/org/dromara/backstage/payment/domain/bo/WxOrderBo.java → ruoyi-modules/ruoyi-backstage/src/main/java/org/dromara/backstage/payment/domain/bo/PayOrderBo.java

@@ -1,11 +1,12 @@
 package org.dromara.backstage.payment.domain.bo;
 
+import com.alibaba.excel.annotation.ExcelProperty;
 import io.github.linpeilie.annotations.AutoMapper;
 import jakarta.validation.constraints.NotBlank;
 import jakarta.validation.constraints.NotNull;
 import lombok.Data;
 import lombok.EqualsAndHashCode;
-import org.dromara.backstage.payment.domain.WxOrder;
+import org.dromara.backstage.payment.domain.PayOrder;
 import org.dromara.common.core.validate.AddGroup;
 import org.dromara.common.core.validate.EditGroup;
 import org.dromara.common.mybatis.core.domain.BaseEntity;
@@ -21,19 +22,19 @@ import java.util.Date;
  */
 @Data
 @EqualsAndHashCode(callSuper = true)
-@AutoMapper(target = WxOrder.class, reverseConvertGenerate = false)
-public class WxOrderBo extends BaseEntity {
+@AutoMapper(target = PayOrder.class, reverseConvertGenerate = false)
+public class PayOrderBo extends BaseEntity {
 
     /**
      * 订单Id,主键
      */
-    @NotNull(message = "订单Id,主键不能为空", groups = { EditGroup.class })
+    @NotNull(message = "订单Id", groups = { EditGroup.class })
     private Long orderId;
 
     /**
      * 收款方流水号
      */
-    @NotBlank(message = "收款方流水号不能为空", groups = { AddGroup.class, EditGroup.class })
+    @NotNull(message = "收款方流水号", groups = { EditGroup.class })
     private String paySn;
 
     /**
@@ -43,17 +44,22 @@ public class WxOrderBo extends BaseEntity {
     private Date creditTime;
 
     /**
-     * 交易类型,见CREDITTYPE字典类型
+     * 交易类型
      */
-    @NotBlank(message = "交易类型,见CREDITTYPE字典类型不能为空", groups = { AddGroup.class, EditGroup.class })
+    @NotBlank(message = "交易类型", groups = { AddGroup.class, EditGroup.class })
     private String creditType;
 
     /**
-     * 资金来源,见PAYSTYLE字典类型
+     * 资金来源
      */
-    @NotBlank(message = "资金来源,见PAYSTYLE字典类型不能为空", groups = { AddGroup.class, EditGroup.class })
+    @NotBlank(message = "支付方式", groups = { AddGroup.class, EditGroup.class })
     private String payStyle;
 
+    /**
+     * 支付状态
+     */
+    @NotBlank(message = "支付状态", groups = { AddGroup.class, EditGroup.class })
+    private String payStatus;
     /**
      * 交易金额
      */
@@ -61,7 +67,7 @@ public class WxOrderBo extends BaseEntity {
     private BigDecimal receiptMoney;
 
     /**
-     * 交易状态,见 sys_yes_no字典类别
+     * 交易状态
      */
     @NotBlank(message = "交易状态,见 sys_yes_no字典类别不能为空", groups = { AddGroup.class, EditGroup.class })
     private String creditStatus;
@@ -93,20 +99,20 @@ public class WxOrderBo extends BaseEntity {
     /**
      * 手机号码
      */
-    @NotBlank(message = "手机号码不能为空", groups = { AddGroup.class, EditGroup.class })
     private String phone;
 
     /**
      * 部门名称
      */
-    @NotBlank(message = "部门名称不能为空", groups = { AddGroup.class, EditGroup.class })
     private String deptName;
 
     /**
      * 部门Id
      */
-    @NotNull(message = "部门Id不能为空", groups = { AddGroup.class, EditGroup.class })
     private Long deptId;
 
-
+    /**
+     * 订单入账流水号，对应 t_xf_consumeDetailOriginal 表中的original_id
+     */
+    private String originalId;
 }

ruoyi-modules/ruoyi-backstage/src/main/java/org/dromara/backstage/payment/domain/vo/WxOrderVo.java → ruoyi-modules/ruoyi-backstage/src/main/java/org/dromara/backstage/payment/domain/vo/PayOrderVo.java

@@ -2,9 +2,11 @@ package org.dromara.backstage.payment.domain.vo;
 
 import com.alibaba.excel.annotation.ExcelIgnoreUnannotated;
 import com.alibaba.excel.annotation.ExcelProperty;
+import com.baomidou.mybatisplus.annotation.FieldFill;
+import com.baomidou.mybatisplus.annotation.TableField;
 import io.github.linpeilie.annotations.AutoMapper;
 import lombok.Data;
-import org.dromara.backstage.payment.domain.WxOrder;
+import org.dromara.backstage.payment.domain.PayOrder;
 
 import java.io.Serial;
 import java.io.Serializable;
@@ -14,15 +16,15 @@ import java.util.Date;
 
 
 /**
- * 微信支付订单视图对象 t_wx_order
+ * 第三方支付订单视图对象 t_pay_order
  *
  * @author LionLi
  * @date 2024-11-13
  */
 @Data
 @ExcelIgnoreUnannotated
-@AutoMapper(target = WxOrder.class)
-public class WxOrderVo implements Serializable {
+@AutoMapper(target = PayOrder.class)
+public class PayOrderVo implements Serializable {
 
     @Serial
     private static final long serialVersionUID = 1L;
@@ -48,15 +50,20 @@ public class WxOrderVo implements Serializable {
     /**
      * 交易类型,见CREDITTYPE字典类型
      */
-    @ExcelProperty(value = "交易类型,见CREDITTYPE字典类型")
+    @ExcelProperty(value = "交易类型")
     private String creditType;
 
     /**
      * 资金来源,见PAYSTYLE字典类型
      */
-    @ExcelProperty(value = "资金来源,见PAYSTYLE字典类型")
+    @ExcelProperty(value = "支付方式")
     private String payStyle;
 
+    /**
+     * 支付状态 见PAY_STATUS字典类型
+     */
+    @ExcelProperty(value = "支付状态")
+    private String payStatus;
     /**
      * 交易金额
      */
@@ -66,7 +73,7 @@ public class WxOrderVo implements Serializable {
     /**
      * 交易状态,见 sys_yes_no字典类别
      */
-    @ExcelProperty(value = "交易状态,见 sys_yes_no字典类别")
+    @ExcelProperty(value = "交易状态")
     private String creditStatus;
 
     /**
@@ -111,5 +118,28 @@ public class WxOrderVo implements Serializable {
     @ExcelProperty(value = "部门Id")
     private Long deptId;
 
+    /**
+     * 创建者
+     */
+    private Long createBy;
+
+    /**
+     * 创建时间
+     */
+    private Date createTime;
 
+    /**
+     * 更新者
+     */
+    private Long updateBy;
+
+    /**
+     * 更新时间
+     */
+    private Date updateTime;
+
+    /**
+     * 订单入账流水号，对应 t_xf_consumeDetailOriginal 表中的original_id
+     */
+    private String originalId;
 }

ruoyi-modules/ruoyi-backstage/src/main/java/org/dromara/backstage/payment/mapper/PayOrderMapper.java

@@ -0,0 +1,15 @@
+package org.dromara.backstage.payment.mapper;
+
+import org.dromara.backstage.payment.domain.PayOrder;
+import org.dromara.backstage.payment.domain.vo.PayOrderVo;
+import org.dromara.common.mybatis.core.mapper.BaseMapperPlus;
+
+/**
+ * 第三方支付订单Mapper接口
+ *
+ * @author LionLi
+ * @date 2024-11-13
+ */
+public interface PayOrderMapper extends BaseMapperPlus<PayOrder, PayOrderVo> {
+
+}

ruoyi-modules/ruoyi-backstage/src/main/java/org/dromara/backstage/payment/mapper/WxOrderMapper.java

@@ -1,15 +0,0 @@
-package org.dromara.backstage.payment.mapper;
-
-import org.dromara.backstage.payment.domain.WxOrder;
-import org.dromara.backstage.payment.domain.vo.WxOrderVo;
-import org.dromara.common.mybatis.core.mapper.BaseMapperPlus;
-
-/**
- * 微信支付订单Mapper接口
- *
- * @author LionLi
- * @date 2024-11-13
- */
-public interface WxOrderMapper extends BaseMapperPlus<WxOrder, WxOrderVo> {
-
-}

ruoyi-modules/ruoyi-backstage/src/main/java/org/dromara/backstage/payment/service/IPayOrderService.java

@@ -0,0 +1,68 @@
+package org.dromara.backstage.payment.service;
+
+import org.dromara.backstage.payment.domain.bo.PayOrderBo;
+import org.dromara.backstage.payment.domain.vo.PayOrderVo;
+import org.dromara.common.mybatis.core.page.TableDataInfo;
+import org.dromara.common.mybatis.core.page.PageQuery;
+
+import java.util.Collection;
+import java.util.List;
+
+/**
+ * 第三方支付订单Service接口
+ *
+ * @author LionLi
+ * @date 2024-11-13
+ */
+public interface IPayOrderService {
+
+    /**
+     * 查询第三方支付订单
+     *
+     * @param orderId 主键
+     * @return 第三方支付订单
+     */
+    PayOrderVo queryById(Long orderId);
+
+    /**
+     * 分页查询第三方支付订单列表
+     *
+     * @param bo        查询条件
+     * @param pageQuery 分页参数
+     * @return 第三方支付订单分页列表
+     */
+    TableDataInfo<PayOrderVo> queryPageList(PayOrderBo bo, PageQuery pageQuery);
+
+    /**
+     * 查询符合条件的第三方支付订单列表
+     *
+     * @param bo 查询条件
+     * @return 第三方支付订单列表
+     */
+    List<PayOrderVo> queryList(PayOrderBo bo);
+
+    /**
+     * 新增第三方支付订单
+     *
+     * @param bo 第三方支付订单
+     * @return 是否新增成功
+     */
+    Boolean insertByBo(PayOrderBo bo);
+
+    /**
+     * 修改第三方支付订单
+     *
+     * @param bo 第三方支付订单
+     * @return 是否修改成功
+     */
+    Boolean updateByBo(PayOrderBo bo);
+
+    /**
+     * 校验并批量删除第三方支付订单信息
+     *
+     * @param ids     待删除的主键集合
+     * @param isValid 是否进行有效性校验
+     * @return 是否删除成功
+     */
+    Boolean deleteWithValidByIds(Collection<Long> ids, Boolean isValid);
+}

ruoyi-modules/ruoyi-backstage/src/main/java/org/dromara/backstage/payment/service/IWxOrderService.java

@@ -1,69 +0,0 @@
-package org.dromara.backstage.payment.service;
-
-import org.dromara.backstage.payment.domain.WxOrder;
-import org.dromara.backstage.payment.domain.vo.WxOrderVo;
-import org.dromara.backstage.payment.domain.bo.WxOrderBo;
-import org.dromara.common.mybatis.core.page.TableDataInfo;
-import org.dromara.common.mybatis.core.page.PageQuery;
-
-import java.util.Collection;
-import java.util.List;
-
-/**
- * 微信支付订单Service接口
- *
- * @author LionLi
- * @date 2024-11-13
- */
-public interface IWxOrderService {
-
-    /**
-     * 查询微信支付订单
-     *
-     * @param orderId 主键
-     * @return 微信支付订单
-     */
-    WxOrderVo queryById(Long orderId);
-
-    /**
-     * 分页查询微信支付订单列表
-     *
-     * @param bo        查询条件
-     * @param pageQuery 分页参数
-     * @return 微信支付订单分页列表
-     */
-    TableDataInfo<WxOrderVo> queryPageList(WxOrderBo bo, PageQuery pageQuery);
-
-    /**
-     * 查询符合条件的微信支付订单列表
-     *
-     * @param bo 查询条件
-     * @return 微信支付订单列表
-     */
-    List<WxOrderVo> queryList(WxOrderBo bo);
-
-    /**
-     * 新增微信支付订单
-     *
-     * @param bo 微信支付订单
-     * @return 是否新增成功
-     */
-    Boolean insertByBo(WxOrderBo bo);
-
-    /**
-     * 修改微信支付订单
-     *
-     * @param bo 微信支付订单
-     * @return 是否修改成功
-     */
-    Boolean updateByBo(WxOrderBo bo);
-
-    /**
-     * 校验并批量删除微信支付订单信息
-     *
-     * @param ids     待删除的主键集合
-     * @param isValid 是否进行有效性校验
-     * @return 是否删除成功
-     */
-    Boolean deleteWithValidByIds(Collection<Long> ids, Boolean isValid);
-}

ruoyi-modules/ruoyi-backstage/src/main/java/org/dromara/backstage/payment/service/impl/PayOrderServiceImpl.java

@@ -0,0 +1,142 @@
+package org.dromara.backstage.payment.service.impl;
+
+import org.dromara.backstage.payment.domain.PayOrder;
+import org.dromara.common.core.utils.MapstructUtils;
+import org.dromara.common.core.utils.StringUtils;
+import org.dromara.common.mybatis.core.page.TableDataInfo;
+import org.dromara.common.mybatis.core.page.PageQuery;
+import com.baomidou.mybatisplus.extension.plugins.pagination.Page;
+import com.baomidou.mybatisplus.core.conditions.query.LambdaQueryWrapper;
+import com.baomidou.mybatisplus.core.toolkit.Wrappers;
+import lombok.RequiredArgsConstructor;
+import org.springframework.stereotype.Service;
+import org.dromara.backstage.payment.domain.bo.PayOrderBo;
+import org.dromara.backstage.payment.domain.vo.PayOrderVo;
+import org.dromara.backstage.payment.mapper.PayOrderMapper;
+import org.dromara.backstage.payment.service.IPayOrderService;
+
+import java.util.List;
+import java.util.Map;
+import java.util.Collection;
+
+/**
+ * 第三方支付订单Service业务层处理
+ *
+ * @author LionLi
+ * @date 2024-11-13
+ */
+@RequiredArgsConstructor
+@Service
+public class PayOrderServiceImpl implements IPayOrderService {
+
+    private final PayOrderMapper baseMapper;
+
+    /**
+     * 查询第三方支付订单
+     *
+     * @param orderId 主键
+     * @return 第三方支付订单
+     */
+    @Override
+    public PayOrderVo queryById(Long orderId){
+        return baseMapper.selectVoById(orderId);
+    }
+
+    /**
+     * 分页查询第三方支付订单列表
+     *
+     * @param bo        查询条件
+     * @param pageQuery 分页参数
+     * @return 第三方支付订单分页列表
+     */
+    @Override
+    public TableDataInfo<PayOrderVo> queryPageList(PayOrderBo bo, PageQuery pageQuery) {
+        LambdaQueryWrapper<PayOrder> lqw = buildQueryWrapper(bo);
+        Page<PayOrderVo> result = baseMapper.selectVoPage(pageQuery.build(), lqw);
+        return TableDataInfo.build(result);
+    }
+
+    /**
+     * 查询符合条件的第三方支付订单列表
+     *
+     * @param bo 查询条件
+     * @return 第三方支付订单列表
+     */
+    @Override
+    public List<PayOrderVo> queryList(PayOrderBo bo) {
+        LambdaQueryWrapper<PayOrder> lqw = buildQueryWrapper(bo);
+        return baseMapper.selectVoList(lqw);
+    }
+
+    /**
+     * 新增第三方支付订单
+     *
+     * @param bo 第三方支付订单
+     * @return 是否新增成功
+     */
+    @Override
+    public Boolean insertByBo(PayOrderBo bo) {
+        PayOrder add = MapstructUtils.convert(bo, PayOrder.class);
+        validEntityBeforeSave(add);
+        boolean flag = baseMapper.insert(add) > 0;
+        if (flag) {
+            bo.setOrderId(add.getOrderId());
+        }
+        return flag;
+    }
+
+    /**
+     * 修改第三方支付订单
+     *
+     * @param bo 第三方支付订单
+     * @return 是否修改成功
+     */
+    @Override
+    public Boolean updateByBo(PayOrderBo bo) {
+        PayOrder update = MapstructUtils.convert(bo, PayOrder.class);
+        validEntityBeforeSave(update);
+        return baseMapper.updateById(update) > 0;
+    }
+
+    /**
+     * 保存前的数据校验
+     */
+    private void validEntityBeforeSave(PayOrder entity){
+        //TODO 做一些数据校验,如唯一约束
+    }
+
+    /**
+     * 校验并批量删除第三方支付订单信息
+     *
+     * @param ids     待删除的主键集合
+     * @param isValid 是否进行有效性校验
+     * @return 是否删除成功
+     */
+    @Override
+    public Boolean deleteWithValidByIds(Collection<Long> ids, Boolean isValid) {
+        if(isValid){
+            //TODO 做一些业务上的校验,判断是否需要校验
+        }
+        return baseMapper.deleteByIds(ids) > 0;
+    }
+
+    private LambdaQueryWrapper<PayOrder> buildQueryWrapper(PayOrderBo bo) {
+        Map<String, Object> params = bo.getParams();
+        LambdaQueryWrapper<PayOrder> lqw = Wrappers.lambdaQuery();
+        lqw.eq(StringUtils.isNotBlank(bo.getPaySn()), PayOrder::getPaySn, bo.getPaySn());
+        lqw.eq(bo.getCreditTime() != null, PayOrder::getCreditTime, bo.getCreditTime());
+        lqw.eq(StringUtils.isNotBlank(bo.getCreditType()), PayOrder::getCreditType, bo.getCreditType());
+        lqw.eq(StringUtils.isNotBlank(bo.getPayStyle()), PayOrder::getPayStyle, bo.getPayStyle());
+        lqw.eq(StringUtils.isNotBlank(bo.getPayStatus()), PayOrder::getPayStatus, bo.getPayStatus());
+        lqw.eq(bo.getReceiptMoney() != null, PayOrder::getReceiptMoney, bo.getReceiptMoney());
+        lqw.eq(StringUtils.isNotBlank(bo.getCreditStatus()), PayOrder::getCreditStatus, bo.getCreditStatus());
+        lqw.eq(StringUtils.isNotBlank(bo.getTitle()), PayOrder::getTitle, bo.getTitle());
+        lqw.eq(StringUtils.isNotBlank(bo.getBackUrl()), PayOrder::getBackUrl, bo.getBackUrl());
+        lqw.like(StringUtils.isNotBlank(bo.getRealName()), PayOrder::getRealName, bo.getRealName());
+        lqw.eq(bo.getUserId() != null, PayOrder::getUserId, bo.getUserId());
+        lqw.eq(StringUtils.isNotBlank(bo.getPhone()), PayOrder::getPhone, bo.getPhone());
+        lqw.like(StringUtils.isNotBlank(bo.getDeptName()), PayOrder::getDeptName, bo.getDeptName());
+        lqw.eq(bo.getDeptId() != null, PayOrder::getDeptId, bo.getDeptId());
+        return lqw;
+    }
+}

ruoyi-modules/ruoyi-backstage/src/main/java/org/dromara/backstage/payment/service/impl/WxOrderServiceImpl.java

@@ -1,164 +0,0 @@
-package org.dromara.backstage.payment.service.impl;
-
-import org.dromara.common.core.utils.MapstructUtils;
-import org.dromara.common.core.utils.StringUtils;
-import org.dromara.common.mybatis.core.page.TableDataInfo;
-import org.dromara.common.mybatis.core.page.PageQuery;
-import com.baomidou.mybatisplus.extension.plugins.pagination.Page;
-import com.baomidou.mybatisplus.core.conditions.query.QueryWrapper;
-import com.baomidou.mybatisplus.core.conditions.query.LambdaQueryWrapper;
-import com.baomidou.mybatisplus.core.toolkit.Wrappers;
-import lombok.RequiredArgsConstructor;
-import org.springframework.stereotype.Service;
-import org.dromara.backstage.payment.domain.bo.WxOrderBo;
-import org.dromara.backstage.payment.domain.vo.WxOrderVo;
-import org.dromara.backstage.payment.domain.WxOrder;
-import org.dromara.backstage.payment.mapper.WxOrderMapper;
-import org.dromara.backstage.payment.service.IWxOrderService;
-
-import java.util.List;
-import java.util.Map;
-import java.util.Collection;
-
-/**
- * 微信支付订单Service业务层处理
- *
- * @author LionLi
- * @date 2024-11-13
- */
-@RequiredArgsConstructor
-@Service
-public class WxOrderServiceImpl implements IWxOrderService {
-
-    private final WxOrderMapper baseMapper;
-
-    /**
-     * 查询微信支付订单
-     *
-     * @param orderId 主键
-     * @return 微信支付订单
-     */
-    @Override
-    public WxOrderVo queryById(Long orderId){
-        return baseMapper.selectVoById(orderId);
-    }
-
-    /**
-     * 分页查询微信支付订单列表
-     *
-     * @param bo        查询条件
-     * @param pageQuery 分页参数
-     * @return 微信支付订单分页列表
-     */
-    @Override
-    public TableDataInfo<WxOrderVo> queryPageList(WxOrderBo bo, PageQuery pageQuery) {
-        LambdaQueryWrapper<WxOrder> lqw = buildQueryWrapper(bo);
-        Page<WxOrderVo> result = baseMapper.selectVoPage(pageQuery.build(), lqw);
-        return TableDataInfo.build(result);
-    }
-
-    /**
-     * 查询符合条件的微信支付订单列表
-     *
-     * @param bo 查询条件
-     * @return 微信支付订单列表
-     */
-    @Override
-    public List<WxOrderVo> queryList(WxOrderBo bo) {
-        LambdaQueryWrapper<WxOrder> lqw = buildQueryWrapper(bo);
-        return baseMapper.selectVoList(lqw);
-    }
-
-    private LambdaQueryWrapper<WxOrder> buildQueryWrapper(WxOrderBo bo) {
-        Map<String, Object> params = bo.getParams();
-        LambdaQueryWrapper<WxOrder> lqw = Wrappers.lambdaQuery();
-        lqw.eq(StringUtils.isNotBlank(bo.getPaySn()), WxOrder::getPaySn, bo.getPaySn());
-        lqw.eq(bo.getCreditTime() != null, WxOrder::getCreditTime, bo.getCreditTime());
-        lqw.eq(StringUtils.isNotBlank(bo.getCreditType()), WxOrder::getCreditType, bo.getCreditType());
-        lqw.eq(StringUtils.isNotBlank(bo.getPayStyle()), WxOrder::getPayStyle, bo.getPayStyle());
-        lqw.eq(bo.getReceiptMoney() != null, WxOrder::getReceiptMoney, bo.getReceiptMoney());
-        lqw.eq(StringUtils.isNotBlank(bo.getCreditStatus()), WxOrder::getCreditStatus, bo.getCreditStatus());
-        lqw.eq(StringUtils.isNotBlank(bo.getTitle()), WxOrder::getTitle, bo.getTitle());
-        lqw.eq(StringUtils.isNotBlank(bo.getBackUrl()), WxOrder::getBackUrl, bo.getBackUrl());
-        lqw.like(StringUtils.isNotBlank(bo.getRealName()), WxOrder::getRealName, bo.getRealName());
-        lqw.eq(bo.getUserId() != null, WxOrder::getUserId, bo.getUserId());
-        lqw.eq(StringUtils.isNotBlank(bo.getPhone()), WxOrder::getPhone, bo.getPhone());
-        lqw.like(StringUtils.isNotBlank(bo.getDeptName()), WxOrder::getDeptName, bo.getDeptName());
-        lqw.eq(bo.getDeptId() != null, WxOrder::getDeptId, bo.getDeptId());
-        return lqw;
-    }
-
-    private QueryWrapper<WxOrder> buildQueryWrapper(WxOrderBo bo,String tableAlias) {
-        QueryWrapper<WxOrder> lqw = new QueryWrapper<>();
-        String columnPrefix = "";
-        if(StringUtils.isNotBlank(tableAlias)){
-            columnPrefix = tableAlias + ".";
-        }
-        lqw.eq(StringUtils.isNotBlank(bo.getPaySn()), columnPrefix+"pay_sn", bo.getPaySn());
-        lqw.eq(bo.getCreditTime() != null, columnPrefix+"credit_time", bo.getCreditTime());
-        lqw.eq(StringUtils.isNotBlank(bo.getCreditType()), columnPrefix+"credit_type", bo.getCreditType());
-        lqw.eq(StringUtils.isNotBlank(bo.getPayStyle()), columnPrefix+"pay_style", bo.getPayStyle());
-        lqw.eq(bo.getReceiptMoney() != null, columnPrefix+"receipt_money", bo.getReceiptMoney());
-        lqw.eq(StringUtils.isNotBlank(bo.getCreditStatus()), columnPrefix+"credit_status", bo.getCreditStatus());
-        lqw.eq(StringUtils.isNotBlank(bo.getTitle()), columnPrefix+"title", bo.getTitle());
-        lqw.eq(StringUtils.isNotBlank(bo.getBackUrl()), columnPrefix+"back_url", bo.getBackUrl());
-        lqw.like(StringUtils.isNotBlank(bo.getRealName()), columnPrefix+"real_name", bo.getRealName());
-        lqw.eq(bo.getUserId() != null, columnPrefix+"user_id", bo.getUserId());
-        lqw.eq(StringUtils.isNotBlank(bo.getPhone()), columnPrefix+"phone", bo.getPhone());
-        lqw.like(StringUtils.isNotBlank(bo.getDeptName()), columnPrefix+"dept_Name", bo.getDeptName());
-        lqw.eq(bo.getDeptId() != null, columnPrefix+"dept_id", bo.getDeptId());
-        return lqw;
-    }
-
-    /**
-     * 新增微信支付订单
-     *
-     * @param bo 微信支付订单
-     * @return 是否新增成功
-     */
-    @Override
-    public Boolean insertByBo(WxOrderBo bo) {
-        WxOrder add = MapstructUtils.convert(bo, WxOrder.class);
-        validEntityBeforeSave(add);
-        boolean flag = baseMapper.insert(add) > 0;
-        if (flag) {
-            bo.setOrderId(add.getOrderId());
-        }
-        return flag;
-    }
-
-    /**
-     * 修改微信支付订单
-     *
-     * @param bo 微信支付订单
-     * @return 是否修改成功
-     */
-    @Override
-    public Boolean updateByBo(WxOrderBo bo) {
-        WxOrder update = MapstructUtils.convert(bo, WxOrder.class);
-        validEntityBeforeSave(update);
-        return baseMapper.updateById(update) > 0;
-    }
-
-    /**
-     * 保存前的数据校验
-     */
-    private void validEntityBeforeSave(WxOrder entity){
-        //TODO 做一些数据校验,如唯一约束
-    }
-
-    /**
-     * 校验并批量删除微信支付订单信息
-     *
-     * @param ids     待删除的主键集合
-     * @param isValid 是否进行有效性校验
-     * @return 是否删除成功
-     */
-    @Override
-    public Boolean deleteWithValidByIds(Collection<Long> ids, Boolean isValid) {
-        if(isValid){
-            //TODO 做一些业务上的校验,判断是否需要校验
-        }
-        return baseMapper.deleteByIds(ids) > 0;
-    }
-}

ruoyi-modules/ruoyi-backstage/src/main/resources/MET-INF/spring/org.springframework.boot.autoconfigure.AutoConfiguration.imports

@@ -1 +1,2 @@
 org.dromara.backstage.config.LockConfig
+org.dromara.backstage.config.WechatPayConfig

ruoyi-modules/ruoyi-backstage/src/main/resources/mapper/payment/WxOrderMapper.xml → ruoyi-modules/ruoyi-backstage/src/main/resources/mapper/payment/PayOrderMapper.xml

@@ -2,17 +2,19 @@
 <!DOCTYPE mapper
 PUBLIC "-//mybatis.org//DTD Mapper 3.0//EN"
 "http://mybatis.org/dtd/mybatis-3-mapper.dtd">
-<mapper namespace="org.dromara.backstage.payment.mapper.WxOrderMapper">
+<mapper namespace="org.dromara.backstage.payment.mapper.PayOrderMapper">
 
-    <resultMap type="org.dromara.backstage.payment.domain.WxOrder" id="WxOrderResult">
+    <resultMap type="org.dromara.backstage.payment.domain.PayOrder" id="PayOrderResult">
             <result property="orderId"    column="order_id"    />
             <result property="tenantId"    column="tenant_id"    />
             <result property="paySn"    column="pay_sn"    />
             <result property="creditTime"    column="credit_time"    />
             <result property="creditType"    column="credit_type"    />
             <result property="payStyle"    column="pay_style"    />
+            <result property="payStatus"    column="pay_status"    />
             <result property="receiptMoney"    column="receipt_money"    />
             <result property="creditStatus"    column="credit_status"    />
+            <result property="originalId"    column="original_id"    />
             <result property="title"    column="title"    />
             <result property="backUrl"    column="back_url"    />
             <result property="realName"    column="real_name"    />