瀏覽代碼

feat: UserBilling 新增 storeId 字段关联摊位钱包

Co-Authored-By: Claude Opus 4.7 <noreply@anthropic.com>
qmj 1 月之前
父節點
當前提交
438396b589

+ 3 - 0
ruoyi-system/src/main/java/com/ruoyi/system/domain/UserBilling.java

@@ -63,6 +63,9 @@ public class UserBilling
     @Excel(name = "门店id")
     private Long mdId;
 
+    /** 关联摊位ID,非摊位账单为NULL */
+    private Long storeId;
+
     /** 门店名称 */
     @TableField(exist = false)
     private String mdName;

+ 2 - 1
ruoyi-system/src/main/resources/mapper/Billing/UserBillingMapper.xml

@@ -15,6 +15,7 @@
         <result property="paymentMethod"    column="payment_method"    />
         <result property="accountNumber"    column="account_number"    />
         <result property="mdId"    column="md_id"    />
+        <result property="storeId"    column="store_id"    />
         <result property="divvy"    column="divvy"    />
         <result property="balancePay"    column="balance_pay"    />
         <result property="userType"    column="user_type"    />
@@ -27,7 +28,7 @@
     </resultMap>
 
     <sql id="selectUserBillingVo">
-        select b.id, b.user_id, b.type, b.dd_id, b.md_id,b.amount, b.divvy,b.state, b.illustrate, b.payment_method, b.account_number,b.balance_pay, b.user_type,b.cretim, b.divvy_rate, b.behalf_amount, b.wallet_balance, b.tax, b.tax_rate from user_billing b
+        select b.id, b.user_id, b.type, b.dd_id, b.md_id, b.store_id, b.amount, b.divvy,b.state, b.illustrate, b.payment_method, b.account_number,b.balance_pay, b.user_type,b.cretim, b.divvy_rate, b.behalf_amount, b.wallet_balance, b.tax, b.tax_rate from user_billing b
     </sql>
 
     <select id="selectUserBillingList" parameterType="UserBilling" resultMap="UserBillingResult">