用户列表页面完成 订单列表页面开始 10%

AllBase/29WxOrderAllBase.csproj

@@ -58,7 +58,7 @@
     <DefineConstants>DEBUG;TRACE</DefineConstants>
     <AllowUnsafeBlocks>true</AllowUnsafeBlocks>
     <DebugType>full</DebugType>
-    <PlatformTarget>x86</PlatformTarget>
+    <PlatformTarget>AnyCPU</PlatformTarget>
     <UseVSHostingProcess>false</UseVSHostingProcess>
     <ErrorReport>prompt</ErrorReport>
     <CodeAnalysisRuleSet>MinimumRecommendedRules.ruleset</CodeAnalysisRuleSet>
@@ -138,6 +138,7 @@
     <Compile Include="JsonHelper.cs" />
     <Compile Include="LogSave.cs" />
     <Compile Include="Md5Base.cs" />
+    <Compile Include="Model\MvvmBaseClasses\PropertyNotifyObject.cs" />
     <Compile Include="Model\oms_wei_order_info.cs" />
     <Compile Include="Model\o_shop_info.cs" />
     <Compile Include="Model\PddMultiBuyerInfo.cs" />

AllBase/BaseClass.cs

@@ -23,7 +23,8 @@ namespace AllBase
 
         public static int VersionCount = 100;
 
-        public static string ServerUrl = "http://1.13.195.131:9000";
+        public static string ServerUrl { get; set; } = "http://1.13.195.131:9000";
+        public static string DebugUrl { get; set; } = "http://localhost:9000";
 
 
         /// <summary>
@@ -42,11 +43,9 @@ namespace AllBase
         /// </summary>
         public static string routeInUse = "buy_order_api";
 
-        public static string MyApiUrl = "https://new.qixiaoke.com";
 
-
-        public static string ApiUrl = "http://xiaohuomao.nai8.net";//"http://xiaohuomao.nai8.net";//"http://192.168.8.191"; //" "http://192.168.8.191" http://ddapi.nai8.net:29999";
-        public static bool  UserApi = true;
+        public static string ApiUrl { get; set; } = "http://xiaohuomao.nai8.net"; //"http://xiaohuomao.nai8.net";//"http://192.168.8.191"; //" "http://192.168.8.191" http://ddapi.nai8.net:29999";
+        public static bool UserApi { get; set; } = true;
         public static string PddUid = "";
         public static string TaoBaoUid = "";
         public static string ALUid = "";

AllBase/BaseRegex.cs

@@ -443,6 +443,7 @@ namespace AllBase
                 return true;
             return false;
         }
+
         /// <summary>
         /// 获取值
         /// </summary>
@@ -563,6 +564,22 @@ namespace AllBase
                 return i;
             return 0;
         }
+
+        /// <summary>
+        /// 获取值
+        /// </summary>
+        /// <param name="html"></param>
+        /// <param name="reg"></param>
+        /// <returns></returns>
+        public static bool GetBoolJson(ref string html, string reg)
+        {
+            var temp = GetMatchRegexString(html, @"['""]" + reg + @"['""][\s]*:[\s]*(true|false)");
+            bool res;
+            if (bool.TryParse(temp, out res))
+                return res;
+            return false;
+        }
+
         /// <summary>
         /// 时间戳转字符串时间
         /// </summary>

AllBase/DouYinModel/Result/ShopLoginInfo.cs

@@ -1,19 +1,40 @@
-using System;
+using AllBase.Model.MvvmBaseClasses;
+using System;
 using System.Collections.Generic;
+using System.ComponentModel;
 using System.Linq;
 using System.Text;
 using System.Threading.Tasks;
 
 namespace AllBase.Model.Result
 {
-    public class ShopLoginInfo
+    public class ShopLoginInfo : PropertyNotifyObject
     {
+        /// <summary>
+        /// 是否被选中
+        /// </summary>
+        public bool IsSelect
+        {
+            get { return this.GetValue(x => x.IsSelect); }
+            set { this.SetValue(x => x.IsSelect, value); }
+        }
+        /// <summary>
+        /// 是否被过滤掉
+        /// </summary>
+        public bool IsFilter
+        {
+            get { return this.GetValue(x => x.IsFilter); }
+            set { this.SetValue(x => x.IsFilter, value); }
+        }
         public string DbId { get; set; }
-        public string UserName { get; set; }
+        public string CompanyName { get; set; }
+        public string LoginName { get; set; }
         public string Password { get; set; }
         public string ShopId { get; set; }
-        public string ShopName { get; set; }
+        public string ShopAccount { get; set; }
         public string Mobile { get; set; }
+        public string ErpShopId { get; set; }
+        public string SubUserName { get; set; }
         public string ShopToken { get; set; }
         public string Signature { get; set; }
         public string TouTiaoId { get; set; }
@@ -28,7 +49,8 @@ namespace AllBase.Model.Result
         /// 拍单（采购）用户账户
         /// </summary>
         public string BuyAccount { get; set; }
-        public string Group { get; set; }
+        public string GroupName { get; set; }
+        public string Notes { get; set; }
         public string LastRefreshDate { get; set; }
 
         public string AccessToken { get; set; }
@@ -37,5 +59,8 @@ namespace AllBase.Model.Result
         public DateTime AddTime { get; set; }
         public DateTime ExpiresTime { get; set; }
         public DateTime TokenExpiresTime { get; set; }
+
+        public bool is_point_shop_expire { get; set; }
+        public int expire_time { get; set; }
     }
 }

