From 4e449f31bdb988d7a6571eec4176dee17aabdd62 Mon Sep 17 00:00:00 2001 From: wule Date: Fri, 4 Sep 2026 15:04:04 +0800 Subject: [PATCH] =?UTF-8?q?=E8=AE=A2=E5=8D=95=E5=A2=9E=E5=8A=A0=E7=A4=BC?= =?UTF-8?q?=E7=89=A9=E5=8D=95=E9=80=80=E8=B4=B9=E6=98=BE=E7=A4=BA?= MIME-Version: 1.0 Content-Type: text/plain; charset=UTF-8 Content-Transfer-Encoding: 8bit --- AllBase/Model/DBModel/user_payment_record.cs | 1 + .../UserForms/WXGetBalanceQrCodeForm.Designer.cs | 13 ++++++++----- .../Forms/UserForms/WXGetBalanceQrCodeForm.cs | 14 ++++++++++---- 3 files changed, 19 insertions(+), 9 deletions(-) diff --git a/AllBase/Model/DBModel/user_payment_record.cs b/AllBase/Model/DBModel/user_payment_record.cs index c6724c9..00295eb 100644 --- a/AllBase/Model/DBModel/user_payment_record.cs +++ b/AllBase/Model/DBModel/user_payment_record.cs @@ -83,6 +83,7 @@ namespace AllBase.Model.DBModel 退货包裹扣费支出 = 26, 支付宝在线充值 = 30, 云仓退货支出 = 31, + 礼物单退费 = 34, } /* diff --git a/Work/_29Tools/Forms/UserForms/WXGetBalanceQrCodeForm.Designer.cs b/Work/_29Tools/Forms/UserForms/WXGetBalanceQrCodeForm.Designer.cs index e67c8ea..163e480 100644 --- a/Work/_29Tools/Forms/UserForms/WXGetBalanceQrCodeForm.Designer.cs +++ b/Work/_29Tools/Forms/UserForms/WXGetBalanceQrCodeForm.Designer.cs @@ -474,11 +474,14 @@ namespace Work._29Tools.Forms.UserForms this.cmbType.FormattingEnabled = true; this.cmbType.Items.AddRange(new object[] { "", - "充值", - "管理员充值", - "支付宝充值", - "拍单扣除/作废返还", - "超重扣费"}); + "充值", + "管理员充值", + "支付宝充值", + "礼物单支出/礼物单退费", + "拍单扣除/作废返还", + "超重扣费支出", + "退货包裹扣费支出", + "云仓退货扣费支出"}); this.cmbType.Location = new System.Drawing.Point(42, 33); this.cmbType.Name = "cmbType"; this.cmbType.Size = new System.Drawing.Size(121, 25); diff --git a/Work/_29Tools/Forms/UserForms/WXGetBalanceQrCodeForm.cs b/Work/_29Tools/Forms/UserForms/WXGetBalanceQrCodeForm.cs index 879a74b..af9f0fa 100644 --- a/Work/_29Tools/Forms/UserForms/WXGetBalanceQrCodeForm.cs +++ b/Work/_29Tools/Forms/UserForms/WXGetBalanceQrCodeForm.cs @@ -152,14 +152,20 @@ namespace Work._29Tools.Forms.UserForms data3 += "&create_time_end=" + dtpTimeEnd.Value.ToString("yyyy-MM-dd HH:mm:ss"); if (cmbType.Text == "充值") data3 += "&type_in=1,30"; - if (cmbType.Text == "管理员充值") + else if (cmbType.Text == "管理员充值") data3 += "&type_in=1"; - if (cmbType.Text == "支付宝充值") + else if (cmbType.Text == "支付宝充值") data3 += "&type_in=30"; - if (cmbType.Text == "拍单扣除/作废返还") + else if (cmbType.Text == "礼物单支出/礼物单退费") + data3 += "&type_in=16,34"; + else if (cmbType.Text == "拍单扣除/作废返还") data3 += "&type_in=20,23"; - if (cmbType.Text == "超重扣费") + else if (cmbType.Text == "超重扣费支出") data3 += "&type_in=24"; + else if (cmbType.Text == "退货包裹扣费支出") + data3 += "&type_in=26"; + else if (cmbType.Text == "云仓退货扣费支出") + data3 += "&type_in=31"; if (!string.IsNullOrEmpty(txtOutOrderId.Text.Trim())) data3 += "&order_id_in=" + txtOutOrderId.Text.Trim(); if (!string.IsNullOrEmpty(txtShopOrderNo.Text.Trim()))