From cef55c517e8d283cc2b0a19476dca37ce67ea0d3 Mon Sep 17 00:00:00 2001 From: luojiaquan <1583622118@qq.com> Date: Thu, 24 Sep 2026 09:25:47 +0800 Subject: [PATCH] =?UTF-8?q?=E8=A1=A8=E5=90=8D=E4=BF=AE=E6=94=B9?= MIME-Version: 1.0 Content-Type: text/plain; charset=UTF-8 Content-Transfer-Encoding: 8bit --- .../CustomerAccountOccupyConcurrencyTest.java | 26 ++++---- .../ar/service/IArBalanceWriteoffService.java | 3 +- .../customerinfo/domain/BmsCustomer.java | 8 +-- .../domain/BmsCustomerAttachment.java | 2 +- .../domain/BmsCustomerCompany.java | 2 +- .../domain/BmsCustomerContact.java | 2 +- .../api/ICustomerAccountApi.java | 2 +- .../api/impl/CustomerAccountApiImpl.java | 2 +- .../customermoney/domain/CustomerAccount.java | 2 +- .../domain/CustomerBalanceFlow.java | 2 +- .../domain/CustomerCreditApply.java | 2 +- .../domain/CustomerCreditFlow.java | 2 +- .../domain/CustomerCreditGrant.java | 2 +- .../customermoney/domain/CustomerReceipt.java | 4 +- .../vo/CustomerAccountStatusVO.java | 2 +- .../supplierinfo/domain/BmsSupplier.java | 8 +-- .../domain/BmsSupplierAttachment.java | 2 +- .../domain/BmsSupplierCompany.java | 2 +- .../domain/BmsSupplierContact.java | 2 +- .../java/com/ruoyi/price/domain/PrcQuote.java | 2 +- .../price/domain/vo/TmsPriceQuoteRequest.java | 2 +- .../impl/PrcBillingTaskServiceImpl.java | 2 +- .../impl/TmsPriceQuoteServiceImpl.java | 2 +- .../mapper/customer/BmsCustomerMapper.xml | 60 +++++++++---------- .../mapper/customer/BmsSupplierMapper.xml | 46 +++++++------- .../mapper/customer/CreditQuotaMapper.xml | 16 ++--- .../customer/CustomerCreditApplyMapper.xml | 14 ++--- .../mapper/customer/CustomerMoneyMapper.xml | 28 ++++----- bms-back/sql/customer+supplier/customer.sql | 4 +- .../customer_credit_apply.sql | 8 +-- bms-back/sql/customer+supplier/customerye.sql | 14 ++--- .../rename_module_tables_20260924.sql | 33 ++++++++++ .../customer+supplier/role_credit_quota.sql | 20 +++---- bms-back/sql/customer+supplier/supplier.sql | 8 +-- 34 files changed, 184 insertions(+), 152 deletions(-) create mode 100644 bms-back/sql/customer+supplier/rename_module_tables_20260924.sql diff --git a/bms-back/ruoyi-admin/src/test/java/com/ruoyi/customer/customermoney/api/CustomerAccountOccupyConcurrencyTest.java b/bms-back/ruoyi-admin/src/test/java/com/ruoyi/customer/customermoney/api/CustomerAccountOccupyConcurrencyTest.java index 97f3e479..9d158194 100644 --- a/bms-back/ruoyi-admin/src/test/java/com/ruoyi/customer/customermoney/api/CustomerAccountOccupyConcurrencyTest.java +++ b/bms-back/ruoyi-admin/src/test/java/com/ruoyi/customer/customermoney/api/CustomerAccountOccupyConcurrencyTest.java @@ -82,24 +82,24 @@ // void setUp() // { // // 1) 若账户不存在则先创建（总额度=TEST_TOTAL，余额/已用/临时均为0），保证后续 update 有行可改 -// jdbc.update("INSERT INTO customer_account " +// jdbc.update("INSERT INTO ctr_customer_account " // + "(customer_id, currency, balance, frozen_balance, total_credit, extra_credit, used_credit, tax, version, del_flag, create_by, create_time) " // + "SELECT ?, ?, 0, 0, ?, 0, 0, 0, 0, '0', '并发测试', now() " // + "FROM DUAL WHERE NOT EXISTS " -// + "(SELECT 1 FROM customer_account WHERE customer_id = ? AND currency = ? AND del_flag = '0')", +// + "(SELECT 1 FROM ctr_customer_account WHERE customer_id = ? AND currency = ? AND del_flag = '0')", // CUSTOMER_ID, CURRENCY, TEST_TOTAL, CUSTOMER_ID, CURRENCY); // // // 2) 快照账户原值（用于恢复） -// origTotal = queryAmount("SELECT total_credit FROM customer_account WHERE customer_id = ? AND currency = ? AND del_flag = '0'"); -// origUsed = queryAmount("SELECT used_credit FROM customer_account WHERE customer_id = ? AND currency = ? AND del_flag = '0'"); -// origExtra = queryAmount("SELECT extra_credit FROM customer_account WHERE customer_id = ? AND currency = ? AND del_flag = '0'"); +// origTotal = queryAmount("SELECT total_credit FROM ctr_customer_account WHERE customer_id = ? AND currency = ? AND del_flag = '0'"); +// origUsed = queryAmount("SELECT used_credit FROM ctr_customer_account WHERE customer_id = ? AND currency = ? AND del_flag = '0'"); +// origExtra = queryAmount("SELECT extra_credit FROM ctr_customer_account WHERE customer_id = ? AND currency = ? AND del_flag = '0'"); // // // 3) 重置为受控状态：总额度=TEST_TOTAL，已用=0，临时=0，并清掉历史额度流水（只清本客户，避免影响统计断言） -// jdbc.update("UPDATE customer_account SET total_credit = ?, used_credit = 0, extra_credit = 0, " +// jdbc.update("UPDATE ctr_customer_account SET total_credit = ?, used_credit = 0, extra_credit = 0, " // + "extra_effective_date = NULL, extra_expire_date = NULL, version = version + 1 " // + "WHERE customer_id = ? AND currency = ? AND del_flag = '0'", // TEST_TOTAL, CUSTOMER_ID, CURRENCY); -// jdbc.update("DELETE FROM customer_credit_flow WHERE customer_id = ? AND create_by = '并发测试'", +// jdbc.update("DELETE FROM ctr_customer_credit_flow WHERE customer_id = ? AND create_by = '并发测试'", // CUSTOMER_ID); // // // 4) 构造登录态（occupyCredit 内部调用 SecurityUtils.getUsername()/getUserId()） @@ -115,10 +115,10 @@ // // 1) 物理删除测试产生的额度流水 // for (Long id : createdFlowIds) // { -// jdbc.update("DELETE FROM customer_credit_flow WHERE id = ?", id); +// jdbc.update("DELETE FROM ctr_customer_credit_flow WHERE id = ?", id); // } // // 2) 恢复账户原值 -// jdbc.update("UPDATE customer_account SET total_credit = ?, used_credit = ?, extra_credit = ? " +// jdbc.update("UPDATE ctr_customer_account SET total_credit = ?, used_credit = ?, extra_credit = ? " // + "WHERE customer_id = ? AND currency = ? AND del_flag = '0'", // origTotal, origUsed, origExtra, CUSTOMER_ID, CURRENCY); // // 3) 清理线程本地上下文，避免污染其他用例 @@ -157,7 +157,7 @@ // public void 并发占用_额度充足时所有更新全部生效() // throws InterruptedException // { -// jdbc.update("UPDATE customer_account SET total_credit = 5000, used_credit = 0 " +// jdbc.update("UPDATE ctr_customer_account SET total_credit = 5000, used_credit = 0 " // + "WHERE customer_id = ? AND currency = ? AND del_flag = '0'", CUSTOMER_ID, CURRENCY); // // RunResult result = runConcurrentOccupy(5, AMOUNT); @@ -230,17 +230,17 @@ // // private BigDecimal queryUsedCredit() // { -// return queryAmount("SELECT used_credit FROM customer_account WHERE customer_id = ? AND currency = ? AND del_flag = '0'"); +// return queryAmount("SELECT used_credit FROM ctr_customer_account WHERE customer_id = ? AND currency = ? AND del_flag = '0'"); // } // // private BigDecimal queryTotalCredit() // { -// return queryAmount("SELECT total_credit FROM customer_account WHERE customer_id = ? AND currency = ? AND del_flag = '0'"); +// return queryAmount("SELECT total_credit FROM ctr_customer_account WHERE customer_id = ? AND currency = ? AND del_flag = '0'"); // } // // private BigDecimal queryExtraCredit() // { -// return queryAmount("SELECT extra_credit FROM customer_account WHERE customer_id = ? AND currency = ? AND del_flag = '0'"); +// return queryAmount("SELECT extra_credit FROM ctr_customer_account WHERE customer_id = ? AND currency = ? AND del_flag = '0'"); // } // // private BigDecimal queryAmount(String sql) diff --git a/bms-back/ruoyi-system/src/main/java/com/ruoyi/ar/service/IArBalanceWriteoffService.java b/bms-back/ruoyi-system/src/main/java/com/ruoyi/ar/service/IArBalanceWriteoffService.java index f363bf1b..32c5babf 100644 --- a/bms-back/ruoyi-system/src/main/java/com/ruoyi/ar/service/IArBalanceWriteoffService.java +++ b/bms-back/ruoyi-system/src/main/java/com/ruoyi/ar/service/IArBalanceWriteoffService.java @@ -7,8 +7,7 @@ import com.ruoyi.ar.domain.ArBill; /** * 应收账单余额核销 Service接口 * - *

