代理+1 代理提现利润统计 二维码拿掉。 代理积分消耗情况统计

AllBase/AllBase.csproj

@@ -191,6 +191,7 @@
     <Compile Include="Model\DBModel\oms_wei_external_procurement_log.cs" />
     <Compile Include="Model\DBModel\oms_wei_order.cs" />
     <Compile Include="Model\DBModel\user_payment_record.cs" />
+    <Compile Include="Model\DBModel\user_points_record_info.cs" />
     <Compile Include="Model\Param\CollectManage\FissionSettingParam.cs" />
     <Compile Include="Model\Param\OrderManage\FreightTemplateParam.cs" />
     <Compile Include="Model\Param\DyProductManage\DyCategoryParam.cs" />

AllBase/BaseClass.cs

@@ -31,7 +31,7 @@ namespace AllBase
         /// <summary>
         /// 版本ID
         /// </summary>
-        public static int VersionCount = 1229;
+        public static int VersionCount = 1250;
         public static string MainPath = "29wx";
         //public static string MainPath = "29wx";
         //public static string MainPath = "29pdd";

AllBase/BaseRegex.cs

@@ -700,6 +700,33 @@ namespace AllBase
             return defaultValue;
         }
 
+        /// <summary>
+        /// 获取值
+        /// </summary>
+        /// <param name="html"></param>
+        /// <param name="reg"></param>
+        /// <returns></returns>
+        public static string GetStringXml(ref string html, string reg)
+        {
+            string temp = GetMatchRegexString(html, @"<" + reg + ">([^']+?)</" + reg + ">");
+            return temp;
+        }
+
+
+        /// <summary>
+        /// 获取值
+        /// </summary>
+        /// <param name="html"></param>
+        /// <param name="reg"></param>
+        /// <returns></returns>
+        public static string GetStringXml(ref string html, string reg, string defaultValue)
+        {
+            string temp = GetMatchRegexString(html, @"<" + reg + ">([^']+?)</" + reg + ">");
+            if (string.IsNullOrEmpty(temp))
+                return defaultValue;
+            return temp;
+        }
+
         public static string GetOneJsonObjStrJson(ref string html, string reg)
         {
             return GetJsonObjStrJson(ref html, reg).FirstOrDefault();

AllBase/Model/DBModel/user_payment_record.cs

@@ -10,7 +10,7 @@ namespace AllBase.Model.DBModel
     {
         public long id { get; set; }
         /// <summary>
-        /// 变动类型，1：充值，2：采购花费，3：产品退款到账，4：运费退款到账，5：采购收款，6：产品退款扣除，7：运费退款扣除, 16:礼物单话费
+        /// 变动类型，1：充值，2：采购花费，3：产品退款到账，4：运费退款到账，5：采购收款，6：产品退款扣除，7：运费退款扣除，16:礼物单话费，20:中转运费，23:作废运费返还
         /// </summary>
         public int? type { get; set; }
         /// <summary>
@@ -66,4 +66,20 @@ namespace AllBase.Model.DBModel
         /// </summary>
         public string counterparty_account_name { get; set; }
     }
+
+    public enum EnumOrderPaymentType
+    {
+        充值 = 1,
+        //采购花费 = 2,
+        //产品退款到账 = 3,
+        //运费退款到账 = 4,
+        //采购收款 = 5,
+        //产品退款扣除 = 6,
+        //运费退款扣除 = 7,
+        //礼物单支出 = 16,
+        中转仓扣费支出 = 20,
+        中转仓作废返还收入 = 23,
+        中转仓超重支出 = 24,
+        支付宝在线充值 = 30,
+    }
 }

AllBase/Model/DBModel/user_points_record_info.cs

@@ -0,0 +1,24 @@
+using System;
+using System.Collections.Generic;
+using System.Linq;
+using System.Text;
+using System.Threading.Tasks;
+
+namespace AllBase.Model.DBModel
+{
+    public class user_points_record_info
+    {
+        public int id { get; set; }
+        public string user_name { get; set; }
+        public string user_nick { get; set; }
+        public int delta_points { get; set; }
+        public int? new_points { get; set; }
+        public string option_type { get; set; }
+        public string operator_type { get; set; }
+        public string operator_name { get; set; }
+        public string shop_id { get; set; }
+        public string shop_account { get; set; }
+        public string remark { get; set; }
+        public DateTime add_time { get; set; }
+    }
+}