AllBase/Helper/GlobalConfig.cs

@@ -3,6 +3,7 @@ using AllBase.Model;
 using AllBase.Model.Result;
 using System;
 using System.Collections.Generic;
+using System.Collections.ObjectModel;
 using System.Linq;
 using System.Text;
 using System.Threading.Tasks;
@@ -14,7 +15,7 @@ namespace AllBase.Helper
         /// <summary>
         /// 店铺列表
         /// </summary>
-        public static List<ShopLoginInfo> ShopLoginList { get; set; } = new List<ShopLoginInfo>();
+        public static ObservableCollection<ShopLoginInfo> ShopLoginList { get; set; } = new ObservableCollection<ShopLoginInfo>();
 
         public static SystemSettings SystemSettings { get; set; }
 

AllBase/Model/MvvmBaseClasses/PropertyNotifyObject.cs

@@ -0,0 +1,117 @@
+using NPOI.Util;
+using System;
+using System.Collections.Generic;
+using System.ComponentModel;
+using System.Linq;
+using System.Linq.Expressions;
+using System.Text;
+using System.Threading.Tasks;
+
+namespace AllBase.Model.MvvmBaseClasses
+{
+    public class PropertyNotifyObject
+ : NotifyPropertyBase, IDisposable
+    {
+        public PropertyNotifyObject()
+        {
+        }
+
+        Dictionary<object, object> _ValueDictionary = new Dictionary<object, object>();
+
+        #region 根据属性名得到属性值
+        public T GetPropertyValue<T>(string propertyName)
+        {
+            if (string.IsNullOrEmpty(propertyName)) 
+                throw new ArgumentException("invalid property name: " + propertyName);
+            object _propertyValue;
+            if (!_ValueDictionary.TryGetValue(propertyName, out _propertyValue))
+            {
+                _propertyValue = default(T);
+                _ValueDictionary.Add(propertyName, _propertyValue);
+            }
+            return (T)_propertyValue;
+        }
+        #endregion
+
+        public void SetPropertyValue<T>(string propertyName, T value)
+        {
+            if (!_ValueDictionary.ContainsKey(propertyName) || _ValueDictionary[propertyName] != (object)value)
+            {
+                _ValueDictionary[propertyName] = value;
+                OnPropertyChanged(propertyName);
+            }
+        }
+
+        #region Dispose
+        public void Dispose()
+        {
+            DoDispose();
+        }
+        ~PropertyNotifyObject()
+        {
+            DoDispose();
+        }
+        void DoDispose()
+        {
+            if (_ValueDictionary != null)
+                _ValueDictionary.Clear();
+        }
+        #endregion
+    }
+
+    public static class PropertyNotifyObjectEx
+    {
+        public static U GetValue<T, U>(this T t, Expression<Func<T, U>> exp) where T : PropertyNotifyObject
+        {
+            string _pN = MyCommMetoh.GetPropertyName(exp);
+            return t.GetPropertyValue<U>(_pN);
+        }
+
+        public static void SetValue<T, U>(this T t, Expression<Func<T, U>> exp, U value) where T : PropertyNotifyObject
+        {
+            string _pN = MyCommMetoh.GetPropertyName(exp);
+            t.SetPropertyValue<U>(_pN, value);
+        }
+    }
+
+    public class NotifyPropertyBase : INotifyPropertyChanged
+    {
+        #region INotifyPropertyChanged
+        public void OnPropertyChanged(string propertyName)
+        {
+            if (PropertyChanged != null)
+            {
+                PropertyChanged(this, new PropertyChangedEventArgs(propertyName));
+            }
+        }
+        public event PropertyChangedEventHandler PropertyChanged;
+        #endregion
+    }
+
+    public static class NotifyPropertyBaseEx
+    {
+        public static void OnPropertyChanged<T,U>(this T npb, Expression<Func<T, U>> exp) where T : NotifyPropertyBase, new()
+        {
+            string _PropertyName = MyCommMetoh.GetPropertyName(exp);
+            npb.OnPropertyChanged(_PropertyName);
+        }
+    }
+
+    public class MyCommMetoh
+    {
+        //得到属性的名称
+        public static string GetPropertyName<T, U>(Expression<Func<T, U>> exp)
+        {
+            string _pName = "";
+            if (exp.Body is MemberExpression)
+            {
+                _pName = (exp.Body as MemberExpression).Member.Name;
+            }
+            else if (exp.Body is UnaryExpression)
+            {
+                _pName = ((exp.Body as UnaryExpression).Operand as MemberExpression).Member.Name;
+            }
+            return _pName;
+        }
+    }
+}

