diff --git a/xkt/src/main/java/com/ruoyi/xkt/domain/PaymentBill.java b/xkt/src/main/java/com/ruoyi/xkt/domain/FinanceBill.java similarity index 91% rename from xkt/src/main/java/com/ruoyi/xkt/domain/PaymentBill.java rename to xkt/src/main/java/com/ruoyi/xkt/domain/FinanceBill.java index bad44fc31..368c91c48 100644 --- a/xkt/src/main/java/com/ruoyi/xkt/domain/PaymentBill.java +++ b/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 */ diff --git a/xkt/src/main/java/com/ruoyi/xkt/domain/PaymentBillDetail.java b/xkt/src/main/java/com/ruoyi/xkt/domain/FinanceBillDetail.java similarity index 84% rename from xkt/src/main/java/com/ruoyi/xkt/domain/PaymentBillDetail.java rename to xkt/src/main/java/com/ruoyi/xkt/domain/FinanceBillDetail.java index c77405088..c70c2e751 100644 --- a/xkt/src/main/java/com/ruoyi/xkt/domain/PaymentBillDetail.java +++ b/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:代发订单明细] */ diff --git a/xkt/src/main/java/com/ruoyi/xkt/dto/payment/AlipayCallbackDTO.java b/xkt/src/main/java/com/ruoyi/xkt/dto/finance/AlipayCallbackDTO.java similarity index 99% rename from xkt/src/main/java/com/ruoyi/xkt/dto/payment/AlipayCallbackDTO.java rename to xkt/src/main/java/com/ruoyi/xkt/dto/finance/AlipayCallbackDTO.java index 479b43bbd..fbe730533 100644 --- a/xkt/src/main/java/com/ruoyi/xkt/dto/payment/AlipayCallbackDTO.java +++ b/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; diff --git a/xkt/src/main/java/com/ruoyi/xkt/dto/payment/AlipayReqDTO.java b/xkt/src/main/java/com/ruoyi/xkt/dto/finance/AlipayReqDTO.java similarity index 96% rename from xkt/src/main/java/com/ruoyi/xkt/dto/payment/AlipayReqDTO.java rename to xkt/src/main/java/com/ruoyi/xkt/dto/finance/AlipayReqDTO.java index 961021b4b..68416cd58 100644 --- a/xkt/src/main/java/com/ruoyi/xkt/dto/payment/AlipayReqDTO.java +++ b/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; diff --git a/xkt/src/main/java/com/ruoyi/xkt/dto/payment/ExternalAccountDTO.java b/xkt/src/main/java/com/ruoyi/xkt/dto/finance/ExternalAccountDTO.java similarity index 97% rename from xkt/src/main/java/com/ruoyi/xkt/dto/payment/ExternalAccountDTO.java rename to xkt/src/main/java/com/ruoyi/xkt/dto/finance/ExternalAccountDTO.java index 79447b181..a1ebc60c9 100644 --- a/xkt/src/main/java/com/ruoyi/xkt/dto/payment/ExternalAccountDTO.java +++ b/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; diff --git a/xkt/src/main/java/com/ruoyi/xkt/dto/payment/ExternalAccountTransDetailDTO.java b/xkt/src/main/java/com/ruoyi/xkt/dto/finance/ExternalAccountTransDetailDTO.java similarity index 97% rename from xkt/src/main/java/com/ruoyi/xkt/dto/payment/ExternalAccountTransDetailDTO.java rename to xkt/src/main/java/com/ruoyi/xkt/dto/finance/ExternalAccountTransDetailDTO.java index a83f7d3e6..8318fa978 100644 --- a/xkt/src/main/java/com/ruoyi/xkt/dto/payment/ExternalAccountTransDetailDTO.java +++ b/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; diff --git a/xkt/src/main/java/com/ruoyi/xkt/dto/payment/PaymentBillDTO.java b/xkt/src/main/java/com/ruoyi/xkt/dto/finance/FinanceBillDTO.java similarity index 90% rename from xkt/src/main/java/com/ruoyi/xkt/dto/payment/PaymentBillDTO.java rename to xkt/src/main/java/com/ruoyi/xkt/dto/finance/FinanceBillDTO.java index 300427431..45e9c1e98 100644 --- a/xkt/src/main/java/com/ruoyi/xkt/dto/payment/PaymentBillDTO.java +++ b/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 */ diff --git a/xkt/src/main/java/com/ruoyi/xkt/dto/payment/PaymentBillDetailDTO.java b/xkt/src/main/java/com/ruoyi/xkt/dto/finance/FinanceBillDetailDTO.java similarity index 83% rename from xkt/src/main/java/com/ruoyi/xkt/dto/payment/PaymentBillDetailDTO.java rename to xkt/src/main/java/com/ruoyi/xkt/dto/finance/FinanceBillDetailDTO.java index bf1930223..f25b0e5a5 100644 --- a/xkt/src/main/java/com/ruoyi/xkt/dto/payment/PaymentBillDetailDTO.java +++ b/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:代发订单明细] */ diff --git a/xkt/src/main/java/com/ruoyi/xkt/dto/finance/FinanceBillInfo.java b/xkt/src/main/java/com/ruoyi/xkt/dto/finance/FinanceBillInfo.java new file mode 100644 index 000000000..d12cec58f --- /dev/null +++ b/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 financeBillDetails; +} diff --git a/xkt/src/main/java/com/ruoyi/xkt/dto/payment/InternalAccountDTO.java b/xkt/src/main/java/com/ruoyi/xkt/dto/finance/InternalAccountDTO.java similarity index 97% rename from xkt/src/main/java/com/ruoyi/xkt/dto/payment/InternalAccountDTO.java rename to xkt/src/main/java/com/ruoyi/xkt/dto/finance/InternalAccountDTO.java index 63d729ff2..f7df2eba0 100644 --- a/xkt/src/main/java/com/ruoyi/xkt/dto/payment/InternalAccountDTO.java +++ b/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; diff --git a/xkt/src/main/java/com/ruoyi/xkt/dto/payment/InternalAccountTransDetailDTO.java b/xkt/src/main/java/com/ruoyi/xkt/dto/finance/InternalAccountTransDetailDTO.java similarity index 97% rename from xkt/src/main/java/com/ruoyi/xkt/dto/payment/InternalAccountTransDetailDTO.java rename to xkt/src/main/java/com/ruoyi/xkt/dto/finance/InternalAccountTransDetailDTO.java index f1f9115de..04f4fb7dc 100644 --- a/xkt/src/main/java/com/ruoyi/xkt/dto/payment/InternalAccountTransDetailDTO.java +++ b/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; diff --git a/xkt/src/main/java/com/ruoyi/xkt/dto/payment/PaymentBillInfo.java b/xkt/src/main/java/com/ruoyi/xkt/dto/payment/PaymentBillInfo.java deleted file mode 100644 index e2febb621..000000000 --- a/xkt/src/main/java/com/ruoyi/xkt/dto/payment/PaymentBillInfo.java +++ /dev/null @@ -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 paymentBillDetails; -} diff --git a/xkt/src/main/java/com/ruoyi/xkt/enums/EFinBillDetailRelType.java b/xkt/src/main/java/com/ruoyi/xkt/enums/EFinBillDetailRelType.java new file mode 100644 index 000000000..89375d7c3 --- /dev/null +++ b/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; + } +} diff --git a/xkt/src/main/java/com/ruoyi/xkt/enums/EFinBillRelType.java b/xkt/src/main/java/com/ruoyi/xkt/enums/EFinBillRelType.java new file mode 100644 index 000000000..57cbc91d9 --- /dev/null +++ b/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; + } +} diff --git a/xkt/src/main/java/com/ruoyi/xkt/enums/EFinBillSrcType.java b/xkt/src/main/java/com/ruoyi/xkt/enums/EFinBillSrcType.java new file mode 100644 index 000000000..97b847034 --- /dev/null +++ b/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; + } +} diff --git a/xkt/src/main/java/com/ruoyi/xkt/enums/EFinBillStatus.java b/xkt/src/main/java/com/ruoyi/xkt/enums/EFinBillStatus.java new file mode 100644 index 000000000..81362f40e --- /dev/null +++ b/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; + } +} diff --git a/xkt/src/main/java/com/ruoyi/xkt/enums/EFinBillType.java b/xkt/src/main/java/com/ruoyi/xkt/enums/EFinBillType.java new file mode 100644 index 000000000..2ee2462de --- /dev/null +++ b/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; + } +} diff --git a/xkt/src/main/java/com/ruoyi/xkt/manager/impl/AliPaymentMangerImpl.java b/xkt/src/main/java/com/ruoyi/xkt/manager/impl/AliPaymentMangerImpl.java index fd6a42b21..2b856af7e 100644 --- a/xkt/src/main/java/com/ruoyi/xkt/manager/impl/AliPaymentMangerImpl.java +++ b/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; diff --git a/xkt/src/main/java/com/ruoyi/xkt/mapper/PaymentBillDetailMapper.java b/xkt/src/main/java/com/ruoyi/xkt/mapper/FinanceBillDetailMapper.java similarity index 61% rename from xkt/src/main/java/com/ruoyi/xkt/mapper/PaymentBillDetailMapper.java rename to xkt/src/main/java/com/ruoyi/xkt/mapper/FinanceBillDetailMapper.java index 862d42df2..95368ca15 100644 --- a/xkt/src/main/java/com/ruoyi/xkt/mapper/PaymentBillDetailMapper.java +++ b/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 { +public interface FinanceBillDetailMapper extends BaseMapper { } diff --git a/xkt/src/main/java/com/ruoyi/xkt/mapper/PaymentBillMapper.java b/xkt/src/main/java/com/ruoyi/xkt/mapper/FinanceBillMapper.java similarity index 66% rename from xkt/src/main/java/com/ruoyi/xkt/mapper/PaymentBillMapper.java rename to xkt/src/main/java/com/ruoyi/xkt/mapper/FinanceBillMapper.java index 758d727c4..07e69b734 100644 --- a/xkt/src/main/java/com/ruoyi/xkt/mapper/PaymentBillMapper.java +++ b/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 { +public interface FinanceBillMapper extends BaseMapper { } diff --git a/xkt/src/main/java/com/ruoyi/xkt/service/IPaymentBillService.java b/xkt/src/main/java/com/ruoyi/xkt/service/IFinanceBillService.java similarity index 53% rename from xkt/src/main/java/com/ruoyi/xkt/service/IPaymentBillService.java rename to xkt/src/main/java/com/ruoyi/xkt/service/IFinanceBillService.java index 63f4f2cb7..88bdd4339 100644 --- a/xkt/src/main/java/com/ruoyi/xkt/service/IPaymentBillService.java +++ b/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); } diff --git a/xkt/src/main/java/com/ruoyi/xkt/service/impl/PaymentBillServiceImpl.java b/xkt/src/main/java/com/ruoyi/xkt/service/impl/FinanceBillServiceImpl.java similarity index 59% rename from xkt/src/main/java/com/ruoyi/xkt/service/impl/PaymentBillServiceImpl.java rename to xkt/src/main/java/com/ruoyi/xkt/service/impl/FinanceBillServiceImpl.java index 551233b93..36cf38834 100644 --- a/xkt/src/main/java/com/ruoyi/xkt/service/impl/PaymentBillServiceImpl.java +++ b/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; } diff --git a/xkt/src/main/resources/mapper/PaymentBillDetailMapper.xml b/xkt/src/main/resources/mapper/FinanceBillDetailMapper.xml similarity index 67% rename from xkt/src/main/resources/mapper/PaymentBillDetailMapper.xml rename to xkt/src/main/resources/mapper/FinanceBillDetailMapper.xml index 1d0706cb2..1463127aa 100644 --- a/xkt/src/main/resources/mapper/PaymentBillDetailMapper.xml +++ b/xkt/src/main/resources/mapper/FinanceBillDetailMapper.xml @@ -1,5 +1,5 @@ - + \ No newline at end of file diff --git a/xkt/src/main/resources/mapper/PaymentBillMapper.xml b/xkt/src/main/resources/mapper/FinanceBillMapper.xml similarity index 68% rename from xkt/src/main/resources/mapper/PaymentBillMapper.xml rename to xkt/src/main/resources/mapper/FinanceBillMapper.xml index eb897c6c3..5140e947a 100644 --- a/xkt/src/main/resources/mapper/PaymentBillMapper.xml +++ b/xkt/src/main/resources/mapper/FinanceBillMapper.xml @@ -1,5 +1,5 @@ - + \ No newline at end of file