1中转仓订单退货功能 2中转仓订单运费根据oem或管理员设定调整 3其他一些问题修复
This commit is contained in:
wule committed
1 parent
d6f81f9ef4
commit
2e20cbdf68
24 files changed
+834
-292
No files matched your search
+83
-49
@@ -1,4 +1,7 @@
|
||||
using AllBase;
|
||||
using AllBase.Helper;
|
||||
using AllBase.Model.Division;
|
||||
using NaiBa.Util;
|
||||
using NaiBa.Util.Extension;
|
||||
using System;
|
||||
using System.Collections.Generic;
|
||||
@@ -6,6 +9,7 @@ using System.Diagnostics;
|
||||
using System.Drawing;
|
||||
using System.Drawing.Text;
|
||||
using System.IO;
|
||||
using System.IO.Compression;
|
||||
using System.Management;
|
||||
using System.Runtime.InteropServices;
|
||||
using System.Text;
|
||||
@@ -14,6 +18,7 @@ using System.Threading.Tasks;
|
||||
using System.Windows.Forms;
|
||||
using System.Xml;
|
||||
using Work.Api;
|
||||
using Work.BaseForms;
|
||||
|
||||
namespace Work
|
||||
{
|
||||
@@ -39,7 +44,7 @@ namespace Work
|
||||
//new Thread(Update).Start();//--------检查更新
|
||||
//new Thread(GetAuthConfig).Start();
|
||||
//new Thread(new JumpUpProductNew().Ini).Start();
|
||||
//new Thread(CheckFiles).Start();
|
||||
new Thread(CheckFiles).Start();
|
||||
//new Thread(UpdateTime).Start();
|
||||
//new Thread(GetMacCode).Start();
|
||||
|
||||
@@ -371,58 +376,87 @@ namespace Work
|
||||
/// </summary>
|
||||
private void CheckFiles()
|
||||
{
|
||||
FileBase.DirectoryCreate("cefSharp");
|
||||
List<KeyValueBase> files = new List<KeyValueBase>();
|
||||
files.Add(new KeyValueBase("taobao_address.tjm", "taobao_address.js"));
|
||||
files.Add(new KeyValueBase("1688_address.tjm", "1688address.js"));
|
||||
files.Add(new KeyValueBase("CClib.dll", "CClib.ico"));
|
||||
//files.Add(new KeyValueBase("pdd.dat", "pdd.ico"));
|
||||
//files.Add(new KeyValueBase("WmCode.dll", "WmCode.ico"));
|
||||
files.Add(new KeyValueBase("crawlerInfoInterface.js", "crawlerInfoInterface.js"));
|
||||
files.Add(new KeyValueBase("crawlerInfo.js", "crawlerInfo.js"));
|
||||
files.Add(new KeyValueBase("Interop.MSScriptControl.dll", "Interop.MSScriptControl.ico"));
|
||||
//files.Add(new KeyValueBase("XGCode.dll", "XGCode.ico"));
|
||||
files.Add(new KeyValueBase("Newtonsoft.Json.dll", "Newtonsoft.Json.dll"));
|
||||
files.Add(new KeyValueBase("Newtonsoft.Json.xml", "Newtonsoft.Json.xml"));
|
||||
//FileBase.DirectoryCreate("cefSharp");
|
||||
//List<KeyValueBase> files = new List<KeyValueBase>();
|
||||
//files.Add(new KeyValueBase("taobao_address.tjm", "taobao_address.js"));
|
||||
//files.Add(new KeyValueBase("1688_address.tjm", "1688address.js"));
|
||||
//files.Add(new KeyValueBase("CClib.dll", "CClib.ico"));
|
||||
////files.Add(new KeyValueBase("pdd.dat", "pdd.ico"));
|
||||
////files.Add(new KeyValueBase("WmCode.dll", "WmCode.ico"));
|
||||
//files.Add(new KeyValueBase("crawlerInfoInterface.js", "crawlerInfoInterface.js"));
|
||||
//files.Add(new KeyValueBase("crawlerInfo.js", "crawlerInfo.js"));
|
||||
//files.Add(new KeyValueBase("Interop.MSScriptControl.dll", "Interop.MSScriptControl.ico"));
|
||||
////files.Add(new KeyValueBase("XGCode.dll", "XGCode.ico"));
|
||||
//files.Add(new KeyValueBase("Newtonsoft.Json.dll", "Newtonsoft.Json.dll"));
|
||||
//files.Add(new KeyValueBase("Newtonsoft.Json.xml", "Newtonsoft.Json.xml"));
|
||||
|
||||
files.Add(new KeyValueBase("zxing.dll", "zxing.dll"));
|
||||
//files.Add(new KeyValueBase("NPOI.dll", "NPOI.dll"));
|
||||
//files.Add(new KeyValueBase("NPOI.OOXML.dll", "NPOI.OOXML.dll"));
|
||||
//files.Add(new KeyValueBase("NPOI.OpenXml4Net.dll", "NPOI.OpenXml4Net.dll"));
|
||||
//files.Add(new KeyValueBase("NPOI.OpenXmlFormats.dll", "NPOI.OpenXmlFormats.dll"));
|
||||
files.Add(new KeyValueBase("OrderComing.ico", "temp/OrderComing.wav"));
|
||||
files.Add(new KeyValueBase("AfterSale.ico", "temp/AfterSale.wav"));
|
||||
//files.Add(new KeyValueBase("9527.ico", "temp/9527.wav"));
|
||||
//files.Add(new KeyValueBase("本墨绪圆.dll", "本墨绪圆.dll"));
|
||||
//if(!File.Exists("cefSharp/CefSharp.dll"))
|
||||
// files.Add(new KeyValueBase("cefSharp.zip", "cefSharp.zip"));
|
||||
//files.Add(new KeyValueBase("icoz.ico", "icoz.ico"));
|
||||
foreach (KeyValueBase k in files)
|
||||
{
|
||||
if (FileBase.Exists(k.Key))
|
||||
continue;
|
||||
//if (k.Key.Contains("OrderComing.ico") || k.Key.Contains("AfterSale.ico"))
|
||||
//{
|
||||
// if (GetHtml.DownloadFile("http://dl.qixiaoke.com/files/" + k.Key, k.Value))
|
||||
// FileBase.Move(k.Key + ".bak", k.Value);
|
||||
//}
|
||||
//else
|
||||
//{
|
||||
// if (GetHtml.DownloadFile("http://dl.qixiaoke.com/files/" + k.Value, k.Key + ".bak"))
|
||||
// FileBase.Move(k.Key + ".bak", k.Key);
|
||||
//}
|
||||
}
|
||||
//if (FileBase.Exists("cefSharp.zip"))
|
||||
//files.Add(new KeyValueBase("zxing.dll", "zxing.dll"));
|
||||
////files.Add(new KeyValueBase("NPOI.dll", "NPOI.dll"));
|
||||
////files.Add(new KeyValueBase("NPOI.OOXML.dll", "NPOI.OOXML.dll"));
|
||||
////files.Add(new KeyValueBase("NPOI.OpenXml4Net.dll", "NPOI.OpenXml4Net.dll"));
|
||||
////files.Add(new KeyValueBase("NPOI.OpenXmlFormats.dll", "NPOI.OpenXmlFormats.dll"));
|
||||
//files.Add(new KeyValueBase("OrderComing.ico", "temp/OrderComing.wav"));
|
||||
//files.Add(new KeyValueBase("AfterSale.ico", "temp/AfterSale.wav"));
|
||||
////files.Add(new KeyValueBase("9527.ico", "temp/9527.wav"));
|
||||
////files.Add(new KeyValueBase("本墨绪圆.dll", "本墨绪圆.dll"));
|
||||
////if(!File.Exists("cefSharp/CefSharp.dll"))
|
||||
//// files.Add(new KeyValueBase("cefSharp.zip", "cefSharp.zip"));
|
||||
////files.Add(new KeyValueBase("icoz.ico", "icoz.ico"));
|
||||
//foreach (KeyValueBase k in files)
|
||||
//{
|
||||
// ZipHelper.DecomparessFile(Application.StartupPath + @"\cefSharp.zip",
|
||||
// Application.StartupPath + @"\cefSharp\");
|
||||
// FileBase.Delete("cefSharp.zip");
|
||||
// if (FileBase.Exists(k.Key))
|
||||
// continue;
|
||||
// //if (k.Key.Contains("OrderComing.ico") || k.Key.Contains("AfterSale.ico"))
|
||||
// //{
|
||||
// // if (GetHtml.DownloadFile("http://dl.qixiaoke.com/files/" + k.Key, k.Value))
|
||||
// // FileBase.Move(k.Key + ".bak", k.Value);
|
||||
// //}
|
||||
// //else
|
||||
// //{
|
||||
// // if (GetHtml.DownloadFile("http://dl.qixiaoke.com/files/" + k.Value, k.Key + ".bak"))
|
||||
// // FileBase.Move(k.Key + ".bak", k.Key);
|
||||
// //}
|
||||
//}
|
||||
//new Thread(new MulitServicerSet("拼多多商家").Login).Start();
|
||||
////if (FileBase.Exists("cefSharp.zip"))
|
||||
////{
|
||||
//// ZipHelper.DecomparessFile(Application.StartupPath + @"\cefSharp.zip",
|
||||
//// Application.StartupPath + @"\cefSharp\");
|
||||
//// FileBase.Delete("cefSharp.zip");
|
||||
////}
|
||||
////new Thread(new MulitServicerSet("拼多多商家").Login).Start();
|
||||
|
||||
// 取地址信息
|
||||
//new AddressSetIni().Ini();
|
||||
//new AddressSetIni().getAddress1688();
|
||||
//// 取地址信息
|
||||
////new AddressSetIni().Ini();
|
||||
////new AddressSetIni().getAddress1688();
|
||||
|
||||
// 区划
|
||||
if (!FileBase.Exists("temp\\Division60715"))
|
||||
{
|
||||
if (GetHtml.DownloadFile(BaseClass.ServerUrl + "/Download/" + "Division60715.zip", "temp\\Division60715.dll" + ".bak"))
|
||||
{
|
||||
FileBase.Move("temp\\Division60715.dll" + ".bak", "temp\\Division60715.zip");
|
||||
ZipFile.ExtractToDirectory(Path.Combine(Environment.CurrentDirectory, "temp\\Division60715.zip"), Path.Combine(Environment.CurrentDirectory, "temp"));
|
||||
File.Delete(Path.Combine(Environment.CurrentDirectory, "temp\\Division60715.zip"));
|
||||
}
|
||||
}
|
||||
if (1 == 1)
|
||||
{
|
||||
string filePath = Path.Combine(Environment.CurrentDirectory, "temp\\Division60715");
|
||||
using (StreamReader sr = new StreamReader(filePath, System.Text.Encoding.UTF8))
|
||||
{
|
||||
try
|
||||
{
|
||||
string cateStr = sr.ReadToEnd().Trim();
|
||||
GlobalConfig.Divisions.AddRange(JsonHelper.DeserializeJsonToList<Division>(cateStr));
|
||||
}
|
||||
catch (Exception ex)
|
||||
{
|
||||
BaseMsgForm.ShowError("区划获取失败：" + ex.Message);
|
||||
if (GlobalConfig.Divisions == null)
|
||||
GlobalConfig.Divisions = new ConcurrentList<Division>();
|
||||
}
|
||||
}
|
||||
}
|
||||
}
|
||||
/// <summary>
|
||||
/// 执行CMD命令
|
||||
|
||||
Reference in new issue
Block a user