AllBase/Model/oms_wei_order_info.cs

@@ -11,7 +11,234 @@ namespace AllBase.Model
     {
         public bool is_select { get; set; }
         public long id { get; set; }
-        public string order_id { get; set; }
+        public long shop_id { get; set; }
         public string shop_name { get; set; }
+        /// <summary>
+        /// 商户ID
+        /// </summary>
+        public string merchant_id { get; set; }
+        public string order_id { get; set; }
+        /// <summary>
+        /// 买家身份标识
+        /// </summary>
+        public string openid { get; set; }
+        public int create_time { get; set; }
+        public int update_time { get; set; }
+        public string unionid { get; set; }
+        /// <summary>
+        /// 状态10	待付款；20	待发货；21	部分发货；30	待收货；100	完成；200	全部商品售后之后，订单取消；250	未付款用户主动取消或超时未付款订单自动取消；
+        /// </summary>
+        public int? status { get; set; }
+        /// <summary>
+        /// 售后信息json
+        /// </summary>
+        public string aftersale_detail { get; set; }
+        /// <summary>
+        /// 支付信息
+        /// </summary>
+        public string pay_info { get; set; }
+        /// <summary>
+        /// 额外信息
+        /// </summary>
+        public string ext_info { get; set; }
+        /// <summary>
+        /// 商品总价
+        /// </summary>
+        public int? product_price { get; set; }
+        /// <summary>
+        /// 订单金额，单位为分，order_price=original_order_price-discounted_price-deduction_price-change_down_price
+        /// </summary>
+        public int? order_price { get; set; }
+        /// <summary>
+        /// 采购价，单位为分
+        /// </summary>
+        public int? purchase_price { get; set; }
+        /// <summary>
+        /// 采购时间
+        /// </summary>
+        public int? purchase_time { get; set; }
+        /// <summary>
+        /// 运费，单位为分
+        /// </summary>
+        public int? freight { get; set; }
+        /// <summary>
+        /// 平台服务费（微信小店：预计技术服务费），单位为分
+        /// </summary>
+        public int? predict_commission_fee { get; set; }
+        /// <summary>
+        /// 达人佣金（微信小店：分账金额），单位为分
+        /// </summary>
+        public int? commission_amount { get; set; }
+        /// <summary>
+        /// 优惠券优惠金额，单位为分
+        /// </summary>
+        public int? discounted_price { get; set; }
+        /// <summary>
+        /// 采购状态，默认值为：0未采购，推送仓库时修改为1采购
+        /// </summary>
+        public int? purchase_status { get; set; }
+        /// <summary>
+        /// 延迟发货时间(微信小店：商品发货时效，超时此时间未发货即为发货超时)
+        /// </summary>
+        public int? delivery_deadline { get; set; }
+        /// <summary>
+        /// 发货时间
+        /// </summary>
+        public int? delivery_time { get; set; }
+        /// <summary>
+        /// 收货人姓名
+        /// </summary>
+        public string user_name { get; set; }
+        /// <summary>
+        /// 邮编
+        /// </summary>
+        public string postal_code { get; set; }
+        public string province_name { get; set; }
+        public string city_name { get; set; }
+        /// <summary>
+        /// 区
+        /// </summary>
+        public string county_name { get; set; }
+        /// <summary>
+        /// 详细地址 
+        /// </summary>
+        public string detail_info { get; set; }
+        public string tel_number { get; set; }
+        /// <summary>
+        /// 门牌号码
+        /// </summary>
+        public string house_number { get; set; }
+        /// <summary>
+        /// 虚拟发货订单联系方式(deliver_method=1时返回)
+        /// </summary>
+        public string virtual_order_tel_number { get; set; }
+        /// <summary>
+        /// 额外的联系方式信息（虚拟号码相关）
+        /// </summary>
+        public string tel_number_ext_info { get; set; }
+        /// <summary>
+        /// 0：不使用虚拟号码，1：使用虚拟号码
+        /// </summary>
+        public int? use_tel_number { get; set; }
+        /// <summary>
+        /// 标识当前店铺下一个唯一的用户收货地址
+        /// </summary>
+        public string hash_code { get; set; }
+        /// <summary>
+        /// 发货物流信息JSON
+        /// </summary>
+        public string delivery_product_info { get; set; }
+        /// <summary>
+        /// 发货完成时间，秒级时间戳
+        /// </summary>
+        public int? ship_done_time { get; set; }
+        /// <summary>
+        /// 电子面单代发时的订单密文
+        /// </summary>
+        public string ewaybill_order_code { get; set; }
+        /// <summary>
+        /// 结算信息json
+        /// </summary>
+        public string settle_info { get; set; }
+        /// <summary>
+        /// 订单审核状态（0待审核1已审核）
+        /// </summary>
+        public int? audit_status { get; set; }
+        /// <summary>
+        /// 订单审核时间
+        /// </summary>
+        public DateTime audit_time { get; set; }
+        /// <summary>
+        /// erp发货快递公司
+        /// </summary>
+        public string erp_send_company { get; set; }
+        /// <summary>
+        /// erp发货快递单号
+        /// </summary>
+        public string erp_send_code { get; set; }
+        /// <summary>
+        /// erp发货状态
+        /// </summary>
+        public int? erp_send_status { get; set; }
+        /// <summary>
+        /// erp发货时间
+        /// </summary>
+        public DateTime erp_send_time { get; set; }
+        /// <summary>
+        /// 旗帜颜色备注，1：灰旗，2：红旗，3：橙旗，4：绿旗，5：天蓝旗，6：紫旗
+        /// </summary>
+        public int? colour_flag { get; set; }
+        /// <summary>
+        /// 旗帜备注时间
+        /// </summary>
+        public DateTime colour_flag_update_time { get; set; }
+        /// <summary>
+        /// 供应商备注异常单
+        /// </summary>
+        public string supplier_remark_exception { get; set; }
+        /// <summary>
+        /// 礼物单状态，默认值0：不存在礼物单，1：礼物单已发货，2：礼物单信息已更正
+        /// </summary>
+        public int? gift_order_status { get; set; }
+        /// <summary>
+        /// 店铺备注：取微信ext_info.merchant_notes
+        /// </summary>
+        public string shop_remark { get; set; }
+        /// <summary>
+        /// 软件备注
+        /// </summary>
+        public string soft_remark { get; set; }
+        /// <summary>
+        /// 外采金额（单位：分，整数存储）
+        /// </summary>
+        public int? out_amount { get; set; }
+        /// <summary>
+        /// 外采账户
+        /// </summary>
+        public string out_account { get; set; }
+        /// <summary>
+        /// 外采订单号
+        /// </summary>
+        public string out_order_no { get; set; }
+        /// <summary>
+        /// 外采快递公司
+        /// </summary>
+        public string out_express_company { get; set; }
+        /// <summary>
+        /// 外采快递单号
+        /// </summary>
+        public string out_express_no { get; set; }
+        /// <summary>
+        /// 外采是否发货（0 未发货，1 已发货）
+        /// </summary>
+        public int? out_shipped { get; set; }
+        /// <summary>
+        /// 判断是否优化过发货0 未优化， 1已优化
+        /// </summary>
+        public int? is_shipment_optimized { get; set; }
+        /// <summary>
+        /// 判断是否优随机使用快递单号0 未使用， 1已使用
+        /// </summary>
+        public int? is_express_no_used { get; set; }
+        /// <summary>
+        /// 外采订单售后状态
+        /// </summary>
+        public string out_after_sale_status { get; set; }
+        /// <summary>
+        /// 是否支持运费险：0-不支持，1-支持
+        /// </summary>
+        public int? has_freight_insurance { get; set; }
+        /// <summary>
+        /// 运费险金额（单位：元）
+        /// </summary>
+        public decimal? freight_insurance_amount { get; set; }
+        /// <summary>
+        /// 是否外采礼物单：0-否，1-是（外采订单）
+        /// </summary>
+        public int? external_gift { get; set; }
+        /// <summary>
+        /// 中转仓的状态 0未使用，1已创建，2创建失败(购买失败)，3已创建未有上游快递单号，4已创建有上游快递单号
+        /// </summary>
+        public decimal? transfer_warehouse_status { get; set; }
     }
 }