资金来源为客户账户余额（customer_account.balance）；核销时三方联动：账户余额扣减、已用额度释放、 - * 账单已核销/未核销金额及状态更新。

+ *

核销仅更新账单已核销/未核销金额及状态（2026-09-23 口径变更后不再变动 ctr_customer_account 余额与额度）。

* * @author ruoyi * @date 2026-09-16 diff --git a/bms-back/ruoyi-system/src/main/java/com/ruoyi/customer/customerinfo/domain/BmsCustomer.java b/bms-back/ruoyi-system/src/main/java/com/ruoyi/customer/customerinfo/domain/BmsCustomer.java index 5c06e336..45424c0c 100644 --- a/bms-back/ruoyi-system/src/main/java/com/ruoyi/customer/customerinfo/domain/BmsCustomer.java +++ b/bms-back/ruoyi-system/src/main/java/com/ruoyi/customer/customerinfo/domain/BmsCustomer.java @@ -10,7 +10,7 @@ import com.ruoyi.common.annotation.Excel; import com.ruoyi.common.core.domain.BaseEntity; /** - * 客户主对象 bms_customer + * 客户主对象 ctr_customer * * @author ruoyi * @date 2026-09-08 @@ -111,13 +111,13 @@ public class BmsCustomer extends BaseEntity @Excel(name = "绑定产品代码") private String productCodes; - /** 附件列表（子表 bms_customer_attachment） */ + /** 附件列表（子表 ctr_customer_attachment） */ private List attachmentList; - /** 公司主体列表（子表 bms_customer_company） */ + /** 公司主体列表（子表 ctr_customer_company） */ private List companyList; - /** 联系人列表（子表 bms_customer_contact） */ + /** 联系人列表（子表 ctr_customer_contact） */ private List contactList; /** 删除标记（0正常 2删除） */ diff --git a/bms-back/ruoyi-system/src/main/java/com/ruoyi/customer/customerinfo/domain/BmsCustomerAttachment.java b/bms-back/ruoyi-system/src/main/java/com/ruoyi/customer/customerinfo/domain/BmsCustomerAttachment.java index 85824455..9190fa62 100644 --- a/bms-back/ruoyi-system/src/main/java/com/ruoyi/customer/customerinfo/domain/BmsCustomerAttachment.java +++ b/bms-back/ruoyi-system/src/main/java/com/ruoyi/customer/customerinfo/domain/BmsCustomerAttachment.java @@ -9,7 +9,7 @@ import com.ruoyi.common.annotation.Excel; import com.ruoyi.common.core.domain.BaseEntity; /** - * 客户附件对象 bms_customer_attachment + * 客户附件对象 ctr_customer_attachment * * @author ruoyi * @date 2026-09-08 diff --git a/bms-back/ruoyi-system/src/main/java/com/ruoyi/customer/customerinfo/domain/BmsCustomerCompany.java b/bms-back/ruoyi-system/src/main/java/com/ruoyi/customer/customerinfo/domain/BmsCustomerCompany.java index 6c519eb5..36708394 100644 --- a/bms-back/ruoyi-system/src/main/java/com/ruoyi/customer/customerinfo/domain/BmsCustomerCompany.java +++ b/bms-back/ruoyi-system/src/main/java/com/ruoyi/customer/customerinfo/domain/BmsCustomerCompany.java @@ -11,7 +11,7 @@ import com.ruoyi.common.annotation.Excel; import com.ruoyi.common.core.domain.BaseEntity; /** - * 客户公司主体对象 bms_customer_company + * 客户公司主体对象 ctr_customer_company * * @author ruoyi * @date 2026-09-09 diff --git a/bms-back/ruoyi-system/src/main/java/com/ruoyi/customer/customerinfo/domain/BmsCustomerContact.java b/bms-back/ruoyi-system/src/main/java/com/ruoyi/customer/customerinfo/domain/BmsCustomerContact.java index 7bee64d9..9ae931ff 100644 --- a/bms-back/ruoyi-system/src/main/java/com/ruoyi/customer/customerinfo/domain/BmsCustomerContact.java +++ b/bms-back/ruoyi-system/src/main/java/com/ruoyi/customer/customerinfo/domain/BmsCustomerContact.java @@ -7,7 +7,7 @@ import com.ruoyi.common.annotation.Excel; import com.ruoyi.common.core.domain.BaseEntity; /** - * 客户联系人对象 bms_customer_contact + * 客户联系人对象 ctr_customer_contact * * @author ruoyi * @date 2026-09-09 diff --git a/bms-back/ruoyi-system/src/main/java/com/ruoyi/customer/customermoney/api/ICustomerAccountApi.java b/bms-back/ruoyi-system/src/main/java/com/ruoyi/customer/customermoney/api/ICustomerAccountApi.java index 40c5db72..4ac3411f 100644 --- a/bms-back/ruoyi-system/src/main/java/com/ruoyi/customer/customermoney/api/ICustomerAccountApi.java +++ b/bms-back/ruoyi-system/src/main/java/com/ruoyi/customer/customermoney/api/ICustomerAccountApi.java @@ -9,7 +9,7 @@ import com.ruoyi.customer.customermoney.vo.CustomerAccountStatusVO; * 客户资金公共服务：客户余额扣减/回补、授信额度占用/释放的统一入口。 * *

客户余额、授信额度及其流水（客户模块资产）的所有变动都必须经过本接口， - * 其他模块（应收账单、计费订单/计费变动等）不得直接更新 customer_account / + * 其他模块（应收账单、计费订单/计费变动等）不得直接更新 ctr_customer_account / * 直接插入流水表。每个方法在同一事务内完成：行锁账户 -> 乐观锁变动 -> 写流水， * 调用方自身的事务会与本操作共享事务（默认 REQUIRED），任一失败整体回滚。

* diff --git a/bms-back/ruoyi-system/src/main/java/com/ruoyi/customer/customermoney/api/impl/CustomerAccountApiImpl.java b/bms-back/ruoyi-system/src/main/java/com/ruoyi/customer/customermoney/api/impl/CustomerAccountApiImpl.java index 7a499726..cfdc7fe4 100644 --- a/bms-back/ruoyi-system/src/main/java/com/ruoyi/customer/customermoney/api/impl/CustomerAccountApiImpl.java +++ b/bms-back/ruoyi-system/src/main/java/com/ruoyi/customer/customermoney/api/impl/CustomerAccountApiImpl.java @@ -549,7 +549,7 @@ public class CustomerAccountApiImpl implements ICustomerAccountApi } } - /** Deadlock / duplicate key while inserting customer_account. */ + /** Deadlock / duplicate key while inserting ctr_customer_account. */ private static boolean isAccountInitRace(Throwable e) { Throwable t = e; diff --git a/bms-back/ruoyi-system/src/main/java/com/ruoyi/customer/customermoney/domain/CustomerAccount.java b/bms-back/ruoyi-system/src/main/java/com/ruoyi/customer/customermoney/domain/CustomerAccount.java index 0a24b999..a908588c 100644 --- a/bms-back/ruoyi-system/src/main/java/com/ruoyi/customer/customermoney/domain/CustomerAccount.java +++ b/bms-back/ruoyi-system/src/main/java/com/ruoyi/customer/customermoney/domain/CustomerAccount.java @@ -8,7 +8,7 @@ import lombok.Data; import lombok.EqualsAndHashCode; /** - * 客户余额账户 customer_account + * 客户余额账户 ctr_customer_account * * @author ruoyi * @date 2026-09-11 diff --git a/bms-back/ruoyi-system/src/main/java/com/ruoyi/customer/customermoney/domain/CustomerBalanceFlow.java b/bms-back/ruoyi-system/src/main/java/com/ruoyi/customer/customermoney/domain/CustomerBalanceFlow.java index 6de7c97a..9d58439b 100644 --- a/bms-back/ruoyi-system/src/main/java/com/ruoyi/customer/customermoney/domain/CustomerBalanceFlow.java +++ b/bms-back/ruoyi-system/src/main/java/com/ruoyi/customer/customermoney/domain/CustomerBalanceFlow.java @@ -6,7 +6,7 @@ import lombok.Data; import lombok.EqualsAndHashCode; /** - * 客户余额流水 customer_balance_flow + * 客户余额流水 ctr_customer_balance_flow * * @author ruoyi * @date 2026-09-11 diff --git a/bms-back/ruoyi-system/src/main/java/com/ruoyi/customer/customermoney/domain/CustomerCreditApply.java b/bms-back/ruoyi-system/src/main/java/com/ruoyi/customer/customermoney/domain/CustomerCreditApply.java index 6d1c8d0a..8c03fe8d 100644 --- a/bms-back/ruoyi-system/src/main/java/com/ruoyi/customer/customermoney/domain/CustomerCreditApply.java +++ b/bms-back/ruoyi-system/src/main/java/com/ruoyi/customer/customermoney/domain/CustomerCreditApply.java @@ -7,7 +7,7 @@ import lombok.Data; import lombok.EqualsAndHashCode; /** - * 客户额度调整申请审批 customer_credit_apply + * 客户额度调整申请审批 ctr_customer_credit_apply * 信用额度/额外额度（临时额度）调整先申请，审批通过后才真正调整账户额度 * * @author ruoyi diff --git a/bms-back/ruoyi-system/src/main/java/com/ruoyi/customer/customermoney/domain/CustomerCreditFlow.java b/bms-back/ruoyi-system/src/main/java/com/ruoyi/customer/customermoney/domain/CustomerCreditFlow.java index 021e9110..b9cd4b9c 100644 --- a/bms-back/ruoyi-system/src/main/java/com/ruoyi/customer/customermoney/domain/CustomerCreditFlow.java +++ b/bms-back/ruoyi-system/src/main/java/com/ruoyi/customer/customermoney/domain/CustomerCreditFlow.java @@ -8,7 +8,7 @@ import lombok.Data; import lombok.EqualsAndHashCode; /** - * 客户额度流水 customer_credit_flow + * 客户额度流水 ctr_customer_credit_flow * * @author ruoyi * @date 2026-09-16 diff --git a/bms-back/ruoyi-system/src/main/java/com/ruoyi/customer/customermoney/domain/CustomerCreditGrant.java b/bms-back/ruoyi-system/src/main/java/com/ruoyi/customer/customermoney/domain/CustomerCreditGrant.java index a9b9d965..017aeceb 100644 --- a/bms-back/ruoyi-system/src/main/java/com/ruoyi/customer/customermoney/domain/CustomerCreditGrant.java +++ b/bms-back/ruoyi-system/src/main/java/com/ruoyi/customer/customermoney/domain/CustomerCreditGrant.java @@ -8,7 +8,7 @@ import lombok.Data; import lombok.EqualsAndHashCode; /** - * 客户授信额度分配台账 customer_credit_grant + * 客户授信额度分配台账 ctr_customer_credit_grant * 审批通过的净增额度占一行（占用角色额度池）；调减/到期按 FIFO 核销行余额。 * 角色池已用 = SUM(remaining WHERE role_id=? AND status='0') * diff --git a/bms-back/ruoyi-system/src/main/java/com/ruoyi/customer/customermoney/domain/CustomerReceipt.java b/bms-back/ruoyi-system/src/main/java/com/ruoyi/customer/customermoney/domain/CustomerReceipt.java index 6e4068e1..133af749 100644 --- a/bms-back/ruoyi-system/src/main/java/com/ruoyi/customer/customermoney/domain/CustomerReceipt.java +++ b/bms-back/ruoyi-system/src/main/java/com/ruoyi/customer/customermoney/domain/CustomerReceipt.java @@ -10,7 +10,7 @@ import lombok.Data; import lombok.EqualsAndHashCode; /** - * 客户收款 customer_receipt + * 客户收款 ctr_customer_receipt * * @author ruoyi * @date 2026-09-11 @@ -122,7 +122,7 @@ public class CustomerReceipt extends BaseEntity /** 删除标志（0存在 1删除） */ private String delFlag; - /** 收款附件列表（存 bms_customer_attachment，attachment_type='3'，biz_id 关联本单） */ + /** 收款附件列表（存 ctr_customer_attachment，attachment_type='3'，biz_id 关联本单） */ private List attachmentList; /** 收款附件数量（列表查询统计） */ diff --git a/bms-back/ruoyi-system/src/main/java/com/ruoyi/customer/customermoney/vo/CustomerAccountStatusVO.java b/bms-back/ruoyi-system/src/main/java/com/ruoyi/customer/customermoney/vo/CustomerAccountStatusVO.java index 78d9cdfa..7eaafe98 100644 --- a/bms-back/ruoyi-system/src/main/java/com/ruoyi/customer/customermoney/vo/CustomerAccountStatusVO.java +++ b/bms-back/ruoyi-system/src/main/java/com/ruoyi/customer/customermoney/vo/CustomerAccountStatusVO.java @@ -33,7 +33,7 @@ public class CustomerAccountStatusVO implements Serializable private String customerCode; /** 客户名称 */ private String customerName; - /** 启用状态（0正常 1停用）—— 来自 bms_customer.is_enable */ + /** 启用状态（0正常 1停用）—— 来自 ctr_customer.is_enable */ private String isEnable; /** 启用状态文案（正常 / 停用） */ private String isEnableLabel; diff --git a/bms-back/ruoyi-system/src/main/java/com/ruoyi/customer/supplierinfo/domain/BmsSupplier.java b/bms-back/ruoyi-system/src/main/java/com/ruoyi/customer/supplierinfo/domain/BmsSupplier.java index 7d151955..bf447f69 100644 --- a/bms-back/ruoyi-system/src/main/java/com/ruoyi/customer/supplierinfo/domain/BmsSupplier.java +++ b/bms-back/ruoyi-system/src/main/java/com/ruoyi/customer/supplierinfo/domain/BmsSupplier.java @@ -15,7 +15,7 @@ import com.ruoyi.customer.supplierinfo.domain.BmsSupplierCompany; import com.ruoyi.customer.supplierinfo.domain.BmsSupplierContact; /** - * 供应商主对象 bms_supplier + * 供应商主对象 sup_supplier * * @author ruoyi * @date 2026-09-09 @@ -124,13 +124,13 @@ public class BmsSupplier extends BaseEntity /** 绑定的渠道/服务ID */ private String channelIds; - /** 附件列表（子表 bms_supplier_attachment） */ + /** 附件列表（子表 sup_supplier_attachment） */ private List attachmentList; - /** 公司主体列表（子表 bms_supplier_company） */ + /** 公司主体列表（子表 sup_supplier_company） */ private List companyList; - /** 联系人列表（子表 bms_supplier_contact） */ + /** 联系人列表（子表 sup_supplier_contact） */ private List contactList; /** 删除标记（0正常 2删除） */ diff --git a/bms-back/ruoyi-system/src/main/java/com/ruoyi/customer/supplierinfo/domain/BmsSupplierAttachment.java b/bms-back/ruoyi-system/src/main/java/com/ruoyi/customer/supplierinfo/domain/BmsSupplierAttachment.java index 0847816d..911012ce 100644 --- a/bms-back/ruoyi-system/src/main/java/com/ruoyi/customer/supplierinfo/domain/BmsSupplierAttachment.java +++ b/bms-back/ruoyi-system/src/main/java/com/ruoyi/customer/supplierinfo/domain/BmsSupplierAttachment.java @@ -7,7 +7,7 @@ import com.ruoyi.common.annotation.Excel; import com.ruoyi.common.core.domain.BaseEntity; /** - * 供应商附件对象 bms_supplier_attachment + * 供应商附件对象 sup_supplier_attachment * * @author ruoyi * @date 2026-09-10 diff --git a/bms-back/ruoyi-system/src/main/java/com/ruoyi/customer/supplierinfo/domain/BmsSupplierCompany.java b/bms-back/ruoyi-system/src/main/java/com/ruoyi/customer/supplierinfo/domain/BmsSupplierCompany.java index edf51470..ad8b6710 100644 --- a/bms-back/ruoyi-system/src/main/java/com/ruoyi/customer/supplierinfo/domain/BmsSupplierCompany.java +++ b/bms-back/ruoyi-system/src/main/java/com/ruoyi/customer/supplierinfo/domain/BmsSupplierCompany.java @@ -9,7 +9,7 @@ import com.ruoyi.common.annotation.Excel; import com.ruoyi.common.core.domain.BaseEntity; /** - * 供应商公司主体（工商信息）对象 bms_supplier_company + * 供应商公司主体（工商信息）对象 sup_supplier_company * * @author ruoyi * @date 2026-09-10 diff --git a/bms-back/ruoyi-system/src/main/java/com/ruoyi/customer/supplierinfo/domain/BmsSupplierContact.java b/bms-back/ruoyi-system/src/main/java/com/ruoyi/customer/supplierinfo/domain/BmsSupplierContact.java index f0e40e17..8809596d 100644 --- a/bms-back/ruoyi-system/src/main/java/com/ruoyi/customer/supplierinfo/domain/BmsSupplierContact.java +++ b/bms-back/ruoyi-system/src/main/java/com/ruoyi/customer/supplierinfo/domain/BmsSupplierContact.java @@ -7,7 +7,7 @@ import com.ruoyi.common.annotation.Excel; import com.ruoyi.common.core.domain.BaseEntity; /** - * 供应商联系人对象 bms_supplier_contact + * 供应商联系人对象 sup_supplier_contact * * @author ruoyi * @date 2026-09-10 diff --git a/bms-back/ruoyi-system/src/main/java/com/ruoyi/price/domain/PrcQuote.java b/bms-back/ruoyi-system/src/main/java/com/ruoyi/price/domain/PrcQuote.java index 52101e60..b5a94050 100644 --- a/bms-back/ruoyi-system/src/main/java/com/ruoyi/price/domain/PrcQuote.java +++ b/bms-back/ruoyi-system/src/main/java/com/ruoyi/price/domain/PrcQuote.java @@ -18,7 +18,7 @@ public class PrcQuote extends BaseEntity private String quoteId; private String quoteKey; private Long customerId; - /** bms_customer.customer_code */ + /** ctr_customer.customer_code */ private String customerCode; private String productCode; private String productName; diff --git a/bms-back/ruoyi-system/src/main/java/com/ruoyi/price/domain/vo/TmsPriceQuoteRequest.java b/bms-back/ruoyi-system/src/main/java/com/ruoyi/price/domain/vo/TmsPriceQuoteRequest.java index 98466e5c..b1fc26f1 100644 --- a/bms-back/ruoyi-system/src/main/java/com/ruoyi/price/domain/vo/TmsPriceQuoteRequest.java +++ b/bms-back/ruoyi-system/src/main/java/com/ruoyi/price/domain/vo/TmsPriceQuoteRequest.java @@ -14,7 +14,7 @@ public class TmsPriceQuoteRequest implements Serializable private Long customerId; - /** Required. Maps to bms_customer.customer_code; used in quote unique key. */ + /** Required. Maps to ctr_customer.customer_code; used in quote unique key. */ @NotBlank(message = "customerCode is required") private String customerCode; diff --git a/bms-back/ruoyi-system/src/main/java/com/ruoyi/price/service/impl/PrcBillingTaskServiceImpl.java b/bms-back/ruoyi-system/src/main/java/com/ruoyi/price/service/impl/PrcBillingTaskServiceImpl.java index d68cae85..cbce7128 100644 --- a/bms-back/ruoyi-system/src/main/java/com/ruoyi/price/service/impl/PrcBillingTaskServiceImpl.java +++ b/bms-back/ruoyi-system/src/main/java/com/ruoyi/price/service/impl/PrcBillingTaskServiceImpl.java @@ -250,7 +250,7 @@ public class PrcBillingTaskServiceImpl implements IPrcBillingTaskService } /** - * Retry bill() on MySQL deadlock / lock wait (common when many tasks share one customer_account). + * Retry bill() on MySQL deadlock / lock wait (common when many tasks share one ctr_customer_account). */ private TmsPriceQuoteResult billWithDbRetry(Long taskId, TmsPriceBillRequest billReq) { diff --git a/bms-back/ruoyi-system/src/main/java/com/ruoyi/price/service/impl/TmsPriceQuoteServiceImpl.java b/bms-back/ruoyi-system/src/main/java/com/ruoyi/price/service/impl/TmsPriceQuoteServiceImpl.java index ea9d446f..39772436 100644 --- a/bms-back/ruoyi-system/src/main/java/com/ruoyi/price/service/impl/TmsPriceQuoteServiceImpl.java +++ b/bms-back/ruoyi-system/src/main/java/com/ruoyi/price/service/impl/TmsPriceQuoteServiceImpl.java @@ -335,7 +335,7 @@ public class TmsPriceQuoteServiceImpl implements ITmsPriceQuoteService } /** - * Require customerCode; resolve customer_id from bms_customer. + * Require customerCode; resolve customer_id from ctr_customer. */ private void resolveCustomer(TmsPriceQuoteRequest request) { diff --git a/bms-back/ruoyi-system/src/main/resources/mapper/customer/BmsCustomerMapper.xml b/bms-back/ruoyi-system/src/main/resources/mapper/customer/BmsCustomerMapper.xml index f8730bd4..16e8c459 100644 --- a/bms-back/ruoyi-system/src/main/resources/mapper/customer/BmsCustomerMapper.xml +++ b/bms-back/ruoyi-system/src/main/resources/mapper/customer/BmsCustomerMapper.xml @@ -36,24 +36,24 @@ PUBLIC "-//mybatis.org//DTD Mapper 3.0//EN" - + select c.customer_id, c.customer_code, c.customer_name, c.customer_code_dw, c.credit_code, c.customer_type, c.is_enable, c.sales_user_id, c.sales_user, c.ed, c.zq, c.settlement_user_id, c.settlement_user, c.service_user_id, c.service_user, c.settlement_type, c.temp_ed, - (select coalesce(sum(ca.balance), 0) from customer_account ca + (select coalesce(sum(ca.balance), 0) from ctr_customer_account ca where ca.customer_id = c.customer_id and ca.currency = 'CNY' and ca.del_flag = '0') as account_balance, - (select coalesce(sum(ca.balance), 0) from customer_account ca + (select coalesce(sum(ca.balance), 0) from ctr_customer_account ca where ca.customer_id = c.customer_id and ca.currency != 'CNY' and ca.del_flag = '0') as foreign_currency_balance, c.weight_threshold, c.throw_ratio, - (select coalesce(sum(ca.total_credit+ca.extra_credit-ca.used_credit), 0) from customer_account ca + (select coalesce(sum(ca.total_credit+ca.extra_credit-ca.used_credit), 0) from ctr_customer_account ca where ca.customer_id = c.customer_id and ca.del_flag = '0') as credit_ed, c.product_codes, c.remark, c.create_by, c.create_time, c.update_by, c.update_time, c.del_flag - from bms_customer c + from ctr_customer c left join sys_user su on su.user_id = c.sales_user_id + 0 @@ -97,7 +97,7 @@ PUBLIC "-//mybatis.org//DTD Mapper 3.0//EN" @@ -124,7 +124,7 @@ PUBLIC "-//mybatis.org//DTD Mapper 3.0//EN" - select attachment_id, customer_id, biz_type, file_name, file_path, file_size, file_type, file_extension, attachment_type, biz_id, is_logo, sort_order, remark, create_by, create_time, update_by, update_time, del_flag from bms_customer_attachment + select attachment_id, customer_id, biz_type, file_name, file_path, file_size, file_type, file_extension, attachment_type, biz_id, is_logo, sort_order, remark, create_by, create_time, update_by, update_time, del_flag from ctr_customer_attachment - insert into bms_customer_attachment + insert into ctr_customer_attachment customer_id, biz_type, @@ -180,7 +180,7 @@ PUBLIC "-//mybatis.org//DTD Mapper 3.0//EN" - update bms_customer_attachment + update ctr_customer_attachment customer_id = #{customerId}, biz_type = #{bizType}, @@ -201,19 +201,19 @@ PUBLIC "-//mybatis.org//DTD Mapper 3.0//EN" - update bms_customer_attachment set del_flag = '2' where customer_id = #{customerId} + update ctr_customer_attachment set del_flag = '2' where customer_id = #{customerId} - update bms_customer_attachment set del_flag = '2' + update ctr_customer_attachment set del_flag = '2' where customer_id = #{customerId} and (biz_type = 'customer' or biz_type is null or biz_type = '') - update bms_customer + update ctr_customer set credit_ed = #{creditEd}, temp_ed = #{tempEd}, update_by = #{updateBy}, @@ -226,19 +226,19 @@ PUBLIC "-//mybatis.org//DTD Mapper 3.0//EN" select customer_id as customerId, credit_ed as creditEd, temp_ed as tempEd - from bms_customer + from ctr_customer where customer_id = #{customerId} - update bms_customer_attachment set del_flag = '2' where attachment_id in + update ctr_customer_attachment set del_flag = '2' where attachment_id in #{attachmentId} - insert into bms_customer + insert into ctr_customer customer_code, customer_name, @@ -302,7 +302,7 @@ PUBLIC "-//mybatis.org//DTD Mapper 3.0//EN" - update bms_customer + update ctr_customer customer_code = #{customerCode}, customer_name = #{customerName}, @@ -335,17 +335,17 @@ PUBLIC "-//mybatis.org//DTD Mapper 3.0//EN" - update bms_customer set del_flag = '2' where customer_id = #{customerId} + update ctr_customer set del_flag = '2' where customer_id = #{customerId} - update bms_customer set del_flag = '2' where customer_id in + update ctr_customer set del_flag = '2' where customer_id in #{customerId} - + @@ -387,7 +387,7 @@ PUBLIC "-//mybatis.org//DTD Mapper 3.0//EN" - select company_id, customer_id, company_name_full, english_name, credit_code, legal_person, legal_person_phone, legal_person_id_card, registered_capital, capital_currency, paid_in_capital, establish_date, business_term_start, business_term_end, business_term_permanent, registration_authority, registration_number, operating_status, business_scope, shareholders, employee_count, company_phone, company_fax, company_website, company_email, registered_province, registered_city, registered_district, registered_address_detail, business_license_url, attachment_ids, remark, create_by, create_time, update_by, update_time, del_flag from bms_customer_company + select company_id, customer_id, company_name_full, english_name, credit_code, legal_person, legal_person_phone, legal_person_id_card, registered_capital, capital_currency, paid_in_capital, establish_date, business_term_start, business_term_end, business_term_permanent, registration_authority, registration_number, operating_status, business_scope, shareholders, employee_count, company_phone, company_fax, company_website, company_email, registered_province, registered_city, registered_district, registered_address_detail, business_license_url, attachment_ids, remark, create_by, create_time, update_by, update_time, del_flag from ctr_customer_company - insert into bms_customer_company + insert into ctr_customer_company customer_id, company_name_full, @@ -485,7 +485,7 @@ PUBLIC "-//mybatis.org//DTD Mapper 3.0//EN" - update bms_customer_company + update ctr_customer_company customer_id = #{customerId}, company_name_full = #{companyNameFull}, @@ -525,14 +525,14 @@ PUBLIC "-//mybatis.org//DTD Mapper 3.0//EN" - update bms_customer_company set del_flag = '2' where customer_id = #{customerId} + update ctr_customer_company set del_flag = '2' where customer_id = #{customerId} - update bms_customer_company set del_flag = '2' where company_id = #{companyId} + update ctr_customer_company set del_flag = '2' where company_id = #{companyId} - + @@ -562,7 +562,7 @@ PUBLIC "-//mybatis.org//DTD Mapper 3.0//EN" - select contact_id, customer_id, contact_name, position, department, phone, landline, email, wechat, qq, country, province, city, district, contact_address, postal_code, is_default, contact_type, sort_order, remark, create_by, create_time, update_by, update_time, del_flag from bms_customer_contact + select contact_id, customer_id, contact_name, position, department, phone, landline, email, wechat, qq, country, province, city, district, contact_address, postal_code, is_default, contact_type, sort_order, remark, create_by, create_time, update_by, update_time, del_flag from ctr_customer_contact - insert into bms_customer_contact + insert into ctr_customer_contact customer_id, contact_name, @@ -635,7 +635,7 @@ PUBLIC "-//mybatis.org//DTD Mapper 3.0//EN" - update bms_customer_contact + update ctr_customer_contact customer_id = #{customerId}, contact_name = #{contactName}, @@ -663,10 +663,10 @@ PUBLIC "-//mybatis.org//DTD Mapper 3.0//EN" - update bms_customer_contact set del_flag = '2' where customer_id = #{customerId} + update ctr_customer_contact set del_flag = '2' where customer_id = #{customerId} - update bms_customer_contact set del_flag = '2' where contact_id = #{contactId} + update ctr_customer_contact set del_flag = '2' where contact_id = #{contactId} diff --git a/bms-back/ruoyi-system/src/main/resources/mapper/customer/BmsSupplierMapper.xml b/bms-back/ruoyi-system/src/main/resources/mapper/customer/BmsSupplierMapper.xml index 1995e6f7..b233782e 100644 --- a/bms-back/ruoyi-system/src/main/resources/mapper/customer/BmsSupplierMapper.xml +++ b/bms-back/ruoyi-system/src/main/resources/mapper/customer/BmsSupplierMapper.xml @@ -44,7 +44,7 @@ PUBLIC "-//mybatis.org//DTD Mapper 3.0//EN" s.service_user_id, s.service_user, s.ed, s.zq, s.settlement_type, s.temp_ed, s.account_balance, s.foreign_currency_balance, s.credit_ed, s.weight_threshold, s.throw_ratio, s.cooperation_start_date, s.cooperation_status, s.channel_ids, s.remark, s.create_by, s.create_time, s.update_by, s.update_time, s.del_flag - from bms_supplier s + from sup_supplier s left join sys_user su on su.user_id = s.purchaser_user_id + 0 @@ -79,7 +79,7 @@ PUBLIC "-//mybatis.org//DTD Mapper 3.0//EN" - insert into bms_supplier + insert into sup_supplier supplier_code, supplier_name, @@ -143,7 +143,7 @@ PUBLIC "-//mybatis.org//DTD Mapper 3.0//EN" - update bms_supplier + update sup_supplier supplier_code = #{supplierCode}, supplier_name = #{supplierName}, @@ -178,17 +178,17 @@ PUBLIC "-//mybatis.org//DTD Mapper 3.0//EN" - delete from bms_supplier where supplier_id = #{supplierId} + delete from sup_supplier where supplier_id = #{supplierId} - delete from bms_supplier where supplier_id in + delete from sup_supplier where supplier_id in #{supplierId} - + @@ -209,7 +209,7 @@ PUBLIC "-//mybatis.org//DTD Mapper 3.0//EN" - select attachment_id, supplier_id, file_name, file_path, file_size, file_type, file_extension, attachment_type, is_logo, sort_order, remark, create_by, create_time, update_by, update_time, del_flag from bms_supplier_attachment + select attachment_id, supplier_id, file_name, file_path, file_size, file_type, file_extension, attachment_type, is_logo, sort_order, remark, create_by, create_time, update_by, update_time, del_flag from sup_supplier_attachment - insert into bms_supplier_attachment + insert into sup_supplier_attachment supplier_id, file_name, @@ -259,7 +259,7 @@ PUBLIC "-//mybatis.org//DTD Mapper 3.0//EN" - update bms_supplier_attachment + update sup_supplier_attachment supplier_id = #{supplierId}, file_name = #{fileName}, @@ -278,14 +278,14 @@ PUBLIC "-//mybatis.org//DTD Mapper 3.0//EN" - update bms_supplier_attachment set del_flag = '2' where supplier_id = #{supplierId} + update sup_supplier_attachment set del_flag = '2' where supplier_id = #{supplierId} - update bms_supplier_attachment set del_flag = '2' where attachment_id = #{attachmentId} + update sup_supplier_attachment set del_flag = '2' where attachment_id = #{attachmentId} - + @@ -327,7 +327,7 @@ PUBLIC "-//mybatis.org//DTD Mapper 3.0//EN" - select company_id, supplier_id, company_name_full, english_name, credit_code, legal_person, legal_person_phone, legal_person_id_card, registered_capital, capital_currency, paid_in_capital, establish_date, business_term_start, business_term_end, business_term_permanent, registration_authority, registration_number, operating_status, business_scope, shareholders, employee_count, company_phone, company_fax, company_website, company_email, registered_province, registered_city, registered_district, registered_address_detail, business_license_oss_id, attachment_ids, remark, create_by, create_time, update_by, update_time, del_flag from bms_supplier_company + select company_id, supplier_id, company_name_full, english_name, credit_code, legal_person, legal_person_phone, legal_person_id_card, registered_capital, capital_currency, paid_in_capital, establish_date, business_term_start, business_term_end, business_term_permanent, registration_authority, registration_number, operating_status, business_scope, shareholders, employee_count, company_phone, company_fax, company_website, company_email, registered_province, registered_city, registered_district, registered_address_detail, business_license_oss_id, attachment_ids, remark, create_by, create_time, update_by, update_time, del_flag from sup_supplier_company - insert into bms_supplier_company + insert into sup_supplier_company supplier_id, company_name_full, @@ -425,7 +425,7 @@ PUBLIC "-//mybatis.org//DTD Mapper 3.0//EN" - update bms_supplier_company + update sup_supplier_company supplier_id = #{supplierId}, company_name_full = #{companyNameFull}, @@ -465,14 +465,14 @@ PUBLIC "-//mybatis.org//DTD Mapper 3.0//EN" - update bms_supplier_company set del_flag = '2' where supplier_id = #{supplierId} + update sup_supplier_company set del_flag = '2' where supplier_id = #{supplierId} - update bms_supplier_company set del_flag = '2' where company_id = #{companyId} + update sup_supplier_company set del_flag = '2' where company_id = #{companyId} - + @@ -502,7 +502,7 @@ PUBLIC "-//mybatis.org//DTD Mapper 3.0//EN" - select contact_id, supplier_id, contact_name, position, department, phone, landline, email, wechat, qq, country, province, city, district, contact_address, postal_code, is_default, contact_type, sort_order, remark, create_by, create_time, update_by, update_time, del_flag from bms_supplier_contact + select contact_id, supplier_id, contact_name, position, department, phone, landline, email, wechat, qq, country, province, city, district, contact_address, postal_code, is_default, contact_type, sort_order, remark, create_by, create_time, update_by, update_time, del_flag from sup_supplier_contact - insert into bms_supplier_contact + insert into sup_supplier_contact supplier_id, contact_name, @@ -576,7 +576,7 @@ PUBLIC "-//mybatis.org//DTD Mapper 3.0//EN" - update bms_supplier_contact + update sup_supplier_contact supplier_id = #{supplierId}, contact_name = #{contactName}, @@ -604,11 +604,11 @@ PUBLIC "-//mybatis.org//DTD Mapper 3.0//EN" - update bms_supplier_contact set del_flag = '2' where supplier_id = #{supplierId} + update sup_supplier_contact set del_flag = '2' where supplier_id = #{supplierId} - update bms_supplier_contact set del_flag = '2' where contact_id = #{contactId} + update sup_supplier_contact set del_flag = '2' where contact_id = #{contactId} diff --git a/bms-back/ruoyi-system/src/main/resources/mapper/customer/CreditQuotaMapper.xml b/bms-back/ruoyi-system/src/main/resources/mapper/customer/CreditQuotaMapper.xml index 6263d56f..661b204d 100644 --- a/bms-back/ruoyi-system/src/main/resources/mapper/customer/CreditQuotaMapper.xml +++ b/bms-back/ruoyi-system/src/main/resources/mapper/customer/CreditQuotaMapper.xml @@ -13,7 +13,7 @@ PUBLIC "-//mybatis.org//DTD Mapper 3.0//EN" r.status as status, coalesce(q.total_quota, 0) as totalQuota, (select coalesce(sum(g.remaining), 0) - from customer_credit_grant g + from ctr_customer_credit_grant g where g.role_id = r.role_id and g.status = '0' and g.del_flag = '0') as usedQuota, q.remark as remark from sys_role r @@ -30,7 +30,7 @@ PUBLIC "-//mybatis.org//DTD Mapper 3.0//EN" r.status as status, q.total_quota as totalQuota, (select coalesce(sum(g.remaining), 0) - from customer_credit_grant g + from ctr_customer_credit_grant g where g.role_id = r.role_id and g.status = '0' and g.del_flag = '0') as usedQuota, q.remark as remark from sys_user_role ur @@ -50,7 +50,7 @@ PUBLIC "-//mybatis.org//DTD Mapper 3.0//EN" @@ -109,8 +109,8 @@ PUBLIC "-//mybatis.org//DTD Mapper 3.0//EN" c.customer_code, c.customer_name, r.role_name, u.user_name as approve_by - from customer_credit_grant g - left join bms_customer c on c.customer_id = g.customer_id + from ctr_customer_credit_grant g + left join ctr_customer c on c.customer_id = g.customer_id left join sys_role r on r.role_id = g.role_id left join sys_user u on u.user_id = g.approve_user_id @@ -134,7 +134,7 @@ PUBLIC "-//mybatis.org//DTD Mapper 3.0//EN" select grant_id, customer_id, account_id, role_id, approve_user_id, apply_id, flow_id, credit_type, amount, remaining, effective_date, expire_date, status, create_by, create_time, update_by, update_time, del_flag - from customer_credit_grant + from ctr_customer_credit_grant where customer_id = #{customerId} and credit_type = #{creditType} and status = '0' @@ -145,7 +145,7 @@ PUBLIC "-//mybatis.org//DTD Mapper 3.0//EN" - insert into customer_credit_grant ( + insert into ctr_customer_credit_grant ( customer_id, account_id, role_id, approve_user_id, apply_id, flow_id, credit_type, amount, remaining, effective_date, expire_date, status, create_by, create_time, remark, del_flag @@ -158,7 +158,7 @@ PUBLIC "-//mybatis.org//DTD Mapper 3.0//EN" - update customer_credit_grant + update ctr_customer_credit_grant set remaining = #{remaining}, status = #{status}, release_time = #{releaseTime}, diff --git a/bms-back/ruoyi-system/src/main/resources/mapper/customer/CustomerCreditApplyMapper.xml b/bms-back/ruoyi-system/src/main/resources/mapper/customer/CustomerCreditApplyMapper.xml index dcdb9135..c572713c 100644 --- a/bms-back/ruoyi-system/src/main/resources/mapper/customer/CustomerCreditApplyMapper.xml +++ b/bms-back/ruoyi-system/src/main/resources/mapper/customer/CustomerCreditApplyMapper.xml @@ -44,8 +44,8 @@ PUBLIC "-//mybatis.org//DTD Mapper 3.0//EN" a.create_by, a.create_time, a.update_by, a.update_time, a.remark, a.del_flag, c.customer_code, c.customer_name, r.role_name as approve_role_name - from customer_credit_apply a - left join bms_customer c on c.customer_id = a.customer_id + from ctr_customer_credit_apply a + left join ctr_customer c on a.customer_id = c.customer_id left join sys_role r on r.role_id = a.approve_role_id @@ -75,13 +75,13 @@ PUBLIC "-//mybatis.org//DTD Mapper 3.0//EN" - insert into customer_credit_apply ( + insert into ctr_customer_credit_apply ( apply_no, customer_id, credit_type, adjust_mode, change_amount, effective_date, expire_date, reason, status, apply_by, apply_user_id, apply_time, @@ -96,7 +96,7 @@ PUBLIC "-//mybatis.org//DTD Mapper 3.0//EN" - update customer_credit_apply + update ctr_customer_credit_apply set status = 'APPROVED', account_id = #{accountId}, flow_id = #{flowId}, @@ -112,7 +112,7 @@ PUBLIC "-//mybatis.org//DTD Mapper 3.0//EN" - update customer_credit_apply + update ctr_customer_credit_apply set status = 'REJECTED', approve_by = #{approveBy}, approve_user_id = #{approveUserId}, @@ -124,7 +124,7 @@ PUBLIC "-//mybatis.org//DTD Mapper 3.0//EN" - update customer_credit_apply + update ctr_customer_credit_apply set status = 'CANCELLED', update_by = #{updateBy}, update_time = sysdate() diff --git a/bms-back/ruoyi-system/src/main/resources/mapper/customer/CustomerMoneyMapper.xml b/bms-back/ruoyi-system/src/main/resources/mapper/customer/CustomerMoneyMapper.xml index fac8e271..88f606cf 100644 --- a/bms-back/ruoyi-system/src/main/resources/mapper/customer/CustomerMoneyMapper.xml +++ b/bms-back/ruoyi-system/src/main/resources/mapper/customer/CustomerMoneyMapper.xml @@ -33,7 +33,7 @@ PUBLIC "-//mybatis.org//DTD Mapper 3.0//EN" credit_effective_date, credit_expire_date, extra_credit, extra_effective_date, extra_expire_date, used_credit, tax, version, create_by, create_time, update_by, update_time, remark, del_flag - from customer_account + from ctr_customer_account select distinct customer_id - from customer_account + from ctr_customer_account where del_flag = '0' and currency = 'CNY' and ( @@ -67,7 +67,7 @@ PUBLIC "-//mybatis.org//DTD Mapper 3.0//EN" - insert into customer_account + insert into ctr_customer_account customer_id, currency, @@ -99,7 +99,7 @@ PUBLIC "-//mybatis.org//DTD Mapper 3.0//EN" - update customer_account + update ctr_customer_account set balance = #{balance}, frozen_balance = #{frozenBalance}, used_credit = #{usedCredit}, @@ -111,7 +111,7 @@ PUBLIC "-//mybatis.org//DTD Mapper 3.0//EN" - update customer_account + update ctr_customer_account set total_credit = #{totalCredit}, credit_effective_date = #{creditEffectiveDate}, credit_expire_date = #{creditExpireDate}, @@ -159,7 +159,7 @@ PUBLIC "-//mybatis.org//DTD Mapper 3.0//EN" before_amount, change_amount, after_amount, used_credit, effective_date, expire_date, reason, adjust_mode, operator_id, role_id, create_by, create_time, update_by, update_time, remark, del_flag - from customer_credit_flow + from ctr_customer_credit_flow - insert into customer_receipt + insert into ctr_customer_receipt receipt_no, customer_id, @@ -374,7 +374,7 @@ PUBLIC "-//mybatis.org//DTD Mapper 3.0//EN" - update customer_receipt + update ctr_customer_receipt set status = 'CONFIRMED', confirmed_at = #{confirmedAt}, confirmed_by = #{confirmedBy}, @@ -385,7 +385,7 @@ PUBLIC "-//mybatis.org//DTD Mapper 3.0//EN" - update customer_receipt + update ctr_customer_receipt set status = 'CANCELLED', update_by = #{updateBy}, update_time = now() @@ -424,7 +424,7 @@ PUBLIC "-//mybatis.org//DTD Mapper 3.0//EN" direction, amount, before_balance, after_balance, before_frozen_balance, after_frozen_balance, operator_id, create_by, create_time, update_by, update_time, remark, del_flag - from customer_balance_flow + from ctr_customer_balance_flow