chfei/KJD_WebService
1
0 Fork 0
Code Issues Pull Requests Actions Packages Projects Releases Wiki Activity

oem账户管理问题修复 微信食品标签图

Browse Source
This commit is contained in:
wule_5900x committed 2026-07-20 07:38:23 +08:00
1 parent ba502650ab
commit c7ab757152
10 files changed
+663 -478
Download Patch File Download Diff File Expand all files Collapse all files

No files matched your search

AllBase/BaseClass.cs
+1 -1
View File
@@ -31,7 +31,7 @@ namespace AllBase
/// <summary>
/// 版本ID
/// </summary>
public static int VersionCount = 1228;
public static int VersionCount = 1229;
public static string MainPath = "29wx";
//public static string MainPath = "29wx";
//public static string MainPath = "29pdd";
KJDService/KJD_WebService/BLL/BXX/BXXProductManage.cs
+2
View File
@@ -674,6 +674,8 @@ namespace KJD_Web.BLL.BXX
forceIndex.Add("index_from_shop_id");
if (!from_shop_name.IsNullOrEmpty())
forceIndex.Add("index_from_shop_name");
if (!ext_code_in.IsNullOrEmpty() || !search_ext_code.IsNullOrEmpty())
forceIndex.Add("index_ext_code");
//if (!add_user_name.IsNullOrEmpty())
// forceIndex.Add("index_add_user_name");
KJDService/KJD_WebService/BLL/WXXD/WXOemManage.cs
+3 -3
View File
@@ -88,11 +88,11 @@ namespace KJD_Web.BLL.WXXD
string where = "";
if (!string.IsNullOrEmpty(oem_id))
where += " and p.oem_id in ('" + oem_id.Replace(",", "','") + "')";
where += " and oem_id in ('" + oem_id.Replace(",", "','") + "')";
if (!string.IsNullOrEmpty(oem_name))
where += " and p.oem_name in ('" + oem_name.Replace(",", "','") + "')";
where += " and oem_name in ('" + oem_name.Replace(",", "','") + "')";
if (!string.IsNullOrEmpty(oem_owner))
where += " and p.oem_owner in ('" + oem_owner.Replace(",", "','") + "')";
where += " and oem_owner in ('" + oem_owner.Replace(",", "','") + "')";
sql += where;
sql += " ORDER BY add_time DESC;";
KJDService/KJD_WebService/BLL/WXXD/WXOrderManage.cs
+81
View File
@@ -1291,5 +1291,86 @@ namespace KJD_Web.BLL.WXXD
}
return "{\"code\":19999,\"msg\":\"输入为空\"}";
}
public string WXUpdateAbnormalTransitOrder(string inputData)
{
if (!string.IsNullOrEmpty(inputData))
{
if (!WXUserManage.GetSign(inputData))
return "{\"code\":999,\"msg\":\"校验失败\"}";
var out_order_no = HtmlUtils.UrlDecodeUtf8(RegexUtils.GetStringQuery(ref inputData, "out_order_no"))?.Replace("'", "\\'");
var order_no = HtmlUtils.UrlDecodeUtf8(RegexUtils.GetStringQuery(ref inputData, "order_no"))?.Replace("'", "\\'");
var order_sku_id = HtmlUtils.UrlDecodeUtf8(RegexUtils.GetStringQuery(ref inputData, "order_sku_id"))?.Replace("'", "\\'");
var buyer_account = HtmlUtils.UrlDecodeUtf8(RegexUtils.GetStringQuery(ref inputData, "buyer_account"))?.Replace("'", "\\'");
var out_amount = HtmlUtils.UrlDecodeUtf8(RegexUtils.GetStringQuery(ref inputData, "out_amount"))?.Replace("'", "\\'");
var purchaser_note = HtmlUtils.UrlDecodeUtf8(RegexUtils.GetStringQuery(ref inputData, "purchaser_note"))?.Replace("'", "\\'");
var refund_status = HtmlUtils.UrlDecodeUtf8(RegexUtils.GetStringQuery(ref inputData, "refund_status"))?.Replace("'", "\\'");
var old_out_order_no = HtmlUtils.UrlDecodeUtf8(RegexUtils.GetStringQuery(ref inputData, "old_out_order_no"))?.Replace("'", "\\'");
var old_order_no = HtmlUtils.UrlDecodeUtf8(RegexUtils.GetStringQuery(ref inputData, "old_order_no"))?.Replace("'", "\\'");
var old_order_sku_id = HtmlUtils.UrlDecodeUtf8(RegexUtils.GetStringQuery(ref inputData, "old_order_sku_id"))?.Replace("'", "\\'");
var old_buyer_account = HtmlUtils.UrlDecodeUtf8(RegexUtils.GetStringQuery(ref inputData, "old_buyer_account"))?.Replace("'", "\\'");
var old_out_amount = HtmlUtils.UrlDecodeUtf8(RegexUtils.GetStringQuery(ref inputData, "old_out_amount"))?.Replace("'", "\\'");
var old_purchaser_note = HtmlUtils.UrlDecodeUtf8(RegexUtils.GetStringQuery(ref inputData, "old_purchaser_note"))?.Replace("'", "\\'");
var old_refund_status = HtmlUtils.UrlDecodeUtf8(RegexUtils.GetStringQuery(ref inputData, "old_refund_status"))?.Replace("'", "\\'");
var order_code = HtmlUtils.UrlDecodeUtf8(RegexUtils.GetStringQuery(ref inputData, "order_code"))?.Replace("'", "\\'");
if(order_code.IsNullOrEmpty() || old_purchaser_note.IsNullOrEmpty() || old_out_amount.ParseToInt().IsNullOrZero() || old_buyer_account.IsNullOrEmpty() || old_order_no.IsNullOrEmpty() || old_out_order_no.IsNullOrEmpty() ||
purchaser_note.IsNullOrEmpty() || out_amount.ParseToInt().IsNullOrZero() || buyer_account.IsNullOrEmpty() || order_no.IsNullOrEmpty() || out_order_no.IsNullOrEmpty())
{
return "{\"code\":500,\"msg\":\"异常单记录信息不完整\",\"affected_rows\":" + 0 + "}";
}
string conn = System.Configuration.ConfigurationManager.ConnectionStrings["ConnKJD"].ConnectionString;
MysqlUtils mySql = new MysqlUtils(conn, true);
string sql;
sql = "INSERT INTO wxxd.order_abnormal_order_record (out_order_no,order_no,order_sku_id,buyer_account,out_amount,purchaser_note,refund_status,order_code) ";
sql += " VALUES('" + old_out_order_no + "','" + old_order_no + "','" + old_order_sku_id + "','" + old_buyer_account + "'," + old_out_amount + ",'" +
old_purchaser_note + "','" + old_refund_status + "','" + order_code + "')";
var rows = mySql.ExecuteAffectedRows(sql);
if (!mySql.Message.IsNullOrEmpty())
{
mySql.RollBack();
mySql.Close();
return "{\"code\":500,\"msg\":\"" + mySql.Message + "\",\"affected_rows\":" + rows + "}";
}
if (rows == 0)
{
mySql.RollBack();
mySql.Close();
return "{\"code\":500,\"msg\":\"创建异常单记录失败\",\"affected_rows\":" + rows + "}";
}
sql = "UPDATE erp.oms_wei_external_procurement_log SET ";
sql += " out_order_no='" + out_order_no + "',";
sql += " order_no='" + order_no + "',";
sql += " order_sku_id='" + order_sku_id + "',";
sql += " buyer_account='" + buyer_account + "',";
sql += " out_amount=" + out_amount + ",";
sql += " purchaser_note='" + purchaser_note + "',";
sql += " refund_status='" + refund_status + "',";
sql = sql.TrimEnd(',');
sql += " WHERE order_code='" + order_code + "' AND order_no='" + old_order_no + "';";
rows = mySql.ExecuteAffectedRows(sql);
if (!mySql.Message.IsNullOrEmpty())
{
mySql.RollBack();
mySql.Close();
return "{\"code\":500,\"msg\":\"" + mySql.Message + "\",\"affected_rows\":" + rows + "}";
}
if (rows == 0)
{
mySql.RollBack();
mySql.Close();
return "{\"code\":500,\"msg\":\"更新异常单拍单失败\",\"affected_rows\":" + rows + "}";
}
mySql.Commit();
mySql.Close();
return "{\"code\":200,\"msg\":\"success\",\"affected_rows\":" + rows + "}";
}
return "{\"code\":19999,\"msg\":\"输入为空\"}";
}
}
}
KJDService/KJD_WebService/WXOrderService.asmx.cs
+16 -3
View File
@@ -91,7 +91,7 @@ namespace KJD_Web
[WebMethod]
public void get_refund_list()
{
string jsontext = GetRequestJsonString();
var result = jsontext;
@@ -124,7 +124,7 @@ namespace KJD_Web
Context.Response.Write(result);
Context.Response.End();
}
/// <summary>
/// 获取中转仓订单信息
/// </summary>
@@ -222,7 +222,7 @@ namespace KJD_Web
Context.Response.End();
}
[WebMethod]
public void wx_get_transit_warehouse_aftersale_list()
@@ -235,5 +235,18 @@ namespace KJD_Web
Context.Response.Write(result);
Context.Response.End();
}
[WebMethod]
public void wx_update_abnormal_transit_order()
{
string jsontext = GetRequestJsonString();
var result = jsontext;
result = new WXOrderManage().WXUpdateAbnormalTransitOrder(jsontext);
Context.Response.Write(result);
Context.Response.End();
}
}
}
TEMUKJD/WXForms/AdminForms/WXAdminAccountForm.Designer.cs
Generated
+485 -433
View File
File diff suppressed because it is too large. Load diff
TEMUKJD/WXForms/AdminForms/WXAdminAccountForm.cs
+8 -4
View File
@@ -303,6 +303,8 @@ namespace TemuKJD.WXForms.AdminForms
if (columName == "colPlus")
{
this.lblUserInfo.Text = mobile + " - " + nickName;
this.lblTopUpUserId.Text = mobile;
this.lblTopUpNickName.Text = nickName;
this.numAddTopUp.Value = 0;
this.pnlTopUp.Tag = row;
this.pnlTopUp.Visible = true;
@@ -311,6 +313,8 @@ namespace TemuKJD.WXForms.AdminForms
if (columName == "colBalancePlus")
{
this.lblUserBalanceInfo.Text = mobile + " - " + nickName;
this.lblBalanceUserId.Text = mobile;
this.lblBalanceNickName.Text = nickName;
this.numAddBalance.Value = 0;
this.pnlBalance.Tag = row;
this.pnlBalance.Visible = true;
@@ -449,8 +453,8 @@ namespace TemuKJD.WXForms.AdminForms
{
string url = BaseClass.BuildObjString("user/update_user_points");
string data = UserLogin.GetSignaturex();
data += "&update_user_name=" + lblUserInfo.Text.Split('-')[0].Trim();
data += "&update_user_nick=" + lblUserInfo.Text.Split('-')[1].Trim();
data += "&update_user_name=" + lblTopUpUserId.Text;
data += "&update_user_nick=" + lblTopUpNickName.Text;
data += "&option_type=" + "充值";
data += "&operator_type=" + "管理员";
@@ -527,8 +531,8 @@ namespace TemuKJD.WXForms.AdminForms
{
string url = BaseClass.BuildObjString("user/update_user_balance");
string data = UserLogin.GetSignaturex();
data += "&update_user_name=" + lblUserBalanceInfo.Text.Split('-')[0].Trim();
data += "&update_user_nick=" + lblUserBalanceInfo.Text.Split('-')[1].Trim();
data += "&update_user_name=" + lblBalanceUserId.Text;
data += "&update_user_nick=" + lblBalanceNickName.Text;
data += "&option_type=" + "充值";
data += "&operator_name=" + BaseClass.UserName;
data += "&delta_balance=" + numAddBalance.Value;
TEMUKJD/WXForms/AdminForms/WxOemManageForm.Designer.cs
Generated
+13 -12
View File
@@ -28,8 +28,8 @@
/// </summary>
private void InitializeComponent()
{
System.Windows.Forms.DataGridViewCellStyle dataGridViewCellStyle5 = new System.Windows.Forms.DataGridViewCellStyle();
System.Windows.Forms.DataGridViewCellStyle dataGridViewCellStyle6 = new System.Windows.Forms.DataGridViewCellStyle();
System.Windows.Forms.DataGridViewCellStyle dataGridViewCellStyle1 = new System.Windows.Forms.DataGridViewCellStyle();
System.Windows.Forms.DataGridViewCellStyle dataGridViewCellStyle2 = new System.Windows.Forms.DataGridViewCellStyle();
this.splitContainer5 = new System.Windows.Forms.SplitContainer();
this.btnCancelEdit = new DevComponents.DotNetBar.PanelEx();
this.btnAddMdy = new DevComponents.DotNetBar.PanelEx();
@@ -246,6 +246,7 @@
this.btnClear.StyleMouseOver.ForeColor.Color = System.Drawing.Color.White;
this.btnClear.TabIndex = 847;
this.btnClear.Text = "置空";
this.btnClear.Click += new System.EventHandler(this.btnClear_Click);
//
// txtSearchOemName
//
@@ -391,20 +392,20 @@
//
this.dgvOem.AllowUserToAddRows = false;
this.dgvOem.AllowUserToDeleteRows = false;
dataGridViewCellStyle5.BackColor = System.Drawing.Color.FromArgb(((int)(((byte)(249)))), ((int)(((byte)(249)))), ((int)(((byte)(249)))));
this.dgvOem.AlternatingRowsDefaultCellStyle = dataGridViewCellStyle5;
dataGridViewCellStyle1.BackColor = System.Drawing.Color.FromArgb(((int)(((byte)(249)))), ((int)(((byte)(249)))), ((int)(((byte)(249)))));
this.dgvOem.AlternatingRowsDefaultCellStyle = dataGridViewCellStyle1;
this.dgvOem.AutoRowNumber = true;
this.dgvOem.AutoSizeColumnsMode = System.Windows.Forms.DataGridViewAutoSizeColumnsMode.Fill;
this.dgvOem.BackgroundColor = System.Drawing.Color.White;
this.dgvOem.BorderColor = System.Drawing.Color.FromArgb(((int)(((byte)(63)))), ((int)(((byte)(126)))), ((int)(((byte)(255)))));
dataGridViewCellStyle6.Alignment = System.Windows.Forms.DataGridViewContentAlignment.MiddleLeft;
dataGridViewCellStyle6.BackColor = System.Drawing.SystemColors.Control;
dataGridViewCellStyle6.Font = new System.Drawing.Font("微软雅黑", 9F, System.Drawing.FontStyle.Regular, System.Drawing.GraphicsUnit.Point, ((byte)(134)));
dataGridViewCellStyle6.ForeColor = System.Drawing.SystemColors.WindowText;
dataGridViewCellStyle6.SelectionBackColor = System.Drawing.SystemColors.Highlight;
dataGridViewCellStyle6.SelectionForeColor = System.Drawing.SystemColors.HighlightText;
dataGridViewCellStyle6.WrapMode = System.Windows.Forms.DataGridViewTriState.False;
this.dgvOem.ColumnHeadersDefaultCellStyle = dataGridViewCellStyle6;
dataGridViewCellStyle2.Alignment = System.Windows.Forms.DataGridViewContentAlignment.MiddleLeft;
dataGridViewCellStyle2.BackColor = System.Drawing.SystemColors.Control;
dataGridViewCellStyle2.Font = new System.Drawing.Font("微软雅黑", 9F, System.Drawing.FontStyle.Regular, System.Drawing.GraphicsUnit.Point, ((byte)(134)));
dataGridViewCellStyle2.ForeColor = System.Drawing.SystemColors.WindowText;
dataGridViewCellStyle2.SelectionBackColor = System.Drawing.SystemColors.Highlight;
dataGridViewCellStyle2.SelectionForeColor = System.Drawing.SystemColors.HighlightText;
dataGridViewCellStyle2.WrapMode = System.Windows.Forms.DataGridViewTriState.False;
this.dgvOem.ColumnHeadersDefaultCellStyle = dataGridViewCellStyle2;
this.dgvOem.ColumnHeadersHeightSizeMode = System.Windows.Forms.DataGridViewColumnHeadersHeightSizeMode.AutoSize;
this.dgvOem.Columns.AddRange(new System.Windows.Forms.DataGridViewColumn[] {
this.colCheck,
TEMUKJD/WXForms/AdminForms/WxOemManageForm.cs
+6
View File
@@ -194,5 +194,11 @@ namespace TemuKJD.WXForms.AdminForms
}
}, cancellationTokenSource.Token);
}
private void btnClear_Click(object sender, EventArgs e)
{
txtSearchOemId.Text = "";
txtSearchOemName.Text = "";
}
}
}
TEMUKJD/WXForms/ProductForms/WXDBProdUploadForm.cs
+48 -22
View File
@@ -1,7 +1,15 @@
using AllBase;
using AllBase.Extension;
using AllBase.Helper;
using AllBase.Model.Config;
using AllBase.Model.Param.WXParam;
using AllBase.Model.Result;
using AllBase.Model.Result.PDDResult;
using AllBase.Model.Result.WXResult;
using CefSharp;
using NaiBa.Util;
using NaiBa.Util.Extension;
using Newtonsoft.Json;
using Newtonsoft.Json.Linq;
using System;
using System.Collections.Generic;
@@ -12,25 +20,18 @@ using System.IO;
using System.Linq;
using System.Net.Http;
using System.Text;
using System.Text.RegularExpressions;
using System.Threading;
using System.Threading.Tasks;
using System.Windows.Forms;
using TemuKJD.Extension;
using TemuKJD.BaseForms;
using TemuKJD.ToolForms;
using Work;
using TemuKJD.BLL;
using System.Text.RegularExpressions;
using TemuKJD.Extension;
using TemuKJD.PDDForms.ProductSelectForms;
using TemuKJD.ToolForms;
using TemuKJD.WXForms.ShopForms;
using AllBase.Model.Result.PDDResult;
using AllBase.Model.Param.WXParam;
using AllBase.Model.Result.WXResult;
using Newtonsoft.Json;
using NaiBa.Util;
using AllBase.Model.Config;
using CefSharp;
using AllBase.Extension;
using Work;
using static System.Net.Mime.MediaTypeNames;
namespace TemuKJD.WXForms.ProductForms
{
@@ -4601,16 +4602,41 @@ namespace TemuKJD.WXForms.ProductForms
bookStr += address + "\r\n" + "\r\n";
bookStr += Storage + "\r\n" + "\r\n";
var bookImg = new Bitmap(800, 800);
int width = 800;
int height = 1000;
var bookImg = new Bitmap(width, height);
using (Graphics g = Graphics.FromImage(bookImg))
{
g.Clear(Color.White);
//Font font = new Font("宋体", 15, FontStyle.Bold);
Font font = new Font("微软雅黑", 15, FontStyle.Regular);
Brush textBrush = Brushes.Black;
g.TextRenderingHint = System.Drawing.Text.TextRenderingHint.ClearTypeGridFit;
RectangleF rectF = new RectangleF(80, 80, 800 - 80, 800 - 80);
g.DrawString(bookStr, font, textBrush, rectF);
g.Clear(Color.Gray);
Brush borderBrush = Brushes.Gray;
Brush contentBrush = Brushes.White;
g.FillRectangle(contentBrush, new RectangleF(8, 8, width - 16, height - 16));
g.FillRectangle(borderBrush, new RectangleF(18, 18, width - 36, height - 36));
g.FillRectangle(contentBrush, new RectangleF(22, 22, width - 44, height - 44));
g.FillRectangle(borderBrush, new RectangleF(40, 140, width - 80, 4));
SizeF textSize;
{
Font font = new Font("微软雅黑", 30, FontStyle.Regular);
Brush textBrush = Brushes.DarkRed;
g.TextRenderingHint = System.Drawing.Text.TextRenderingHint.ClearTypeGridFit;
// 测量文本的宽度
textSize = g.MeasureString("商 品 标 签", font);
float x = (width - textSize.Width) / 2;
RectangleF rectF = new RectangleF(x, 50, width - x, height - 200);
g.DrawString("商 品 标 签", font, textBrush, rectF);
}
{
//Font font = new Font("宋体", 15, FontStyle.Bold);
Font font = new Font("微软雅黑", 15, FontStyle.Regular);
Brush textBrush = Brushes.Black;
g.TextRenderingHint = System.Drawing.Text.TextRenderingHint.ClearTypeGridFit;
RectangleF rectF = new RectangleF(80, 120 + textSize.Height, width - 160, height - 80 - 120 - textSize.Height);
g.DrawString(bookStr, font, textBrush, rectF);
}
}
Thread.Sleep(Randomx.GetId(500, 800));
@@ -5674,8 +5700,8 @@ namespace TemuKJD.WXForms.ProductForms
}
}));
var html = GetHtml.PostUtf8(url, data);
if (string.IsNullOrEmpty(html) || !html.Contains("\"code\":200"))
html = GetHtml.PostUtf8(url, data);
//if (string.IsNullOrEmpty(html) || !html.Contains("\"code\":200"))
// html = GetHtml.PostUtf8(url, data);
//if (string.IsNullOrEmpty(html) || !html.Contains("\"code\":200"))
// html = GetHtml.PostUtf8(url, data);
if (string.IsNullOrEmpty(html) || !html.Contains("\"code\":200"))