From 9947182f98a301d7f32b96e2db9286cc44061b7b Mon Sep 17 00:00:00 2001 From: wule Date: Sun, 15 Nov 2026 23:31:12 +0800 Subject: [PATCH] =?UTF-8?q?1=E4=BF=AE=E6=94=B9=E4=BB=93=E5=BA=93=E7=B1=BB?= =?UTF-8?q?=E5=9E=8B=E5=91=BD=E5=90=8D=20=20=202=E6=8E=A5=E5=8F=A3?= =?UTF-8?q?=E8=8E=B7=E5=8F=96=E5=BA=97=E9=93=BA=E7=B1=BB=E7=9B=AE=E6=8F=90?= =?UTF-8?q?=E5=AE=A1=E9=99=90=E9=A2=9D?= MIME-Version: 1.0 Content-Type: text/plain; charset=UTF-8 Content-Transfer-Encoding: 8bit --- AllBase/Model/DBModel/user_payment_record.cs | 48 ++++++++++++++++--- .../AdminForms/WXAdminAccountBalanceForm.cs | 10 ++-- .../ProductForms/WXDBProdUploadForm.cs | 15 ++++++ .../ShopForms/WXOemAccountBalanceForm.cs | 10 ++-- 4 files changed, 67 insertions(+), 16 deletions(-) diff --git a/AllBase/Model/DBModel/user_payment_record.cs b/AllBase/Model/DBModel/user_payment_record.cs index 7f6d7be..76532c3 100644 --- a/AllBase/Model/DBModel/user_payment_record.cs +++ b/AllBase/Model/DBModel/user_payment_record.cs @@ -71,6 +71,26 @@ namespace AllBase.Model.DBModel public enum EnumOrderPaymentType { + //充值 = 1, + ////采购花费 = 2, + ////产品退款到账 = 3, + ////运费退款到账 = 4, + ////采购收款 = 5, + ////产品退款扣除 = 6, + ////运费退款扣除 = 7, + //礼物单支出 = 16, + //中转仓扣费支出 = 20, + //中转仓作废返还收入 = 23, + //中转仓超重支出 = 24, + //退货包裹扣费支出 = 26, + //支付宝在线充值 = 30, + //云仓退货支出 = 31, + //礼物单退费 = 34, + //额外订单创建 = 35, + //额外订单作废 = 36, + //同步物流 = 55, + //变动类型，1：充值，2：采购花费，3：产品退款到账，4：运费退款到账，5：采购收款，6：产品退款扣除，7：运费退款扣除, 16:礼物单话费，20:中转仓扣费支出，23:中转仓退款收入,24:中转仓超重扣费支出,26 退货包裹扣费支出30支付宝充值;31 云仓退货支出33 分销退货包裹超重花费32 分销退货包裹发货花费退款34 礼物单退费35 额外包裹创建36 额外包裹作废37 额外订单超重支出38 退货包裹作废返还55 同步物流支出 + 充值 = 1, //采购花费 = 2, //产品退款到账 = 3, @@ -79,15 +99,31 @@ namespace AllBase.Model.DBModel //产品退款扣除 = 6, //运费退款扣除 = 7, 礼物单支出 = 16, - 中转仓扣费支出 = 20, - 中转仓作废返还收入 = 23, - 中转仓超重支出 = 24, + + 发货包裹扣费支出 = 20, + 发货包裹作废返还 = 23, + 发货包裹超重支出 = 24, + 退货包裹扣费支出 = 26, + 退货包裹超重支出 = 28, + 退货包裹作废返还 = 38, + 支付宝在线充值 = 30, - 云仓退货支出 = 31, + + 退货仓退货支出 = 31, + 退货仓作废返还 = 32, + 退货仓超重支出 = 33, + 礼物单退费 = 34, - 额外订单创建 = 35, - 额外订单作废 = 36, + + 额外包裹创建支出 = 35, + 额外包裹作废返还 = 36, + 额外包裹超重支出 = 37, + + 额外包裹退货拦截创建支出 = 39, + 额外包裹退货拦截作废返还 = 40, + 额外包裹退货拦截超重支出 = 41, + 同步物流 = 55, } } diff --git a/TEMUKJD/WXForms/AdminForms/WXAdminAccountBalanceForm.cs b/TEMUKJD/WXForms/AdminForms/WXAdminAccountBalanceForm.cs index 893fb67..b271852 100644 --- a/TEMUKJD/WXForms/AdminForms/WXAdminAccountBalanceForm.cs +++ b/TEMUKJD/WXForms/AdminForms/WXAdminAccountBalanceForm.cs @@ -311,17 +311,17 @@ namespace TemuKJD.WXForms.AdminForms var checkRows = dgvPayment.Rows.Cast().Where(r => r.Cells["colCheck"].Value.ParseToBool() == true).ToList(); lblPostageTotal.Text = checkRows - .Where(r => r.Cells["colType"].Value.ParseToString() == EnumOrderPaymentType.中转仓扣费支出.ParseToString()) + .Where(r => r.Cells["colType"].Value.ParseToString() == EnumOrderPaymentType.发货包裹扣费支出.ParseToString()) .Sum(r => r.Cells["colAmount"].Value.ParseToDecimal()).ToString(); lblPostageReturnTotal.Text = checkRows - .Where(r => r.Cells["colType"].Value.ParseToString() == EnumOrderPaymentType.中转仓作废返还收入.ParseToString()) + .Where(r => r.Cells["colType"].Value.ParseToString() == EnumOrderPaymentType.发货包裹作废返还.ParseToString()) .Sum(r => r.Cells["colAmount"].Value.ParseToDecimal()).ToString(); lblPostageWeightTotal.Text = checkRows - .Where(r => r.Cells["colType"].Value.ParseToString() == EnumOrderPaymentType.中转仓超重支出.ParseToString()) + .Where(r => r.Cells["colType"].Value.ParseToString() == EnumOrderPaymentType.发货包裹超重支出.ParseToString()) .Sum(r => r.Cells["colAmount"].Value.ParseToDecimal()).ToString(); lblPostageNotReturnCnt.Text = (checkRows - .Where(r => r.Cells["colType"].Value.ParseToString() == EnumOrderPaymentType.中转仓扣费支出.ParseToString()).Count() - checkRows - .Where(r => r.Cells["colType"].Value.ParseToString() == EnumOrderPaymentType.中转仓作废返还收入.ParseToString()).Count()).ToString(); + .Where(r => r.Cells["colType"].Value.ParseToString() == EnumOrderPaymentType.发货包裹扣费支出.ParseToString()).Count() - checkRows + .Where(r => r.Cells["colType"].Value.ParseToString() == EnumOrderPaymentType.发货包裹作废返还.ParseToString()).Count()).ToString(); lblProfit.Text = (lblPostageTotal.Text.ParseToDecimal() - lblPostageReturnTotal.Text.ParseToDecimal() - lblPostageNotReturnCnt.Text.ParseToInt() * 2.2m).ToString(); } diff --git a/TEMUKJD/WXForms/ProductForms/WXDBProdUploadForm.cs b/TEMUKJD/WXForms/ProductForms/WXDBProdUploadForm.cs index 16276f5..94ddc60 100644 --- a/TEMUKJD/WXForms/ProductForms/WXDBProdUploadForm.cs +++ b/TEMUKJD/WXForms/ProductForms/WXDBProdUploadForm.cs @@ -1450,6 +1450,7 @@ namespace TemuKJD.WXForms.ProductForms if (result.Contains("今日提审次数已用尽，请明日再试") || result.Contains("如需上架请先缴纳足额保证金") || result.Contains("在架商品数已达到上限") || result.Contains("提审次数已达上限") || result.Contains("拥金上货失败：需要开通优选联盟") || result.Contains("本店铺近期提审失败比例较高，已被限")) { + //已达今日上限 shop.upLimitRetryCount++; if (shop.upLimitRetryCount >= globalShopUploadCntLimitRetryTimes) { @@ -3250,6 +3251,20 @@ namespace TemuKJD.WXForms.ProductForms #endregion + #region 检测是否有提审额度 + var urlAuditQuota = BaseClass.BuildWXImgObjString("product/wx_api_get_audit_quota"); + var checkData = UserLogin.GetSignaturex(); + checkData += "&token=" + token.accessToken; + //checkData += "&post_data=" + GetHtml.UrlEncodeUtf8("{\"cat_id\":\"" + leafCatId + "\"}"); + checkData += "&post_data=" + GetHtml.UrlEncodeUtf8("{\"cat_id\":" + leafCatId + "}"); + var apiRst = GetHtml.PostUtf8(urlAuditQuota, checkData); + var avail_quota = BaseRegex.GetIntJson(ref apiRst, "avail_quota"); + if (avail_quota > 0 == false) + { + return "{\"success\":false,\"draftId\":0,\"status\":\"未上传\",\"errMsg\":\"当前类目店铺提审次数已达上限，请等待明日提审次数重置\"}"; + } + #endregion + #region ai短标题 // ai获取短标题 if (wxUploadRule.IsAiShortTitle || chkAiImage.Checked) { diff --git a/TEMUKJD/WXForms/ShopForms/WXOemAccountBalanceForm.cs b/TEMUKJD/WXForms/ShopForms/WXOemAccountBalanceForm.cs index 9bd3361..3db5ae5 100644 --- a/TEMUKJD/WXForms/ShopForms/WXOemAccountBalanceForm.cs +++ b/TEMUKJD/WXForms/ShopForms/WXOemAccountBalanceForm.cs @@ -448,17 +448,17 @@ namespace Work._29Tools.Forms.UserForms var checkRows = dgvPayment.Rows.Cast().Where(r => r.Cells["colCheck"].Value.ParseToBool() == true).ToList(); lblPostageTotal.Text = checkRows - .Where(r => r.Cells["colType"].Value.ParseToString() == EnumOrderPaymentType.中转仓扣费支出.ParseToString()) + .Where(r => r.Cells["colType"].Value.ParseToString() == EnumOrderPaymentType.发货包裹扣费支出.ParseToString()) .Sum(r => r.Cells["colAmount"].Value.ParseToDecimal()).ToString(); lblPostageReturnTotal.Text = checkRows - .Where(r => r.Cells["colType"].Value.ParseToString() == EnumOrderPaymentType.中转仓作废返还收入.ParseToString()) + .Where(r => r.Cells["colType"].Value.ParseToString() == EnumOrderPaymentType.发货包裹作废返还.ParseToString()) .Sum(r => r.Cells["colAmount"].Value.ParseToDecimal()).ToString(); lblPostageWeightTotal.Text = checkRows - .Where(r => r.Cells["colType"].Value.ParseToString() == EnumOrderPaymentType.中转仓超重支出.ParseToString()) + .Where(r => r.Cells["colType"].Value.ParseToString() == EnumOrderPaymentType.发货包裹超重支出.ParseToString()) .Sum(r => r.Cells["colAmount"].Value.ParseToDecimal()).ToString(); lblPostageNotReturnCnt.Text = (checkRows - .Where(r => r.Cells["colType"].Value.ParseToString() == EnumOrderPaymentType.中转仓扣费支出.ParseToString()).Count() - checkRows - .Where(r => r.Cells["colType"].Value.ParseToString() == EnumOrderPaymentType.中转仓作废返还收入.ParseToString()).Count()).ToString(); + .Where(r => r.Cells["colType"].Value.ParseToString() == EnumOrderPaymentType.发货包裹扣费支出.ParseToString()).Count() - checkRows + .Where(r => r.Cells["colType"].Value.ParseToString() == EnumOrderPaymentType.发货包裹作废返还.ParseToString()).Count()).ToString(); lblProfit.Text = (lblPostageTotal.Text.ParseToDecimal() - lblPostageReturnTotal.Text.ParseToDecimal() - lblPostageNotReturnCnt.Text.ParseToInt() * 2.2m).ToString(); }