代理版本调试
This commit is contained in:
1 parent
dcdfa30419
commit
1669305479
34 files changed
+4872
-184
No files matched your search
@@ -94,7 +94,7 @@
|
||||
<CodeAnalysisIgnoreBuiltInRules>false</CodeAnalysisIgnoreBuiltInRules>
|
||||
</PropertyGroup>
|
||||
<PropertyGroup Condition="'$(Configuration)|$(Platform)' == 'Release|x64'">
|
||||
<OutputPath>bin\x64\Release\</OutputPath>
|
||||
<OutputPath>..\bin\</OutputPath>
|
||||
<AllowUnsafeBlocks>true</AllowUnsafeBlocks>
|
||||
<Optimize>true</Optimize>
|
||||
<DebugType>pdbonly</DebugType>
|
||||
@@ -166,6 +166,7 @@
|
||||
<Compile Include="DouYinModel\Param\ShopManage\DouShopSettingParam.cs" />
|
||||
<Compile Include="DouYinModel\Result\DouGoodsInfo.cs" />
|
||||
<Compile Include="DouYinModel\Result\DouOrderListInfo.cs" />
|
||||
<Compile Include="Model\Local\ErpMerchantInfo.cs" />
|
||||
<Compile Include="Model\Local\oms_wei_external_procurement_log.cs" />
|
||||
<Compile Include="Model\Local\TransitWarehouseParam.cs" />
|
||||
<Compile Include="Model\Local\WaybillHelper.cs" />
|
||||
|
||||
@@ -22,7 +22,7 @@ namespace AllBase
|
||||
/// 版本ID
|
||||
/// </summary>
|
||||
|
||||
public static int VersionCount = 126;
|
||||
public static int VersionCount = 130;
|
||||
|
||||
public static string ServerUrl { get; set; } = "http://1.13.195.131:9000";
|
||||
public static string DebugUrl { get; set; } = "http://localhost:9000";
|
||||
|
||||
@@ -4,6 +4,7 @@ using System.Drawing.Drawing2D;
|
||||
using System.Drawing.Imaging;
|
||||
using System.IO;
|
||||
using System.Runtime.InteropServices;
|
||||
using System.Windows.Media.Imaging;
|
||||
|
||||
namespace AllBase
|
||||
{
|
||||
@@ -325,5 +326,13 @@ namespace AllBase
|
||||
DeleteObject(h);
|
||||
return icon;
|
||||
}
|
||||
|
||||
public static Icon ConvertToIcon(Bitmap bmp)
|
||||
{
|
||||
IntPtr h = bmp.GetHicon();
|
||||
Icon icon = Icon.FromHandle(h);
|
||||
DeleteObject(h);
|
||||
return icon;
|
||||
}
|
||||
}
|
||||
}
|
||||
@@ -0,0 +1,68 @@
|
||||
using System;
|
||||
using System.Collections.Generic;
|
||||
using System.Linq;
|
||||
using System.Text;
|
||||
using System.Threading.Tasks;
|
||||
|
||||
namespace AllBase.Model.Local
|
||||
{
|
||||
/// <summary>
|
||||
/// erp 账户信息
|
||||
/// </summary>
|
||||
public class ErpMerchantInfo
|
||||
{
|
||||
public long id { get; set; }
|
||||
/// <summary>
|
||||
/// 唯一用户标识
|
||||
/// </summary>
|
||||
public long user_id { get; set; }
|
||||
/// <summary>
|
||||
/// 账户类型,1:分销商账户,2:供应商账户
|
||||
/// </summary>
|
||||
public int? account_type { get; set; }
|
||||
/// <summary>
|
||||
/// 账户名称
|
||||
/// </summary>
|
||||
public string account_name { get; set; }
|
||||
/// <summary>
|
||||
/// 账户状态(1-正常 2-冻结 3-注销)
|
||||
/// </summary>
|
||||
public int account_status { get; set; }
|
||||
/// <summary>
|
||||
/// 账户累计充值金额
|
||||
/// </summary>
|
||||
public decimal recharge_amount_total { get; set; }
|
||||
/// <summary>
|
||||
/// 可用余额
|
||||
/// </summary>
|
||||
public decimal balance { get; set; }
|
||||
/// <summary>
|
||||
/// 冻结金额
|
||||
/// </summary>
|
||||
public decimal frozen_amount { get; set; }
|
||||
/// <summary>
|
||||
/// 提现账户收款图片
|
||||
/// </summary>
|
||||
public string withdraw_account_image_url { get; set; }
|
||||
/// <summary>
|
||||
/// 已提现金额
|
||||
/// </summary>
|
||||
public decimal? withdrawn_amount { get; set; }
|
||||
/// <summary>
|
||||
/// 创建时间
|
||||
/// </summary>
|
||||
public DateTime create_time { get; set; }
|
||||
/// <summary>
|
||||
/// 更新时间
|
||||
/// </summary>
|
||||
public DateTime update_time { get; set; }
|
||||
/// <summary>
|
||||
/// 创建人
|
||||
/// </summary>
|
||||
public long? create_by { get; set; }
|
||||
/// <summary>
|
||||
/// 修改人
|
||||
/// </summary>
|
||||
public long? update_by { get; set; }
|
||||
}
|
||||
}
|
||||
@@ -44,6 +44,8 @@ namespace AllBase.Model.Local
|
||||
public string ShopAccount { get; set; }
|
||||
public string Mobile { get; set; }
|
||||
public string ErpShopId { get; set; }
|
||||
public string ErpCorporateAccountUserId { get; set; }
|
||||
public string ErpManageUserId { get; set; }
|
||||
public string SubUserName { get; set; }
|
||||
public string ShopToken { get; set; }
|
||||
public string Signature { get; set; }
|
||||
|
||||
@@ -325,6 +325,10 @@ namespace AllBase.Model.Local
|
||||
}
|
||||
return profitCount;
|
||||
}
|
||||
set
|
||||
{
|
||||
profitCount = decimal.MinValue;
|
||||
}
|
||||
}
|
||||
/// <summary>
|
||||
/// 通过计算的利润文本
|
||||
|
||||
Reference in new issue
Block a user