修复oem无法进行礼物单查询的bug

This commit is contained in:
wule committed 2026-09-01 16:28:12 +08:00
1 parent 8eab94968e
commit 2dfec55b5f
5 files changed
+161 -129

No files matched your search

@@ -399,6 +399,7 @@ namespace Work._29Tools.Forms.UserForms
"充值",
"管理员充值",
"支付宝充值",
"礼物单支出",
"拍单扣除/作废返还",
"超重扣费支出",
"退货包裹扣费支出",
@@ -137,18 +137,22 @@ 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";
else if (cmbType.Text == "拍单扣除/作废返还")
data3 += "&type_in=20,23";
if (cmbType.Text == "超重扣费支出")
else if (cmbType.Text == "超重扣费支出")
data3 += "&type_in=24";
if (cmbType.Text == "退货包裹扣费支出")
else if(cmbType.Text == "退货包裹扣费支出")
data3 += "&type_in=26";
if (cmbType.Text == "云仓退货扣费支出")
else if (cmbType.Text == "云仓退货扣费支出")
data3 += "&type_in=31";
else if (!string.IsNullOrEmpty(cmbType.Text))
data3 += "&type_in=" + cmbType.Text;
data3 += "&page=" + ucSplitPage1.CurrentPage;
data3 += "&page_size=" + ucSplitPage1.PageSize;
pageSize = ucSplitPage1.PageSize;
@@ -201,6 +205,108 @@ namespace Work._29Tools.Forms.UserForms
}));
}
public async Task GetAllBalanceList()
{
Invoke(new Action(() =>
{
this.dgvPayment.Rows.Clear();
dgvPayment.CellValueChanged -= dgvPayment_CellValueChanged;
}));
await Task.Run(() =>
{
int pageCount = 1;
int pageSize = 50;
var url3 = BaseClass.BuildWXObjString("user/get_user_balance");
var data3 = UserLogin.GetSignaturex();
Invoke(new Action(() =>
{
if (!string.IsNullOrEmpty(txtUserName.Text.Trim()))
data3 += "&user_name_in=" + txtUserName.Text.Trim();
data3 += "&create_time_begin=" + dtpTimeBegin.Value.ToString("yyyy-MM-dd HH:mm:ss");
data3 += "&create_time_end=" + dtpTimeEnd.Value.ToString("yyyy-MM-dd HH:mm:ss");
if (cmbType.Text == "充值")
data3 += "&type_in=1,30";
else if (cmbType.Text == "管理员充值")
data3 += "&type_in=1";
else if (cmbType.Text == "支付宝充值")
data3 += "&type_in=30";
else if (cmbType.Text == "礼物单支出")
data3 += "&type_in=16";
else if (cmbType.Text == "拍单扣除/作废返还")
data3 += "&type_in=20,23";
else if (cmbType.Text == "超重扣费支出")
data3 += "&type_in=24";
else if (cmbType.Text == "退货包裹扣费支出")
data3 += "&type_in=26";
else if (cmbType.Text == "云仓退货扣费支出")
data3 += "&type_in=31";
else if (!string.IsNullOrEmpty(cmbType.Text))
data3 += "&type_in=" + cmbType.Text;
//if (!string.IsNullOrEmpty(txtOutOrderId.Text.Trim()))
// data3 += "&order_id_in=" + txtOutOrderId.Text.Trim();
//if (!string.IsNullOrEmpty(txtShopOrderNo.Text.Trim()))
// data3 += "&remark_fulltext=" + txtShopOrderNo.Text.Trim();
data3 += "&page=" + ucSplitPage1.CurrentPage;
data3 += "&page_size=" + ucSplitPage1.PageSize;
pageSize = ucSplitPage1.PageSize;
}));
var html3 = GetHtml.PostUtf8(url3, data3);
if (string.IsNullOrEmpty(html3) || !html3.Contains("\"code\":200"))
html3 = GetHtml.PostUtf8(url3, data3);
if (string.IsNullOrEmpty(html3) || !html3.Contains("\"code\":200"))
{
BaseMsgForm.ShowError("查询失败:" + BaseRegex.GetStringJsonByRegs(ref html3, html3, "msg"));
return;
}
List<user_payment_record> paymentList = new List<user_payment_record>();
paymentList = JsonHelper.DeserializeJsonToList<user_payment_record>(JsonHelper.JObjectParse(html3)["data"].ParseToString());
foreach (var payment in paymentList)
{
Invoke(new Action(() =>
{
var rowIndex = this.dgvPayment.Rows.Add(
true,
((EnumOrderPaymentType)payment.type.ParseToInt()).ParseToString(),
payment.user_name,
payment.order_id,
payment.amount,
payment.oem_amount,
payment.balance,
payment.create_time.ToString("yyyy-MM-dd HH:mm:ss"),
payment.remark
);
var row = this.dgvPayment.Rows[rowIndex];
row.Height = 60;
var rowExists = dgvPayment.Rows.Cast<DataGridViewRow>()
.Where(r => r.Cells["colOrderId"].Value.ParseToString() == payment.order_id && r.Cells["colType"].Value.ParseToString() == "中转仓作废返还收入").ToList();
if (rowExists.Count > 1)
{
var c = Color.FromArgb(Randomx.GetId(127, 200), Randomx.GetId(127, 200), Randomx.GetId(127, 200));
foreach (var rowExist in rowExists)
{
rowExist.Cells["colOrderId"].Style.BackColor = c;
}
}
}));
}
int count = BaseRegex.GetIntJson(ref html3, "count");
pageCount = Math.Ceiling(1.0 * count / pageSize).ParseToInt();
pageCount = Math.Max(pageCount, 1);
ucSplitPage1.TotalPage = pageCount;
});
Invoke(new Action(() =>
{
GetProfit();
dgvPayment.CellValueChanged += dgvPayment_CellValueChanged;
}));
}
private async void btnSearch_Click(object sender, EventArgs e)
{
if (cancellationTokenSource != null)