diff --git a/AllBase/Model/DBModel/user_payment_record.cs b/AllBase/Model/DBModel/user_payment_record.cs
index 591877b..0dd19da 100644
--- a/AllBase/Model/DBModel/user_payment_record.cs
+++ b/AllBase/Model/DBModel/user_payment_record.cs
@@ -10,13 +10,15 @@ namespace AllBase.Model.DBModel
{
public long id { get; set; }
///
- /// 变动类型，1：充值，2：采购花费，3：产品退款到账，4：运费退款到账，5：采购收款，6：产品退款扣除，7：运费退款扣除，16:礼物单话费，20:中转运费，23:作废运费返还 26退货包裹扣费
+ /// 变动类型，1：充值，2：采购花费，3：产品退款到账，4：运费退款到账，5：采购收款，6：产品退款扣除，7：运费退款扣除，16：礼物单话费，20：中转运费，23：作废运费返还 26：退货包裹扣费，
+ /// 30：支付宝在线充值，31：云仓退货支出
///
public int? type { get; set; }
///
/// 充值或花费的金额(元)
///
public decimal amount { get; set; }
+ public decimal oem_amount { get; set; }
///
/// 充值或花费后的当前账户余额(元)
///
diff --git a/TEMUKJD/WXForms/AdminForms/WXAdminAccountBalanceForm.Designer.cs b/TEMUKJD/WXForms/AdminForms/WXAdminAccountBalanceForm.Designer.cs
index a2ca444..85aae18 100644
--- a/TEMUKJD/WXForms/AdminForms/WXAdminAccountBalanceForm.Designer.cs
+++ b/TEMUKJD/WXForms/AdminForms/WXAdminAccountBalanceForm.Designer.cs
@@ -455,7 +455,9 @@ namespace TemuKJD.WXForms.AdminForms
"管理员充值",
"支付宝充值",
"拍单扣除/作废返还",
- "超重扣费"});
+ "超重扣费支出",
+ "退货包裹扣费支出",
+ "云仓退货扣费支出"});
this.cmbType.Location = new System.Drawing.Point(63, 50);
this.cmbType.Name = "cmbType";
this.cmbType.Size = new System.Drawing.Size(90, 25);
diff --git a/TEMUKJD/WXForms/AdminForms/WXAdminAccountBalanceForm.cs b/TEMUKJD/WXForms/AdminForms/WXAdminAccountBalanceForm.cs
index 0404867..b62c420 100644
--- a/TEMUKJD/WXForms/AdminForms/WXAdminAccountBalanceForm.cs
+++ b/TEMUKJD/WXForms/AdminForms/WXAdminAccountBalanceForm.cs
@@ -100,8 +100,12 @@ namespace TemuKJD.WXForms.AdminForms
data3 += "&type_in=30";
if (cmbType.Text == "拍单扣除/作废返还")
data3 += "&type_in=20,23";
- if (cmbType.Text == "超重扣费")
+ if (cmbType.Text == "超重扣费支出")
data3 += "&type_in=24";
+ if (cmbType.Text == "退货包裹扣费支出")
+ data3 += "&type_in=26";
+ 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()))
@@ -172,6 +176,100 @@ namespace TemuKJD.WXForms.AdminForms
pictureBox2.Visible = false;
}
+ 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";
+ if (cmbType.Text == "管理员充值")
+ data3 += "&type_in=1";
+ if (cmbType.Text == "支付宝充值")
+ data3 += "&type_in=30";
+ if (cmbType.Text == "拍单扣除/作废返还")
+ data3 += "&type_in=20,23";
+ if (cmbType.Text == "超重扣费支出")
+ data3 += "&type_in=24";
+ if (cmbType.Text == "退货包裹扣费支出")
+ data3 += "&type_in=26";
+ 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()))
+ 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 paymentList = new List();
+ paymentList = JsonHelper.DeserializeJsonToList(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.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()
+ .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 ucSplitPage1_PageChange(object obj)
{
pictureBox2.Visible = true;
diff --git a/TEMUKJD/WXForms/ShopForms/WXOemAccountBalanceForm.Designer.cs b/TEMUKJD/WXForms/ShopForms/WXOemAccountBalanceForm.Designer.cs
index 1593e0b..8fed6f6 100644
--- a/TEMUKJD/WXForms/ShopForms/WXOemAccountBalanceForm.Designer.cs
+++ b/TEMUKJD/WXForms/ShopForms/WXOemAccountBalanceForm.Designer.cs
@@ -103,15 +103,16 @@ namespace Work._29Tools.Forms.UserForms
this.txtSearch = new System.Windows.Forms.TextBox();
this.pictureBox2 = new System.Windows.Forms.PictureBox();
this.dgvPayment = new TemuKJD.UserComponent.DataGridViewEx();
+ this.ucSplitPage1 = new TemuKJD.UserControls.UcSplitPage();
this.colCheck = new System.Windows.Forms.DataGridViewCheckBoxColumn();
this.colType = new System.Windows.Forms.DataGridViewTextBoxColumn();
this.colUserName = new System.Windows.Forms.DataGridViewTextBoxColumn();
this.colOrderId = new System.Windows.Forms.DataGridViewTextBoxColumn();
this.colAmount = new System.Windows.Forms.DataGridViewTextBoxColumn();
+ this.colOmeAmount = new System.Windows.Forms.DataGridViewTextBoxColumn();
this.colBalance = new System.Windows.Forms.DataGridViewTextBoxColumn();
this.colCreateTime = new System.Windows.Forms.DataGridViewTextBoxColumn();
this.colRemark = new System.Windows.Forms.DataGridViewTextBoxColumn();
- this.ucSplitPage1 = new TemuKJD.UserControls.UcSplitPage();
this.panel1.SuspendLayout();
((System.ComponentModel.ISupportInitialize)(this.splitContainer2)).BeginInit();
this.splitContainer2.Panel1.SuspendLayout();
@@ -399,7 +400,9 @@ namespace Work._29Tools.Forms.UserForms
"管理员充值",
"支付宝充值",
"拍单扣除/作废返还",
- "超重扣费"});
+ "超重扣费支出",
+ "退货包裹扣费支出",
+ "云仓退货扣费支出"});
this.cmbType.Location = new System.Drawing.Point(55, 20);
this.cmbType.Name = "cmbType";
this.cmbType.Size = new System.Drawing.Size(121, 25);
@@ -880,6 +883,7 @@ namespace Work._29Tools.Forms.UserForms
this.colUserName,
this.colOrderId,
this.colAmount,
+ this.colOmeAmount,
this.colBalance,
this.colCreateTime,
this.colRemark});
@@ -894,6 +898,20 @@ namespace Work._29Tools.Forms.UserForms
this.dgvPayment.CellContentClick += new System.Windows.Forms.DataGridViewCellEventHandler(this.dgvPayment_CellContentClick);
this.dgvPayment.CellValueChanged += new System.Windows.Forms.DataGridViewCellEventHandler(this.dgvPayment_CellValueChanged);
//
+ // ucSplitPage1
+ //
+ this.ucSplitPage1.CurrentPage = 1;
+ this.ucSplitPage1.Dock = System.Windows.Forms.DockStyle.Right;
+ this.ucSplitPage1.IsShowPageSize = true;
+ this.ucSplitPage1.Location = new System.Drawing.Point(903, 0);
+ this.ucSplitPage1.Margin = new System.Windows.Forms.Padding(0);
+ this.ucSplitPage1.Name = "ucSplitPage1";
+ this.ucSplitPage1.PageSize = 50;
+ this.ucSplitPage1.Size = new System.Drawing.Size(459, 25);
+ this.ucSplitPage1.TabIndex = 1163;
+ this.ucSplitPage1.TotalPage = 1;
+ this.ucSplitPage1.PageChange += new System.Action