界面修改 功能修改
This commit is contained in:
1 parent
3fe394c8da
commit
25cdf642bf
43 files changed
+897
-189
No files matched your search
@@ -1,8 +1,9 @@
|
||||
using AllBase;
|
||||
using AllBase.DouYinModel.Result;
|
||||
using AllBase.Model.Result;
|
||||
using _29WxOrder.BuyForms;
|
||||
using _29WxOrder.BuyForms;
|
||||
using _29WxOrder.ShopForms;
|
||||
using AllBase;
|
||||
using AllBase.DouYinModel.Result;
|
||||
using AllBase.Helper;
|
||||
using AllBase.Model.Result;
|
||||
using NaiBa.Util;
|
||||
using NaiBa.Util.Helper;
|
||||
using Newtonsoft.Json;
|
||||
@@ -108,7 +109,7 @@ namespace _29WxOrder.OrderForms
|
||||
LstFinishedOrderId.Clear();
|
||||
|
||||
isread = true;
|
||||
foreach (var shop in CollectionClass.DouShopLoginList)
|
||||
foreach (var shop in GlobalConfig.ShopLoginList)
|
||||
{
|
||||
Invoke(new Action(() => { this.mainform.lblMsg.Text = "正在读取售后:" + shop.ShopName; }));
|
||||
int size = 10;
|
||||
@@ -604,7 +605,7 @@ namespace _29WxOrder.OrderForms
|
||||
string name = DgvSaleOrderList.Columns[e.ColumnIndex].HeaderText;
|
||||
if (name == "售后订单编号")
|
||||
{
|
||||
DouShopLoginInfo shop = CollectionClass.DouShopLoginList.Find(x => x.ShopId == shopid);
|
||||
ShopLoginInfo shop = GlobalConfig.ShopLoginList.Find(x => x.ShopId == shopid);
|
||||
ShopBrower shopBrower = new ShopBrower();
|
||||
shopBrower.TitleText = "店铺后台-售后";
|
||||
shopBrower.shop = shop;
|
||||
@@ -614,7 +615,7 @@ namespace _29WxOrder.OrderForms
|
||||
}
|
||||
else if (name == "订单号")
|
||||
{
|
||||
DouShopLoginInfo shop = CollectionClass.DouShopLoginList.Find(x => x.ShopId == shopid);
|
||||
ShopLoginInfo shop = GlobalConfig.ShopLoginList.Find(x => x.ShopId == shopid);
|
||||
if (shop != null)
|
||||
{
|
||||
ShopForms.ShopBrower shopBrower = new ShopForms.ShopBrower();
|
||||
@@ -752,7 +753,7 @@ namespace _29WxOrder.OrderForms
|
||||
{
|
||||
IEnumerable<DataGridViewRow> enumerableList = this.DgvSaleOrderList.Rows.Cast<DataGridViewRow>();
|
||||
List<DataGridViewRow> list = (from item in enumerableList where item.Cells["col_order_id"].Value.ToString() == orderid select item).ToList();
|
||||
DouShopLoginInfo shop = CollectionClass.DouShopLoginList.Find(x => x.ShopId == DgvSaleOrderList.Rows[mouseEvent.RowIndex].Cells["shopId"].Value.ToString());
|
||||
ShopLoginInfo shop = GlobalConfig.ShopLoginList.Find(x => x.ShopId == DgvSaleOrderList.Rows[mouseEvent.RowIndex].Cells["shopId"].Value.ToString());
|
||||
if (shop != null)
|
||||
{
|
||||
DouyinApi dyapi = new DouyinApi(shop);
|
||||
@@ -897,7 +898,7 @@ namespace _29WxOrder.OrderForms
|
||||
}
|
||||
var shopid = DgvSaleOrderList.Rows[mouseEvent.RowIndex].Cells["shopId"].Value.ToString();
|
||||
string aftersale_id = DgvSaleOrderList.Rows[mouseEvent.RowIndex].Cells["col_aftersale_id"].Value.ToString();
|
||||
DouShopLoginInfo shop = CollectionClass.DouShopLoginList.Find(x => x.ShopId == shopid);
|
||||
ShopLoginInfo shop = GlobalConfig.ShopLoginList.Find(x => x.ShopId == shopid);
|
||||
ShopBrower shopBrower = new ShopBrower();
|
||||
shopBrower.TitleText = "店铺后台-售后";
|
||||
shopBrower.shop = shop;
|
||||
|
||||
@@ -1,4 +1,5 @@
|
||||
using AllBase;
|
||||
using AllBase.Helper;
|
||||
using AllBase.Model.Result;
|
||||
using DevComponents.DotNetBar;
|
||||
using Newtonsoft.Json.Linq;
|
||||
@@ -81,7 +82,7 @@ namespace _29WxOrder.OrderForms
|
||||
{
|
||||
if (lstProvince.Count == 0)
|
||||
{
|
||||
DouShopLoginInfo shop = CollectionClass.DouShopLoginList.Find(x => x.ShopId == _shopId);
|
||||
ShopLoginInfo shop = GlobalConfig.ShopLoginList.Find(x => x.ShopId == _shopId);
|
||||
DouyinApi api = new DouyinApi(shop);
|
||||
var address = api.GetAddressProvince();
|
||||
//{"code":10000,"data":[{"province":"安徽省","province_id":34},{"province":"澳门特别行政区","province_id":82},{"province":"北京市","province_id":11},{"province":"重庆市","province_id":50},{"province":"福建省","province_id":35},{"province":"广东省","province_id":44},{"province":"甘肃省","province_id":62},{"province":"广西壮族自治区","province_id":45},{"province":"贵州省","province_id":52},{"province":"河北省","province_id":13},{"province":"湖北省","province_id":42},{"province":"黑龙江省","province_id":23},{"province":"河南省","province_id":41},{"province":"湖南省","province_id":43},{"province":"海南省","province_id":46},{"province":"吉林省","province_id":22},{"province":"江苏省","province_id":32},{"province":"江西省","province_id":36},{"province":"辽宁省","province_id":21},{"province":"内蒙古自治区","province_id":15},{"province":"宁夏回族自治区","province_id":64},{"province":"青海省","province_id":63},{"province":"四川省","province_id":51},{"province":"山东省","province_id":37},{"province":"上海市","province_id":31},{"province":"山西省","province_id":14},{"province":"陕西省","province_id":61},{"province":"天津市","province_id":12},{"province":"台湾省","province_id":71},{"province":"香港特别行政区","province_id":81},{"province":"新疆维吾尔自治区","province_id":65},{"province":"西藏自治区","province_id":54},{"province":"云南省","province_id":53},{"province":"浙江省","province_id":33}],"err_no":0,"log_id":"20220715142943010208016085061166AE","message":"success","msg":"success","sub_code":"","sub_msg":""}
|
||||
@@ -264,7 +265,7 @@ namespace _29WxOrder.OrderForms
|
||||
var prov = lstArea.FirstOrDefault(a => a.code.ToString() == item.Name);
|
||||
if (prov == null)
|
||||
{
|
||||
DouShopLoginInfo shop = CollectionClass.DouShopLoginList.Find(x => x.ShopId == _shopId);
|
||||
ShopLoginInfo shop = GlobalConfig.ShopLoginList.Find(x => x.ShopId == _shopId);
|
||||
DouyinApi api = new DouyinApi(shop);
|
||||
var area = api.GetAreasByProvince(item.Name.ToString());
|
||||
if (area.Contains("\"message\":\"success\"") || area.Contains("\"code\":10000"))
|
||||
@@ -345,7 +346,7 @@ namespace _29WxOrder.OrderForms
|
||||
|
||||
private void btnAcceptReturnRefund_Click(object sender, EventArgs e)
|
||||
{
|
||||
DouShopLoginInfo shop = CollectionClass.DouShopLoginList.Find(x => x.ShopId == _shopId);
|
||||
ShopLoginInfo shop = GlobalConfig.ShopLoginList.Find(x => x.ShopId == _shopId);
|
||||
|
||||
var type = "101";
|
||||
|
||||
|
||||
@@ -43,7 +43,7 @@ namespace _29WxOrder.OrderForms
|
||||
public delegate void delegateClick(object sender, EventArgs e);
|
||||
public string order_id;
|
||||
public DouYinOrderModel orderDetail;
|
||||
public AllBase.Model.Result.DouShopLoginInfo shop;
|
||||
public AllBase.Model.Result.ShopLoginInfo shop;
|
||||
public string webUrl = "https://yangkeduo.com/goods.html?goods_id=";
|
||||
public static string PddUid = "";
|
||||
public string detailHtml = "";//商品详情
|
||||
@@ -254,7 +254,7 @@ namespace _29WxOrder.OrderForms
|
||||
|
||||
|
||||
#region 更新订单
|
||||
shop = CollectionClass.DouShopLoginList.Find(x => x.ShopId == orderDetail.shop_id.ToString());
|
||||
shop = GlobalConfig.ShopLoginList.Find(x => x.ShopId == orderDetail.shop_id.ToString());
|
||||
this.buyOrderListForm.UpdateOrderStatusAndEncrypt(orderDetail);
|
||||
#endregion
|
||||
|
||||
|
||||
@@ -1,5 +1,6 @@
|
||||
using AllBase;
|
||||
using AllBase.DouYinModel.Result;
|
||||
using AllBase.Helper;
|
||||
using AllBase.Model.Result;
|
||||
using NaiBa.Util.Extension;
|
||||
using Newtonsoft.Json;
|
||||
@@ -77,7 +78,7 @@ namespace _29WxOrder.OrderForms
|
||||
for (int i = 0; i < CollectionClass.orderDataList.Count; i++)
|
||||
{
|
||||
DouYinOrderModel dymodel = CollectionClass.orderDataList[i];
|
||||
DouShopLoginInfo shop = CollectionClass.DouShopLoginList.Find(x => x.ShopId == dymodel.shop_id.ToString());
|
||||
ShopLoginInfo shop = GlobalConfig.ShopLoginList.Find(x => x.ShopId == dymodel.shop_id.ToString());
|
||||
if (BaseClass.isUseSimGetRealAddress && (dymodel.name.Contains("解密失败") || dymodel.mobile.Contains("#1##") || dymodel.mobile == "******"))
|
||||
{
|
||||
isdecryption = false;
|
||||
@@ -1002,7 +1003,7 @@ namespace _29WxOrder.OrderForms
|
||||
/// </summary>
|
||||
public void UpdateOrderStatusAndEncrypt(DouYinOrderModel douYinOrderModel, UpdateOrderType updateOrderType = UpdateOrderType.UpdateAll)
|
||||
{
|
||||
DouShopLoginInfo shop = CollectionClass.DouShopLoginList.Find(x => x.ShopId == douYinOrderModel.shop_id.ToString());
|
||||
ShopLoginInfo shop = GlobalConfig.ShopLoginList.Find(x => x.ShopId == douYinOrderModel.shop_id.ToString());
|
||||
if (douYinOrderModel != null)
|
||||
{
|
||||
if (shop != null)
|
||||
@@ -1341,7 +1342,7 @@ namespace _29WxOrder.OrderForms
|
||||
string districtId = "";
|
||||
BuyOrderForms.MatchAddress(ref address, ref province, ref provinceId, ref city, ref cityId, ref district, ref districtId);
|
||||
|
||||
var shop = CollectionClass.DouShopLoginList.Find(x => x.ShopId == shopid);
|
||||
var shop = GlobalConfig.ShopLoginList.Find(x => x.ShopId == shopid);
|
||||
string data = @"{""order_id"":""" + orderid +
|
||||
@""",""shop_name"":""" + GetHtml.UrlEncodeUtf8(shop.ShopName) +
|
||||
@""",""up_goods_id"":""" + upproductid.Replace("pdd-", "").Replace("pd-", "") +
|
||||
@@ -1403,7 +1404,7 @@ namespace _29WxOrder.OrderForms
|
||||
}
|
||||
else if (name == "订单号")
|
||||
{
|
||||
DouShopLoginInfo shop = CollectionClass.DouShopLoginList.Find(x => x.ShopId == shopid);
|
||||
ShopLoginInfo shop = GlobalConfig.ShopLoginList.Find(x => x.ShopId == shopid);
|
||||
if (shop != null)
|
||||
{
|
||||
ShopForms.ShopBrower shopBrower = new ShopForms.ShopBrower();
|
||||
@@ -1418,7 +1419,7 @@ namespace _29WxOrder.OrderForms
|
||||
string GetOrderStatusl(string orderid)
|
||||
{
|
||||
DouYinOrderModel douYinOrderModel = CollectionClass.orderDataList.Find(x => x.order_id == orderid);
|
||||
DouShopLoginInfo shop = CollectionClass.DouShopLoginList.Find(x => x.ShopId == douYinOrderModel.shop_id.ToString());
|
||||
ShopLoginInfo shop = GlobalConfig.ShopLoginList.Find(x => x.ShopId == douYinOrderModel.shop_id.ToString());
|
||||
if (douYinOrderModel != null)
|
||||
{
|
||||
if (shop != null)
|
||||
|
||||
@@ -1,5 +1,6 @@
|
||||
using AllBase;
|
||||
using AllBase.DouYinModel.Result;
|
||||
using AllBase.Helper;
|
||||
using AllBase.Model.Result;
|
||||
using Newtonsoft.Json.Linq;
|
||||
using System;
|
||||
@@ -190,7 +191,7 @@ namespace _29WxOrder.OrderForms
|
||||
sb.Append("&remark=" + tbremark.Text);
|
||||
sb.Append("&is_update_order=0"); // 1修改状态0不修改状态
|
||||
|
||||
DouShopLoginInfo shop = Work.CollectionClass.DouShopLoginList.Find(x => x.ShopId == orderDetail.shop_id.ToString());
|
||||
ShopLoginInfo shop = GlobalConfig.ShopLoginList.Find(x => x.ShopId == orderDetail.shop_id.ToString());
|
||||
if (shop != null)
|
||||
{
|
||||
orderDetail.remark = tbremark.Text.ToString();
|
||||
|
||||
@@ -1,5 +1,6 @@
|
||||
using AllBase;
|
||||
using AllBase.DouYinModel.Result;
|
||||
using AllBase.Helper;
|
||||
using AllBase.Model.Result;
|
||||
using Newtonsoft.Json;
|
||||
using Newtonsoft.Json.Linq;
|
||||
@@ -44,7 +45,7 @@ namespace _29WxOrder.OrderForms
|
||||
return;
|
||||
}
|
||||
|
||||
DouShopLoginInfo shop = Work.CollectionClass.DouShopLoginList.Find(x => x.ShopId == douYinOrderModel.shop_id.ToString());
|
||||
ShopLoginInfo shop = GlobalConfig.ShopLoginList.Find(x => x.ShopId == douYinOrderModel.shop_id.ToString());
|
||||
if (shop != null)
|
||||
{
|
||||
douYinOrderModel.remark = tbremark.Text.ToString();
|
||||
|
||||
@@ -1,7 +1,8 @@
|
||||
using AllBase;
|
||||
using _29WxOrder.BuyForms;
|
||||
using AllBase;
|
||||
using AllBase.DouYinModel.Result;
|
||||
using AllBase.Helper;
|
||||
using AllBase.Model.Result;
|
||||
using _29WxOrder.BuyForms;
|
||||
using NaiBa.Util.Extension;
|
||||
using Newtonsoft.Json;
|
||||
using Newtonsoft.Json.Linq;
|
||||
@@ -464,7 +465,7 @@ namespace _29WxOrder.OrderForms
|
||||
|
||||
#region 更新订单
|
||||
DouYinOrderModel douYinOrderModel = CollectionClass.orderSenderDataList.Find(x => x.order_id == orderid);
|
||||
DouShopLoginInfo shop = CollectionClass.DouShopLoginList.Find(x => x.ShopId == douYinOrderModel.shop_id.ToString());
|
||||
ShopLoginInfo shop = GlobalConfig.ShopLoginList.Find(x => x.ShopId == douYinOrderModel.shop_id.ToString());
|
||||
if (douYinOrderModel != null)
|
||||
{
|
||||
if (shop != null)
|
||||
@@ -808,7 +809,7 @@ namespace _29WxOrder.OrderForms
|
||||
{
|
||||
string orderid = DgvSendOrderList.Rows[e.RowIndex].Cells["col_order_id"].Value.ToString();
|
||||
string shopid = DgvSendOrderList.Rows[e.RowIndex].Cells["col_shop_id"].Value.ToString();
|
||||
DouShopLoginInfo shop = CollectionClass.DouShopLoginList.Find(x => x.ShopId == shopid);
|
||||
ShopLoginInfo shop = GlobalConfig.ShopLoginList.Find(x => x.ShopId == shopid);
|
||||
if (shop != null)
|
||||
{
|
||||
ShopForms.ShopBrower shopBrower = new ShopForms.ShopBrower();
|
||||
|
||||
@@ -67,7 +67,7 @@ namespace _29WxOrder.OrderForms
|
||||
}
|
||||
|
||||
List<DouYinOrderModel> orderList = new List<DouYinOrderModel>();
|
||||
List<DouShopLoginInfo> shopList = new List<DouShopLoginInfo>();
|
||||
List<ShopLoginInfo> shopList = new List<ShopLoginInfo>();
|
||||
|
||||
string urlx = BaseClass.LoginApiUrl + "?obj=douyin/order&act=get";
|
||||
string datax = "&order_status_buy=0,4&page=" + page + "&pageSize=100";
|
||||
@@ -92,7 +92,7 @@ namespace _29WxOrder.OrderForms
|
||||
CollectionClass.successOrderDataList.Add(douYinOrderModel);
|
||||
orderList.Add(douYinOrderModel);
|
||||
|
||||
DouShopLoginInfo shop = CollectionClass.DouShopLoginList.Find(x => x.ShopId == douYinOrderModel.shop_id.ToString());
|
||||
ShopLoginInfo shop = GlobalConfig.ShopLoginList.Find(x => x.ShopId == douYinOrderModel.shop_id.ToString());
|
||||
if (shop != null && douYinOrderModel.order_status != 4) // 订单状态不为4的放入列表,后面按时间段查询更新订单。
|
||||
{
|
||||
if (!shopList.Contains(shop))
|
||||
@@ -283,7 +283,7 @@ namespace _29WxOrder.OrderForms
|
||||
{
|
||||
try
|
||||
{
|
||||
foreach (DouShopLoginInfo shop in CollectionClass.DouShopLoginList)
|
||||
foreach (ShopLoginInfo shop in GlobalConfig.ShopLoginList)
|
||||
{
|
||||
if (!shopIds.Contains(shop.ShopId) || shop.ApiAuthStatus != "授权成功")
|
||||
continue;
|
||||
@@ -653,7 +653,7 @@ namespace _29WxOrder.OrderForms
|
||||
}
|
||||
else if (name == "订单号")
|
||||
{
|
||||
DouShopLoginInfo shop = CollectionClass.DouShopLoginList.Find(x => x.ShopId == shopid);
|
||||
ShopLoginInfo shop = GlobalConfig.ShopLoginList.Find(x => x.ShopId == shopid);
|
||||
if (shop != null)
|
||||
{
|
||||
ShopForms.ShopBrower shopBrower = new ShopForms.ShopBrower();
|
||||
|
||||
Reference in new issue
Block a user