refactor: 支付单据结构调整

xkt/src/main/java/com/ruoyi/xkt/domain/FinanceBill.java

@@ -9,7 +9,7 @@ import lombok.ToString;
 import java.math.BigDecimal;
 
 /**
- * 支付单据
+ * 财务单据
  *
  * @author liangyq
  * @date 2025-04-01 11:57:52.533
@@ -17,7 +17,7 @@ import java.math.BigDecimal;
 @Data
 @EqualsAndHashCode(callSuper = true)
 @ToString(callSuper = true)
-public class PaymentBill extends SimpleEntity {
+public class FinanceBill extends SimpleEntity {
     /**
      * 单号
      */
@@ -46,6 +46,10 @@ public class PaymentBill extends SimpleEntity {
      * 关联ID
      */
     private Long relId;
+    /**
+     * 业务唯一键
+     */
+    private String businessUniqueKey;
     /**
      * 收入内部账户ID
      */

xkt/src/main/java/com/ruoyi/xkt/domain/FinanceBillDetail.java

@@ -8,7 +8,7 @@ import lombok.ToString;
 import java.math.BigDecimal;
 
 /**
- * 支付单据明细
+ * 财务单据明细
  *
  * @author liangyq
  * @date 2025-04-01 11:57:52.550
@@ -16,11 +16,11 @@ import java.math.BigDecimal;
 @Data
 @EqualsAndHashCode(callSuper = true)
 @ToString(callSuper = true)
-public class PaymentBillDetail extends SimpleEntity {
+public class FinanceBillDetail extends SimpleEntity {
     /**
-     * 支付单据ID
+     * 财务单据ID
      */
-    private Long paymentBillId;
+    private Long financeBillId;
     /**
      * 关联类型[1:代发订单明细]
      */

xkt/src/main/java/com/ruoyi/xkt/dto/finance/AlipayCallbackDTO.java

@@ -1,4 +1,4 @@
-package com.ruoyi.xkt.dto.payment;
+package com.ruoyi.xkt.dto.finance;
 
 import lombok.Data;
 

xkt/src/main/java/com/ruoyi/xkt/dto/finance/AlipayReqDTO.java

@@ -1,4 +1,4 @@
-package com.ruoyi.xkt.dto.payment;
+package com.ruoyi.xkt.dto.finance;
 
 import com.fasterxml.jackson.annotation.JsonProperty;
 import lombok.AllArgsConstructor;

xkt/src/main/java/com/ruoyi/xkt/dto/finance/ExternalAccountDTO.java

@@ -1,4 +1,4 @@
-package com.ruoyi.xkt.dto.payment;
+package com.ruoyi.xkt.dto.finance;
 
 import lombok.Data;
 

xkt/src/main/java/com/ruoyi/xkt/dto/finance/ExternalAccountTransDetailDTO.java

@@ -1,4 +1,4 @@
-package com.ruoyi.xkt.dto.payment;
+package com.ruoyi.xkt.dto.finance;
 
 import lombok.Data;
 

xkt/src/main/java/com/ruoyi/xkt/dto/finance/FinanceBillDTO.java

@@ -1,4 +1,4 @@
-package com.ruoyi.xkt.dto.payment;
+package com.ruoyi.xkt.dto.finance;
 
 import lombok.Data;
 
@@ -6,15 +6,15 @@ import java.math.BigDecimal;
 import java.util.Date;
 
 /**
- * 支付单据
+ * 财务单据
  *
  * @author liangyq
  * @date 2025-04-01 11:57:52.533
  **/
 @Data
-public class PaymentBillDTO {
+public class FinanceBillDTO {
     /**
-     * 支付单据ID
+     * 财务单据ID
      */
     private Long id;
     /**
@@ -45,6 +45,10 @@ public class PaymentBillDTO {
      * 关联ID
      */
     private Long relId;
+    /**
+     * 业务唯一键
+     */
+    private String businessUniqueKey;
     /**
      * 收入内部账户ID
      */

xkt/src/main/java/com/ruoyi/xkt/dto/finance/FinanceBillDetailDTO.java

@@ -1,4 +1,4 @@
-package com.ruoyi.xkt.dto.payment;
+package com.ruoyi.xkt.dto.finance;
 
 import lombok.Data;
 
@@ -6,21 +6,21 @@ import java.math.BigDecimal;
 import java.util.Date;
 
 /**
- * 支付单据明细
+ * 财务单据明细
  *
  * @author liangyq
  * @date 2025-04-01 11:57:52.550
  **/
 @Data
-public class PaymentBillDetailDTO {
+public class FinanceBillDetailDTO {
     /**
-     * 支付单据明细ID
+     * 财务单据明细ID
      */
     private Long id;
     /**
-     * 支付单据ID
+     * 财务单据ID
      */
-    private Long paymentBillId;
+    private Long financeBillId;
     /**
      * 关联类型[1:代发订单明细]
      */

xkt/src/main/java/com/ruoyi/xkt/dto/finance/FinanceBillInfo.java

@@ -0,0 +1,23 @@
+package com.ruoyi.xkt.dto.finance;
+
+import com.ruoyi.xkt.domain.FinanceBill;
+import com.ruoyi.xkt.domain.FinanceBillDetail;
+import lombok.AllArgsConstructor;
+import lombok.Data;
+import lombok.NoArgsConstructor;
+
+import java.util.List;
+
+/**
+ * @author liangyq
+ * @date 2025-04-08 21:18
+ */
+@Data
+@AllArgsConstructor
+@NoArgsConstructor
+public class FinanceBillInfo {
+
+    private FinanceBill financeBill;
+
+    private List<FinanceBillDetail> financeBillDetails;
+}

xkt/src/main/java/com/ruoyi/xkt/dto/finance/InternalAccountDTO.java

@@ -1,4 +1,4 @@
-package com.ruoyi.xkt.dto.payment;
+package com.ruoyi.xkt.dto.finance;
 
 import lombok.Data;
 

xkt/src/main/java/com/ruoyi/xkt/dto/finance/InternalAccountTransDetailDTO.java

@@ -1,4 +1,4 @@
-package com.ruoyi.xkt.dto.payment;
+package com.ruoyi.xkt.dto.finance;
 
 import lombok.Data;
 

xkt/src/main/java/com/ruoyi/xkt/dto/payment/PaymentBillInfo.java

@@ -1,23 +0,0 @@
-package com.ruoyi.xkt.dto.payment;
-
-import com.ruoyi.xkt.domain.PaymentBill;
-import com.ruoyi.xkt.domain.PaymentBillDetail;
-import lombok.AllArgsConstructor;
-import lombok.Data;
-import lombok.NoArgsConstructor;
-
-import java.util.List;
-
-/**
- * @author liangyq
- * @date 2025-04-08 21:18
- */
-@Data
-@AllArgsConstructor
-@NoArgsConstructor
-public class PaymentBillInfo {
-
-    private PaymentBill paymentBill;
-
-    private List<PaymentBillDetail> paymentBillDetails;
-}

xkt/src/main/java/com/ruoyi/xkt/enums/EFinBillDetailRelType.java

@@ -0,0 +1,27 @@
+package com.ruoyi.xkt.enums;
+
+import lombok.AllArgsConstructor;
+import lombok.Getter;
+
+/**
+ * @author liangyq
+ * @date 2025-04-02 23:42
+ */
+@Getter
+@AllArgsConstructor
+public enum EFinBillDetailRelType {
+
+    STORE_ORDER_DETAIL(1, "代发订单明细");
+
+    private final Integer value;
+    private final String label;
+
+    public static EFinBillDetailRelType of(Integer value) {
+        for (EFinBillDetailRelType e : EFinBillDetailRelType.values()) {
+            if (e.getValue().equals(value)) {
+                return e;
+            }
+        }
+        return null;
+    }
+}

xkt/src/main/java/com/ruoyi/xkt/enums/EFinBillRelType.java

@@ -0,0 +1,27 @@
+package com.ruoyi.xkt.enums;
+
+import lombok.AllArgsConstructor;
+import lombok.Getter;
+
+/**
+ * @author liangyq
+ * @date 2025-04-02 23:42
+ */
+@Getter
+@AllArgsConstructor
+public enum EFinBillRelType {
+
+    STORE_ORDER(1, "代发订单");
+
+    private final Integer value;
+    private final String label;
+
+    public static EFinBillRelType of(Integer value) {
+        for (EFinBillRelType e : EFinBillRelType.values()) {
+            if (e.getValue().equals(value)) {
+                return e;
+            }
+        }
+        return null;
+    }
+}

xkt/src/main/java/com/ruoyi/xkt/enums/EFinBillSrcType.java

@@ -0,0 +1,29 @@
+package com.ruoyi.xkt.enums;
+
+import lombok.AllArgsConstructor;
+import lombok.Getter;
+
+/**
+ * @author liangyq
+ * @date 2025-04-02 23:42
+ */
+@Getter
+@AllArgsConstructor
+public enum EFinBillSrcType {
+
+    STORE_ORDER_PAID(1, "代发订单支付"),
+    STORE_ORDER_COMPLETED(2, "代发订单完成"),
+    WITHDRAW(3, "提现");
+
+    private final Integer value;
+    private final String label;
+
+    public static EFinBillSrcType of(Integer value) {
+        for (EFinBillSrcType e : EFinBillSrcType.values()) {
+            if (e.getValue().equals(value)) {
+                return e;
+            }
+        }
+        return null;
+    }
+}

xkt/src/main/java/com/ruoyi/xkt/enums/EFinBillStatus.java

@@ -0,0 +1,30 @@
+package com.ruoyi.xkt.enums;
+
+import lombok.AllArgsConstructor;
+import lombok.Getter;
+
+/**
+ * @author liangyq
+ * @date 2025-04-02 23:42
+ */
+@Getter
+@AllArgsConstructor
+public enum EFinBillStatus {
+
+    INIT(1, "初始"),
+    PROCESSING(2, "执行中"),
+    SUCCESS(3, "执行成功"),
+    FAILURE(4, "执行失败");
+
+    private final Integer value;
+    private final String label;
+
+    public static EFinBillStatus of(Integer value) {
+        for (EFinBillStatus e : EFinBillStatus.values()) {
+            if (e.getValue().equals(value)) {
+                return e;
+            }
+        }
+        return null;
+    }
+}

xkt/src/main/java/com/ruoyi/xkt/enums/EFinBillType.java

@@ -0,0 +1,29 @@
+package com.ruoyi.xkt.enums;
+
+import lombok.AllArgsConstructor;
+import lombok.Getter;
+
+/**
+ * @author liangyq
+ * @date 2025-04-02 23:42
+ */
+@Getter
+@AllArgsConstructor
+public enum EFinBillType {
+
+    COLLECTION(1, "收款单"),
+    PAYMENT(2, "付款单"),
+    TRANSFER(3, "转移单");
+
+    private final Integer value;
+    private final String label;
+
+    public static EFinBillType of(Integer value) {
+        for (EFinBillType e : EFinBillType.values()) {
+            if (e.getValue().equals(value)) {
+                return e;
+            }
+        }
+        return null;
+    }
+}

xkt/src/main/java/com/ruoyi/xkt/manager/impl/AliPaymentMangerImpl.java

@@ -10,7 +10,7 @@ import com.alipay.api.request.AlipayTradeWapPayRequest;
 import com.ruoyi.common.exception.ServiceException;
 import com.ruoyi.xkt.domain.AlipayCallback;
 import com.ruoyi.xkt.dto.order.StoreOrderInfo;
-import com.ruoyi.xkt.dto.payment.AlipayReqDTO;
+import com.ruoyi.xkt.dto.finance.AlipayReqDTO;
 import com.ruoyi.xkt.enums.EPayChannel;
 import com.ruoyi.xkt.enums.EPayFrom;
 import com.ruoyi.xkt.manager.PaymentManager;

xkt/src/main/java/com/ruoyi/xkt/mapper/FinanceBillDetailMapper.java

@@ -1,7 +1,7 @@
 package com.ruoyi.xkt.mapper;
 
 import com.baomidou.mybatisplus.core.mapper.BaseMapper;
-import com.ruoyi.xkt.domain.PaymentBillDetail;
+import com.ruoyi.xkt.domain.FinanceBillDetail;
 import org.springframework.stereotype.Repository;
 
 /**
@@ -9,5 +9,5 @@ import org.springframework.stereotype.Repository;
  * @date 2025-04-02 12:48
  */
 @Repository
-public interface PaymentBillDetailMapper extends BaseMapper<PaymentBillDetail> {
+public interface FinanceBillDetailMapper extends BaseMapper<FinanceBillDetail> {
 }

xkt/src/main/java/com/ruoyi/xkt/mapper/FinanceBillMapper.java

@@ -1,7 +1,7 @@
 package com.ruoyi.xkt.mapper;
 
 import com.baomidou.mybatisplus.core.mapper.BaseMapper;
-import com.ruoyi.xkt.domain.PaymentBill;
+import com.ruoyi.xkt.domain.FinanceBill;
 import org.springframework.stereotype.Repository;
 
 /**
@@ -9,5 +9,5 @@ import org.springframework.stereotype.Repository;
  * @date 2025-04-02 12:48
  */
 @Repository
-public interface PaymentBillMapper extends BaseMapper<PaymentBill> {
+public interface FinanceBillMapper extends BaseMapper<FinanceBill> {
 }

xkt/src/main/java/com/ruoyi/xkt/service/IFinanceBillService.java

@@ -1,18 +1,19 @@
 package com.ruoyi.xkt.service;
 
+import com.ruoyi.xkt.dto.finance.FinanceBillInfo;
 import com.ruoyi.xkt.dto.order.StoreOrderInfo;
-import com.ruoyi.xkt.dto.payment.PaymentBillInfo;
 
 /**
  * @author liangyq
  * @date 2025-04-08 21:14
  */
-public interface IPaymentBillService {
+public interface IFinanceBillService {
     /**
      * 根据订单创建收款单
      *
      * @param orderInfo
+     * @param srcId
      * @return
      */
-    PaymentBillInfo createCollectionBillByOrder(StoreOrderInfo orderInfo);
+    FinanceBillInfo createCollectionBillAfterOrderPaid(StoreOrderInfo orderInfo, String srcId);
 }

xkt/src/main/java/com/ruoyi/xkt/service/impl/FinanceBillServiceImpl.java

@@ -3,11 +3,11 @@ package com.ruoyi.xkt.service.impl;
 import com.ruoyi.common.constant.Constants;
 import com.ruoyi.xkt.domain.InternalAccount;
 import com.ruoyi.xkt.dto.order.StoreOrderInfo;
-import com.ruoyi.xkt.dto.payment.PaymentBillInfo;
-import com.ruoyi.xkt.mapper.PaymentBillDetailMapper;
-import com.ruoyi.xkt.mapper.PaymentBillMapper;
+import com.ruoyi.xkt.dto.finance.FinanceBillInfo;
+import com.ruoyi.xkt.mapper.FinanceBillDetailMapper;
+import com.ruoyi.xkt.mapper.FinanceBillMapper;
 import com.ruoyi.xkt.service.IInternalAccountService;
-import com.ruoyi.xkt.service.IPaymentBillService;
+import com.ruoyi.xkt.service.IFinanceBillService;
 import org.springframework.beans.factory.annotation.Autowired;
 import org.springframework.stereotype.Service;
 import org.springframework.transaction.annotation.Transactional;
@@ -17,18 +17,19 @@ import org.springframework.transaction.annotation.Transactional;
  * @date 2025-04-08 21:14
  */
 @Service
-public class PaymentBillServiceImpl implements IPaymentBillService {
+public class FinanceBillServiceImpl implements IFinanceBillService {
 
     @Autowired
-    private PaymentBillMapper paymentBillMapper;
+    private FinanceBillMapper financeBillMapper;
     @Autowired
-    private PaymentBillDetailMapper paymentBillDetailMapper;
+    private FinanceBillDetailMapper financeBillDetailMapper;
     @Autowired
     private IInternalAccountService internalAccountService;
 
     @Transactional
     @Override
-    public PaymentBillInfo createCollectionBillByOrder(StoreOrderInfo orderInfo) {
+    public FinanceBillInfo createCollectionBillAfterOrderPaid(StoreOrderInfo orderInfo, String srcId) {
+        //获取平台账户并加锁
         InternalAccount ca = internalAccountService.getWithLock(Constants.PLATFORM_INTERNAL_ACCOUNT_ID);
         return null;
     }

xkt/src/main/resources/mapper/FinanceBillDetailMapper.xml

@@ -1,5 +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="com.ruoyi.xkt.mapper.PaymentBillDetailMapper">
+<mapper namespace="com.ruoyi.xkt.mapper.FinanceBillDetailMapper">
 
 </mapper>

xkt/src/main/resources/mapper/FinanceBillMapper.xml

@@ -1,5 +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="com.ruoyi.xkt.mapper.PaymentBillMapper">
+<mapper namespace="com.ruoyi.xkt.mapper.FinanceBillMapper">
 
 </mapper>