代理+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; }
+    }
+}

Bin.Pak/History/火麒麟微店通/io.pak

@@ -0,0 +1 @@
+2658f55HMThd0KE8FSJyrlRb898rzDa88rfp3Wu0lBx7Swh62S2o13qKTwl984JFT20lG5ikWH7WWUNHAO72agv4kg0l5w23rHJmnA0eZxZcHXuAzdW058M1wu4xtmcJC2xggztkm5F55R1HxKU4s4sGFJiNDf6cB2DcWroaGvG5Yk9t98hD53IXIR6V92PS5YxN98U4kk16Xj0Y5G0F2TZ091YO2OXLpJIZmp6lMP9MlMpCXARz6ivEWDBC45j5dGAC1XZB6HYCh6hZvOK9VLF27J0EW0w1Vvi9fUFTm8X91Y12um16j2wm76kfo0h4S4ls96o8AsuAed3NiqW4c5988lMz3A0YIwv2XAF0039P9304fFTZAbmh4DTdxoEkSfPtMT07b2vknGzN8EU2JXdVcBBXrvveQs5oGn0K687j5X8Ij4D5EDVzx748WR4Va2IsfEt5yIK9J22eDY58KmA3kIrqi4Yf5tElYOQ6eZSaJovQ55xjxroIt8wT7i2XbM8ZSsSKm5k3Z80fc7Hw8TFESb7tm30Py3X3mbL3eE0opMJ6MUoyiUj1zpI7VvK32yq6x997weK2lwU6A0PyOe39oWvYN0AKIqCqwNizY4S9QApiH4Yr13XsKjlutMNDajfRCg0JqqH283RtXCKX8ry6AUWpz6QmvA40uSDqcd1Ka71e6gvspe9DFh00T2fMwiqJu8MLjcQfC3FnVP6mRYKkdZI19VRWKZ67KW1n6aLV7o7Q5ro3NOkZsJhAIUvM6PjoHr6RwV0iv4JMbB4cjHyLfb1y2U6yooM0eG6TOuUF1B9X6340Iy4tVmVU25CfUf4BDV9BQDx3N8b4hnCAoQ4We0fj4xYR0ZxfyoV5jr69e3VVDyPrz2ADsZf2N7hjMEv13rKGxO1hvGY757bfnKGh6OCfd6jEtd409v4sns36EHzO3iUT60VxuMsB3f1688qmGK4tRHBdaQY9UQRzUvEEkuDh8qC87rK1nmsJ6fSqPAQPZ7B2pijRtE7epsp6xzm2i9OfeS5Ti81ix78cZ7kn649abz6SoGD62Okjp1Zya1Um4Zl0gR3oj6j25bCW2LBgQOnfcCPY7kX1TZfzyqRxqx763wto5E3ZRe8IFbq8bd3o8Qt6Ji1EyXQCF8N1PBCCqI8h8Mz68zzoXLjiwz193hNp4bR4wUdHJ52kykpgsA6LBssrli4cz3MXproyF0EjOVFd14Z9QrGn8Lf12hdy39E6frcl12pb9Co7ZdAaNZQH93P2TDCn6Wh151W6NX6N628Bj8jUD1FnwML1C3IJu7aX5vemKSXGu07afCLuY8c7HQChRY8Og2q5hVcJfixR6yffFncHNOx22V8prYEhKQc0J4ET08JiQV1FVSfhhFwOVs98HwJKFWxU0L6HyJTxYD8s15U2xAnaNRe4a3DGm2LeIgX4zkbqzdFe5ySzj89q6Bn597CIPzK53vfJ2wpTC6NR1U1sZF3Kzb12LhZX0q8LDBM0F5jBy5dKZS782CHPA2X4sBKlUo5QO7n4ajkg27ZLzBALR7wqe96gW437x0oNxxT4RYRKfB9hRVY0cRTwJTMfYjQWxSjLWQ5t4c27Gf5158w55CtY01GUjyBTMy1D36a329WJDPYJzA9Exmc6E85RqDvW9F7MV6O1X5yx4WlRvN0Kv5Gt8Es0MQA05qa53I3R1xJK1qH18Gujrsk6DO6c7q2qIth6l4fI3119OATWs1F3R82q3B6P33D3YFwyB60ZRGs1XqLDbIj4eTCcd651Yv9x1p1S3pO6BB2n23gwkMKmmJWJ55ZWoZ6345L187psy8L48VGle6umpW5gmU4D1G02yZa1gkzsJ9x74H5tz33IDDyWDuCu89axcFN3D7DA6L90bbdeKEj9Fe7Afk3ms0FL9OxOH3KaHGlTrJc124J665yl01Tg7Mq3I7Y0Aq7aptQsACWxo8mxUxZeNdh5Ogpm1o7rZlAzz1lP2Ff23foY1xMS12akt4hix7oW8HSZf08mj729o2dle2g8cpV2Kkyx5H8H0kM186yFlQ8dNed915h453inONLVOVU6Guwa0fhqoZfiEezEFjM7IxII607er1PlG3M5MWG9nPhX60xMEG04ZHmnxSCeMs6InTYA3h4o1edvGRRXl3F91gcQvP1O1bqfPWvMlpD2g6z159RgG12zfNak0Uh4VZDPAKcHSfNJJ38KJmEi2QSU04mu127X950sK5873319b0f4FNQeyKyJsaXYPM8hyS9tBw5F2FEA29XPdlXR98GVON1EZ1f9JA64rWU1YLVWo7oD58xH9jFu6D0a7VpsX32hnzMD70nlXmDpEKd82B3k6Bg0Z9d987bAqXa828234ERwhn5zoDF3eidd96U0Cy7P0zUB6a9uMYU9AZbf4tf0UYhHYW4rqg1L1eqrH6TKSdK3BVS6KOE48oFcW629CNuaSy5ne5m9nIF7hunwwi89ZzLjx547ZuhR2xJ8q6pS1yTSc2I7BJrg3qlYKb4oMbetgBHXSml8qN36XH91339rsA6L5QaIFqp8zDT4fbi5QWwMcH8kWC4D1G7debV7cq6JdbXJAnRKBT4179zs795rYNBe0CsraL9p1jI5jQl18EzCCimrTPoCKJY2vM3dD9TRvWwxBzxM79m56Hzq1XiOwM237d53bQhLX5E0ZGq45At3qFK5MyDASZU7nNS6vKiY8Kunb4j7c18Il4Js7uDrRdyPlaBj3XCGETu7ueT5hqFVGoFKsB92EXdJKBiX2vYgC1Zd49yLg756StghyfH4G2eH13W1uxDxU140eSNBCfBLyU548S3jmU8c3j6ya2mrzVZ223W71A70wssQwf3utRoT5Um3r9xWIJpXXcuua97BJEnlhb3W9X6FEN5vRL4RQG76q4Z7PRbPQBwEYlFkwz5C3Ak088Pv1q7kpsbQv1q6W084CKwcEYu2J8xFq5TkC4Pws4gox6M8nnES82HWzA2EeuvqxviJU9usi8BPDeFmXEOCV48VS4C5Lx07VFI434N59EXnO7c1p8yeViFH6prYdBC7TJCYKFIzT8qIydwu965cP3A6lfeGNwWZtcP2yycD57W9szP7XaRyCAB9NtU7szU7Rc6URO8z99CnySJ5R9LwZU34cnStFQ9FDAP7mG3O2I4LIP27Kbd7VIAiDJorpXmm3L8Wj0efy5fZ3MT8TBUP0n7w28aAfYEJMgib3fTwSYj1G322rMQHbSh6hYaK73ausYYGRQ3q8ItI7UlGd9S3soQiE91IaN6G83HkoQ3DJPoNtAmM3mPLsr1Dh2Pv25eYkx9KsBWfK60njuTv7uaYuDRE9JW5xdoUscVDd6UTPMhZU6VFdzjVLWQXesMZHUk2s14GMB276kl21n3DMWS2A14xN7tpeDG071Q7pfuYW2R4KgSruJ6NGaKJpvlYRqZsi2b1ZIgeDZkrB0GWlcO0nW1lqDP8qCAdv9KN8lUsA8jd06hI5upG0HUfipI669DshrvBkF8P7P2c5mp0dXPLGV4936N86XBZSEaJaiacs8xf70k0qL2DB3QUnmbbz1KVn9r3m0Yqrztt3Wj7Dpyv8X3go7eYa2K9kLMLja3LxCguE4JuS9fTrAUi7MG923F0cFrPYf5qFJ7S7z0VIO5k0tjfkwXmCWmfBcpvhw6XCnEKo2iCfo1n3zd3PHESOK3wccRucBZD32kPf2GJng685B2dmF0n0Fzpl7V499c73MEFlkm1mYPmZlgIPBp7VX3t6uDM73scHoy1j3OIC4vrtGgpP9colWUE525e9K0rS0PeNvHt1ol0fY3iLS1VXNB3TgNJUwGFGyUn3egFIFJVMuPCU2BzT111WHZ5idp2aZjn9362JrBkq1m0RSq1ixPQi67D99FHQj7SvyG9cxtgSm6eMDk8e55M6IC2SP7IB997JE2U9q7Hiz719fKZsKfZ2GFKrxyrUOsnZ6Jtv9FiV1Z31D1OzcOpTCZ3DCB8szbS348BHoWQm35B8v2MSoszGFAJoC33hNIQx7aSY7SOJjLwuMhukbVA0Y3819WIz0lGquco92KvT9BV4QF5jMT13REUvRA172gpRhg4phjWAtNWgg8YZYbdZL372IacJ0L1tdJxoRG28iV6pk06Khrnqy6S9j4SsB5g7ahx4zCL7PNY0jVUG1yEbNnmGF5m48dTj9ppP8eWaKoW2Z660Bdxs9FVJ8pREIanyDdOahZJI5dZ2QZAU7L9ZC4fI1x73n2gQo5wLHy3dpb4Hvk1T9r6OmZ8rkqOK7pdeN26wSgOrOjwwt5fMGHVekEQ5R2S3Xe5p5uN26Kexz49D00QOzdNG4v93dR1lqKKUOwJFrTmmSldcQfNWYJc93gLRMi4GBE79L2rNpEQ2Bre4G2dmDZ2MG7qmGW0OxwY96JI5GmdNf8f4txhVqb9xSTJg1OUq83AX1mhmdB99m2fvlvu7qaiCcR4xDXKjS7zFNQOZWtrsJjv6gLJh4OcaAQox4MtI470abKkxOiTdqISHF26ED3A2SZz0iLJb184QJJz992vl4H4e93fMS253kZQyV82xXPHMtVyaI1meC9NS64BJGJhoyYdj7sZ9Jlja8dNC8dbkLBvQDHuwz6zxvoO5LWGt8H94N94R1vuV9PbHFrj45FMRlbetzzo4C0u88kGQ758iv7Q6tFFfv3jAppyHrT7HBxyeJm1Bwj31vxt2THuzT8S2c2R71TFd0gGo54ixrx5Re9oi51AX8h3tFpMdjiBU0iWNt8GCWVB5UXUWWF3r8c1OZ2g81h7ddjkQ0Wv95L2H3q3lRb59iSpW1jh9JkCr1YX3Ts6JUx6cM7zrU4nqM0qXqaQCY3KUq87nGY2FwBPF3VQg7045qCd10Y92oGrv3Fy0g66049GNDU758zagUQSlcmPkeV2S5nAL1m28Ezh4Dwjh7aE0QvyHnz9LlnEgGXQeR2u6eugxgNpL7K8YWnr3Cdn06SLMJdDWVcLine truncated

Bin.Pak/History/火麒麟微店通/na.pak

@@ -0,0 +1 @@
+火麒麟微店通MThd火麒麟微店通MThd0KE8FSJyrlRb898rzDa88rfp3Wu0lBx7Swh62S2o13qKTwl984JFT20lG5ikWH7WWUNHAO72agv4kg0l5w23rHJmnA0eZxZcHXuAzdW058M1wu4xtmcJC2xggztkm5F55R1HxKU4s4sGFJiNDf6cB2DcWroaGvG5Yk9t98hD53IXIR6V92PS5YxN98U4kk16Xj0Y5G0F2TZ091YO2OXLpJIZmp6lMP9MlMpCXARz6ivEWDBC45j5dGAC1XZB6HYCh6hZvOK9VLF27J0EW0w1Vvi9fUFTm8X91Y12um16j2wm76kfo0h4S4ls96o8AsuAed3NiqW4c5988lMz3A0YIwv2XAF0039P9304fFTZAbmh4DTdxoEkSfPtMT07b2vknGzN8EU2JXdVcBBXrvveQs5oGn0K687j5X8Ij4D5EDVzx748WR4Va2IsfEt5yIK9J22eDY58KmA3kIrqi4Yf5tElYOQ6eZSaJovQ55xjxroIt8wT7i2XbM8ZSsSKm5k3Z80fc7Hw8TFESb7tm30Py3X3mbL3eE0opMJ6MUoyiUj1zpI7VvK32yq6x997weK2lwU6A0PyOe39oWvYN0AKIqCqwNizY4S9QApiH4Yr13XsKjlutMNDajfRCg0JqqH283RtXCKX8ry6AUWpz6QmvA40uSDqcd1Ka71e6gvspe9DFh00T2fMwiqJu8MLjcQfC3FnVP6mRYKkdZI19VRWKZ67KW1n6aLV7o7Q5ro3NOkZsJhAIUvM6PjoHr6RwV0iv4JMbB4cjHyLfb1y2U6yooM0eG6TOuUF1B9X6340Iy4tVmVU25CfUf4BDV9BQDx3N8b4hnCAoQ4We0fj4xYR0ZxfyoV5jr69e3VVDyPrz2ADsZf2N7hjMEv13rKGxO1hvGY757bfnKGh6OCfd6jEtd409v4sns36EHzO3iUT60VxuMsB3f1688qmGK4tRHBdaQY9UQRzUvEEkuDh8qC87rK1nmsJ6fSqPAQPZ7B2pijRtE7epsp6xzm2i9OfeS5Ti81ix78cZ7kn649abz6SoGD62Okjp1Zya1Um4Zl0gR3oj6j25bCW2LBgQOnfcCPY7kX1TZfzyqRxqx763wto5E3ZRe8IFbq8bd3o8Qt6Ji1EyXQCF8N1PBCCqI8h8Mz68zzoXLjiwz193hNp4bR4wUdHJ52kykpgsA6LBssrli4cz3MXproyF0EjOVFd14Z9QrGn8Lf12hdy39E6frcl12pb9Co7ZdAaNZQH93P2TDCn6Wh151W6NX6N628Bj8jUD1FnwML1C3IJu7aX5vemKSXGu07afCLuY8c7HQChRY8Og2q5hVcJfixR6yffFncHNOx22V8prYEhKQc0J4ET08JiQV1FVSfhhFwOVs98HwJKFWxU0L6HyJTxYD8s15U2xAnaNRe4a3DGm2LeIgX4zkbqzdFe5ySzj89q6Bn597CIPzK53vfJ2wpTC6NR1U1sZF3Kzb12LhZX0q8LDBM0F5jBy5dKZS782CHPA2X4sBKlUo5QO7n4ajkg27ZLzBALR7wqe96gW437x0oNxxT4RYRKfB9hRVY0cRTwJTMfYjQWxSjLWQ5t4c27Gf5158w55CtY01GUjyBTMy1D36a329WJDPYJzA9Exmc6E85RqDvW9F7MV6O1X5yx4WlRvN0Kv5Gt8Es0MQA05qa53I3R1xJK1qH18Gujrsk6DO6c7q2qIth6l4fI3119OATWs1F3R82q3B6P33D3YFwyB60ZRGs1XqLDbIj4eTCcd651Yv9x1p1S3pO6BB2n23gwkMKmmJWJ55ZWoZ6345L187psy8L48VGle6umpW5gmU4D1G02yZa1gkzsJ9x74H5tz33IDDyWDuCu89axcFN3D7DA6L90bbdeKEj9Fe7Afk3ms0FL9OxOH3KaHGlTrJc124J665yl01Tg7Mq3I7Y0Aq7aptQsACWxo8mxUxZeNdh5Ogpm1o7rZlAzz1lP2Ff23foY1xMS12akt4hix7oW8HSZf08mj729o2dle2g8cpV2Kkyx5H8H0kM186yFlQ8dNed915h453inONLVOVU6Guwa0fhqoZfiEezEFjM7IxII607er1PlG3M5MWG9nPhX60xMEG04ZHmnxSCeMs6InTYA3h4o1edvGRRXl3F91gcQvP1O1bqfPWvMlpD2g6z159RgG12zfNak0Uh4VZDPAKcHSfNJJ38KJmEi2QSU04mu127X950sK5873319b0f4FNQeyKyJsaXYPM8hyS9tBw5F2FEA29XPdlXR98GVON1EZ1f9JA64rWU1YLVWo7oD58xH9jFu6D0a7VpsX32hnzMD70nlXmDpEKd82B3k6Bg0Z9d987bAqXa828234ERwhn5zoDF3eidd96U0Cy7P0zUB6a9uMYU9AZbf4tf0UYhHYW4rqg1L1eqrH6TKSdK3BVS6KOE48oFcW629CNuaSy5ne5m9nIF7hunwwi89ZzLjx547ZuhR2xJ8q6pS1yTSc2I7BJrg3qlYKb4oMbetgBHXSml8qN36XH91339rsA6L5QaIFqp8zDT4fbi5QWwMcH8kWC4D1G7debV7cq6JdbXJAnRKBT4179zs795rYNBe0CsraL9p1jI5jQl18EzCCimrTPoCKJY2vM3dD9TRvWwxBzxM79m56Hzq1XiOwM237d53bQhLX5E0ZGq45At3qFK5MyDASZU7nNS6vKiY8Kunb4j7c18Il4Js7uDrRdyPlaBj3XCGETu7ueT5hqFVGoFKsB92EXdJKBiX2vYgC1Zd49yLg756StghyfH4G2eH13W1uxDxU140eSNBCfBLyU548S3jmU8c3j6ya2mrzVZ223W71A70wssQwf3utRoT5Um3r9xWIJpXXcuua97BJEnlhb3W9X6FEN5vRL4RQG76q4Z7PRbPQBwEYlFkwz5C3Ak088Pv1q7kpsbQv1q6W084CKwcEYu2J8xFq5TkC4Pws4gox6M8nnES82HWzA2EeuvqxviJU9usi8BPDeFmXEOCV48VS4C5Lx07VFI434N59EXnO7c1p8yeViFH6prYdBC7TJCYKFIzT8qIydwu965cP3A6lfeGNwWZtcP2yycD57W9szP7XaRyCAB9NtU7szU7Rc6URO8z99CnySJ5R9LwZU34cnStFQ9FDAP7mG3O2I4LIP27Kbd7VIAiDJorpXmm3L8Wj0efy5fZ3MT8TBUP0n7w28aAfYEJMgib3fTwSYj1G322rMQHbSh6hYaK73ausYYGRQ3q8ItI7UlGd9S3soQiE91IaN6G83HkoQ3DJPoNtAmM3mPLsr1Dh2Pv25eYkx9KsBWfK60njuTv7uaYuDRE9JW5xdoUscVDd6UTPMhZU6VFdzjVLWQXesMZHUk2s14GMB276kl21n3DMWS2A14xN7tpeDG071Q7pfuYW2R4KgSruJ6NGaKJpvlYRqZsi2b1ZIgeDZkrB0GWlcO0nW1lqDP8qCAdv9KN8lUsA8jd06hI5upG0HUfipI669DshrvBkF8P7P2c5mp0dXPLGV4936N86XBZSEaJaiacs8xf70k0qL2DB3QUnmbbz1KVn9r3m0Yqrztt3Wj7Dpyv8X3go7eYa2K9kLMLja3LxCguE4JuS9fTrAUi7MG923F0cFrPYf5qFJ7S7z0VIO5k0tjfkwXmCWmfBcpvhw6XCnEKo2iCfo1n3zd3PHESOK3wccRucBZD32kPf2GJng685B2dmF0n0Fzpl7V499c73MEFlkm1mYPmZlgIPBp7VX3t6uDM73scHoy1j3OIC4vrtGgpP9colWUE525e9K0rS0PeNvHt1ol0fY3iLS1VXNB3TgNJUwGFGyUn3egFIFJVMuPCU2BzT111WHZ5idp2aZjn9362JrBkq1m0RSq1ixPQi67D99FHQj7SvyG9cxtgSm6eMDk8e55M6IC2SP7IB997JE2U9q7Hiz719fKZsKfZ2GFKrxyrUOsnZ6Jtv9FiV1Z31D1OzcOpTCZ3DCB8szbS348BHoWQm35B8v2MSoszGFAJoC33hNIQx7aSY7SOJjLwuMhukbVA0Y3819WIz0lGquco92KvT9BV4QF5jMT13REUvRA172gpRhg4phjWAtNWgg8YZYbdZL372IacJ0L1tdJxoRG28iV6pk06Khrnqy6S9j4SsB5g7ahx4zCL7PNY0jVUG1yEbNnmGF5m48dTj9ppP8eWaKoW2Z660Bdxs9FVJ8pREIanyDdOahZJI5dZ2QZAU7L9ZC4fI1x73n2gQo5wLHy3dpb4Hvk1T9r6OmZ8rkqOK7pdeN26wSgOrOjwwt5fMGHVekEQ5R2S3Xe5p5uN26Kexz49D00QOzdNG4v93dR1lqKKUOwJFrTmmSldcQfNWYJc93gLRMi4GBE79L2rNpEQ2Bre4G2dmDZ2MG7qmGW0OxwY96JI5GmdNf8f4txhVqb9xSTJg1OUq83AX1mhmdB99m2fvlvu7qaiCcR4xDXKjS7zFNQOZWtrsJjv6gLJh4OcaAQox4MtI470abKkxOiTdqISHF26ED3A2SZz0iLJb184QJJz992vl4H4e93fMS253kZQyV82xXPHMtVyaI1meC9NS64BJGJhoyYdj7sZ9Jlja8dNC8dbkLBvQDHuwz6zxvoO5LWGt8H94N94R1vuV9PbHFrj45FMRlbetzzo4C0u88kGQ758iv7Q6tFFfv3jAppyHrT7HBxyeJm1Bwj31vxt2THuzT8S2c2R71TFd0gGo54ixrx5Re9oi51AX8h3tFpMdjiBU0iWNt8GCWVB5UXUWWF3r8c1OZ2g81h7ddjkQ0Wv95L2H3q3lRb59iSpW1jh9JkCr1YX3Ts6JUx6cM7zrU4nqM0qXqaQCY3KUq87nGY2FwBPF3VQg7045qCd10Y92oGrv3Fy0g66049GNDU758zagUQSlcmPkeV2S5nAL1m28Ezh4Dwjh7aE0QvyHnz9LlnEgGXQeR2Line truncated

Bin.Pak/package260721火麒麟微店通 x64.nsi

@@ -0,0 +1,189 @@
+; 该脚本使用 HM VNISEdit 脚本编辑器向导产生
+
+; 安装程序初始定义常量
+!define PRODUCT_NAME "火麒麟微店通"
+!define PRODUCT_VERSION "v12.17"
+;!define PRODUCT_PUBLISHER "${PRODUCT_NAME}软件制作组"
+!define PRODUCT_DIR_REGKEY "Software\Microsoft\Windows\CurrentVersion\App Paths\29供应链.exe"
+!define PRODUCT_UNINST_KEY "Software\Microsoft\Windows\CurrentVersion\Uninstall\${PRODUCT_NAME}"
+;!define PRODUCT_UNINST_ROOT_KEY "HKLM" ;需要管理员权限
+!define PRODUCT_UNINST_ROOT_KEY "HKCU"
+!define UTILS_PATH ".\Utils"
+!define SOURCE_PATH "..\Bin.Oem"
+!define OUT_PUT_PATH ".\Bin"
+
+SetCompressor lzma
+
+; ------ MUI 现代界面定义 (1.67 版本以上兼容) ------
+!include "MUI.nsh"
+
+; MUI 预定义常量
+!define MUI_ABORTWARNING
+!define MUI_ICON "${SOURCE_PATH}\favicon.ico"
+;!define MUI_UNICON "${NSISDIR}\Contrib\Graphics\Icons\modern-uninstall.ico"
+!define MUI_UNICON "${UTILS_PATH}\uninstall.ico"
+
+; 语言选择窗口常量设置
+!define MUI_LANGDLL_REGISTRY_ROOT "${PRODUCT_UNINST_ROOT_KEY}"
+!define MUI_LANGDLL_REGISTRY_KEY "${PRODUCT_UNINST_KEY}"
+!define MUI_LANGDLL_REGISTRY_VALUENAME "NSIS:Language"
+
+; 欢迎页面
+!insertmacro MUI_PAGE_WELCOME
+; 许可协议页面
+!define MUI_LICENSEPAGE_CHECKBOX
+!insertmacro MUI_PAGE_LICENSE "${UTILS_PATH}\Licence.txt"
+; 安装目录选择页面
+!insertmacro MUI_PAGE_DIRECTORY
+; 安装过程页面
+!insertmacro MUI_PAGE_INSTFILES
+; 安装完成页面
+;!define MUI_FINISHPAGE_RUN "$INSTDIR\29供应链.exe" ;win10直接启动会双开，以下改为使用函数启动
+;!define MUI_FINISHPAGE_RUN "exe_file" ;指定要运行的可执行文件路径（如 $INSTDIR\MyApp.exe）。文件名含空格时无需加引号 。
+;!define MUI_FINISHPAGE_RUN_TEXT "text" ;设置复选框旁的显示文本（例如：“立即运行我的应用”）。
+;!define MUI_FINISHPAGE_RUN_PARAMETERS "params" ;传入运行参数。若参数含双引号，需用 \" 转义 。
+;!define MUI_FINISHPAGE_RUN_NOTCHECKED ;默认不选中该复选框（即默认不运行）。
+;!define MUI_FINISHPAGE_RUN_FUNCTION "func_name" ;替代直接运行 exe，改为调用自定义 NSIS 函数（此时 MUI_FINISHPAGE_RUN 可不带参数），适合需执行多步逻辑的场景 。
+;示例================================================================================================================
+;!include "MUI2.nsh"
+
+;!define MUI_FINISHPAGE_RUN "$INSTDIR\MyApp.exe"
+;!define MUI_FINISHPAGE_RUN_TEXT "启动应用程序"
+;!define MUI_FINISHPAGE_RUN_PARAMETERS "/silent"
+;;!define MUI_FINISHPAGE_RUN_NOTCHECKED
+
+;!insertmacro MUI_PAGE_FINISH
+;示例结束============================================================================================================
+
+!define MUI_FINISHPAGE_RUN
+;安装函数定义
+!define MUI_FINISHPAGE_RUN_FUNCTION "LaunchExe"
+!insertmacro MUI_PAGE_FINISH
+
+; 安装卸载过程页面
+!insertmacro MUI_UNPAGE_INSTFILES
+
+; 安装界面包含的语言设置
+!insertmacro MUI_LANGUAGE "English"
+!insertmacro MUI_LANGUAGE "SimpChinese"
+
+; 安装预释放文件
+!insertmacro MUI_RESERVEFILE_LANGDLL
+!insertmacro MUI_RESERVEFILE_INSTALLOPTIONS
+; ------ MUI 现代界面定义结束 ------
+
+Name "${PRODUCT_NAME} ${PRODUCT_VERSION}"
+OutFile "${OUT_PUT_PATH}\${PRODUCT_NAME} ${PRODUCT_VERSION}.exe"
+InstallDir "$PROGRAMFILES\${PRODUCT_NAME}"
+;InstallDir "D:\${PRODUCT_NAME}"
+;InstallDirRegKey HKLM "${PRODUCT_UNINST_KEY}" "UninstallString"
+InstallDirRegKey HKCU "${PRODUCT_UNINST_KEY}" "UninstallString"
+ShowInstDetails show
+ShowUnInstDetails show
+BrandingText "${PRODUCT_NAME}安装程序"
+
+Section "MainSection" SEC01
+  SetOutPath "$INSTDIR"
+	;SetOverwrite on|off|try|ifnewer ;强制覆盖|不覆盖|仅覆盖可写文件|仅覆盖旧文件
+  SetOverwrite on
+  ;/x 排除的目录或文件
+  ;File /r /x "Config.xml" /x "choice.debug.tools" /x "DB.dll" /x "Publish.exe" /x "AllBase.pdb" /x "Work.pdb" /x "29供应链.pdb" /x "data" "${SOURCE_PATH}\*.*"
+  File /r /x "BaseClass.cs" /x "Config.xml" /x "choice.debug.tools" /x "DB.dll" /x "Publish.exe" /x "*.pdb" /x "*.zip" /x "data" /x "Cache" /x "29wx.lnk" /x "29wx.ico" /x "29pdd.lnk" /x "29pdd.ico" "${SOURCE_PATH}\*.*"
+  CreateDirectory "$SMPROGRAMS\${PRODUCT_NAME}"
+  CreateShortCut "$SMPROGRAMS\${PRODUCT_NAME}\${PRODUCT_NAME}.lnk" "$INSTDIR\29供应链.exe" "" "$INSTDIR\favicon.ico"
+  CreateShortCut "$DESKTOP\${PRODUCT_NAME}.lnk" "$INSTDIR\29供应链.exe" "" "$INSTDIR\favicon.ico"
+  File "${SOURCE_PATH}\29供应链.exe"
+  ;SetOutPath "$TEMP"
+  ;File "${UTILS_PATH}\VC_redist_2015_2022.x64.exe"
+  ;ExecWait '$TEMP\vc_redist.x86.exe' # 一般(非静默)VC的安装
+  ;ExecWait '"$TEMP\vc_redist.x86.exe" /q' # silent install 静默安装
+SectionEnd
+
+Section -AdditionalIcons
+  SetOutPath $INSTDIR
+  CreateShortCut "$SMPROGRAMS\${PRODUCT_NAME}\Uninstall.lnk" "$INSTDIR\uninst.exe"
+SectionEnd
+
+Section -Post
+  WriteUninstaller "$INSTDIR\uninst.exe"
+  ;WriteRegStr HKLM "${PRODUCT_DIR_REGKEY}" "" "$INSTDIR\29供应链.exe"
+  WriteRegStr HKCU "${PRODUCT_DIR_REGKEY}" "" "$INSTDIR\29供应链.exe"
+  WriteRegStr ${PRODUCT_UNINST_ROOT_KEY} "${PRODUCT_UNINST_KEY}" "DisplayName" "$(^Name)"
+  WriteRegStr ${PRODUCT_UNINST_ROOT_KEY} "${PRODUCT_UNINST_KEY}" "UninstallString" "$INSTDIR\uninst.exe"
+  WriteRegStr ${PRODUCT_UNINST_ROOT_KEY} "${PRODUCT_UNINST_KEY}" "DisplayIcon" "$INSTDIR\29供应链.exe"
+  WriteRegStr ${PRODUCT_UNINST_ROOT_KEY} "${PRODUCT_UNINST_KEY}" "DisplayVersion" "${PRODUCT_VERSION}"
+  WriteRegStr ${PRODUCT_UNINST_ROOT_KEY} "${PRODUCT_UNINST_KEY}" "Publisher" "${PRODUCT_NAME}软件制作组"
+SectionEnd
+
+#-- 根据 NSIS 脚本编辑规则，所有 Function 区段必须放置在 Section 区段之后编写，以避免安装程序出现未可预知的问题。--#
+
+Function .onInit
+  !insertmacro MUI_LANGDLL_DISPLAY
+FunctionEnd
+
+;function要写字section之后
+Function LaunchExe
+	;ExecShell "" "$INSTDIR\${PRODUCT_NAME}.exe"
+	; 启动主程序，ExecWait 会等待程序启动后再继续（推荐用于确保启动成功）
+	;ExecWait '"$INSTDIR\YourApp.exe"' // 等待也可以用来弹出必要组件安装时等待安装完成再继续运行安装程序。
+	; 若希望安装程序立即关闭而不等待，可使用 Exec
+	;Exec '"$INSTDIR\29供应链.exe"'
+	Exec "$INSTDIR\29供应链.exe"
+	; 以普通用户权限启动程序（即使安装包是管理员权限）
+	;System::Call 'shell32::ShellExecute(i 0, t"open", t"explorer.exe", t"/e,$INSTDIR\start.bat", t"", i 0)'
+	;Exec "$INSTDIR\start.bat"
+FunctionEnd
+
+
+/******************************
+ *  以下是安装程序的卸载部分  *
+ ******************************/
+
+Section Uninstall
+  Delete "$INSTDIR\uninst.exe"
+  Delete "$TEMP\vc_redist.x86.exe"
+  Delete "$INSTDIR\29供应链.exe"
+
+  Delete "$SMPROGRAMS\${PRODUCT_NAME}\Uninstall.lnk"
+  Delete "$DESKTOP\${PRODUCT_NAME}.lnk"
+  Delete "$SMPROGRAMS\${PRODUCT_NAME}\${PRODUCT_NAME}.lnk"
+
+  RMDir "$SMPROGRAMS\${PRODUCT_NAME}"
+
+  RMDir /r "$INSTDIR\blob_storage"
+  RMDir /r "$INSTDIR\Cache"
+  RMDir /r "$INSTDIR\config"
+  RMDir /r "$INSTDIR\data"
+  RMDir /r "$INSTDIR\DawnCache"
+  RMDir /r "$INSTDIR\GPUCache"
+  RMDir /r "$INSTDIR\locales"
+  RMDir /r "$INSTDIR\log"
+  RMDir /r "$INSTDIR\ru-ru"
+  RMDir /r "$INSTDIR\static"
+  RMDir /r "$INSTDIR\taobao"
+  RMDir /r "$INSTDIR\temp"
+  RMDir /r "$INSTDIR\upBak"
+  RMDir /r "$INSTDIR\upTemp"
+  RMDir /r "$INSTDIR\x64"
+  RMDir /r "$INSTDIR\x86"
+
+  RMDir /r "$INSTDIR"
+
+  DeleteRegKey ${PRODUCT_UNINST_ROOT_KEY} "${PRODUCT_UNINST_KEY}"
+  ;DeleteRegKey HKLM "${PRODUCT_DIR_REGKEY}"
+  DeleteRegKey HKCU "${PRODUCT_DIR_REGKEY}"
+  SetAutoClose true
+SectionEnd
+
+#-- 根据 NSIS 脚本编辑规则，所有 Function 区段必须放置在 Section 区段之后编写，以避免安装程序出现未可预知的问题。--#
+
+Function un.onInit
+!insertmacro MUI_UNGETLANGUAGE
+  MessageBox MB_ICONQUESTION|MB_YESNO|MB_DEFBUTTON2 "您确实要完全移除 $(^Name) ，及其所有的组件？" IDYES +2
+  Abort
+FunctionEnd
+
+Function un.onUninstSuccess
+  HideWindow
+  MessageBox MB_ICONINFORMATION|MB_OK "$(^Name) 已成功地从您的计算机移除。"
+FunctionEnd

KJDService/KJD_WebService/BLL/BXX/BXXProductManage.cs

@@ -637,6 +637,8 @@ namespace KJD_Web.BLL.BXX
                 var has_wx_format = RegexUtils.GetStringQuery(ref inputData, "has_wx_format")?.Replace("'", "\\'");
                 var problem_prod_data = RegexUtils.GetStringQuery(ref inputData, "problem_prod_data")?.Replace("'", "\\'");
                 var is_relation = RegexUtils.GetStringQuery(ref inputData, "is_relation")?.Replace("'", "\\'");
+                var add_time_begin = RegexUtils.GetStringQuery(ref inputData, "add_time_begin")?.Replace("'", "\\'");
+                var add_time_end = RegexUtils.GetStringQuery(ref inputData, "add_time_end")?.Replace("'", "\\'");
                 var start_time = RegexUtils.GetStringQuery(ref inputData, "start_time")?.Replace("'", "\\'");
                 var end_time = RegexUtils.GetStringQuery(ref inputData, "end_time")?.Replace("'", "\\'");
                 var ban_wx = RegexUtils.GetStringQuery(ref inputData, "ban_wx")?.Replace("'", "\\'");
@@ -678,6 +680,10 @@ namespace KJD_Web.BLL.BXX
                         forceIndex.Add("index_ext_code");
                     //if (!add_user_name.IsNullOrEmpty())
                     //    forceIndex.Add("index_add_user_name");
+                    if (!search_notes.IsNullOrEmpty())
+                        forceIndex.Add("index_notes");
+                    if (!start_time.IsNullOrEmpty())
+                        forceIndex.Add("index_mdy_time");
 
                     if (!forceIndex.Contains("index_view_uv"))
                         forceIndex.Add("index_sort_add_time");
@@ -817,6 +823,10 @@ namespace KJD_Web.BLL.BXX
                 {
                         where += " and p.is_relation=" + is_relation;
                 }
+                if (add_time_begin != null && add_time_end != null)
+                {
+                    where += " and p.add_time between '" + add_time_begin + "' and '" + add_time_end + "'";
+                }
                 if (start_time != null && end_time != null)
                 {
                     where += " and p.mdy_time between '" + start_time + "' and '" + end_time + "'";

KJDService/KJD_WebService/BLL/WXXD/WXUserManage.cs

@@ -1,4 +1,5 @@
 using KJD_Web.Model;
+using KJD_Web.Model.WxModel;
 using KJD_Web.Utils;
 using MySql.Data.MySqlClient;
 using Mysqlx.Crud;
@@ -9,6 +10,7 @@ using System.Data;
 using System.Linq;
 using System.Net;
 using System.Reflection;
+using System.Threading;
 using System.Web;
 using System.Web.ApplicationServices;
 using System.Web.Security;
@@ -55,7 +57,8 @@ namespace KJD_Web.BLL.WXXD
                 var version = RegexUtils.GetStringQuery(ref inputData, "version").ParseToInt();
                 if (sub_soft_type == "order")
                 {
-
+                    if (version < (System.Configuration.ConfigurationManager.ConnectionStrings["WxFindOrderLimitVersion"]?.ConnectionString).ParseToInt())
+                        return "{\"code\":1,\"msg\":\"当前版本过于陈旧，请立即升级新版\"}";
                 }
                 else
                 {
@@ -375,22 +378,25 @@ namespace KJD_Web.BLL.WXXD
                 var search_company_name = RegexUtils.GetStringQuery(ref inputData, "search_company_name")?.Replace("'", "\\'");
                 var search_authoritys_and = RegexUtils.GetStringQuery(ref inputData, "search_authoritys_and")?.Replace("'", "\\'");
                 var search_authoritys_or = RegexUtils.GetStringQuery(ref inputData, "search_authoritys_or")?.Replace("'", "\\'");
-                var oem_id =  RegexUtils.GetStringQuery(ref inputData, "oem_id")?.Replace("'", "\\'");
+                var oem_id = RegexUtils.GetStringQuery(ref inputData, "oem_id")?.Replace("'", "\\'");
+                var is_not_count = RegexUtils.GetStringQuery(ref inputData, "is_not_count")?.Replace("'", "\\'");
 
 
                 int page = RegexUtils.GetStringQuery(ref inputData, "page").ParseToInt();
-                int page_size = RegexUtils.GetStringQuery(ref inputData, "page_size").ParseToInt(20000);
+                int page_size = RegexUtils.GetStringQuery(ref inputData, "page_size").ParseToInt(5000);
 
 
                 string conn = System.Configuration.ConfigurationManager.ConnectionStrings["ConnKJD"].ConnectionString;
                 MysqlUtils mySql = new MysqlUtils(conn);
 
                 //string sql = "select * from wxxd.user where group_id=3";
-                string sql = "select u.*,uu.authority as main_authority,uu.oem_id as main_oem_id,uu.postage_per_order as main_postage_per_order,o.oem_name " +
+                string sql = "select COUNT(*) " +
                     " FROM wxxd.user u " +
                     " LEFT JOIN wxxd.user uu ON uu.user_name=u.parent_user_name " +
                     " LEFT JOIN wxxd.oem o ON uu.oem_id=o.oem_id or u.oem_id=o.oem_id " +
                     " WHERE 1=1";
+
+
                 string where = "";
                 if (!string.IsNullOrEmpty(group_id))
                     where += " AND u.group_id=" + group_id;
@@ -437,10 +443,39 @@ namespace KJD_Web.BLL.WXXD
                     where += " AND (u.oem_id='" + oem_id + "' or uu.oem_id='" + oem_id + "')";
 
                 sql += where;
+
+                int count = -1;
+                if (is_not_count != "true")
+                {
+                    count = mySql.ExecuteFirstInt(sql);
+                    if (!mySql.Message.IsNullOrEmpty())
+                    {
+                        mySql.Close();
+                        return "{\"code\":500,\"msg\":\"" + mySql.Message + "\"}";
+                    }
+                    if (count == 0)
+                    {
+                        return "{\"code\":200,\"msg\":\"success\",\"data\":[]}";
+                    }
+                }
+
+                sql = "select u.*,uu.authority as main_authority,uu.oem_id as main_oem_id,uu.postage_per_order as main_postage_per_order,o.oem_name " +
+                    " FROM wxxd.user u " +
+                    " LEFT JOIN wxxd.user uu ON uu.user_name=u.parent_user_name " +
+                    " LEFT JOIN wxxd.oem o ON uu.oem_id=o.oem_id or u.oem_id=o.oem_id " +
+                    " WHERE 1=1";
+                sql += where;
+
                 sql += " ORDER BY u.id desc";
+                sql += " limit " + Math.Max(page - 1, 0) * page_size + "," + page_size;
 
                 var dt = mySql.ExecuteDataTable(sql);
                 mySql.Close();
+                if (!mySql.Message.IsNullOrEmpty())
+                {
+                    mySql.Close();
+                    return "{\"code\":500,\"msg\":\"" + mySql.Message + "\"}";
+                }
                 if (dt != null)
                 {
                     List<UserLoginResultParam> userList = new List<UserLoginResultParam>();
@@ -501,7 +536,7 @@ namespace KJD_Web.BLL.WXXD
                         userList.Add(user);
                     }
                     var data = JsonUtils.SerializeObjectToString(userList);
-                    return "{\"code\":200,\"msg\":\"success\",\"data\":" + data + "}";
+                    return "{\"code\":200,\"msg\":\"success\",\"data\":" + data + ",\"count\":" + count + "}";
                 }
             }
             return "{\"code\":19999,\"msg\":\"输入为空\"}";
@@ -741,18 +776,26 @@ namespace KJD_Web.BLL.WXXD
                 string conn = System.Configuration.ConfigurationManager.ConnectionStrings["ConnKJD"].ConnectionString;
                 MysqlUtils mySql = new MysqlUtils(conn, true);
                 string sql;
-                int userPoints;
-                int newUserPoints;
-                int operatorPoints;
-                int newOperatorPoints;
-                int shopPointsPerMonth = 30;
+                decimal userPoints;
+                decimal userPointsNew;
+                decimal userTotalPoints;
+                decimal userTotalPointsNew;
+                decimal operatorPoints;
+                decimal operatorPointsNew;
+                decimal shopPointsPerMonth = 30;
 
                 // 账户之间的转移单独写
                 if (option_type == "转移")
                 {
                     // 转移查找自己账户及对方账户确定余额足够
                     sql = "SELECT points FROM `wxxd`.`user` WHERE user_name='" + operator_name + "'";
-                    operatorPoints = mySql.ExecuteFirstInt(sql);
+                    operatorPoints = mySql.ExecuteFirstDecimal(sql);
+                    if (!mySql.Message.IsNullOrEmpty())
+                    {
+                        mySql.RollBack();
+                        mySql.Close();
+                        return "{\"code\":500,\"msg\":\"查询错误：" + mySql.Message + "\"}";
+                    }
                     if (operatorPoints < delta_points)
                     {
                         mySql.RollBack();
@@ -760,16 +803,31 @@ namespace KJD_Web.BLL.WXXD
                         return "{\"code\":500,\"msg\":\"余额不足\"}";
                     }
                     sql = "SELECT points FROM `wxxd`.`user` WHERE user_name='" + user_name + "'";
-                    userPoints = mySql.ExecuteFirstInt(sql);
+                    userPoints = mySql.ExecuteFirstDecimal(sql);
+                    if (!mySql.Message.IsNullOrEmpty())
+                    {
+                        mySql.RollBack();
+                        mySql.Close();
+                        return "{\"code\":500,\"msg\":\"查询错误：" + mySql.Message + "\"}";
+                    }
                     if (userPoints < -delta_points)
                     {
                         mySql.RollBack();
                         mySql.Close();
                         return "{\"code\":500,\"msg\":\"对方账户余额不足\"}";
                     }
+                    sql = "SELECT recharge_points_total FROM `wxxd`.`user` WHERE user_name='" + user_name + "'";
+                    userTotalPoints = mySql.ExecuteFirstDecimal(sql);
+                    if (!mySql.Message.IsNullOrEmpty())
+                    {
+                        mySql.RollBack();
+                        mySql.Close();
+                        return "{\"code\":500,\"msg\":\"查询错误：" + mySql.Message + "\"}";
+                    }
 
-                    newUserPoints = userPoints + delta_points.ParseToInt();
-                    sql = " UPDATE `wxxd`.`user` SET points=" + newUserPoints.ParseToInt();
+                    userPointsNew = userPoints + delta_points;
+                    userTotalPointsNew = userTotalPoints + delta_points;
+                    sql = " UPDATE `wxxd`.`user` SET points=" + userPointsNew + ",recharge_points_total=" + userTotalPointsNew;
                     sql += " WHERE user_name='" + user_name + "' AND points=" + userPoints + ";";
                     var toPointsRst = mySql.ExecuteAffectedRows(sql);
                     if (!string.IsNullOrEmpty(mySql.Message))
@@ -785,8 +843,8 @@ namespace KJD_Web.BLL.WXXD
                         return "{\"code\":500,\"msg\":\"收款账户已发生改变，请刷新账户后重新操作\"}";
                     }
 
-                    newOperatorPoints = operatorPoints - delta_points.ParseToInt();
-                    sql = " UPDATE `wxxd`.`user` SET points=" + newOperatorPoints.ParseToInt();
+                    operatorPointsNew = operatorPoints - delta_points;
+                    sql = " UPDATE `wxxd`.`user` SET points=" + operatorPointsNew;
                     sql += " WHERE user_name='" + operator_name + "' AND points=" + operatorPoints + ";";
                     var fromPointsRst = mySql.ExecuteAffectedRows(sql);
                     if (!string.IsNullOrEmpty(mySql.Message))
@@ -803,17 +861,21 @@ namespace KJD_Web.BLL.WXXD
                     }
 
                     // 转入
-                    sql = " INSERT INTO wxxd.user_points_record(user_name,user_nick,points,option_type,operator_type,operator_name,shop_id,shop_account)";
-                    sql += " VALUES(@user_name,@user_nick,@points,@option_type,@operator_type,@operator_name,@shop_id,@shop_account);";
+                    sql = " INSERT INTO wxxd.user_points_record" +
+                        " (user_name,user_nick,delta_points,new_points,option_type,operator_type,operator_name,shop_id,shop_account,counterparty_account_name)";
+                    sql += " VALUES" +
+                        " (@user_name,@user_nick,@delta_points,@new_points,@option_type,@operator_type,@operator_name,@shop_id,@shop_account,@counterparty_account_name);";
                     List<MySqlParameter> paramLst = new List<MySqlParameter>();
                     paramLst.Add(new MySqlParameter() { DbType = DbType.String, ParameterName = "user_name", Value = user_name, });
                     paramLst.Add(new MySqlParameter() { DbType = DbType.String, ParameterName = "user_nick", Value = user_nick, });
-                    paramLst.Add(new MySqlParameter() { DbType = DbType.Int32, ParameterName = "points", Value = delta_points, });
-                    paramLst.Add(new MySqlParameter() { DbType = DbType.String, ParameterName = "option_type", Value = delta_points > 0 ? "转入" : "转出", });
+                    paramLst.Add(new MySqlParameter() { DbType = DbType.Decimal, ParameterName = "delta_points", Value = delta_points, });
+                    paramLst.Add(new MySqlParameter() { DbType = DbType.Decimal, ParameterName = "new_points", Value = userPointsNew, });
+                    paramLst.Add(new MySqlParameter() { DbType = DbType.String, ParameterName = "option_type", Value = "转入" });
                     paramLst.Add(new MySqlParameter() { DbType = DbType.String, ParameterName = "operator_type", Value = operator_type, });
                     paramLst.Add(new MySqlParameter() { DbType = DbType.String, ParameterName = "operator_name", Value = operator_name, });
                     paramLst.Add(new MySqlParameter() { DbType = DbType.String, ParameterName = "shop_id", Value = shop_id, });
                     paramLst.Add(new MySqlParameter() { DbType = DbType.String, ParameterName = "shop_account", Value = shop_account, });
+                    paramLst.Add(new MySqlParameter() { DbType = DbType.String, ParameterName = "counterparty_account_name", Value = operator_name, });
                     var addOptionRst = mySql.ExecuteAffectedRows(sql, paramLst.ToArray());
                     if (!string.IsNullOrEmpty(mySql.Message))
                     {
@@ -828,17 +890,22 @@ namespace KJD_Web.BLL.WXXD
                         return "{\"code\":500,\"msg\":\"新增操作记录失败，请稍候重试\"}";
                     }
 
-                    sql = " INSERT INTO wxxd.user_points_record(user_name,user_nick,points,option_type,operator_type,operator_name,shop_id,shop_account)";
-                    sql += " VALUES(@user_name,@user_nick,@points,@option_type,@operator_type,@operator_name,@shop_id,@shop_account);";
+                    // 转出
+                    sql = " INSERT INTO wxxd.user_points_record" +
+                        "(user_name,user_nick,delta_points,new_points,option_type,operator_type,operator_name,shop_id,shop_account,counterparty_account_name)";
+                    sql += " VALUES" +
+                        "(@user_name,@user_nick,@delta_points,@new_points,@option_type,@operator_type,@operator_name,@shop_id,@shop_account,@counterparty_account_name);";
                     paramLst = new List<MySqlParameter>();
                     paramLst.Add(new MySqlParameter() { DbType = DbType.String, ParameterName = "user_name", Value = operator_name, });
                     paramLst.Add(new MySqlParameter() { DbType = DbType.String, ParameterName = "user_nick", Value = operator_nick, });
-                    paramLst.Add(new MySqlParameter() { DbType = DbType.Int32, ParameterName = "points", Value = delta_points, });
-                    paramLst.Add(new MySqlParameter() { DbType = DbType.String, ParameterName = "option_type", Value = delta_points > 0 ? "转出" : "转入", });
+                    paramLst.Add(new MySqlParameter() { DbType = DbType.Decimal, ParameterName = "delta_points", Value = delta_points, });
+                    paramLst.Add(new MySqlParameter() { DbType = DbType.Decimal, ParameterName = "new_points", Value = operatorPointsNew, });
+                    paramLst.Add(new MySqlParameter() { DbType = DbType.String, ParameterName = "option_type", Value = "转出" });
                     paramLst.Add(new MySqlParameter() { DbType = DbType.String, ParameterName = "operator_type", Value = operator_type, });
                     paramLst.Add(new MySqlParameter() { DbType = DbType.String, ParameterName = "operator_name", Value = operator_name, });
                     paramLst.Add(new MySqlParameter() { DbType = DbType.String, ParameterName = "shop_id", Value = shop_id, });
                     paramLst.Add(new MySqlParameter() { DbType = DbType.String, ParameterName = "shop_account", Value = shop_account, });
+                    paramLst.Add(new MySqlParameter() { DbType = DbType.String, ParameterName = "counterparty_account_name", Value = user_name, });
                     addOptionRst = mySql.ExecuteAffectedRows(sql, paramLst.ToArray());
                     if (!string.IsNullOrEmpty(mySql.Message))
                     {
@@ -855,24 +922,32 @@ namespace KJD_Web.BLL.WXXD
 
                     mySql.Commit();
                     mySql.Close();
-                    return "{\"code\":200,\"msg\":\"success\",\"newOperatorPoints\":" + newOperatorPoints + ",\"newUserPoints\":" + newUserPoints + "}";
+                    return "{\"code\":200,\"msg\":\"success\",\"newOperatorPoints\":" + operatorPointsNew + ",\"newUserPoints\":" + userPointsNew + "}";
                 }
                 else
                 {
                     #region 计算是否余额不足
                     sql = "SELECT points FROM `wxxd`.`user` WHERE user_name='" + user_name + "'";
-                    userPoints = mySql.ExecuteFirstInt(sql);
-
+                    userPoints = mySql.ExecuteFirstDecimal(sql);
                     if (!string.IsNullOrEmpty(mySql.Message))
                     {
                         mySql.RollBack();
                         mySql.Close();
                         return "{\"code\":501,\"msg\":\"" + mySql.Message + "\"}";
                     }
+                    sql = "SELECT recharge_points_total FROM `wxxd`.`user` WHERE user_name='" + user_name + "'";
+                    userTotalPoints = mySql.ExecuteFirstDecimal(sql);
+                    if (!mySql.Message.IsNullOrEmpty())
+                    {
+                        mySql.RollBack();
+                        mySql.Close();
+                        return "{\"code\":500,\"msg\":\"查询错误：" + mySql.Message + "\"}";
+                    }
+
                     if (option_type == "续费")
                     {
                         sql = "SELECT shop_points_per_month FROM `wxxd`.`user` WHERE user_name='" + user_name + "'";
-                        shopPointsPerMonth = mySql.ExecuteFirstInt(sql); // 店铺续费一个月的点数，默认30，可以设置为其他值
+                        shopPointsPerMonth = mySql.ExecuteFirstDecimal(sql); // 店铺续费一个月的点数，默认30，可以设置为其他值
                         if (!string.IsNullOrEmpty(mySql.Message))
                         {
                             mySql.RollBack();
@@ -881,11 +956,11 @@ namespace KJD_Web.BLL.WXXD
                         }
                         shopPointsPerMonth = Math.Max(30, shopPointsPerMonth);
 
-                        if (delta_points <= 0 || delta_points % shopPointsPerMonth > 0)
+                        if (delta_points <= 0 || delta_points.ParseToInt().ParseToDecimal() != delta_points || delta_points.ParseToInt() % shopPointsPerMonth.ParseToInt() > 0)
                         {
                             mySql.RollBack();
                             mySql.Close();
-                            return "{\"code\":501,\"msg\":\"续费点数必须是" + shopPointsPerMonth + "的整倍数\"}";
+                            return "{\"code\":501,\"msg\":\"续费点数必须是" + shopPointsPerMonth.ParseToInt() + "的整倍数\"}";
                         }
                         else if (userPoints < delta_points)
                         {
@@ -899,13 +974,15 @@ namespace KJD_Web.BLL.WXXD
                     sql = "UPDATE `wxxd`.`user` SET";
                     if (option_type == "充值")
                     {
-                        sql += " points=points+" + delta_points.ParseToInt() + ",";
-                        newUserPoints = userPoints + delta_points.ParseToInt();
+                        userPointsNew = userPoints + delta_points;
+                        sql += " points=" + userPointsNew + ",";
+                        userTotalPointsNew = userTotalPoints + delta_points;
+                        sql += " recharge_points_total=" + userTotalPointsNew + ",";
                     }
                     else
                     {
-                        sql += " points=points-" + delta_points.ParseToInt() + ",";
-                        newUserPoints = userPoints - delta_points.ParseToInt();
+                        userPointsNew = userPoints - delta_points;
+                        sql += " points=" + userPointsNew + ",";
                     }
                     sql = sql.TrimEnd(',');
                     sql += " WHERE user_name='" + user_name + "' AND points=" + userPoints + ";";
@@ -923,12 +1000,13 @@ namespace KJD_Web.BLL.WXXD
                         return "{\"code\":500,\"msg\":\"账户已发生改变，请刷新账户后重新操作\"}";
                     }
 
-                    sql = " INSERT INTO wxxd.user_points_record(user_name,user_nick,points,option_type,operator_type,operator_name,shop_id,shop_account)";
-                    sql += " VALUES(@user_name,@user_nick,@points,@option_type,@operator_type,@operator_name,@shop_id,@shop_account);";
+                    sql = " INSERT INTO wxxd.user_points_record(user_name,user_nick,delta_points,new_points,option_type,operator_type,operator_name,shop_id,shop_account)";
+                    sql += " VALUES(@user_name,@user_nick,@delta_points,@new_points,@option_type,@operator_type,@operator_name,@shop_id,@shop_account);";
                     List<MySqlParameter> paramLst = new List<MySqlParameter>();
                     paramLst.Add(new MySqlParameter() { DbType = DbType.String, ParameterName = "user_name", Value = user_name, });
                     paramLst.Add(new MySqlParameter() { DbType = DbType.String, ParameterName = "user_nick", Value = user_nick, });
-                    paramLst.Add(new MySqlParameter() { DbType = DbType.Int32, ParameterName = "points", Value = delta_points, });
+                    paramLst.Add(new MySqlParameter() { DbType = DbType.Decimal, ParameterName = "delta_points", Value = delta_points, });
+                    paramLst.Add(new MySqlParameter() { DbType = DbType.Decimal, ParameterName = "new_points", Value = userPointsNew, });
                     paramLst.Add(new MySqlParameter() { DbType = DbType.String, ParameterName = "option_type", Value = option_type, });
                     paramLst.Add(new MySqlParameter() { DbType = DbType.String, ParameterName = "operator_type", Value = operator_type, });
                     paramLst.Add(new MySqlParameter() { DbType = DbType.String, ParameterName = "operator_name", Value = operator_name, });
@@ -963,7 +1041,7 @@ namespace KJD_Web.BLL.WXXD
 
                         if (expireTime == 0)
                         {
-                            newExpireTime = TimeUtils.DateTimeToTimestampSeconds(DateTime.Now.AddMonths(delta_points.ParseToInt() / shopPointsPerMonth));
+                            newExpireTime = TimeUtils.DateTimeToTimestampSeconds(DateTime.Now.AddMonths(delta_points.ParseToInt() / shopPointsPerMonth.ParseToInt()));
                             sql = " INSERT INTO `wxxd`.`user_points_shop_expire` (shop_id,expire_time‌)" +
                                 " VALUES ('" + shop_id + "'," + newExpireTime + ");";
                         }
@@ -971,9 +1049,9 @@ namespace KJD_Web.BLL.WXXD
                         {
                             DateTime expireDateTime = TimeUtils.StampToDateTime(expireTime);
                             if (expireDateTime < DateTime.Now)
-                                expireDateTime = DateTime.Now.AddMonths(delta_points.ParseToInt() / shopPointsPerMonth);
+                                expireDateTime = DateTime.Now.AddMonths(delta_points.ParseToInt() / shopPointsPerMonth.ParseToInt());
                             else
-                                expireDateTime = expireDateTime.AddMonths(delta_points.ParseToInt() / shopPointsPerMonth);
+                                expireDateTime = expireDateTime.AddMonths(delta_points.ParseToInt() / shopPointsPerMonth.ParseToInt());
                             newExpireTime = TimeUtils.DateTimeToTimestampSeconds(expireDateTime);
 
                             sql = "UPDATE `wxxd`.`user_points_shop_expire` set expire_time‌=" + newExpireTime + " WHERE shop_id='" + shop_id + "' AND expire_time‌=" + expireTime;
@@ -995,7 +1073,102 @@ namespace KJD_Web.BLL.WXXD
 
                     mySql.Commit();
                     mySql.Close();
-                    return "{\"code\":200,\"msg\":\"success\",\"newExpireTime\":" + newExpireTime + ",\"newUserPoints\":" + newUserPoints + "}";
+                    return "{\"code\":200,\"msg\":\"success\",\"newExpireTime\":" + newExpireTime + ",\"newUserPoints\":" + userPointsNew + "}";
+                }
+            }
+            return "{\"code\":19999,\"msg\":\"输入为空\"}";
+        }
+
+
+        public string GetUserPoints(string inputData)
+        {
+            if (!string.IsNullOrEmpty(inputData))
+            {
+                if (!GetSign(inputData))
+                    return "{\"code\":999,\"msg\":\"校验失败\"}";
+
+                var option_type_in = RegexUtils.GetStringQuery(ref inputData, "option_type_in")?.Replace("'", "\\'");
+                var user_name_in = HtmlUtils.UrlDecodeUtf8(RegexUtils.GetStringQuery(ref inputData, "user_name_in"))?.Replace("'", "\\'");
+                var shop_id_in = RegexUtils.GetStringQuery(ref inputData, "shop_id_in")?.Replace("'", "\\'");
+                var shop_account_in = RegexUtils.GetStringQuery(ref inputData, "shop_account_in")?.Replace("'", "\\'");
+                var create_time_begin = RegexUtils.GetStringQuery(ref inputData, "create_time_begin")?.Replace("'", "\\'");
+                var create_time_end = RegexUtils.GetStringQuery(ref inputData, "create_time_end")?.Replace("'", "\\'");
+                var is_not_count = RegexUtils.GetStringQuery(ref inputData, "is_not_count")?.Replace("'", "\\'");
+
+                int page = RegexUtils.GetStringQuery(ref inputData, "page").ParseToInt();
+                int page_size = RegexUtils.GetStringQuery(ref inputData, "page_size").ParseToInt(200);
+
+                string conn = System.Configuration.ConfigurationManager.ConnectionStrings["ConnKJD"].ConnectionString;
+                MysqlUtils mySql = new MysqlUtils(conn);
+
+                string sql = "SELECT count(*) " +
+                    " FROM wxxd.user_points_record up " +
+                    " WHERE 1=1";
+                string where = "";
+                if (!string.IsNullOrEmpty(option_type_in))
+                    where += " AND up.option_type in ('" + option_type_in + "')";
+                if (!string.IsNullOrEmpty(user_name_in))
+                    where += " AND up.user_name in ('" + user_name_in.Replace(",", "','") + "')";
+                if (!string.IsNullOrEmpty(shop_id_in))
+                    where += " AND up.shop_id in ('" + shop_id_in.Replace(",", "','") + "')";
+                if (!string.IsNullOrEmpty(shop_account_in))
+                    where += " AND up.shop_account in ('" + shop_account_in.Replace(",", "','") + "')";
+                if (!string.IsNullOrEmpty(create_time_begin))
+                    where += " AND up.add_time >= '" + create_time_begin + "'";
+                if (!string.IsNullOrEmpty(create_time_end))
+                    where += " AND up.add_time <= '" + create_time_end + "'";
+
+                sql += where;
+
+                int count = -1;
+                if (is_not_count != "true")
+                {
+                    count = mySql.ExecuteFirstInt(sql);
+                    if (!mySql.Message.IsNullOrEmpty())
+                    {
+                        mySql.Close();
+                        return "{\"code\":500,\"msg\":\"" + mySql.Message + "\"}";
+                    }
+                }
+
+                sql = "SELECT * " +
+                    " FROM wxxd.user_points_record up " +
+                    " WHERE 1=1";
+                sql += where;
+                sql += " ORDER BY up.add_time desc ";
+                sql += " limit " + Math.Max(page - 1, 0) * page_size + "," + page_size;
+
+                var dt = mySql.ExecuteDataTable(sql);
+                mySql.Close();
+                if (!string.IsNullOrEmpty(mySql.Message))
+                { 
+                    return "{\"code\":500,\"msg\":\"" + mySql.Message + "\"}";
+                }
+                if (dt != null)
+                {
+                    List<user_points_record_info> userPaymentList = new List<user_points_record_info>();
+                    foreach (DataRow row in dt.Rows)
+                    {
+                        user_points_record_info userPayment = new user_points_record_info
+                        {
+                            id = Convert.ToInt32(row["id"]),
+                            user_name = row["user_name"].ParseToString(),
+                            delta_points = row["delta_points"].ParseToInt(),
+                            new_points = row["new_points"].ParseToNullableInt(),
+                            operator_name = row["operator_name"].ParseToString(),
+                            operator_type = row["operator_type"].ParseToString(),
+                            option_type = row["option_type"].ParseToString(),
+                            shop_account = row["shop_account"].ParseToString(),
+                            shop_id = row["shop_id"].ParseToString(),
+                            user_nick = row["user_nick"].ParseToString(),
+                            remark = row["remark"].ParseToString(),
+                            add_time = row["add_time"].ParseToString().ParseToDateTime(),
+                            counterparty_account_name = row["counterparty_account_name"].ParseToString(),
+                        };
+                        userPaymentList.Add(userPayment);
+                    }
+                    var data = JsonUtils.SerializeObjectToString(userPaymentList);
+                    return "{\"code\":200,\"msg\":\"success\",\"data\":" + data + ",\"count\":\"" + count + "\"}";
                 }
             }
             return "{\"code\":19999,\"msg\":\"输入为空\"}";
@@ -1208,6 +1381,126 @@ namespace KJD_Web.BLL.WXXD
             return "{\"code\":19999,\"msg\":\"输入为空\"}";
         }
 
+        public string GetUserBalance(string inputData)
+        {
+            // ALTER TABLE books ALTER INDEX idx_name INVISIBLE; --隐藏
+            // ALTER TABLE books ALTER INDEX idx_name VISIBLE; --恢复
+            // 双字匹配的全文索引 ALTER TABLE `user_payment_record` ADD FULLTEXT INDEX `remark_fulltext` (`remark`) WITH parser ngram
+            if (!string.IsNullOrEmpty(inputData))
+            {
+                if (!GetSign(inputData))
+                    return "{\"code\":999,\"msg\":\"校验失败\"}";
+
+                var timeCalc = DateTime.Now;
+
+                var type_in = RegexUtils.GetStringQuery(ref inputData, "type_in")?.Replace("'", "\\'");
+                var user_name_in = HtmlUtils.UrlDecodeUtf8(RegexUtils.GetStringQuery(ref inputData, "user_name_in"))?.Replace("'", "\\'");
+                var order_id_in = RegexUtils.GetStringQuery(ref inputData, "order_id_in")?.Replace("'", "\\'");
+                var after_sale_id_in = RegexUtils.GetStringQuery(ref inputData, "after_sale_id_in")?.Replace("'", "\\'");
+                var create_time_begin = RegexUtils.GetStringQuery(ref inputData, "create_time_begin")?.Replace("'", "\\'");
+                var create_time_end = RegexUtils.GetStringQuery(ref inputData, "create_time_end")?.Replace("'", "\\'");
+                var is_not_count = RegexUtils.GetStringQuery(ref inputData, "is_not_count")?.Replace("'", "\\'");
+                var remark_fulltext = RegexUtils.GetStringQuery(ref inputData, "remark_fulltext")?.Replace("'", "\\'");
+
+                int page = RegexUtils.GetStringQuery(ref inputData, "page").ParseToInt();
+                int page_size = RegexUtils.GetStringQuery(ref inputData, "page_size").ParseToInt(200);
+
+                string conn = System.Configuration.ConfigurationManager.ConnectionStrings["ConnKJD"].ConnectionString;
+                MysqlUtils mySql = new MysqlUtils(conn);
+
+                string sql = "SELECT count(*) " +
+                    " FROM wxxd.user_payment_record up " +
+                    " WHERE 1=1";
+                string where = "";
+                if (!string.IsNullOrEmpty(type_in))
+                    where += " AND up.type in (" + type_in + ")";
+                if (!string.IsNullOrEmpty(user_name_in))
+                    where += " AND up.user_name in ('" + user_name_in.Replace(",", "','") + "')";
+                if (!string.IsNullOrEmpty(order_id_in))
+                    where += " AND up.order_id in ('" + order_id_in.Replace(",", "','") + "')";
+                if (!string.IsNullOrEmpty(after_sale_id_in))
+                    where += " AND up.after_sale_id in ('" + after_sale_id_in.Replace(",", "','") + "')";
+                if (!string.IsNullOrEmpty(create_time_begin))
+                    where += " AND up.create_time >= '" + create_time_begin + "'";
+                if (!string.IsNullOrEmpty(create_time_end))
+                    where += " AND up.create_time <= '" + create_time_end + "'";
+                //if (!string.IsNullOrEmpty(remark_fulltext))
+                //{
+                //    List<string> fullTextSearchStr = new List<string>();
+                //    var remark_fulltextLst = remark_fulltext.Split(new string[] { "," }, StringSplitOptions.RemoveEmptyEntries);
+                //    foreach (var t in remark_fulltextLst)
+                //    {
+                //        var t1 = t;
+                //        while (t1.Length >= 12)
+                //        {
+                //            fullTextSearchStr.Add(t1.Substring(0, 10));
+                //            t1 = t1.Substring(10);
+                //        }
+                //        fullTextSearchStr.Add(t1);
+                //    }
+                //    where += " AND MATCH(remark) AGAINST('" + string.Join(" +", fullTextSearchStr) + "' IN BOOLEAN MODE) ";
+                //    //where += " AND MATCH(remark) AGAINST('" + string.Join(" +", fullTextSearchStr) + "' IN NATURAL LANGUAGE MODE) ";
+                //    //where += " AND MATCH(remark) AGAINST('" + remark_fulltext.Replace(",", " ") + "' IN NATURAL LANGUAGE MODE) ";
+                //}
+                if (!string.IsNullOrEmpty(remark_fulltext))
+                {
+                    where += " AND MATCH(remark) AGAINST('" + remark_fulltext + "' IN BOOLEAN MODE)";
+                }
+
+                sql += where;
+
+                int count = -1;
+                if (is_not_count != "true")
+                {
+                    count = mySql.ExecuteFirstInt(sql);
+                    if (!mySql.Message.IsNullOrEmpty())
+                    {
+                        mySql.Close();
+                        return "{\"code\":500,\"msg\":\"" + mySql.Message + "\"}";
+                    }
+                }
+
+                sql = "SELECT * " +
+                    " FROM wxxd.user_payment_record up " +
+                    " WHERE 1=1";
+                sql += where;
+                sql += " ORDER BY up.create_time desc ";
+                sql += " limit " + Math.Max(page - 1, 0) * page_size + "," + page_size;
+
+                var dt = mySql.ExecuteDataTable(sql);
+                mySql.Close();
+                if (dt != null)
+                {
+                    List<user_payment_record_info> userPaymentList = new List<user_payment_record_info>();
+                    foreach (DataRow row in dt.Rows)
+                    {
+                        user_payment_record_info userPayment = new user_payment_record_info
+                        {
+                            id = Convert.ToInt32(row["id"]),
+                            user_name = row["user_name"].ParseToString(),
+                            after_sale_id = row["after_sale_id"].ParseToLong(),
+                            amount = row["amount"].ParseToDecimal(),
+                            counterparty_account_name = row["counterparty_account_name"].ParseToString(),
+                            create_by = row["create_by"].ParseToString(),
+                            balance = row["balance"].ParseToDecimal(),
+                            create_time = row["create_time"].ParseToString().ParseToDateTime(),
+                            is_deleted = row["is_deleted"].ParseToInt(),
+                            order_id = row["order_id"].ParseToString(),
+                            platform_code = row["platform_code"].ParseToString(),
+                            remark = row["remark"].ParseToString(),
+                            type = row["type"].ParseToInt(),
+                            update_by = row["update_by"].ParseToString(),
+                            update_time = row["update_time"].ParseToString().ParseToDateTime(),
+                        };
+                        userPaymentList.Add(userPayment);
+                    }
+                    var data = JsonUtils.SerializeObjectToString(userPaymentList); 
+                    var seconds = (DateTime.Now - timeCalc).TotalSeconds.ToString("0.000");
+                    return "{\"code\":200,\"msg\":\"success\",\"data\":" + data + ",\"count\":\"" + count + "\",\"seconds\":\"" + seconds + "\"}";
+                }
+            }
+            return "{\"code\":19999,\"msg\":\"输入为空\"}";
+        }
 
         public string ChangePassword(string inputData)
         {

KJDService/KJD_WebService/KJD_WebService.csproj

@@ -139,7 +139,8 @@
     <Compile Include="Model\WxModel\oms_wei_order_item.cs" />
     <Compile Include="Model\WxModel\oms_wei_refund.cs" />
     <Compile Include="Model\WxModel\order_pdd_buyer_order.cs" />
-    <Compile Include="Model\WxModel\user_payment_record.cs" />
+    <Compile Include="Model\WxModel\user_payment_record_info.cs" />
+    <Compile Include="Model\WxModel\user_points_record_info.cs" />
     <Compile Include="Model\WxModel\WXBuyUrlNotesInfo.cs" />
     <Compile Include="Model\WxModel\WXClientProductInfoLite.cs" />
     <Compile Include="Model\WxModel\WXGetEditProductInfoLite.cs" />

KJDService/KJD_WebService/Model/WxModel/user_payment_record_info.cs

@@ -5,9 +5,12 @@ using System.Web;
 
 namespace KJD_Web.Model.WxModel
 {
-    public class user_payment_record
+    public class user_payment_record_info
     {
         public long id { get; set; }
+        /// <summary>
+        /// 变动类型，1：充值，2：采购花费，3：产品退款到账，4：运费退款到账，5：采购收款，6：产品退款扣除，7：运费退款扣除，16:礼物单话费，20:中转运费，23:作废运费返还
+        /// </summary>
 
         public int? type { get; set; }
         /// <summary>

KJDService/KJD_WebService/Model/WxModel/user_points_record_info.cs

@@ -0,0 +1,27 @@
+using System;
+using System.Collections.Generic;
+using System.Linq;
+using System.Web;
+
+namespace KJD_Web.Model.WxModel
+{
+    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; }
+        /// <summary>
+        /// 对方账户名称
+        /// </summary>
+        public string counterparty_account_name { get; set; }
+    }
+}

KJDService/KJD_WebService/Utils/MySqlUtils.cs

@@ -351,6 +351,20 @@ namespace KJD_Web.Utils
             return i;
         }
 
+
+        /// <summary>
+        /// 返回第一个执行结果
+        /// </summary>
+        /// <param name="SqlString"></param>
+        /// <returns></returns>
+        public decimal ExecuteFirstDecimal(string SqlString, MySqlParameter[] parms = null)
+        {
+            string id = ExecuteFirst(SqlString, parms);
+            decimal i;
+            decimal.TryParse(id, out i);
+            return i;
+        }
+
         /// <summary>
         /// 返回第一个值
         /// </summary>

KJDService/KJD_WebService/WXUserService.asmx.cs

@@ -174,7 +174,19 @@ namespace KJD_Web
             Context.Response.Write(result);
             Context.Response.End();
         }
-        
+
+        [WebMethod]
+        public void get_user_points()
+        {
+            string jsontext = GetRequestJsonString();
+
+            var result = jsontext;
+            result = new WXUserManage().GetUserPoints(jsontext);
+
+            Context.Response.Write(result);
+            Context.Response.End();
+        }
+
         [WebMethod]
         public void update_user_balance()
         {
@@ -187,6 +199,18 @@ namespace KJD_Web
             Context.Response.End();
         }
 
+        [WebMethod]
+        public void get_user_balance()
+        {
+            string jsontext = GetRequestJsonString();
+
+            var result = jsontext;
+            result = new WXUserManage().GetUserBalance(jsontext);
+
+            Context.Response.Write(result);
+            Context.Response.End();
+        }
+
         [WebMethod]
         public void get_wx_sale_assistant_cookie()
         {

KJDService/KJD_WebService/Web.config

@@ -23,7 +23,7 @@
 
 	<add name="UpdateWxFindOrderFileDir" connectionString="C:\inetpub\wwwroot\find_order_update"/>
 	<add name="UpdateWxFindOrderUrl" connectionString="http://weidian.e57.cn/find_order_update/"/>
-	<add name="WxFindOrderLimitVersion" connectionString="99"/>
+	<add name="WxFindOrderLimitVersion" connectionString="172"/>
 	<add name="WxFindOrderLowVersion" connectionString="99"/>
   </connectionStrings>
   <!--

TEMUKJD/BaseForms/BaseGeneralForm.designer.cs

@@ -108,7 +108,7 @@
             // pbLogo
             // 
             this.pbLogo.BackColor = System.Drawing.Color.Transparent;
-            this.pbLogo.Image = global::TemuKJD.Properties.Resources.common_icon;
+            this.pbLogo.Image = global::TemuKJD.Properties.Resources.icon;
             this.pbLogo.Location = new System.Drawing.Point(5, 4);
             this.pbLogo.Name = "pbLogo";
             this.pbLogo.Size = new System.Drawing.Size(23, 23);

TEMUKJD/ChangeForm.designer.cs

@@ -37,8 +37,8 @@
             this.pnlExtend = new DevComponents.DotNetBar.PanelEx();
             this.pnlChat = new DevComponents.DotNetBar.PanelEx();
             this.panel2 = new System.Windows.Forms.Panel();
-            this.pnlAiTalk = new DevComponents.DotNetBar.PanelEx();
             this.label2 = new System.Windows.Forms.Label();
+            this.pnlAiTalk = new DevComponents.DotNetBar.PanelEx();
             this.panel2.SuspendLayout();
             this.SuspendLayout();
             // 
@@ -150,20 +150,6 @@
             this.panel2.Size = new System.Drawing.Size(440, 258);
             this.panel2.TabIndex = 8;
             // 
-            // pnlAiTalk
-            // 
-            this.pnlAiTalk.Cursor = System.Windows.Forms.Cursors.Hand;
-            this.pnlAiTalk.DisabledBackColor = System.Drawing.Color.Empty;
-            this.pnlAiTalk.Location = new System.Drawing.Point(236, 143);
-            this.pnlAiTalk.Name = "pnlAiTalk";
-            this.pnlAiTalk.Size = new System.Drawing.Size(172, 65);
-            this.pnlAiTalk.Style.BackColor1.Color = System.Drawing.Color.Transparent;
-            this.pnlAiTalk.Style.BackgroundImage = global::TemuKJD.Properties.Resources.choice_chat_ai;
-            this.pnlAiTalk.StyleMouseOver.Border = DevComponents.DotNetBar.eBorderType.RaisedInner;
-            this.pnlAiTalk.StyleMouseOver.BorderColor.Color = System.Drawing.Color.FromArgb(((int)(((byte)(7)))), ((int)(((byte)(157)))), ((int)(((byte)(235)))));
-            this.pnlAiTalk.TabIndex = 70;
-            this.pnlAiTalk.Click += new System.EventHandler(this.pnlAiTalk_Click);
-            // 
             // label2
             // 
             this.label2.AutoSize = true;
@@ -178,6 +164,20 @@
             this.label2.Visible = false;
             this.label2.Click += new System.EventHandler(this.label2_Click);
             // 
+            // pnlAiTalk
+            // 
+            this.pnlAiTalk.Cursor = System.Windows.Forms.Cursors.Hand;
+            this.pnlAiTalk.DisabledBackColor = System.Drawing.Color.Empty;
+            this.pnlAiTalk.Location = new System.Drawing.Point(236, 143);
+            this.pnlAiTalk.Name = "pnlAiTalk";
+            this.pnlAiTalk.Size = new System.Drawing.Size(172, 65);
+            this.pnlAiTalk.Style.BackColor1.Color = System.Drawing.Color.Transparent;
+            this.pnlAiTalk.Style.BackgroundImage = global::TemuKJD.Properties.Resources.choice_chat_ai;
+            this.pnlAiTalk.StyleMouseOver.Border = DevComponents.DotNetBar.eBorderType.RaisedInner;
+            this.pnlAiTalk.StyleMouseOver.BorderColor.Color = System.Drawing.Color.FromArgb(((int)(((byte)(7)))), ((int)(((byte)(157)))), ((int)(((byte)(235)))));
+            this.pnlAiTalk.TabIndex = 70;
+            this.pnlAiTalk.Click += new System.EventHandler(this.pnlAiTalk_Click);
+            // 
             // ChangeForm
             // 
             this.AutoScaleMode = System.Windows.Forms.AutoScaleMode.None;

TEMUKJD/KJD.csproj

@@ -55,7 +55,7 @@
     <WarningLevel>4</WarningLevel>
   </PropertyGroup>
   <PropertyGroup>
-    <ApplicationIcon>29_common_blue_icon.ico</ApplicationIcon>
+    <ApplicationIcon>bag.ico</ApplicationIcon>
   </PropertyGroup>
   <PropertyGroup Condition="'$(Configuration)|$(Platform)' == 'Debug|x64'">
     <DebugSymbols>true</DebugSymbols>
@@ -213,11 +213,17 @@
     <Compile Include="WXForms\AdminForms\WXAdminTransitWarehouseManage.Designer.cs">
       <DependentUpon>WXAdminTransitWarehouseManage.cs</DependentUpon>
     </Compile>
-    <Compile Include="WXForms\AdminForms\WxOemManageForm.cs">
+    <Compile Include="WXForms\AdminForms\WXAdminAccountBalanceForm.cs">
       <SubType>Form</SubType>
     </Compile>
-    <Compile Include="WXForms\AdminForms\WxOemManageForm.Designer.cs">
-      <DependentUpon>WxOemManageForm.cs</DependentUpon>
+    <Compile Include="WXForms\AdminForms\WXAdminAccountBalanceForm.Designer.cs">
+      <DependentUpon>WXAdminAccountBalanceForm.cs</DependentUpon>
+    </Compile>
+    <Compile Include="WXForms\AdminForms\WxAdminOemManageForm.cs">
+      <SubType>Form</SubType>
+    </Compile>
+    <Compile Include="WXForms\AdminForms\WxAdminOemManageForm.Designer.cs">
+      <DependentUpon>WxAdminOemManageForm.cs</DependentUpon>
     </Compile>
     <Compile Include="WXForms\AiTalkForms\WxAiTalkForm.cs">
       <SubType>Form</SubType>
@@ -412,6 +418,18 @@
     <Compile Include="WXForms\ProductForms\WXFinderSquareForm.Designer.cs">
       <DependentUpon>WXFinderSquareForm.cs</DependentUpon>
     </Compile>
+    <Compile Include="WXForms\ShopForms\WXOemPointsTopUpListForm.cs">
+      <SubType>Form</SubType>
+    </Compile>
+    <Compile Include="WXForms\ShopForms\WXOemPointsTopUpListForm.Designer.cs">
+      <DependentUpon>WXOemPointsTopUpListForm.cs</DependentUpon>
+    </Compile>
+    <Compile Include="WXForms\ShopForms\WXOemAccountBalanceForm.cs">
+      <SubType>Form</SubType>
+    </Compile>
+    <Compile Include="WXForms\ShopForms\WXOemAccountBalanceForm.Designer.cs">
+      <DependentUpon>WXOemAccountBalanceForm.cs</DependentUpon>
+    </Compile>
     <Compile Include="WXForms\ShopForms\WXOemAccountForm.cs">
       <SubType>Form</SubType>
     </Compile>
@@ -1400,8 +1418,11 @@
     <EmbeddedResource Include="WXForms\AdminForms\WXAdminTransitWarehouseManage.resx">
       <DependentUpon>WXAdminTransitWarehouseManage.cs</DependentUpon>
     </EmbeddedResource>
-    <EmbeddedResource Include="WXForms\AdminForms\WxOemManageForm.resx">
-      <DependentUpon>WxOemManageForm.cs</DependentUpon>
+    <EmbeddedResource Include="WXForms\AdminForms\WXAdminAccountBalanceForm.resx">
+      <DependentUpon>WXAdminAccountBalanceForm.cs</DependentUpon>
+    </EmbeddedResource>
+    <EmbeddedResource Include="WXForms\AdminForms\WxAdminOemManageForm.resx">
+      <DependentUpon>WxAdminOemManageForm.cs</DependentUpon>
     </EmbeddedResource>
     <EmbeddedResource Include="WXForms\AiTalkForms\WxAiTalkForm.resx">
       <DependentUpon>WxAiTalkForm.cs</DependentUpon>
@@ -1529,6 +1550,12 @@
     <EmbeddedResource Include="WXForms\ProductForms\WXProductForm.resx">
       <DependentUpon>WXProductForm.cs</DependentUpon>
     </EmbeddedResource>
+    <EmbeddedResource Include="WXForms\ShopForms\WXOemPointsTopUpListForm.resx">
+      <DependentUpon>WXOemPointsTopUpListForm.cs</DependentUpon>
+    </EmbeddedResource>
+    <EmbeddedResource Include="WXForms\ShopForms\WXOemAccountBalanceForm.resx">
+      <DependentUpon>WXOemAccountBalanceForm.cs</DependentUpon>
+    </EmbeddedResource>
     <EmbeddedResource Include="WXForms\ShopForms\WXOemAccountForm.resx">
       <DependentUpon>WXOemAccountForm.cs</DependentUpon>
     </EmbeddedResource>
@@ -1968,6 +1995,7 @@
     <Content Include="29_common_blue_icon.ico" />
     <Content Include="29_common_icon_purple.ico" />
     <Content Include="29_common_icon_orange.ico" />
+    <Content Include="bag.ico" />
     <Content Include="icon.ico" />
     <Content Include="qk.ico" />
     <Content Include="Resources\choice_chat_ai.png" />

TEMUKJD/KJD.csproj.user

@@ -1,7 +1,7 @@
 <?xml version="1.0" encoding="utf-8"?>
 <Project ToolsVersion="Current" xmlns="http://schemas.microsoft.com/developer/msbuild/2003">
   <PropertyGroup>
-    <ProjectView>ShowAllFiles</ProjectView>
+    <ProjectView>ProjectFiles</ProjectView>
     <PublishUrlHistory>publish\</PublishUrlHistory>
     <InstallUrlHistory />
     <SupportUrlHistory />

TEMUKJD/PDDForms/ProductSelectForms/PDDDBProdListForm.Designer.cs

@@ -83,6 +83,7 @@ namespace TemuKJD.PDDForms.ProductSelectForms
             this.btnPushToOutServer = new DevComponents.DotNetBar.PanelEx();
             this.btnGetProdWxCate = new DevComponents.DotNetBar.PanelEx();
             this.tableLayoutPanel1 = new System.Windows.Forms.TableLayoutPanel();
+            this.cmbTime = new System.Windows.Forms.ComboBox();
             this.cmbHasFission = new System.Windows.Forms.ComboBox();
             this.label20 = new System.Windows.Forms.Label();
             this.txtViewUvMin = new System.Windows.Forms.TextBox();
@@ -91,7 +92,6 @@ namespace TemuKJD.PDDForms.ProductSelectForms
             this.label19 = new System.Windows.Forms.Label();
             this.dtpEnd = new System.Windows.Forms.DateTimePicker();
             this.dtpStart = new System.Windows.Forms.DateTimePicker();
-            this.chkTime = new TemuKJD.UserComponent.UcCheckBox(this.components);
             this.cmbCat2 = new System.Windows.Forms.ComboBox();
             this.label16 = new System.Windows.Forms.Label();
             this.label1 = new System.Windows.Forms.Label();
@@ -872,6 +872,7 @@ namespace TemuKJD.PDDForms.ProductSelectForms
             this.tableLayoutPanel1.ColumnStyles.Add(new System.Windows.Forms.ColumnStyle());
             this.tableLayoutPanel1.ColumnStyles.Add(new System.Windows.Forms.ColumnStyle(System.Windows.Forms.SizeType.Percent, 12.50328F));
             this.tableLayoutPanel1.ColumnStyles.Add(new System.Windows.Forms.ColumnStyle());
+            this.tableLayoutPanel1.Controls.Add(this.cmbTime, 8, 2);
             this.tableLayoutPanel1.Controls.Add(this.cmbHasFission, 15, 1);
             this.tableLayoutPanel1.Controls.Add(this.label20, 14, 1);
             this.tableLayoutPanel1.Controls.Add(this.txtViewUvMin, 13, 1);
@@ -880,7 +881,6 @@ namespace TemuKJD.PDDForms.ProductSelectForms
             this.tableLayoutPanel1.Controls.Add(this.label19, 12, 0);
             this.tableLayoutPanel1.Controls.Add(this.dtpEnd, 11, 2);
             this.tableLayoutPanel1.Controls.Add(this.dtpStart, 9, 2);
-            this.tableLayoutPanel1.Controls.Add(this.chkTime, 8, 2);
             this.tableLayoutPanel1.Controls.Add(this.cmbCat2, 5, 2);
             this.tableLayoutPanel1.Controls.Add(this.label16, 0, 1);
             this.tableLayoutPanel1.Controls.Add(this.label1, 0, 2);
@@ -928,6 +928,20 @@ namespace TemuKJD.PDDForms.ProductSelectForms
             this.tableLayoutPanel1.Size = new System.Drawing.Size(908, 105);
             this.tableLayoutPanel1.TabIndex = 679;
             // 
+            // cmbTime
+            // 
+            this.cmbTime.Anchor = ((System.Windows.Forms.AnchorStyles)((System.Windows.Forms.AnchorStyles.Left | System.Windows.Forms.AnchorStyles.Right)));
+            this.cmbTime.FormattingEnabled = true;
+            this.cmbTime.Items.AddRange(new object[] {
+            "",
+            "修改时间",
+            "入库时间"});
+            this.cmbTime.Location = new System.Drawing.Point(402, 77);
+            this.cmbTime.Margin = new System.Windows.Forms.Padding(0, 3, 3, 3);
+            this.cmbTime.Name = "cmbTime";
+            this.cmbTime.Size = new System.Drawing.Size(56, 25);
+            this.cmbTime.TabIndex = 983;
+            // 
             // cmbHasFission
             // 
             this.cmbHasFission.Anchor = ((System.Windows.Forms.AnchorStyles)((System.Windows.Forms.AnchorStyles.Left | System.Windows.Forms.AnchorStyles.Right)));
@@ -1021,16 +1035,6 @@ namespace TemuKJD.PDDForms.ProductSelectForms
             this.dtpStart.Size = new System.Drawing.Size(110, 23);
             this.dtpStart.TabIndex = 978;
             // 
-            // chkTime
-            // 
-            this.chkTime.Anchor = System.Windows.Forms.AnchorStyles.Right;
-            this.chkTime.Location = new System.Drawing.Point(416, 77);
-            this.chkTime.Name = "chkTime";
-            this.chkTime.Size = new System.Drawing.Size(42, 21);
-            this.chkTime.TabIndex = 977;
-            this.chkTime.Text = "时间";
-            this.chkTime.UseVisualStyleBackColor = true;
-            // 
             // cmbCat2
             // 
             this.cmbCat2.Anchor = ((System.Windows.Forms.AnchorStyles)((System.Windows.Forms.AnchorStyles.Left | System.Windows.Forms.AnchorStyles.Right)));
@@ -2207,7 +2211,6 @@ namespace TemuKJD.PDDForms.ProductSelectForms
         private System.Windows.Forms.ComboBox cmbHasReturn;
         private System.Windows.Forms.Label label18;
         private DevComponents.DotNetBar.PanelEx btnUpdateReturnServerData;
-        private UserComponent.UcCheckBox chkTime;
         private System.Windows.Forms.DateTimePicker dtpEnd;
         private System.Windows.Forms.DateTimePicker dtpStart;
         private DevComponents.DotNetBar.PanelEx panelEx1;
@@ -2266,5 +2269,6 @@ namespace TemuKJD.PDDForms.ProductSelectForms
         private System.Windows.Forms.Panel panel1;
         private DevComponents.DotNetBar.PanelEx btnAddUserProd;
         private DevComponents.DotNetBar.PanelEx btnEditGroup;
+        private System.Windows.Forms.ComboBox cmbTime;
     }
 }

TEMUKJD/PDDForms/ProductSelectForms/PDDDBProdListForm.cs

@@ -130,6 +130,8 @@ namespace TemuKJD.PDDForms.ProductSelectForms
 
             this.dtpStart.Value = new DateTime(2026, 3, 12, 0, 0, 0);
             this.dtpEnd.Value = new DateTime(2026, 3, 13, 13, 0, 0);
+            this.dtpStart.Value = DateTime.Now.Date.AddMonths(-1);
+            this.dtpEnd.Value = DateTime.Now.Date.AddDays(1).AddSeconds(-1);
 
 
             WXDBProdUploadForm.lstWXShopTokenInfo = NaiBa.Util.Helper.ConfigHelper.LoadConfig<NaiBa.Util.ConcurrentList<WXShopTokenInfo>>("wx_shop_token_list");
@@ -187,14 +189,14 @@ namespace TemuKJD.PDDForms.ProductSelectForms
                     if (lstTemuDbProduct.Any(p => p.view_uv != null))
                         dgvDbProduct.Columns["colViewUv"].Visible = true;
                 }));
-                foreach (var prod in lstTemuDbProduct)
+                foreach (var prod in lstTemuDbProduct.Reverse().ToList())
                 {
                     string catName = (prod.cat_name ?? prod.cat_id);
                     if (prod.wx_cat_leaf != null)
                     {
                         var catN = GlobalConfig.WxCatList.FirstOrDefault(c => c.cat_id == prod.wx_cat_leaf.ParseToString())?.name;
                         if (!string.IsNullOrEmpty(catN))
-                        {
+                        { 
                             catName = catN;
                         }
                     }
@@ -370,11 +372,16 @@ namespace TemuKJD.PDDForms.ProductSelectForms
                     data += "&min_view_uv=" + txtViewUvMin.Text.ParseToInt();
                 }
 
-                if (chkTime.Checked)
+                if (cmbTime.Text == "修改时间")
                 {
                     data += "&start_time=" + dtpStart.Value.ToString("yyyy-MM-dd HH:mm:ss");
                     data += "&end_time=" + dtpEnd.Value.ToString("yyyy-MM-dd HH:mm:ss");
                 }
+                if (cmbTime.Text == "入库时间")
+                {
+                    data += "&add_time_begin=" + dtpStart.Value.ToString("yyyy-MM-dd HH:mm:ss");
+                    data += "&add_time_end=" + dtpEnd.Value.ToString("yyyy-MM-dd HH:mm:ss");
+                }
 
                 if (cmbSourceType.Text != "厂商直采")
                 {

TEMUKJD/Properties/Resources.Designer.cs

@@ -220,16 +220,6 @@ namespace TemuKJD.Properties {
             }
         }
         
-        /// <summary>
-        ///   查找 System.Drawing.Bitmap 类型的本地化资源。
-        /// </summary>
-        internal static System.Drawing.Bitmap common_icon {
-            get {
-                object obj = ResourceManager.GetObject("common_icon", resourceCulture);
-                return ((System.Drawing.Bitmap)(obj));
-            }
-        }
-        
         /// <summary>
         ///   查找类似 [{&quot;id&quot;:0,&quot;name&quot;:&quot;全部分类&quot;,&quot;parent_cid&quot;:-1,&quot;level&quot;:0,&quot;enable&quot;:0,&quot;is_leaf&quot;:false,&quot;industry_status&quot;:0,&quot;extra&quot;:null,&quot;is_get_child&quot;:true},{&quot;id&quot;:20005,&quot;name&quot;:&quot;女装&quot;,&quot;parent_cid&quot;:0,&quot;level&quot;:1,&quot;enable&quot;:1,&quot;is_leaf&quot;:false,&quot;industry_status&quot;:0,&quot;extra&quot;:null,&quot;is_get_child&quot;:true},{&quot;id&quot;:20009,&quot;name&quot;:&quot;男装&quot;,&quot;parent_cid&quot;:0,&quot;level&quot;:1,&quot;enable&quot;:1,&quot;is_leaf&quot;:false,&quot;industry_status&quot;:0,&quot;extra&quot;:null,&quot;is_get_child&quot;:true},{&quot;id&quot;:20062,&quot;name&quot;:&quot;内衣裤袜&quot;,&quot;parent_cid&quot;:0,&quot;level&quot;:1,&quot;enable&quot;:1,&quot;is_leaf&quot;:false,&quot;industry_status&quot;:0,&quot;extra&quot;:null,&quot;is_get_chi [字符串的其余部分被截断]&quot;; 的本地化字符串。
         /// </summary>

TEMUKJD/Properties/Resources.resx

@@ -157,9 +157,6 @@
   <data name="close_hover" type="System.Resources.ResXFileRef, System.Windows.Forms">
     <value>..\Resources\close.hover.png;System.Drawing.Bitmap, System.Drawing, Version=4.0.0.0, Culture=neutral, PublicKeyToken=b03f5f7f11d50a3a</value>
   </data>
-  <data name="common_icon" type="System.Resources.ResXFileRef, System.Windows.Forms">
-    <value>..\Resources\common_icon.png;System.Drawing.Bitmap, System.Drawing, Version=4.0.0.0, Culture=neutral, PublicKeyToken=b03f5f7f11d50a3a</value>
-  </data>
   <data name="DyCategorys" type="System.Resources.ResXFileRef, System.Windows.Forms">
     <value>..\static\dycategorys.txt;System.String, mscorlib, Version=4.0.0.0, Culture=neutral, PublicKeyToken=b77a5c561934e089;utf-8</value>
   </data>

TEMUKJD/WXForms/AdminForms/WXAdminAccountBalanceForm.cs

@@ -0,0 +1,378 @@
+using AllBase;
+using AllBase.Helper;
+using AllBase.Model.DBModel;
+using AllBase.Model.Result;
+using CefSharp;
+using CefSharp.WinForms;
+using DevComponents.WinForms.Drawing;
+using NaiBa.CefHelper;
+using NaiBa.Util.Extension;
+using Newtonsoft.Json.Linq;
+using System;
+using System.Collections.Generic;
+using System.ComponentModel;
+using System.Data;
+using System.Data.SQLite;
+using System.Diagnostics;
+using System.Drawing;
+using System.Drawing.Printing;
+using System.Linq;
+using System.Security.Cryptography.X509Certificates;
+using System.Security.Policy;
+using System.Text;
+using System.Threading;
+using System.Threading.Tasks;
+using System.Windows.Forms;
+using TemuKJD.BaseForms;
+using TemuKJD.BLL;
+using TemuKJD.Extension;
+using Work;
+
+namespace TemuKJD.WXForms.AdminForms
+{
+    public partial class WXAdminAccountBalanceForm : BaseGeneralForm
+    {
+        // (拍单后)回调函数，更新拍单余额
+        private Action updateBalanceAction = null;
+        public static List<UserSubAccountInfo> AllUsers { get; set; } = new List<UserSubAccountInfo>();
+
+        public WXAdminAccountBalanceForm()
+        {
+            InitializeComponent();
+        }
+
+        private async void WXGetTopUpQrCode_Load(object sender, EventArgs e)
+        {
+            var chkAll = this.dgvPayment.AddSelectorColumn("colCheck");
+            chkAll.Click += ChkAll_Click;
+
+            this.dgvUser.AddSelectorColumn("colSelect");
+            this.dtpTimeBegin.Value = DateTime.Now.Date.AddMonths(-3);
+            this.dtpTimeEnd.Value = DateTime.Now.Date.AddDays(1).AddSeconds(-1);
+
+            ucSplitPage1.cmbPageSize.Items.Remove("5000");
+
+            pictureBox2.Visible = true;
+            await Task.Run(() => { GetBalanceList(); });
+            pictureBox2.Visible = false;
+
+            
+        }
+
+        private void ChkAll_Click(object sender, EventArgs e)
+        {
+            this.dgvPayment.CellValueChanged -= this.dgvPayment_CellValueChanged;
+            this.GetProfit();
+            this.dgvPayment.CellValueChanged += this.dgvPayment_CellValueChanged;
+        }
+
+        private void btnBalanceTopUp_Click(object sender, EventArgs e)
+        {
+            
+        }
+
+        public async void GetBalanceList()
+        {
+            Invoke(new Action(() =>
+            {
+                this.dgvPayment.Rows.Clear();
+                dgvPayment.CellValueChanged -= dgvPayment_CellValueChanged;
+            }));
+
+            await Task.Run(() =>
+            {
+                int pageCount = 1;
+                int pageSize = 50;
+                var url3 = BaseClass.BuildWXObjString("user/get_user_balance");
+                var data3 = UserLogin.GetSignaturex();
+                Invoke(new Action(() =>
+                {
+                    if (!string.IsNullOrEmpty(txtUserName.Text.Trim()))
+                        data3 += "&user_name_in=" + txtUserName.Text.Trim();
+                    data3 += "&create_time_begin=" + dtpTimeBegin.Value.ToString("yyyy-MM-dd HH:mm:ss");
+                    data3 += "&create_time_end=" + dtpTimeEnd.Value.ToString("yyyy-MM-dd HH:mm:ss");
+                    if (cmbType.Text == "充值")
+                        data3 += "&type_in=1,30";
+                    if (cmbType.Text == "管理员充值")
+                        data3 += "&type_in=1";
+                    if (cmbType.Text == "支付宝充值")
+                        data3 += "&type_in=30";
+                    if (cmbType.Text == "拍单扣除/作废返还")
+                        data3 += "&type_in=20,23";
+                    if (cmbType.Text == "超重扣费")
+                        data3 += "&type_in=24";
+                    data3 += "&page=" + ucSplitPage1.CurrentPage;
+                    data3 += "&page_size=" + ucSplitPage1.PageSize;
+                    pageSize = ucSplitPage1.PageSize;
+                }));
+                var html3 = GetHtml.PostUtf8(url3, data3);
+                if (string.IsNullOrEmpty(html3) || !html3.Contains("\"code\":200"))
+                    html3 = GetHtml.PostUtf8(url3, data3);
+                if (string.IsNullOrEmpty(html3) || !html3.Contains("\"code\":200"))
+                {
+                    BaseMsgForm.ShowError("查询失败：" + BaseRegex.GetStringJsonByRegs(ref html3, html3, "msg"));
+                    return;
+                }
+                List<user_payment_record> paymentList = new List<user_payment_record>();
+                paymentList = JsonHelper.DeserializeJsonToList<user_payment_record>(JsonHelper.JObjectParse(html3)["data"].ParseToString());
+                foreach (var payment in paymentList)
+                {
+                    Invoke(new Action(() =>
+                    {
+                        var rowIndex = this.dgvPayment.Rows.Add(
+                            true,
+                            ((EnumOrderPaymentType)payment.type.ParseToInt()).ParseToString(),
+                            payment.user_name,
+                            payment.order_id,
+                            payment.amount,
+                            payment.balance,
+                            payment.create_time.ToString("yyyy-MM-dd HH:mm:ss"),
+                            payment.remark
+                        );
+                        this.dgvPayment.Rows[rowIndex].Height = 60;
+                    }));
+                }
+                int count = BaseRegex.GetIntJson(ref html3, "count");
+                pageCount = Math.Ceiling(1.0 * count / pageSize).ParseToInt();
+                pageCount = Math.Max(pageCount, 1);
+                ucSplitPage1.TotalPage = pageCount;
+            });
+            Invoke(new Action(() =>
+            {
+                GetProfit();
+                dgvPayment.CellValueChanged += dgvPayment_CellValueChanged;
+            }));
+        }
+
+        private async void btnSearch_Click(object sender, EventArgs e)
+        {
+            if (this.ucSplitPage1.CurrentPage != 1)
+                this.ucSplitPage1.CurrentPage = 1;
+
+            pictureBox2.Visible = true;
+            await Task.Run(() => { GetBalanceList(); });
+            pictureBox2.Visible = false;
+        }
+
+        private async void ucSplitPage1_PageChange(object obj)
+        {
+            pictureBox2.Visible = true;
+            await Task.Run(() => { GetBalanceList(); });
+            pictureBox2.Visible = false;
+        }
+
+        private async void btnGetUser_Click(object sender, EventArgs e)
+        {
+            if (pageUser.CurrentPage != 1)
+                pageUser.CurrentPage = 1;
+            else
+            {
+                pictureBox1.Visible = true;
+                await Task.Run(() => { GetUser(); });
+                pictureBox1.Visible = false;
+            }
+        }
+
+        private void GetUser()
+        {
+            Invoke(new Action(() =>
+            {
+                dgvUser.Rows.Clear();
+                AllUsers.Clear();
+            }));
+
+            if (BaseClass.SaLevel == 0)
+                return;
+            string url = BaseClass.BuildObjString("user/get_all_user");
+            StringBuilder data = new StringBuilder();
+            data.Append(UserLogin.GetSignaturex());
+            Invoke(new Action(() =>
+            {
+                // 账户类型
+                if (cmbGroup.Text == "主账户")
+                    data.Append("&group_id=3");
+                else if (cmbGroup.Text == "客服")
+                    data.Append("&group_id=4");
+                if (!string.IsNullOrWhiteSpace(txtSearch.Text))
+                    data.Append("&search=" + txtSearch.Text.Replace("'", "＇"));
+                data.Append("&page_size=" + pageUser.PageSize);
+                data.Append("&page=" + pageUser.CurrentPage);
+            }));
+            string html = GetHtml.PostUtf8(url, data.ToString());
+            if (string.IsNullOrEmpty(html))
+                return;
+            if (html.Contains("\"data\""))
+            {
+                var userObj = Newtonsoft.Json.Linq.JObject.Parse(html);
+                foreach (Newtonsoft.Json.Linq.JObject obj in userObj["data"])
+                {
+                    string oStr = JsonHelper.SerializeObject(obj);
+                    UserSubAccountInfo user = new UserSubAccountInfo();
+                    user.id = BaseRegex.GetIntJson(ref oStr, "id");
+                    user.user_name = BaseRegex.GetStringJson(ref oStr, "user_name");
+                    user.nick_name = BaseRegex.GetStringJson(ref oStr, "nick_name");
+                    user.mobile = BaseRegex.GetStringJson(ref oStr, "mobile");
+                    user.group_id = BaseRegex.GetStringJson(ref oStr, "group_id");
+                    user.shop_count = BaseRegex.GetIntJson(ref oStr, "shop_count");
+                    user.company_name = BaseRegex.GetStringJson(ref oStr, "company_name");
+                    user.sa_level = BaseRegex.GetIntJson(ref oStr, "sa_level");
+                    user.authority = BaseRegex.GetStringJson(ref oStr, "authority");
+                    user.points = BaseRegex.GetIntJson(ref oStr, "points");
+                    user.balance = BaseRegex.GetDecimalJson(ref oStr, "balance");
+                    user.shop_points_per_month = BaseRegex.GetIntJson(ref oStr, "shop_points_per_month");
+                    user.postage_per_order = BaseRegex.GetDecimalJson(ref oStr, "postage_per_order");
+                    user.oem_id = BaseRegex.GetStringJson(ref oStr, "oem_id");
+                    user.oem_name = BaseRegex.GetStringJson(ref oStr, "oem_name");
+                    var parent_user_name = BaseRegex.GetStringJson(ref oStr, "parent_user_name");
+                    AllUsers.Add(user);
+                    Invoke(new Action(() =>
+                    {
+                        dgvUser.Rows.Add(
+                            false,
+                            user.id,
+                            user.nick_name,
+                            user.user_name,
+                            parent_user_name,
+                            user.group_id,
+                            user.group_name,
+                            user.company_name,
+                            user.shop_count,
+                            user.sa_level,
+                            user.sa_level_name /*+ (user.group_id == "4" ? "(客服)" : "")*/,
+                            user.authority,
+                            user.oem_id,
+                            user.oem_name,
+                            (user.authority.Contains("充值用户") && user.group_id == "3") ? (int?)user.points : null,
+                            (user.authority.Contains("充值用户") && user.group_id == "3") ? "+" : null,
+                            (user.authority.Contains("充值用户") && user.group_id == "3") ? (int?)user.shop_points_per_month : null,
+                            (user.authority.Contains("充值用户") && user.group_id == "3") ? "改" : null,
+                            user.balance.ParseToDecimal(),
+                            "+",
+                            Math.Max(2.2m, user.postage_per_order.ParseToDecimal()),
+                            (user.group_id == "3") ? "改" : null,
+                            user.group_id == "3" ? "添加店铺" : "",
+                            "编辑",
+                            "删除");
+                    }));
+                }
+                int count = BaseRegex.GetIntJson(ref html, "count");
+                var pageCount = Math.Ceiling(1.0 * count / pageUser.PageSize).ParseToInt();
+                pageCount = Math.Max(pageCount, 1);
+                pageUser.TotalPage = pageCount;
+            }
+        }
+
+        void GetProfit()
+        {
+            //foreach (var row in dgvPayment.Rows.Cast<DataGridViewRow>().ToList())
+            //{
+            //    if (row.Cells["colCheck"].Value.ParseToBool() == false)
+            //        continue;
+
+            //    if (row.Cells[""].Value.ParseToString() == "中转仓扣费支出")
+            //    {
+
+            //    }
+            //}
+
+            var checkRows = dgvPayment.Rows.Cast<DataGridViewRow>().Where(r => r.Cells["colCheck"].Value.ParseToBool() == true).ToList();
+
+            lblPostageTotal.Text = checkRows
+                .Where(r => r.Cells["colType"].Value.ParseToString() == EnumOrderPaymentType.中转仓扣费支出.ParseToString())
+                .Sum(r => r.Cells["colAmount"].Value.ParseToDecimal()).ToString();
+            lblPostageReturnTotal.Text = checkRows
+                .Where(r => r.Cells["colType"].Value.ParseToString() == EnumOrderPaymentType.中转仓作废返还收入.ParseToString())
+                .Sum(r => r.Cells["colAmount"].Value.ParseToDecimal()).ToString();
+            lblPostageWeightTotal.Text = checkRows
+                .Where(r => r.Cells["colType"].Value.ParseToString() == EnumOrderPaymentType.中转仓超重支出.ParseToString())
+                .Sum(r => r.Cells["colAmount"].Value.ParseToDecimal()).ToString();
+            lblPostageNotReturnCnt.Text = (checkRows
+                .Where(r => r.Cells["colType"].Value.ParseToString() == EnumOrderPaymentType.中转仓扣费支出.ParseToString()).Count() - checkRows
+                .Where(r => r.Cells["colType"].Value.ParseToString() == EnumOrderPaymentType.中转仓作废返还收入.ParseToString()).Count()).ToString();
+            lblProfit.Text = (lblPostageTotal.Text.ParseToDecimal() - lblPostageReturnTotal.Text.ParseToDecimal() - lblPostageNotReturnCnt.Text.ParseToInt() * 2.2m).ToString(); 
+        }
+
+        private async void btnSearchShop_Click(object sender, EventArgs e)
+        {
+            pnlGetUser.Visible = true;
+
+            if (pageUser.CurrentPage != 1)
+                pageUser.CurrentPage = 1;
+            else
+            {
+                pictureBox1.Visible = true;
+                await Task.Run(() => { GetUser(); });
+                pictureBox1.Visible = false;
+            }
+        }
+
+        private void btnClose_Click(object sender, EventArgs e)
+        {
+            this.pnlGetUser.Visible = false;
+        }
+
+        private void btnOk_Click(object sender, EventArgs e)
+        {
+            var ids = dgvUser.Rows.Cast<DataGridViewRow>()
+                .Where(r => r.Cells["colSelect"].Value.ParseToBool() == true)
+                .Select(r => r.Cells["mobileColumn"].Value.ParseToString());
+            this.txtUserName.Text = string.Join(",", ids);
+            this.pnlGetUser.Visible = false;
+        }
+
+        private void dgvUser_CellContentClick(object sender, DataGridViewCellEventArgs e)
+        {
+            if (e.ColumnIndex < 0 || e.RowIndex < 0)
+                return;
+            var row = dgvUser.Rows[e.RowIndex];
+            string headerText = dgvUser.Columns[e.ColumnIndex].HeaderText;
+            string columnName = dgvUser.Columns[e.ColumnIndex].Name;
+            switch (headerText)
+            {
+                case "":
+                    dgvUser.Rows[e.RowIndex].Cells["colSelect"].Value = !(bool)dgvUser.Rows[e.RowIndex].Cells["colSelect"].Value;
+                    break;
+                default:
+                    break;
+            }
+        }
+
+        private void dgvPayment_CellContentClick(object sender, DataGridViewCellEventArgs e)
+        {
+            if (e.ColumnIndex < 0 || e.RowIndex < 0)
+                return;
+            var row = dgvPayment.Rows[e.RowIndex];
+            string headerText = dgvPayment.Columns[e.ColumnIndex].HeaderText;
+            string columnName = dgvPayment.Columns[e.ColumnIndex].Name;
+            switch (headerText)
+            {
+                case "":
+                    dgvPayment.Rows[e.RowIndex].Cells["colCheck"].Value = !(bool)dgvPayment.Rows[e.RowIndex].Cells["colCheck"].Value;
+                    break;
+                default:
+                    break;
+            }
+        }
+
+        private void btnClearFilter_Click(object sender, EventArgs e)
+        {
+            cmbGroup.Text = "全部";
+            this.txtSearch.Text = "";
+        }
+
+        private void dgvPayment_CellValueChanged(object sender, DataGridViewCellEventArgs e)
+        {
+            if (e.ColumnIndex == 0)
+            {
+                GetProfit();
+            }
+        }
+
+        private async void pageUser_PageChange(object obj)
+        {
+            pictureBox1.Visible = true;
+            await Task.Run(() => { GetUser(); });
+            pictureBox1.Visible = false;
+        }
+    }
+}

TEMUKJD/WXForms/AdminForms/WXAdminAccountBalanceForm.resx

@@ -0,0 +1,394 @@
+<?xml version="1.0" encoding="utf-8"?>
+<root>
+  <!-- 
+    Microsoft ResX Schema 
+    
+    Version 2.0
+    
+    The primary goals of this format is to allow a simple XML format 
+    that is mostly human readable. The generation and parsing of the 
+    various data types are done through the TypeConverter classes 
+    associated with the data types.
+    
+    Example:
+    
+    ... ado.net/XML headers & schema ...
+    <resheader name="resmimetype">text/microsoft-resx</resheader>
+    <resheader name="version">2.0</resheader>
+    <resheader name="reader">System.Resources.ResXResourceReader, System.Windows.Forms, ...</resheader>
+    <resheader name="writer">System.Resources.ResXResourceWriter, System.Windows.Forms, ...</resheader>
+    <data name="Name1"><value>this is my long string</value><comment>this is a comment</comment></data>
+    <data name="Color1" type="System.Drawing.Color, System.Drawing">Blue</data>
+    <data name="Bitmap1" mimetype="application/x-microsoft.net.object.binary.base64">
+        <value>[base64 mime encoded serialized .NET Framework object]</value>
+    </data>
+    <data name="Icon1" type="System.Drawing.Icon, System.Drawing" mimetype="application/x-microsoft.net.object.bytearray.base64">
+        <value>[base64 mime encoded string representing a byte array form of the .NET Framework object]</value>
+        <comment>This is a comment</comment>
+    </data>
+                
+    There are any number of "resheader" rows that contain simple 
+    name/value pairs.
+    
+    Each data row contains a name, and value. The row also contains a 
+    type or mimetype. Type corresponds to a .NET class that support 
+    text/value conversion through the TypeConverter architecture. 
+    Classes that don't support this are serialized and stored with the 
+    mimetype set.
+    
+    The mimetype is used for serialized objects, and tells the 
+    ResXResourceReader how to depersist the object. This is currently not 
+    extensible. For a given mimetype the value must be set accordingly:
+    
+    Note - application/x-microsoft.net.object.binary.base64 is the format 
+    that the ResXResourceWriter will generate, however the reader can 
+    read any of the formats listed below.
+    
+    mimetype: application/x-microsoft.net.object.binary.base64
+    value   : The object must be serialized with 
+            : System.Runtime.Serialization.Formatters.Binary.BinaryFormatter
+            : and then encoded with base64 encoding.
+    
+    mimetype: application/x-microsoft.net.object.soap.base64
+    value   : The object must be serialized with 
+            : System.Runtime.Serialization.Formatters.Soap.SoapFormatter
+            : and then encoded with base64 encoding.
+
+    mimetype: application/x-microsoft.net.object.bytearray.base64
+    value   : The object must be serialized into a byte array 
+            : using a System.ComponentModel.TypeConverter
+            : and then encoded with base64 encoding.
+    -->
+  <xsd:schema id="root" xmlns="" xmlns:xsd="http://www.w3.org/2001/XMLSchema" xmlns:msdata="urn:schemas-microsoft-com:xml-msdata">
+    <xsd:import namespace="http://www.w3.org/XML/1998/namespace" />
+    <xsd:element name="root" msdata:IsDataSet="true">
+      <xsd:complexType>
+        <xsd:choice maxOccurs="unbounded">
+          <xsd:element name="metadata">
+            <xsd:complexType>
+              <xsd:sequence>
+                <xsd:element name="value" type="xsd:string" minOccurs="0" />
+              </xsd:sequence>
+              <xsd:attribute name="name" use="required" type="xsd:string" />
+              <xsd:attribute name="type" type="xsd:string" />
+              <xsd:attribute name="mimetype" type="xsd:string" />
+              <xsd:attribute ref="xml:space" />
+            </xsd:complexType>
+          </xsd:element>
+          <xsd:element name="assembly">
+            <xsd:complexType>
+              <xsd:attribute name="alias" type="xsd:string" />
+              <xsd:attribute name="name" type="xsd:string" />
+            </xsd:complexType>
+          </xsd:element>
+          <xsd:element name="data">
+            <xsd:complexType>
+              <xsd:sequence>
+                <xsd:element name="value" type="xsd:string" minOccurs="0" msdata:Ordinal="1" />
+                <xsd:element name="comment" type="xsd:string" minOccurs="0" msdata:Ordinal="2" />
+              </xsd:sequence>
+              <xsd:attribute name="name" type="xsd:string" use="required" msdata:Ordinal="1" />
+              <xsd:attribute name="type" type="xsd:string" msdata:Ordinal="3" />
+              <xsd:attribute name="mimetype" type="xsd:string" msdata:Ordinal="4" />
+              <xsd:attribute ref="xml:space" />
+            </xsd:complexType>
+          </xsd:element>
+          <xsd:element name="resheader">
+            <xsd:complexType>
+              <xsd:sequence>
+                <xsd:element name="value" type="xsd:string" minOccurs="0" msdata:Ordinal="1" />
+              </xsd:sequence>
+              <xsd:attribute name="name" type="xsd:string" use="required" />
+            </xsd:complexType>
+          </xsd:element>
+        </xsd:choice>
+      </xsd:complexType>
+    </xsd:element>
+  </xsd:schema>
+  <resheader name="resmimetype">
+    <value>text/microsoft-resx</value>
+  </resheader>
+  <resheader name="version">
+    <value>2.0</value>
+  </resheader>
+  <resheader name="reader">
+    <value>System.Resources.ResXResourceReader, System.Windows.Forms, Version=4.0.0.0, Culture=neutral, PublicKeyToken=b77a5c561934e089</value>
+  </resheader>
+  <resheader name="writer">
+    <value>System.Resources.ResXResourceWriter, System.Windows.Forms, Version=4.0.0.0, Culture=neutral, PublicKeyToken=b77a5c561934e089</value>
+  </resheader>
+  <metadata name="colSelect.UserAddedColumn" type="System.Boolean, mscorlib, Version=4.0.0.0, Culture=neutral, PublicKeyToken=b77a5c561934e089">
+    <value>True</value>
+  </metadata>
+  <metadata name="UserIdColumn.UserAddedColumn" type="System.Boolean, mscorlib, Version=4.0.0.0, Culture=neutral, PublicKeyToken=b77a5c561934e089">
+    <value>True</value>
+  </metadata>
+  <metadata name="UserNickNameColumn.UserAddedColumn" type="System.Boolean, mscorlib, Version=4.0.0.0, Culture=neutral, PublicKeyToken=b77a5c561934e089">
+    <value>True</value>
+  </metadata>
+  <metadata name="mobileColumn.UserAddedColumn" type="System.Boolean, mscorlib, Version=4.0.0.0, Culture=neutral, PublicKeyToken=b77a5c561934e089">
+    <value>True</value>
+  </metadata>
+  <metadata name="colParentUserName.UserAddedColumn" type="System.Boolean, mscorlib, Version=4.0.0.0, Culture=neutral, PublicKeyToken=b77a5c561934e089">
+    <value>True</value>
+  </metadata>
+  <metadata name="groupIdColumn.UserAddedColumn" type="System.Boolean, mscorlib, Version=4.0.0.0, Culture=neutral, PublicKeyToken=b77a5c561934e089">
+    <value>True</value>
+  </metadata>
+  <metadata name="groupNameColumn.UserAddedColumn" type="System.Boolean, mscorlib, Version=4.0.0.0, Culture=neutral, PublicKeyToken=b77a5c561934e089">
+    <value>True</value>
+  </metadata>
+  <metadata name="colCompany.UserAddedColumn" type="System.Boolean, mscorlib, Version=4.0.0.0, Culture=neutral, PublicKeyToken=b77a5c561934e089">
+    <value>True</value>
+  </metadata>
+  <metadata name="shopCountColumn.UserAddedColumn" type="System.Boolean, mscorlib, Version=4.0.0.0, Culture=neutral, PublicKeyToken=b77a5c561934e089">
+    <value>True</value>
+  </metadata>
+  <metadata name="colSaLevel.UserAddedColumn" type="System.Boolean, mscorlib, Version=4.0.0.0, Culture=neutral, PublicKeyToken=b77a5c561934e089">
+    <value>True</value>
+  </metadata>
+  <metadata name="colSaLevelName.UserAddedColumn" type="System.Boolean, mscorlib, Version=4.0.0.0, Culture=neutral, PublicKeyToken=b77a5c561934e089">
+    <value>True</value>
+  </metadata>
+  <metadata name="colAuthority.UserAddedColumn" type="System.Boolean, mscorlib, Version=4.0.0.0, Culture=neutral, PublicKeyToken=b77a5c561934e089">
+    <value>True</value>
+  </metadata>
+  <metadata name="colOemId.UserAddedColumn" type="System.Boolean, mscorlib, Version=4.0.0.0, Culture=neutral, PublicKeyToken=b77a5c561934e089">
+    <value>True</value>
+  </metadata>
+  <metadata name="colOemName.UserAddedColumn" type="System.Boolean, mscorlib, Version=4.0.0.0, Culture=neutral, PublicKeyToken=b77a5c561934e089">
+    <value>True</value>
+  </metadata>
+  <metadata name="colPoints.UserAddedColumn" type="System.Boolean, mscorlib, Version=4.0.0.0, Culture=neutral, PublicKeyToken=b77a5c561934e089">
+    <value>True</value>
+  </metadata>
+  <metadata name="colPlus.UserAddedColumn" type="System.Boolean, mscorlib, Version=4.0.0.0, Culture=neutral, PublicKeyToken=b77a5c561934e089">
+    <value>True</value>
+  </metadata>
+  <metadata name="colShopPointsPerMonth.UserAddedColumn" type="System.Boolean, mscorlib, Version=4.0.0.0, Culture=neutral, PublicKeyToken=b77a5c561934e089">
+    <value>True</value>
+  </metadata>
+  <metadata name="colChangePointsPerMonth.UserAddedColumn" type="System.Boolean, mscorlib, Version=4.0.0.0, Culture=neutral, PublicKeyToken=b77a5c561934e089">
+    <value>True</value>
+  </metadata>
+  <metadata name="dataGridViewTextBoxColumn1.UserAddedColumn" type="System.Boolean, mscorlib, Version=4.0.0.0, Culture=neutral, PublicKeyToken=b77a5c561934e089">
+    <value>True</value>
+  </metadata>
+  <metadata name="colBalancePlus.UserAddedColumn" type="System.Boolean, mscorlib, Version=4.0.0.0, Culture=neutral, PublicKeyToken=b77a5c561934e089">
+    <value>True</value>
+  </metadata>
+  <metadata name="colPostagePerOrder.UserAddedColumn" type="System.Boolean, mscorlib, Version=4.0.0.0, Culture=neutral, PublicKeyToken=b77a5c561934e089">
+    <value>True</value>
+  </metadata>
+  <metadata name="colChangePostagePerOrder.UserAddedColumn" type="System.Boolean, mscorlib, Version=4.0.0.0, Culture=neutral, PublicKeyToken=b77a5c561934e089">
+    <value>True</value>
+  </metadata>
+  <metadata name="editColumn.UserAddedColumn" type="System.Boolean, mscorlib, Version=4.0.0.0, Culture=neutral, PublicKeyToken=b77a5c561934e089">
+    <value>True</value>
+  </metadata>
+  <metadata name="deleteColumn.UserAddedColumn" type="System.Boolean, mscorlib, Version=4.0.0.0, Culture=neutral, PublicKeyToken=b77a5c561934e089">
+    <value>True</value>
+  </metadata>
+  <metadata name="colCheck.UserAddedColumn" type="System.Boolean, mscorlib, Version=4.0.0.0, Culture=neutral, PublicKeyToken=b77a5c561934e089">
+    <value>True</value>
+  </metadata>
+  <metadata name="colType.UserAddedColumn" type="System.Boolean, mscorlib, Version=4.0.0.0, Culture=neutral, PublicKeyToken=b77a5c561934e089">
+    <value>True</value>
+  </metadata>
+  <metadata name="colUserName.UserAddedColumn" type="System.Boolean, mscorlib, Version=4.0.0.0, Culture=neutral, PublicKeyToken=b77a5c561934e089">
+    <value>True</value>
+  </metadata>
+  <metadata name="colOrderId.UserAddedColumn" type="System.Boolean, mscorlib, Version=4.0.0.0, Culture=neutral, PublicKeyToken=b77a5c561934e089">
+    <value>True</value>
+  </metadata>
+  <metadata name="colAmount.UserAddedColumn" type="System.Boolean, mscorlib, Version=4.0.0.0, Culture=neutral, PublicKeyToken=b77a5c561934e089">
+    <value>True</value>
+  </metadata>
+  <metadata name="colBalance.UserAddedColumn" type="System.Boolean, mscorlib, Version=4.0.0.0, Culture=neutral, PublicKeyToken=b77a5c561934e089">
+    <value>True</value>
+  </metadata>
+  <metadata name="colCreateTime.UserAddedColumn" type="System.Boolean, mscorlib, Version=4.0.0.0, Culture=neutral, PublicKeyToken=b77a5c561934e089">
+    <value>True</value>
+  </metadata>
+  <metadata name="colRemark.UserAddedColumn" type="System.Boolean, mscorlib, Version=4.0.0.0, Culture=neutral, PublicKeyToken=b77a5c561934e089">
+    <value>True</value>
+  </metadata>
+  <assembly alias="System.Drawing" name="System.Drawing, Version=4.0.0.0, Culture=neutral, PublicKeyToken=b03f5f7f11d50a3a" />
+  <data name="$this.Icon" type="System.Drawing.Icon, System.Drawing" mimetype="application/x-microsoft.net.object.bytearray.base64">
+    <value>
+        AAABAAEAgIAQAAAAAABoKAAAFgAAACgAAACAAAAAAAEAAAEABAAAAAAAACgAAAAAAAAAAAAAAAAAAAAA
+        AAAAAAAAAACAAACAAAAAgIAAgAAAAIAAgACAgAAAgICAAMDAwAAAAP8AAP8AAAD//wD/AAAA/wD/AP//
+        AAD///8AAAAAAAAAAAAAAAAzMzMzMzMzMzMzMzMzMzMzMzMzMzMzMzMzMzMzMzMzMzMzMzMzMzMzMzMQ
+        AAAAAAAAAAAAAAAAAAAAAAAAABM5mZmZmZmZmZmZmZmZmZmZmZmZmZmZmZmZmZmZmZmZmZmZmZmZmZmZ
+        mZmZkzEAAAAAAAAAAAAAAAAAAAAAADOZmZmZmZmZmZmZmZmZmZmZmZmZmZmZmZmZmZmZmZmZmZmZmZmZ
+        mZmZmZmZmZmZMwAAAAAAAAAAAAAAAAAAABOZmZmZmZmZmZmZmZmZmZmZmZmZmZmZmZmZmZmZmZmZmZmZ
+        mZmZmZmZmZmZmZmZmZkzAAAAAAAAAAAAAAAAAAOZmZmZmZmZmZmZmZmZmZmZmZmZmZmZmZmZmZmZmZmZ
+        mZmZmZmZmZmZmZmZmZmZmZmZmTEAAAAAAAAAAAAAAAOZmZmZmZmZmZmZmZmZmZmZmZmZmZmZmZmZmZmZ
+        mZmZmZmZmZmZmZmZmZmZmZmZmZmZmZmZMAAAAAAAAAAAAAA5mZmZmZmZmZmZmZmZmZmZmZmZmZmZmZmZ
+        mZmZmZmZmZmZmZmZmZmZmZmZmZmZmZmZmZmZmZMAAAAAAAAAAAADmZmZmZmZmZmZmZmZmZmZmZmZmZmZ
+        mZmZmZmZmZmZmZmZmZmZmZmZmZmZmZmZmZmZmZmZmZmZMAAAAAAAAAAAOZmZmZmZmZmZmZmZmZmZmZmZ
+        mZmZmZmZmZmZmZmZmZmZmZmZmZmZmZmZmZmZmZmZmZmZmZmZmZMAAAAAAAAAA5mZmZmZmZmZmZmZmZmZ
+        mZmZmZmZmZmZmZmZmZmZmZmZmZmZmZmZmZmZmZmZmZmZmZmZmZmZmZmZMAAAAAAAADmZmZmZmZmZmZmZ
+        mZmZmZmZmZmZmZmZmZmZmZmZmZmZmZmZmZmZmZmZmZmZmZmZmZmZmZmZmZmZmZMAAAAAAAGZmZmZmZmZ
+        mZmZmZmZmZmZmZmZmZmZmZmZmZmZmZmZmZmZmZmZmZmZmZmZmZmZmZmZmZmZmZmZmZmZMAAAAAAJmZmZ
+        mZmZmZmZmZmZmZmZmZmZmZmZmZmZmZmZmZmZmZmZmZmZmZmZmZmZmZmZmZmZmZmZmZmZmZmZmZAAAAAA
+        OZmZmZmZmZmZmZmZmZmZmZmZmZmZmZmZmZmZmZmZmZmZmZmZmZmZmZmZmZmZmZmZmZmZmZmZmZmZmZmT
+        AAAAAZmZmZmZmZmZmZmZmZmZmZmZmZmZmZmZmZmZmZmZmZmZmZmZmZmZmZmZmZmZmZmZmZmZmZmZmZmZ
+        mZmZmRAAAAOZmZmZmZmZmZmZmZmZmZmZmZmZmZmZmZmZmZmZmZmZmZmZmZmZmZmZmZmZmZmZmZmZmZmZ
+        mZmZmZmZmZkwAAAZmZmZmZmZmZmZmZmZmZmZmZmZmZmZmZmZmZmZmZmZmZmZmZmZmZmZmZmZmZmZmZmZ
+        mZmZmZmZmZmZmZmZkwAAOZmZmZmZmZmZmZmZmZmZmZmZmZmZmZmZmZmZmZmZmZmZmZmZmZmZmZmZmZmZ
+        mZmZmZmZmZmZmZmZmZmZmZMAAJmZmZmZmZmZmZmZmZmZmZmZmZmZmZmZmZmZmZmZmZmZmZmZmZmZmZmZ
+        mZmZmZmZmZmZmZmZmZmZmZmZmZmZEAOZmZmZmZmZmZmZmZmZmZmZmZmZmZmZmZmZmZmZmZmZmZmZmZmZ
+        mZmZmZmZmZmZmZmZmZmZmZmZmZmZmZmZmTADmZmZmZmZmZmZmZmZmZmZmZmZmZmZmZmZmZmZmZmZmZmZ
+        mZmZmZmZmZmZmZmZmZmZmZmZmZmZmZmZmZmZmZkwCZmZmZmZmZmZmZmZmZmZmZmZmZmZmZmZmZmZmZmZ
+        mZmZmZmZmZmZmZmZmZmZmZmZmZmZmZmZmZmZmZmZmZmZkRmZmZmZmZmZmZmZmZmZmZmZmZmZmZmZmZmZ
+        mZmZmZmZmZmZmZmZmZmZmZmZmZmZmZmZmZmZmZmZmZmZmZmZmZM5mZmZmZmZmZmZmZmZmZmZmZmZmZmZ
+        mZmZmZmZmZmZmZmZmZmZmZmZmZmZmZmZmZmZmZmZmZmZmZmZmZmZmZmTOZmZmZmZmZmZmZmZmZmZmZmZ
+        mZmZmZmZmZmZmZmZmZmZmZmZmZmZmZmZmZmZmZmZmZmZmZmZmZmZmZmZmZmZkzmZmZmZmZmZmZmZmZmZ
+        mZmZmZmZmZmZmZmZmZmZmZmZmZmZmZmZmZmZmZmZmZmZmZmZmZmZmZmZmZmZmZmZmZM5mZmZmZmZmZmZ
+        mZmZmZmZmZmZmZmZmZmZmZmZmZmZmZmZmZmZmZmZmZmZmZmZmZmZmZmZmZmZmZmZmZmZmZmTOZmZmZmZ
+        mZmZmZmZmZmZmZmZmZmZmZmZmZmZmZmZmZmZmZmZmZmZmZmZmZmZmZmZmZmZmZmZmZmZmZmZmZmZkzmZ
+        mZmZmZmZmZmZmZmZmZmZmZmZmZmZmZmZmZmZmZmZmZmZmZmZmZmZmZmZmZmZmZmZmZmZmZmZmZmZmZmZ
+        mZM5mZmZmZmZmZmZmZmZmZmZmZmZmZmZmZmZmZmZmZmZmZmZmZmZmZmZmZmZmZmZmZmZmZmZmZmZmZmZ
+        mZmZmZmTOZmZmZmZmZmZmZmZmZmZmZmZmZmZmZmZmZmZmZmZmZmZmZmZmZmZmZmZmZmZmZmZmZmZmZmZ
+        mZmZmZmZmZmZkzmZmZmZmZmZmZmZmZmZmZmZmZmZmZmZmZmZmZmZmZmZmZmZmZmZmZmZmZmZmZmZmZmZ
+        mZmZmZmZmZmZmZmZmZM5mZmZmZmZmZmZmZmZmZmZmZmZmZmZmZmZmZmZmZmZmZmZmZmZmZmZmZmZmZmZ
+        mZmZmZmZmZmZmZmZmZmZmZmTOZmZmZmZmZmZmZmZmZmZmZmZmZmZmZmZmZmZmZmZmZmZmZmZmZmZmZmZ
+        mZmZmZmZmZmZmZmZmZmZmZmZmZmZkzmZmZmZmZmZmZmZmZmZmZmZmZmZmZmZmZmZmZmZmZmZmZmZmZmZ
+        mZmZmZmZmZmZmZmZmZmZmZmZmZmZmZmZmZM5mZmZmZmZmZmZmZmZmZmZmZmZmZmZmZmZmZmZmZmZmZmZ
+        mZmZmZmZmZmZmZmZmZmZmZmZmZmZmZmZmZmZmZmTOZmZmZmZmZmZmZmZmZmZmZmZmZmZmZmZmZmZmZmZ
+        mZmZmZmZmZmZmZOZmZOZmZmZmZmZmZmZmZmZmZmZmZmZkzmZmZmZmZmZmZmZmP+JmZmZmZmZj///////
+        ///4OZmZj/eZmZmZmZmZmPg5OZmZmZuI//iIuZmZmZmZmZmZmZM5mZmZmZmZmZmZmb//+JmZmZmZmP//
+        //////////OZmP//uZmZmZmZmY//+ZmZOZf///////h5k5mZmZmZmZmTOZmZmZmZmZmZmZmP//iZmZmZ
+        mZ/////////////4mZ///4mZmZmZmZP///uZmZmP////////+JmZmZmZmZmZkzmZmZmZmZmZmZmZj//4
+        mZmZmZmf////////////+Jmf//+JmZmZmZmb///4mZmY//////////+JmZmZmZmZmZM5mZmZmZmZmZmZ
+        mY//+JmZmZmZn/////////////mZmP//iZmZmZmZk///+5mZj/////iP////+JmZmZmZmZmTOZmZmZmZ
+        mZmZmZmP//iZmZmZmZ////iIiIiIiIiZOZj//4mZmZmZmZP///uZmf////eZmT////+ZmZmZmZmZkzmZ
+        mZmZmZmZmZmZj//4mZmZmZmf//+JmZmZmZmZk5mY//+JmZmZmZmT///7mZj///+ZmZmZj///uZmZmZmZ
+        mZM5mZmZmZmZmZmZmY//+JmZmZmZn///iZmZmZmZmZmZmP//iZmZN5k5k///+5mY///zk5mZOT///4mZ
+        mZmZmZmTOZmZmZmZmZmZmZmP//iZmZmZmZ///4mZmZmZmZmZmZj//4mZmP/5k5P///uZmP//+ZmZmZmY
+        //+JmZmZmZmZkzmZmZmZmZmZmZmZj//4mZmZmZmf///4iIiIiIg5mZmY//+JOb//+JmT///7mZj//4mZ
+        mZmZmP//+ZmZmZmZmZM5mZmZmZmZmZmZmY//+JmZmZmZn///////////85mZmP//iZn///+Jk///+5mf
+        //+JmZmZmZj///mZmZmZmZmTOZmZmZmZmZmZmZmP//iZmZmZmZ////////////+ZmZj//4mY////85v/
+        //uZmP//iZmZmZmY///5mZmZmZmZkzmZmZmZmZmZmZmZj//4mZmZmZmf////////////mZmY//+Jv///
+        //+Z///7mZj//4mZmZmZmP//+ZmZmZmZmZM5mZmZmZmZmZmZmY//+JmZmZmZn///////////+JmZmP//
+        if//////if//+5mY//+JmZmZmZj///mZmZmZmZmTOZmZmZmZmZmZmZmP//iZmZmZmZ///////////4mZ
+        mZj//4j///////j///uZmP//iZmZmZmY///5mZmZmZmZkzmZmZmZmZmZmZmZj//4mZmZmZmf//+JMzMz
+        MzOZOZmY//////+D///////7mZj//4mZmZmZmP//+ZmZmZmZmZM5mZmZmZmZmZmZmY//+JmZmZmZn///
+        iZmZmZmZmZmZmP//////mY//////+5mY//+JmZmZmZj///mZmZmZmZmTOZmZmZmZmZmZmZmP//iZmZmZ
+        mZ///4mZmZmZmZmZmZj/////+5mf//////uZmP//iZmZmZmY///5mZmZmZmZkzmZmZmZmZmZMzM5j//4
+        kzMzmZmf//+JMzMzMzM5mZmY/////4mTk//////7mZj//4mZmZmZmP//+ZmZmZmZmZM5mZmZmZmZmP//
+        /////////4mZn////////////4mZmP////+ZmZmP////+5mY//+JmZmZmZj///mZmZmZmZmTOZmZmZmZ
+        mY/////////////4mZ/////////////7mZj////7mZmZn/////uZmP//iZmZmZmY///5mZmZmZmZkzmZ
+        mZmZmZn//////////////5mf////////////+Jmf////iZmZk5P////4mZ///4mZmZmZmP//+ZmZmZmZ
+        mZM5mZmZmZmZj/////////////iZn/////////////iZmP///5mZmZmZj///+5mY//+JmZmZmZj//4mZ
+        mZmZmZmTOZmZmZmZmZ/////////////zmZP///////////+JmZP///uTmZmZmZj//4mZm///mZmZmZmZ
+        //85mZmZmZmZkzmZmZmZmZOZiIiIiIiIiIiImTmZOIiIiIiIiIiImTmZOIi5mZmZmZOZiIuZmZk4iZOZ
+        mZmZOZiDmZmZmZmZmZM5mZmZmZmZOZmZmZmZmZmZmZOZmZmZmZmZmZmZmZOZmZmZmZmZmZmZOZmZmZmZ
+        mZk5mZmZmZOZmZmZmZmZmZmTOZmZmZmZmZmZmZmZmZmZmZmZmZmZmZmZmZmZmZmZmZmZmZmZmZmZmZmZ
+        mZmZmZmZmZmZmZmZmZmZmZmZmZmZkzmZmZmZmZmZmZmZmZmZmZmZmZmZmZmZmZmZmZmZmZmZmZmZmZmZ
+        mZmZmZmZmZmZmZmZmZmZmZmZmZmZmZmZmZM5mZmZmZmZmZmZmZmZmZmZmZmZmZmZmZmZmZmZmZmZmZmZ
+        mZmZmZmZmZmZmZmZmZmZmZmZmZmZmZmZmZmZmZmTOZmZmZmZmZmZmZmZmZmZmZmZmZmZmZmZmZmZmZmZ
+        mZmZmZmZmZmZmZmZmZmZmZmZmZmZmZmZmZmZmZmZmZmZkzmZmZmZmZmZmZmZmZmZmZmZmZmZmZmZmZmZ
+        mZmZmZmZmZmZmZmZmZmZmZmZmZmZmZmZmZmZmZmZmZmZmZmZmZM5mZmZmZmZmZmTuIiIiIs5mZmZmZmZ
+        mTu4i7mZmZmZmZmZmTMzmZOZmZkzOZmZmZmZmZmZmZmZmZmZmZmZmZmTOZmZmZmZmTmbj///////+HmT
+        mZmZk4j/////iJmZmZk4iP////iZOZmZj/mZOZOIiIiIiIiIiDmZmZmZmZmZkzmZmZmZmZmZj///////
+        ///4mZk5k4///4iI///4OZOY////////iZOZmb/5mZmP///////////4mZmZmZmZmZM5mZmZmZmZn///
+        //////////mZmY///5mZmZP///iZmP////////+ZOZk/iZmY/////////////4mZmZmZmZmTOZmZmZmZ
+        mZ/////////////5mZ////+JmZmY////iZl/////////+ZmZP4mZP//////////////7mZmZmZmZkzmZ
+        mZmZmZmb////////////uZP/j///+HM3j/////+ZmYj///////iZmT+JmY//////////////+JmZmZmZ
+        mZM5mZmZmZmZmY//////////+JmT+Jv///////////iPmTmZOI/4mP//uTk/iZmP//////////////iZ
+        mZmZmZmTOZmZmZmZmZmf//////////mZmZmZ///////////5mZmZmZmTOZk///mZP4mZj///////////
+        ///4mZmZmZmZkzmZmZmZmZmTmP////////+JOZmZOY//////////iZmZmZmZmZk5mf/4mT+JmY//////
+        ////////+JmZmZmZmZM5mZmZmZmZmZn/////////mZmZmZk//////////zmZmZmZmZmZmTmP/zm/iZmP
+        //////////////iZmZmZmZmTOZmZmZmZmZk5v///////85OZmZkzmP////////iZmZmZmZmZmZmZn//4
+        /4mZj/////hzN4/////4mZmZmZmZkzmZmZmZmZmZmZj//////4mZmTmY/4j////////4mZmZmZmZmZmZ
+        mZj///+JmY////+JmZmY////+JmZmZmZmZM5mZmZmZmZmZmZ//////+ZmZmZj////////////4mZmZmZ
+        mZmZmZmb////+ZmP///4mZu5mY////iZmZmZmZmTOZmZmZmZmZmZOb/////4k5mZmP/////////////7
+        mZmZmZmZmZmZk/////OZv///+ZmP+Jmf///4mZmZmZmZkzmZmZmZmZmZmZmf////+ZmZmZj////////4
+        eI//+JmZmZmZmZmZmZP////4mb///4mY//+JmP//+5mZmZmZmZM5mZmZmZmZmZk5v/////uTmZmb////
+        ///4mZmX//iZmZmZmZmZmZmZ////+Jmf//95n///+Zj///OZmZmZmZmTOZmZmZmZmZmZmf//////mZmZ
+        mY//////+ZOZmZiJmZmZmZmZmZmZmY////+ZmP//+I////iP//+JmZmZmZmZkzmZmZmZmZmZmZj/////
+        /4mZmZmf/////5k5mZOZmTmZmZmZmZmZmZmP///4mZP/////////////OZmZmZmZmZM5mZmZmZmZmZk/
+        ///////zmZmZm/////iZmZmZmZmZmZmZmZmZmZmZj///85mZj///////////+JmZmZmZmZmTOZmZmZmZ
+        mZmZv///////+5mZmZmP///5mZmZmZmZmZmZmZmZmZmZmZ///3mZmZj//////////4mZmZmZmZmZkzmZ
+        mZmZmZmZmb///4j///uZmZmZmP//mTmZmZmZmZmZmZmZmZmZmZmY/4OZmZmZeP///////4eZmZmZmZmZ
+        mZM5mZmZmZmZmZmY/4OZOP+JmZmZmZmIiZOZmZmZmZmZmZmZmZmZmZmZmYiZmZmZmZk4iIiIiIOZmZmZ
+        mZmZmZmTOZmZmZmZmZmZmTOZmZkzmZmZmZmZmZk5mZmZmZmZmZmZmZmZmZmZmZmZk5mZmZmZmZmZmZmZ
+        mZmZmZmZmZmZkzmZmZmZmZmZmZmZmZmZmZmZmZmZmZmZmZmZmZmZmZmZmZmZmZmZmZmZmZmZmZmZmZmZ
+        mZmZmZmZmZmZmZmZmZM5mZmZmZmZmZmZmZmZmZmZmZmZmZmZmZmZmZmZmZmZmZmZmZmZmZmZmZmZmZmZ
+        mZmZmZmZmZmZmZmZmZmZmZmTOZmZmZmZmZmZmZmZmZmZmZmZmZmZmZmZmZmZmZmZmZmZmZmZmZmZmZmZ
+        mZmZmZmZmZmZmZmZmZmZmZmZmZmZkzmZmZmZmZmZmZmZmZmZmZmZmZmZmZmZmZmZmZmZmZmZmZmZmZmZ
+        mZmZmZmZmZmZmZmZmZmZmZmZmZmZmZmZmZM5mZmZmZmZmZmZmZmZmZmZmZmZmZmZmZmZmZmZmZmZmZmZ
+        mZmZmZmZmZmZmZmZmZmZmZmZmZmZmZmZmZmZmZmTOZmZmZmZmZmZmZmZmZmZmZmZmZmZmZmZmZmZmZmZ
+        mZmZmZmZmZmZmZmZmZmZmZmZmZmZmZmZmZmZmZmZmZmZkzmZmZmZmZmZmZmZmZmZmZmZmZmZmZmZmZmZ
+        mZmZmZmZmZmZmZmZmZmZmZmZmZmZmZmZmZmZmZmZmZmZmZmZmZM5mZmZmZmZmZmZmZmZmZmZmZmZmZmZ
+        mZmZmZmZmZmZmZmZmZmZmZmZmZmZmZmZmZmZmZmZmZmZmZmZmZmZmZmTOZmZmZmZmZmZmZmZmZmZmZmZ
+        mZmZmZmZmZmZmZmZmZmZmZmZmZmZmZmZmZmZmZmZmZmZmZmZmZmZmZmZmZmZkzmZmZmZmZmZmZmZmZmZ
+        mZmZmZmZmZmZmZmZmZmZmZmZmZmZmZmZmZmZmZmZmZmZmZmZmZmZmZmZmZmZmZmZmZM5mZmZmZmZmZmZ
+        mZmZmZmZmZmZmZmZmZmZmZmZmZmZmZmZmZmZmZmZmZmZmZmZmZmZmZmZmZmZmZmZmZmZmZmTOZmZmZmZ
+        mZmZmZmZmZmZmZmZmZmZmZmZmZmZmZmZmZmZmZmZmZmZmZmZmZmZmZmZmZmZmZmZmZmZmZmZmZmZkzmZ
+        mZmZmZmZmZmZmZmZmZmZmZmZmZmZmZmZmZmZmZmZmZmZmZmZmZmZmZmZmZmZmZmZmZmZmZmZmZmZmZmZ
+        mZM5mZmZmZmZmZmZmZmZmZmZmZmZmZmZmZmZmZmZmZmZmZmZmZmZmZmZmZmZmZmZmZmZmZmZmZmZmZmZ
+        mZmZmZmTGZmZmZmZmZmZmZmZmZmZmZmZmZmZmZmZmZmZmZmZmZmZmZmZmZmZmZmZmZmZmZmZmZmZmZmZ
+        mZmZmZmZmZmZkwmZmZmZmZmZmZmZmZmZmZmZmZmZmZmZmZmZmZmZmZmZmZmZmZmZmZmZmZmZmZmZmZmZ
+        mZmZmZmZmZmZmZmZmZADmZmZmZmZmZmZmZmZmZmZmZmZmZmZmZmZmZmZmZmZmZmZmZmZmZmZmZmZmZmZ
+        mZmZmZmZmZmZmZmZmZmZmZkwA5mZmZmZmZmZmZmZmZmZmZmZmZmZmZmZmZmZmZmZmZmZmZmZmZmZmZmZ
+        mZmZmZmZmZmZmZmZmZmZmZmZmZmZMACZmZmZmZmZmZmZmZmZmZmZmZmZmZmZmZmZmZmZmZmZmZmZmZmZ
+        mZmZmZmZmZmZmZmZmZmZmZmZmZmZmZmZmQAAOZmZmZmZmZmZmZmZmZmZmZmZmZmZmZmZmZmZmZmZmZmZ
+        mZmZmZmZmZmZmZmZmZmZmZmZmZmZmZmZmZmZmZMAABmZmZmZmZmZmZmZmZmZmZmZmZmZmZmZmZmZmZmZ
+        mZmZmZmZmZmZmZmZmZmZmZmZmZmZmZmZmZmZmZmZmZmTAAADmZmZmZmZmZmZmZmZmZmZmZmZmZmZmZmZ
+        mZmZmZmZmZmZmZmZmZmZmZmZmZmZmZmZmZmZmZmZmZmZmZmZMAAAAJmZmZmZmZmZmZmZmZmZmZmZmZmZ
+        mZmZmZmZmZmZmZmZmZmZmZmZmZmZmZmZmZmZmZmZmZmZmZmZmZmZmRAAAAA5mZmZmZmZmZmZmZmZmZmZ
+        mZmZmZmZmZmZmZmZmZmZmZmZmZmZmZmZmZmZmZmZmZmZmZmZmZmZmZmZmZMAAAAACZmZmZmZmZmZmZmZ
+        mZmZmZmZmZmZmZmZmZmZmZmZmZmZmZmZmZmZmZmZmZmZmZmZmZmZmZmZmZmZmZmQAAAAAAGZmZmZmZmZ
+        mZmZmZmZmZmZmZmZmZmZmZmZmZmZmZmZmZmZmZmZmZmZmZmZmZmZmZmZmZmZmZmZmZmZMAAAAAAAOZmZ
+        mZmZmZmZmZmZmZmZmZmZmZmZmZmZmZmZmZmZmZmZmZmZmZmZmZmZmZmZmZmZmZmZmZmZmZmZkwAAAAAA
+        AAOZmZmZmZmZmZmZmZmZmZmZmZmZmZmZmZmZmZmZmZmZmZmZmZmZmZmZmZmZmZmZmZmZmZmZmZmZmTAA
+        AAAAAAAAOZmZmZmZmZmZmZmZmZmZmZmZmZmZmZmZmZmZmZmZmZmZmZmZmZmZmZmZmZmZmZmZmZmZmZmZ
+        mZMAAAAAAAAAAAOZmZmZmZmZmZmZmZmZmZmZmZmZmZmZmZmZmZmZmZmZmZmZmZmZmZmZmZmZmZmZmZmZ
+        mZmZmZkwAAAAAAAAAAAAOZmZmZmZmZmZmZmZmZmZmZmZmZmZmZmZmZmZmZmZmZmZmZmZmZmZmZmZmZmZ
+        mZmZmZmZmZmTAAAAAAAAAAAAAAGZmZmZmZmZmZmZmZmZmZmZmZmZmZmZmZmZmZmZmZmZmZmZmZmZmZmZ
+        mZmZmZmZmZmZmZmZEAAAAAAAAAAAAAAAA5mZmZmZmZmZmZmZmZmZmZmZmZmZmZmZmZmZmZmZmZmZmZmZ
+        mZmZmZmZmZmZmZmZmZmZMAAAAAAAAAAAAAAAAAATmZmZmZmZmZmZmZmZmZmZmZmZmZmZmZmZmZmZmZmZ
+        mZmZmZmZmZmZmZmZmZmZmZmZMQAAAAAAAAAAAAAAAAAAABOZmZmZmZmZmZmZmZmZmZmZmZmZmZmZmZmZ
+        mZmZmZmZmZmZmZmZmZmZmZmZmZmZMQAAAAAAAAAAAAAAAAAAAAAAAzmZmZmZmZmZmZmZmZmZmZmZmZmZ
+        mZmZmZmZmZmZmZmZmZmZmZmZmZmZmZmTMAAAAAAAAAAAAAAAAAAAAAAAAAAAEzMzMzMzMzMzMzMzMzMz
+        MzMzMzMzMzMzMzMzMzMzMzMzMzMzMzMzMzMxAAAAAAAAAAAAAAD////////////////////////4AAAA
+        AAAAAAAAAB//////wAAAAAAAAAAAAAAD/////wAAAAAAAAAAAAAAAP////wAAAAAAAAAAAAAAAA////w
+        AAAAAAAAAAAAAAAAD///4AAAAAAAAAAAAAAAAAf//8AAAAAAAAAAAAAAAAAD//+AAAAAAAAAAAAAAAAA
+        Af//AAAAAAAAAAAAAAAAAAD//gAAAAAAAAAAAAAAAAAAf/wAAAAAAAAAAAAAAAAAAD/4AAAAAAAAAAAA
+        AAAAAAAf+AAAAAAAAAAAAAAAAAAAH/AAAAAAAAAAAAAAAAAAAA/wAAAAAAAAAAAAAAAAAAAP4AAAAAAA
+        AAAAAAAAAAAAB+AAAAAAAAAAAAAAAAAAAAfAAAAAAAAAAAAAAAAAAAADwAAAAAAAAAAAAAAAAAAAA8AA
+        AAAAAAAAAAAAAAAAAAOAAAAAAAAAAAAAAAAAAAABgAAAAAAAAAAAAAAAAAAAAYAAAAAAAAAAAAAAAAAA
+        AAGAAAAAAAAAAAAAAAAAAAABgAAAAAAAAAAAAAAAAAAAAYAAAAAAAAAAAAAAAAAAAAGAAAAAAAAAAAAA
+        AAAAAAABgAAAAAAAAAAAAAAAAAAAAYAAAAAAAAAAAAAAAAAAAAGAAAAAAAAAAAAAAAAAAAABgAAAAAAA
+        AAAAAAAAAAAAAYAAAAAAAAAAAAAAAAAAAAGAAAAAAAAAAAAAAAAAAAABgAAAAAAAAAAAAAAAAAAAAYAA
+        AAAAAAAAAAAAAAAAAAGAAAAAAAAAAAAAAAAAAAABgAAAAAAAAAAAAAAAAAAAAYAAAAAAAAAAAAAAAAAA
+        AAGAAAAAAAAAAAAAAAAAAAABgAAAAAAAAAAAAAAAAAAAAYAAAAAAAAAAAAAAAAAAAAGAAAAAAAAAAAAA
+        AAAAAAABgAAAAAAAAAAAAAAAAAAAAYAAAAAAAAAAAAAAAAAAAAGAAAAAAAAAAAAAAAAAAAABgAAAAAAA
+        AAAAAAAAAAAAAYAAAAAAAAAAAAAAAAAAAAGAAAAAAAAAAAAAAAAAAAABgAAAAAAAAAAAAAAAAAAAAYAA
+        AAAAAAAAAAAAAAAAAAGAAAAAAAAAAAAAAAAAAAABgAAAAAAAAAAAAAAAAAAAAYAAAAAAAAAAAAAAAAAA
+        AAGAAAAAAAAAAAAAAAAAAAABgAAAAAAAAAAAAAAAAAAAAYAAAAAAAAAAAAAAAAAAAAGAAAAAAAAAAAAA
+        AAAAAAABgAAAAAAAAAAAAAAAAAAAAYAAAAAAAAAAAAAAAAAAAAGAAAAAAAAAAAAAAAAAAAABgAAAAAAA
+        AAAAAAAAAAAAAYAAAAAAAAAAAAAAAAAAAAGAAAAAAAAAAAAAAAAAAAABgAAAAAAAAAAAAAAAAAAAAYAA
+        AAAAAAAAAAAAAAAAAAGAAAAAAAAAAAAAAAAAAAABgAAAAAAAAAAAAAAAAAAAAYAAAAAAAAAAAAAAAAAA
+        AAGAAAAAAAAAAAAAAAAAAAABgAAAAAAAAAAAAAAAAAAAAYAAAAAAAAAAAAAAAAAAAAGAAAAAAAAAAAAA
+        AAAAAAABgAAAAAAAAAAAAAAAAAAAAYAAAAAAAAAAAAAAAAAAAAGAAAAAAAAAAAAAAAAAAAABgAAAAAAA
+        AAAAAAAAAAAAAYAAAAAAAAAAAAAAAAAAAAGAAAAAAAAAAAAAAAAAAAABgAAAAAAAAAAAAAAAAAAAAYAA
+        AAAAAAAAAAAAAAAAAAGAAAAAAAAAAAAAAAAAAAABgAAAAAAAAAAAAAAAAAAAAYAAAAAAAAAAAAAAAAAA
+        AAGAAAAAAAAAAAAAAAAAAAABgAAAAAAAAAAAAAAAAAAAAYAAAAAAAAAAAAAAAAAAAAGAAAAAAAAAAAAA
+        AAAAAAABgAAAAAAAAAAAAAAAAAAAAYAAAAAAAAAAAAAAAAAAAAGAAAAAAAAAAAAAAAAAAAABgAAAAAAA
+        AAAAAAAAAAAAAYAAAAAAAAAAAAAAAAAAAAGAAAAAAAAAAAAAAAAAAAABgAAAAAAAAAAAAAAAAAAAAYAA
+        AAAAAAAAAAAAAAAAAAGAAAAAAAAAAAAAAAAAAAABgAAAAAAAAAAAAAAAAAAAAYAAAAAAAAAAAAAAAAAA
+        AAGAAAAAAAAAAAAAAAAAAAABgAAAAAAAAAAAAAAAAAAAAYAAAAAAAAAAAAAAAAAAAAGAAAAAAAAAAAAA
+        AAAAAAABgAAAAAAAAAAAAAAAAAAAAYAAAAAAAAAAAAAAAAAAAAGAAAAAAAAAAAAAAAAAAAABgAAAAAAA
+        AAAAAAAAAAAAAcAAAAAAAAAAAAAAAAAAAAPAAAAAAAAAAAAAAAAAAAAD4AAAAAAAAAAAAAAAAAAAA+AA
+        AAAAAAAAAAAAAAAAAAfgAAAAAAAAAAAAAAAAAAAH8AAAAAAAAAAAAAAAAAAAD/AAAAAAAAAAAAAAAAAA
+        AA/4AAAAAAAAAAAAAAAAAAAf/AAAAAAAAAAAAAAAAAAAH/wAAAAAAAAAAAAAAAAAAD/+AAAAAAAAAAAA
+        AAAAAAB//wAAAAAAAAAAAAAAAAAA//+AAAAAAAAAAAAAAAAAAf//wAAAAAAAAAAAAAAAAAP//+AAAAAA
+        AAAAAAAAAAAH///4AAAAAAAAAAAAAAAAD////AAAAAAAAAAAAAAAAD////8AAAAAAAAAAAAAAAD/////
+        wAAAAAAAAAAAAAAD//////wAAAAAAAAAAAAAH////////////////////////w==
+</value>
+  </data>
+</root>

TEMUKJD/WXForms/AdminForms/WXAdminAccountForm.cs

@@ -54,11 +54,8 @@ namespace TemuKJD.WXForms.AdminForms
             data.Append("&add_nick_name=" + GetHtml.UrlEncodeUtf8(txtNickName.Text));
             data.Append("&add_user_name=" + GetHtml.UrlEncodeUtf8(txtMobile.Text));
             data.Append("&add_mobile=" + GetHtml.UrlEncodeUtf8(txtMobile.Text));
-            data.Append("&add_company=" + GetHtml.UrlEncodeUtf8(txtCompany.Text));
-            if (!string.IsNullOrEmpty(txtOemId.Text.Trim()))
-            {
-                data.Append("&oem_id=" + GetHtml.UrlEncodeUtf8(txtOemId.Text.Trim()));
-            }
+            data.Append("&add_company=" + GetHtml.UrlEncodeUtf8(txtCompany.Text)); 
+            data.Append("&oem_id=" + GetHtml.UrlEncodeUtf8(txtOemId.Text.Trim()));
             data.Append("&card_id=");
             if (cmbGroup.Text == "主账户")
             {

TEMUKJD/WXForms/AdminForms/WXAdminForm.Designer.cs

@@ -42,8 +42,9 @@
             System.Windows.Forms.TreeNode treeNode12 = new System.Windows.Forms.TreeNode("图片工具");
             System.Windows.Forms.TreeNode treeNode13 = new System.Windows.Forms.TreeNode("运单管理");
             System.Windows.Forms.TreeNode treeNode14 = new System.Windows.Forms.TreeNode("充值二维码");
-            System.Windows.Forms.TreeNode treeNode15 = new System.Windows.Forms.TreeNode("中转订单管理");
-            System.Windows.Forms.TreeNode treeNode16 = new System.Windows.Forms.TreeNode("超级权限管理", new System.Windows.Forms.TreeNode[] {
+            System.Windows.Forms.TreeNode treeNode15 = new System.Windows.Forms.TreeNode("快递费用明细");
+            System.Windows.Forms.TreeNode treeNode16 = new System.Windows.Forms.TreeNode("中转订单管理");
+            System.Windows.Forms.TreeNode treeNode17 = new System.Windows.Forms.TreeNode("超级权限管理", new System.Windows.Forms.TreeNode[] {
             treeNode1,
             treeNode2,
             treeNode3,
@@ -58,7 +59,8 @@
             treeNode12,
             treeNode13,
             treeNode14,
-            treeNode15});
+            treeNode15,
+            treeNode16});
             this.panel1 = new System.Windows.Forms.Panel();
             this.panel3 = new System.Windows.Forms.Panel();
             this.panel2 = new System.Windows.Forms.Panel();
@@ -81,7 +83,7 @@
             this.panel1.Dock = System.Windows.Forms.DockStyle.Fill;
             this.panel1.Location = new System.Drawing.Point(0, 0);
             this.panel1.Name = "panel1";
-            this.panel1.Size = new System.Drawing.Size(792, 446);
+            this.panel1.Size = new System.Drawing.Size(792, 572);
             this.panel1.TabIndex = 2;
             // 
             // panel3
@@ -89,7 +91,7 @@
             this.panel3.Dock = System.Windows.Forms.DockStyle.Fill;
             this.panel3.Location = new System.Drawing.Point(0, 28);
             this.panel3.Name = "panel3";
-            this.panel3.Size = new System.Drawing.Size(792, 418);
+            this.panel3.Size = new System.Drawing.Size(792, 544);
             this.panel3.TabIndex = 1;
             // 
             // panel2
@@ -126,7 +128,7 @@
             // splitContainer1.Panel2
             // 
             this.splitContainer1.Panel2.Controls.Add(this.panel1);
-            this.splitContainer1.Size = new System.Drawing.Size(933, 446);
+            this.splitContainer1.Size = new System.Drawing.Size(933, 572);
             this.splitContainer1.SplitterDistance = 140;
             this.splitContainer1.SplitterWidth = 1;
             this.splitContainer1.TabIndex = 3;
@@ -177,21 +179,23 @@
             treeNode13.Text = "运单管理";
             treeNode14.Name = "充值二维码";
             treeNode14.Text = "充值二维码";
-            treeNode15.Name = "中转订单管理";
-            treeNode15.Text = "中转订单管理";
-            treeNode16.Name = "超级权限管理";
-            treeNode16.Text = "超级权限管理";
+            treeNode15.Name = "快递费用明细";
+            treeNode15.Text = "快递费用明细";
+            treeNode16.Name = "中转订单管理";
+            treeNode16.Text = "中转订单管理";
+            treeNode17.Name = "超级权限管理";
+            treeNode17.Text = "超级权限管理";
             this.tv.Nodes.AddRange(new System.Windows.Forms.TreeNode[] {
-            treeNode16});
+            treeNode17});
             this.tv.OverForeColor = System.Drawing.Color.FromArgb(((int)(((byte)(235)))), ((int)(((byte)(235)))), ((int)(((byte)(235)))));
-            this.tv.Size = new System.Drawing.Size(140, 446);
+            this.tv.Size = new System.Drawing.Size(140, 572);
             this.tv.TabIndex = 1;
             this.tv.AfterSelect += new System.Windows.Forms.TreeViewEventHandler(this.tv_AfterSelect);
             // 
             // WXAdminForm
             // 
             this.AutoScaleMode = System.Windows.Forms.AutoScaleMode.None;
-            this.ClientSize = new System.Drawing.Size(933, 446);
+            this.ClientSize = new System.Drawing.Size(933, 572);
             this.Controls.Add(this.splitContainer1);
             this.Font = new System.Drawing.Font("微软雅黑", 9F, System.Drawing.FontStyle.Regular, System.Drawing.GraphicsUnit.Point, ((byte)(134)));
             this.Margin = new System.Windows.Forms.Padding(3, 4, 3, 4);

TEMUKJD/WXForms/AdminForms/WXAdminForm.cs

@@ -13,6 +13,7 @@ using TemuKJD.BaseForms;
 using TemuKJD.PDDForms.AdminForms;
 using TemuKJD.PDDForms.ProductSelectForms;
 using TemuKJD.ToolForms;
+using Work._29Tools.Forms.UserForms;
 
 namespace TemuKJD.WXForms.AdminForms
 {
@@ -20,7 +21,7 @@ namespace TemuKJD.WXForms.AdminForms
     {
         public Lazy<WXAdminAccountForm> adminAccountForm = new Lazy<WXAdminAccountForm>();
         public Lazy<WXAdminShopListForm> adminShopForm = new Lazy<WXAdminShopListForm>();
-        public Lazy<WxOemManageForm> oemManageForm = new Lazy<WxOemManageForm>();
+        public Lazy<WxAdminOemManageForm> oemManageForm = new Lazy<WxAdminOemManageForm>();
         public Lazy<PDDDBProdListForm> pddDbProdListForm = new Lazy<PDDDBProdListForm>();
         public Lazy<GetJuShuitanProdForm> getJuShuitanProdForm = new Lazy<GetJuShuitanProdForm>();
         public Lazy<GetJuShuitanProductSKUListForm> getJuShuitanProductSKUListForm = new Lazy<GetJuShuitanProductSKUListForm>();
@@ -33,6 +34,7 @@ namespace TemuKJD.WXForms.AdminForms
         public Lazy<JstBanPlatformForm> banPlatformForm = new Lazy<JstBanPlatformForm>();
         public Lazy<WXAdminSetTopUpQrCodeForm> adminSetTopUpQrCodeForm = new Lazy<WXAdminSetTopUpQrCodeForm>();
         public Lazy<WXAdminTransitWarehouseManage> wxAdminTransitWarehouseManage = new Lazy<WXAdminTransitWarehouseManage>();
+        public Lazy<WXAdminAccountBalanceForm> wxAdminAccountBalanceForm = new Lazy<WXAdminAccountBalanceForm>();
 
         public WXAdminForm()
         {
@@ -43,7 +45,7 @@ namespace TemuKJD.WXForms.AdminForms
                 tv.SelectedNode = tv.Nodes[0].Nodes[0];
                 tv.ExpandGroup(tv.Nodes[0].Name);
 
-                List<string> hideName = new List<string>() { "运单管理", "地址管理1", "1688厂家采集1", "图片工具", "Sku采集回传1",
+                List<string> hideName = new List<string>() { "充值二维码", "运单管理", "地址管理1", "1688厂家采集1", "图片工具", "Sku采集回传1",
                     "超级用户管理", "超级店铺管理", "OEM贴牌管理", "产品数据库", "SKU替换图", "选品加价管理", "认领待上传", "库存上传", "商品核价" };
 
                 if (BaseClass.GroupId == 3)
@@ -129,6 +131,9 @@ namespace TemuKJD.WXForms.AdminForms
                 case "充值二维码":
                     SetForm(adminSetTopUpQrCodeForm.Value);
                     break;
+                case "快递费用明细":
+                    SetForm(wxAdminAccountBalanceForm.Value);
+                    break;
                 case "中转订单管理":
                     SetForm(wxAdminTransitWarehouseManage.Value);
                     break;

TEMUKJD/WXForms/AdminForms/WxAdminOemManageForm.Designer.cs

@@ -1,6 +1,6 @@
 namespace TemuKJD.WXForms.AdminForms
 {
-    partial class WxOemManageForm
+    partial class WxAdminOemManageForm
     {
         /// <summary>
         /// Required designer variable.

TEMUKJD/WXForms/AdminForms/WxAdminOemManageForm.cs

@@ -19,10 +19,10 @@ using Work;
 
 namespace TemuKJD.WXForms.AdminForms
 {
-    public partial class WxOemManageForm : BaseForm
+    public partial class WxAdminOemManageForm : BaseForm
     {
         public CancellationTokenSource cancellationTokenSource { get; set; } = null;
-        public WxOemManageForm()
+        public WxAdminOemManageForm()
         {
             InitializeComponent();
         }
@@ -48,7 +48,7 @@ namespace TemuKJD.WXForms.AdminForms
             data.Append(UserLogin.GetSignaturex());
             data.Append("&oem_id=" + GetHtml.UrlEncodeUtf8(txtOemId.Text.Trim()));
             data.Append("&oem_name=" + GetHtml.UrlEncodeUtf8(txtOemName.Text.Trim()));
-            data.Append("&oem_owner=" + GetHtml.UrlEncodeUtf8(txtOemOwner.Text));
+            data.Append("&oem_owner=" + GetHtml.UrlEncodeUtf8(txtOemOwner.Text.Trim()));
             
             string url = BaseClass.BuildWXObjString("user/add_mdy_oem");
             string html = GetHtml.PostUtf8(url, data.ToString()).Trim();

TEMUKJD/WXForms/ProductForms/WXDBProdUploadForm.Designer.cs

@@ -32,16 +32,18 @@ namespace TemuKJD.WXForms.ProductForms
         private void InitializeComponent()
         {
             this.components = new System.ComponentModel.Container();
-            System.Windows.Forms.DataGridViewCellStyle dataGridViewCellStyle1 = new System.Windows.Forms.DataGridViewCellStyle();
-            System.Windows.Forms.DataGridViewCellStyle dataGridViewCellStyle2 = new System.Windows.Forms.DataGridViewCellStyle();
-            System.Windows.Forms.DataGridViewCellStyle dataGridViewCellStyle3 = new System.Windows.Forms.DataGridViewCellStyle();
-            System.Windows.Forms.DataGridViewCellStyle dataGridViewCellStyle4 = new System.Windows.Forms.DataGridViewCellStyle();
-            System.Windows.Forms.DataGridViewCellStyle dataGridViewCellStyle5 = new System.Windows.Forms.DataGridViewCellStyle();
-            System.Windows.Forms.DataGridViewCellStyle dataGridViewCellStyle6 = new System.Windows.Forms.DataGridViewCellStyle();
-            System.Windows.Forms.DataGridViewCellStyle dataGridViewCellStyle7 = new System.Windows.Forms.DataGridViewCellStyle();
-            System.Windows.Forms.DataGridViewCellStyle dataGridViewCellStyle8 = new System.Windows.Forms.DataGridViewCellStyle();
+            System.Windows.Forms.DataGridViewCellStyle dataGridViewCellStyle9 = new System.Windows.Forms.DataGridViewCellStyle();
+            System.Windows.Forms.DataGridViewCellStyle dataGridViewCellStyle10 = new System.Windows.Forms.DataGridViewCellStyle();
+            System.Windows.Forms.DataGridViewCellStyle dataGridViewCellStyle11 = new System.Windows.Forms.DataGridViewCellStyle();
+            System.Windows.Forms.DataGridViewCellStyle dataGridViewCellStyle12 = new System.Windows.Forms.DataGridViewCellStyle();
+            System.Windows.Forms.DataGridViewCellStyle dataGridViewCellStyle13 = new System.Windows.Forms.DataGridViewCellStyle();
+            System.Windows.Forms.DataGridViewCellStyle dataGridViewCellStyle14 = new System.Windows.Forms.DataGridViewCellStyle();
+            System.Windows.Forms.DataGridViewCellStyle dataGridViewCellStyle15 = new System.Windows.Forms.DataGridViewCellStyle();
+            System.Windows.Forms.DataGridViewCellStyle dataGridViewCellStyle16 = new System.Windows.Forms.DataGridViewCellStyle();
             this.splitContainer1 = new System.Windows.Forms.SplitContainer();
             this.ucGroupBoxEx2 = new TemuKJD.UserComponent.UcGroupBoxEx(this.components);
+            this.label6 = new System.Windows.Forms.Label();
+            this.chkRemoveSpecialChar = new TemuKJD.UserComponent.UcCheckBox(this.components);
             this.txtShippingPriceTimes = new System.Windows.Forms.TextBox();
             this.label13 = new System.Windows.Forms.Label();
             this.btnStop = new DevComponents.DotNetBar.PanelEx();
@@ -56,7 +58,6 @@ namespace TemuKJD.WXForms.ProductForms
             this.fPnlPriceRule = new System.Windows.Forms.FlowLayoutPanel();
             this.ucAddPrice1 = new TemuKJD.PDDForms.ProductSelectForms.UcAddPrice();
             this.ucAddPrice2 = new TemuKJD.PDDForms.ProductSelectForms.UcAddPrice();
-            this.label6 = new System.Windows.Forms.Label();
             this.lblNewAddPrice = new System.Windows.Forms.Label();
             this.txtWaitSeconds = new System.Windows.Forms.TextBox();
             this.txtAddMorePrice = new System.Windows.Forms.TextBox();
@@ -302,6 +303,8 @@ namespace TemuKJD.WXForms.ProductForms
             this.ucGroupBoxEx2.AutoSizeMode = System.Windows.Forms.AutoSizeMode.GrowAndShrink;
             this.ucGroupBoxEx2.BorderColor = System.Drawing.Color.FromArgb(((int)(((byte)(63)))), ((int)(((byte)(126)))), ((int)(((byte)(255)))));
             this.ucGroupBoxEx2.BorderStyle = TemuKJD.UserComponent.UcGroupBoxEx.GroupBoxBorderStyle.ROUND;
+            this.ucGroupBoxEx2.Controls.Add(this.label6);
+            this.ucGroupBoxEx2.Controls.Add(this.chkRemoveSpecialChar);
             this.ucGroupBoxEx2.Controls.Add(this.txtShippingPriceTimes);
             this.ucGroupBoxEx2.Controls.Add(this.label13);
             this.ucGroupBoxEx2.Controls.Add(this.btnStop);
@@ -312,7 +315,6 @@ namespace TemuKJD.WXForms.ProductForms
             this.ucGroupBoxEx2.Controls.Add(this.label14);
             this.ucGroupBoxEx2.Controls.Add(this.label15);
             this.ucGroupBoxEx2.Controls.Add(this.pnlStep);
-            this.ucGroupBoxEx2.Controls.Add(this.label6);
             this.ucGroupBoxEx2.Controls.Add(this.lblNewAddPrice);
             this.ucGroupBoxEx2.Controls.Add(this.txtWaitSeconds);
             this.ucGroupBoxEx2.Controls.Add(this.txtAddMorePrice);
@@ -331,6 +333,30 @@ namespace TemuKJD.WXForms.ProductForms
             this.ucGroupBoxEx2.TabStop = false;
             this.ucGroupBoxEx2.Text = "商品上传";
             // 
+            // label6
+            // 
+            this.label6.Anchor = ((System.Windows.Forms.AnchorStyles)((System.Windows.Forms.AnchorStyles.Top | System.Windows.Forms.AnchorStyles.Right)));
+            this.label6.AutoSize = true;
+            this.label6.Location = new System.Drawing.Point(939, 15);
+            this.label6.Margin = new System.Windows.Forms.Padding(6, 0, 0, 0);
+            this.label6.Name = "label6";
+            this.label6.Size = new System.Drawing.Size(56, 17);
+            this.label6.TabIndex = 727;
+            this.label6.Text = "额外等待";
+            // 
+            // chkRemoveSpecialChar
+            // 
+            this.chkRemoveSpecialChar.Anchor = ((System.Windows.Forms.AnchorStyles)((System.Windows.Forms.AnchorStyles.Top | System.Windows.Forms.AnchorStyles.Right)));
+            this.chkRemoveSpecialChar.AutoSize = true;
+            this.chkRemoveSpecialChar.Checked = true;
+            this.chkRemoveSpecialChar.CheckState = System.Windows.Forms.CheckState.Checked;
+            this.chkRemoveSpecialChar.Location = new System.Drawing.Point(797, 13);
+            this.chkRemoveSpecialChar.Name = "chkRemoveSpecialChar";
+            this.chkRemoveSpecialChar.Size = new System.Drawing.Size(147, 21);
+            this.chkRemoveSpecialChar.TabIndex = 896;
+            this.chkRemoveSpecialChar.Text = "移除标题前部特殊符号";
+            this.chkRemoveSpecialChar.UseVisualStyleBackColor = true;
+            // 
             // txtShippingPriceTimes
             // 
             this.txtShippingPriceTimes.Anchor = ((System.Windows.Forms.AnchorStyles)((System.Windows.Forms.AnchorStyles.Bottom | System.Windows.Forms.AnchorStyles.Left)));
@@ -394,7 +420,7 @@ namespace TemuKJD.WXForms.ProductForms
             this.chkRandomCompanyProd.Anchor = ((System.Windows.Forms.AnchorStyles)((System.Windows.Forms.AnchorStyles.Top | System.Windows.Forms.AnchorStyles.Right)));
             this.chkRandomCompanyProd.Checked = true;
             this.chkRandomCompanyProd.CheckState = System.Windows.Forms.CheckState.Checked;
-            this.chkRandomCompanyProd.Location = new System.Drawing.Point(845, 13);
+            this.chkRandomCompanyProd.Location = new System.Drawing.Point(699, 13);
             this.chkRandomCompanyProd.Name = "chkRandomCompanyProd";
             this.chkRandomCompanyProd.Size = new System.Drawing.Size(87, 21);
             this.chkRandomCompanyProd.TabIndex = 889;
@@ -573,17 +599,6 @@ namespace TemuKJD.WXForms.ProductForms
             this.ucAddPrice2.Size = new System.Drawing.Size(420, 23);
             this.ucAddPrice2.TabIndex = 13;
             // 
-            // label6
-            // 
-            this.label6.Anchor = ((System.Windows.Forms.AnchorStyles)((System.Windows.Forms.AnchorStyles.Top | System.Windows.Forms.AnchorStyles.Right)));
-            this.label6.AutoSize = true;
-            this.label6.Location = new System.Drawing.Point(939, 15);
-            this.label6.Margin = new System.Windows.Forms.Padding(6, 0, 0, 0);
-            this.label6.Name = "label6";
-            this.label6.Size = new System.Drawing.Size(56, 17);
-            this.label6.TabIndex = 727;
-            this.label6.Text = "额外等待";
-            // 
             // lblNewAddPrice
             // 
             this.lblNewAddPrice.AutoSize = true;
@@ -2486,19 +2501,19 @@ namespace TemuKJD.WXForms.ProductForms
             // 
             this.dgvShop.AllowUserToAddRows = false;
             this.dgvShop.AllowUserToDeleteRows = false;
-            dataGridViewCellStyle1.BackColor = System.Drawing.Color.WhiteSmoke;
-            this.dgvShop.AlternatingRowsDefaultCellStyle = dataGridViewCellStyle1;
+            dataGridViewCellStyle9.BackColor = System.Drawing.Color.WhiteSmoke;
+            this.dgvShop.AlternatingRowsDefaultCellStyle = dataGridViewCellStyle9;
             this.dgvShop.AutoRowNumber = true;
             this.dgvShop.BackgroundColor = System.Drawing.Color.White;
             this.dgvShop.BorderColor = System.Drawing.Color.FromArgb(((int)(((byte)(63)))), ((int)(((byte)(126)))), ((int)(((byte)(255)))));
-            dataGridViewCellStyle2.Alignment = System.Windows.Forms.DataGridViewContentAlignment.MiddleLeft;
-            dataGridViewCellStyle2.BackColor = System.Drawing.SystemColors.Control;
-            dataGridViewCellStyle2.Font = new System.Drawing.Font("微软雅黑", 9F, System.Drawing.FontStyle.Regular, System.Drawing.GraphicsUnit.Point, ((byte)(134)));
-            dataGridViewCellStyle2.ForeColor = System.Drawing.SystemColors.WindowText;
-            dataGridViewCellStyle2.SelectionBackColor = System.Drawing.SystemColors.Highlight;
-            dataGridViewCellStyle2.SelectionForeColor = System.Drawing.SystemColors.HighlightText;
-            dataGridViewCellStyle2.WrapMode = System.Windows.Forms.DataGridViewTriState.False;
-            this.dgvShop.ColumnHeadersDefaultCellStyle = dataGridViewCellStyle2;
+            dataGridViewCellStyle10.Alignment = System.Windows.Forms.DataGridViewContentAlignment.MiddleLeft;
+            dataGridViewCellStyle10.BackColor = System.Drawing.SystemColors.Control;
+            dataGridViewCellStyle10.Font = new System.Drawing.Font("微软雅黑", 9F, System.Drawing.FontStyle.Regular, System.Drawing.GraphicsUnit.Point, ((byte)(134)));
+            dataGridViewCellStyle10.ForeColor = System.Drawing.SystemColors.WindowText;
+            dataGridViewCellStyle10.SelectionBackColor = System.Drawing.SystemColors.Highlight;
+            dataGridViewCellStyle10.SelectionForeColor = System.Drawing.SystemColors.HighlightText;
+            dataGridViewCellStyle10.WrapMode = System.Windows.Forms.DataGridViewTriState.False;
+            this.dgvShop.ColumnHeadersDefaultCellStyle = dataGridViewCellStyle10;
             this.dgvShop.ColumnHeadersHeightSizeMode = System.Windows.Forms.DataGridViewColumnHeadersHeightSizeMode.AutoSize;
             this.dgvShop.Columns.AddRange(new System.Windows.Forms.DataGridViewColumn[] {
             this.colSelect,
@@ -2730,19 +2745,19 @@ namespace TemuKJD.WXForms.ProductForms
             // 
             this.dgvSelectProduct.AllowUserToAddRows = false;
             this.dgvSelectProduct.AllowUserToDeleteRows = false;
-            dataGridViewCellStyle3.BackColor = System.Drawing.Color.WhiteSmoke;
-            this.dgvSelectProduct.AlternatingRowsDefaultCellStyle = dataGridViewCellStyle3;
+            dataGridViewCellStyle11.BackColor = System.Drawing.Color.WhiteSmoke;
+            this.dgvSelectProduct.AlternatingRowsDefaultCellStyle = dataGridViewCellStyle11;
             this.dgvSelectProduct.AutoRowNumber = true;
             this.dgvSelectProduct.BackgroundColor = System.Drawing.Color.White;
             this.dgvSelectProduct.BorderColor = System.Drawing.Color.FromArgb(((int)(((byte)(63)))), ((int)(((byte)(126)))), ((int)(((byte)(255)))));
-            dataGridViewCellStyle4.Alignment = System.Windows.Forms.DataGridViewContentAlignment.MiddleLeft;
-            dataGridViewCellStyle4.BackColor = System.Drawing.SystemColors.Control;
-            dataGridViewCellStyle4.Font = new System.Drawing.Font("微软雅黑", 9F, System.Drawing.FontStyle.Regular, System.Drawing.GraphicsUnit.Point, ((byte)(134)));
-            dataGridViewCellStyle4.ForeColor = System.Drawing.SystemColors.WindowText;
-            dataGridViewCellStyle4.SelectionBackColor = System.Drawing.SystemColors.Highlight;
-            dataGridViewCellStyle4.SelectionForeColor = System.Drawing.SystemColors.HighlightText;
-            dataGridViewCellStyle4.WrapMode = System.Windows.Forms.DataGridViewTriState.False;
-            this.dgvSelectProduct.ColumnHeadersDefaultCellStyle = dataGridViewCellStyle4;
+            dataGridViewCellStyle12.Alignment = System.Windows.Forms.DataGridViewContentAlignment.MiddleLeft;
+            dataGridViewCellStyle12.BackColor = System.Drawing.SystemColors.Control;
+            dataGridViewCellStyle12.Font = new System.Drawing.Font("微软雅黑", 9F, System.Drawing.FontStyle.Regular, System.Drawing.GraphicsUnit.Point, ((byte)(134)));
+            dataGridViewCellStyle12.ForeColor = System.Drawing.SystemColors.WindowText;
+            dataGridViewCellStyle12.SelectionBackColor = System.Drawing.SystemColors.Highlight;
+            dataGridViewCellStyle12.SelectionForeColor = System.Drawing.SystemColors.HighlightText;
+            dataGridViewCellStyle12.WrapMode = System.Windows.Forms.DataGridViewTriState.False;
+            this.dgvSelectProduct.ColumnHeadersDefaultCellStyle = dataGridViewCellStyle12;
             this.dgvSelectProduct.ColumnHeadersHeightSizeMode = System.Windows.Forms.DataGridViewColumnHeadersHeightSizeMode.AutoSize;
             this.dgvSelectProduct.Columns.AddRange(new System.Windows.Forms.DataGridViewColumn[] {
             this.colCheck,
@@ -2804,8 +2819,8 @@ namespace TemuKJD.WXForms.ProductForms
             // 
             // colSupplierName
             // 
-            dataGridViewCellStyle5.WrapMode = System.Windows.Forms.DataGridViewTriState.True;
-            this.colSupplierName.DefaultCellStyle = dataGridViewCellStyle5;
+            dataGridViewCellStyle13.WrapMode = System.Windows.Forms.DataGridViewTriState.True;
+            this.colSupplierName.DefaultCellStyle = dataGridViewCellStyle13;
             this.colSupplierName.Frozen = true;
             this.colSupplierName.HeaderText = "店铺名称";
             this.colSupplierName.Name = "colSupplierName";
@@ -2885,8 +2900,8 @@ namespace TemuKJD.WXForms.ProductForms
             // 
             // colProductName
             // 
-            dataGridViewCellStyle6.WrapMode = System.Windows.Forms.DataGridViewTriState.True;
-            this.colProductName.DefaultCellStyle = dataGridViewCellStyle6;
+            dataGridViewCellStyle14.WrapMode = System.Windows.Forms.DataGridViewTriState.True;
+            this.colProductName.DefaultCellStyle = dataGridViewCellStyle14;
             this.colProductName.HeaderText = "商品标题";
             this.colProductName.Name = "colProductName";
             this.colProductName.ReadOnly = true;
@@ -2894,8 +2909,8 @@ namespace TemuKJD.WXForms.ProductForms
             // 
             // colProductCat
             // 
-            dataGridViewCellStyle7.WrapMode = System.Windows.Forms.DataGridViewTriState.True;
-            this.colProductCat.DefaultCellStyle = dataGridViewCellStyle7;
+            dataGridViewCellStyle15.WrapMode = System.Windows.Forms.DataGridViewTriState.True;
+            this.colProductCat.DefaultCellStyle = dataGridViewCellStyle15;
             this.colProductCat.HeaderText = "商品类目";
             this.colProductCat.Name = "colProductCat";
             this.colProductCat.ReadOnly = true;
@@ -2950,8 +2965,8 @@ namespace TemuKJD.WXForms.ProductForms
             // 
             // colAddTime
             // 
-            dataGridViewCellStyle8.WrapMode = System.Windows.Forms.DataGridViewTriState.True;
-            this.colAddTime.DefaultCellStyle = dataGridViewCellStyle8;
+            dataGridViewCellStyle16.WrapMode = System.Windows.Forms.DataGridViewTriState.True;
+            this.colAddTime.DefaultCellStyle = dataGridViewCellStyle16;
             this.colAddTime.HeaderText = "上传时间";
             this.colAddTime.Name = "colAddTime";
             this.colAddTime.ReadOnly = true;
@@ -3303,5 +3318,6 @@ namespace TemuKJD.WXForms.ProductForms
         private System.Windows.Forms.Label label39;
         private UserComponent.UcCheckBox chkSameSpecPriceDown;
         private UserComponent.UcCheckBox chkLowestPriceSku;
+        private UserComponent.UcCheckBox chkRemoveSpecialChar;
     }
 }

TEMUKJD/WXForms/ProductForms/WXDBProdUploadForm.cs

@@ -1411,7 +1411,7 @@ namespace TemuKJD.WXForms.ProductForms
                 data += "&wx_safe_status=安全商品,未校验";
             if (noBanWx)
                 data += "&ban_wx=0";
-            if (BaseClass.SaLevel > 0 || BaseClass.UserAuthority.Contains("爆款数据") || BaseClass.UserAuthority.Contains("学员数据"))
+            if (BaseClass.SaLevel > 0 || BaseClass.UserAuthority.Contains("爆款数据") || BaseClass.UserAuthority.Contains("学员数据") || BaseClass.ParentAuthority.Contains("学员数据"))
                 data += "&special_prod_type=普通商品,爆款数据";
 
             var html = GetHtml.PostUtf8(url, data);
@@ -1782,7 +1782,8 @@ namespace TemuKJD.WXForms.ProductForms
                 {
                     foreach (var txt in lstTitleReplaceText)
                     {
-                        dbProd.product_name = dbProd.product_name.Replace(txt, "");
+                        dbProd.product_name = dbProd.product_name.Replace(txt, ""); 
+                        selectProd.product_name = selectProd.product_name.Replace(txt, "");
                     }
 
                     var goods_name = prodJObj["detail"]["goods_name"].ParseToString();
@@ -1813,6 +1814,55 @@ namespace TemuKJD.WXForms.ProductForms
                     }
                     prodJObj["detail"]["share_desc"] = share_desc;
                 }
+                // 过滤标题特殊字符
+                if (chkRemoveSpecialChar.Checked)
+                {
+                    //if (dbProd.product_name.Contains("】") && dbProd.product_name.IndexOf("】") < dbProd.product_name.Length / 2 && dbProd.product_name.Length > 10)
+                    //    dbProd.product_name = dbProd.product_name.Substring(dbProd.product_name.IndexOf("】")).Trim('】');
+
+                    //if (selectProd.product_name.Contains("】") && selectProd.product_name.IndexOf("】") < selectProd.product_name.Length / 2 && selectProd.product_name.Length > 10)
+                    //    selectProd.product_name = selectProd.product_name.Substring(selectProd.product_name.IndexOf("】")).Trim('】');
+
+                    //var goods_name = prodJObj["detail"]["goods_name"].ParseToString();
+                    //if (goods_name.Contains("】") && goods_name.IndexOf("】") < goods_name.Length / 2 && goods_name.Length > 10)
+                    //    prodJObj["detail"]["goods_name"] = goods_name.Substring(goods_name.IndexOf("】")).Trim('】');
+
+                    //if (dbProd.product_name.Contains("]") && dbProd.product_name.IndexOf("]") < dbProd.product_name.Length / 2 && dbProd.product_name.Length > 10)
+                    //    dbProd.product_name = dbProd.product_name.Substring(dbProd.product_name.IndexOf("]")).Trim(']');
+
+                    //if (selectProd.product_name.Contains("]") && selectProd.product_name.IndexOf("]") < selectProd.product_name.Length / 2 && selectProd.product_name.Length > 10)
+                    //    selectProd.product_name = selectProd.product_name.Substring(selectProd.product_name.IndexOf("]")).Trim(']');
+
+                    //goods_name = prodJObj["detail"]["goods_name"].ParseToString();
+                    //if (goods_name.Contains("]") && goods_name.IndexOf("]") < goods_name.Length / 2 && goods_name.Length > 10)
+                    //    prodJObj["detail"]["goods_name"] = goods_name.Substring(goods_name.IndexOf("]")).Trim(']');
+
+                    
+                    //if (dbProd.product_name.Contains("}") && dbProd.product_name.IndexOf("}") < dbProd.product_name.Length / 2 && dbProd.product_name.Length > 10)
+                    //    dbProd.product_name = dbProd.product_name.Substring(dbProd.product_name.IndexOf("}")).Trim('}');
+
+                    //if (selectProd.product_name.Contains("}") && selectProd.product_name.IndexOf("}") < selectProd.product_name.Length / 2 && selectProd.product_name.Length > 10)
+                    //    selectProd.product_name = selectProd.product_name.Substring(selectProd.product_name.IndexOf("}")).Trim('}');
+
+                    //goods_name = prodJObj["detail"]["goods_name"].ParseToString();
+                    //if (goods_name.Contains("}") && goods_name.IndexOf("}") < goods_name.Length / 2 && goods_name.Length > 10)
+                    //    prodJObj["detail"]["goods_name"] = goods_name.Substring(goods_name.IndexOf("}")).Trim('}');
+
+                    var chLst = new List<char> { ']', '】', '）', ')', '}', };
+                    foreach (var ch in chLst)
+                    {
+                        if (dbProd.product_name.Contains(ch) && dbProd.product_name.IndexOf(ch) < dbProd.product_name.Length / 2 && dbProd.product_name.Length > 10)
+                            dbProd.product_name = dbProd.product_name.Substring(dbProd.product_name.IndexOf(ch)).Trim(ch);
+
+                        if (selectProd.product_name.Contains(ch) && selectProd.product_name.IndexOf(ch) < selectProd.product_name.Length / 2 && selectProd.product_name.Length > 10)
+                            selectProd.product_name = selectProd.product_name.Substring(selectProd.product_name.IndexOf(ch)).Trim(ch);
+
+                        var goods_name = prodJObj["detail"]["goods_name"].ParseToString();
+                        if (goods_name.Contains(ch) && goods_name.IndexOf(ch) < goods_name.Length / 2 && goods_name.Length > 10)
+                            prodJObj["detail"]["goods_name"] = goods_name.Substring(goods_name.IndexOf(ch)).Trim(ch);
+                    }
+
+                }
                 // 替换货号
                 if (!string.IsNullOrEmpty(dbProd.ext_code))
                     prodJObj["detail"]["out_goods_sn"] = dbProd.ext_code;
@@ -4342,7 +4392,10 @@ namespace TemuKJD.WXForms.ProductForms
                 }
             }
             // 微信店采直接复制
-            else if (dbProd.product_get_type_text == "微信店采" && upProdParam.product.info.category.FirstOrDefault()?.name != "图书")
+            //else if (dbProd.product_get_type_text == "微信店采" && upProdParam.product.info.category.FirstOrDefault()?.name != "图书" &&
+            //         upProdParam.product.info.category.FirstOrDefault()?.name != "食品饮料")
+            else if (dbProd.product_get_type_text == "微信店采" && 
+                upProdParam.product.info.category.FirstOrDefault()?.name == "成人用品" && upProdParam.product.info.category[1].name != "情趣内衣")
             {
                 upProdParam.product.info.qualificationList.Clear();
                 if (wxEditProdInfo.product?.info?.qualificationList?.Count > 0)

TEMUKJD/WXForms/ProductForms/WXUserCollectAuthProdListForm.Designer.cs

@@ -144,6 +144,12 @@ namespace TemuKJD.WXForms.ProductForms
             this.col_select_product = new System.Windows.Forms.DataGridViewLinkColumn();
             this.ucSplitPage1 = new TemuKJD.UserControls.UcSplitPage();
             this.statusBar = new TemuKJD.UserControls.StatusBarUserControl();
+            this.txtBatchEditNotes = new System.Windows.Forms.TextBox();
+            this.btnBatchEditNotes = new DevComponents.DotNetBar.PanelEx();
+            this.dtpEnd = new System.Windows.Forms.DateTimePicker();
+            this.dtpStart = new System.Windows.Forms.DateTimePicker();
+            this.chkTime = new TemuKJD.UserComponent.UcCheckBox(this.components);
+            this.label9 = new System.Windows.Forms.Label();
             ((System.ComponentModel.ISupportInitialize)(this.splitContainer1)).BeginInit();
             this.splitContainer1.Panel1.SuspendLayout();
             this.splitContainer1.Panel2.SuspendLayout();
@@ -168,6 +174,8 @@ namespace TemuKJD.WXForms.ProductForms
             // 
             // splitContainer1.Panel1
             // 
+            this.splitContainer1.Panel1.Controls.Add(this.btnBatchEditNotes);
+            this.splitContainer1.Panel1.Controls.Add(this.txtBatchEditNotes);
             this.splitContainer1.Panel1.Controls.Add(this.btnAITitleFission);
             this.splitContainer1.Panel1.Controls.Add(this.txtFissionProductCount);
             this.splitContainer1.Panel1.Controls.Add(this.chkFissionProduct);
@@ -186,7 +194,7 @@ namespace TemuKJD.WXForms.ProductForms
             // 
             this.splitContainer1.Panel2.Controls.Add(this.splitContainer2);
             this.splitContainer1.Size = new System.Drawing.Size(1438, 686);
-            this.splitContainer1.SplitterDistance = 74;
+            this.splitContainer1.SplitterDistance = 115;
             this.splitContainer1.TabIndex = 1;
             // 
             // btnAITitleFission
@@ -217,7 +225,7 @@ namespace TemuKJD.WXForms.ProductForms
             // txtFissionProductCount
             // 
             this.txtFissionProductCount.Anchor = ((System.Windows.Forms.AnchorStyles)((System.Windows.Forms.AnchorStyles.Top | System.Windows.Forms.AnchorStyles.Right)));
-            this.txtFissionProductCount.Location = new System.Drawing.Point(1160, 45);
+            this.txtFissionProductCount.Location = new System.Drawing.Point(1160, 44);
             this.txtFissionProductCount.Margin = new System.Windows.Forms.Padding(0, 3, 3, 3);
             this.txtFissionProductCount.Name = "txtFissionProductCount";
             this.txtFissionProductCount.Size = new System.Drawing.Size(30, 23);
@@ -227,7 +235,7 @@ namespace TemuKJD.WXForms.ProductForms
             // chkFissionProduct
             // 
             this.chkFissionProduct.Anchor = ((System.Windows.Forms.AnchorStyles)((System.Windows.Forms.AnchorStyles.Top | System.Windows.Forms.AnchorStyles.Right)));
-            this.chkFissionProduct.Location = new System.Drawing.Point(1082, 46);
+            this.chkFissionProduct.Location = new System.Drawing.Point(1082, 45);
             this.chkFissionProduct.Margin = new System.Windows.Forms.Padding(10, 3, 3, 3);
             this.chkFissionProduct.Name = "chkFissionProduct";
             this.chkFissionProduct.Size = new System.Drawing.Size(76, 21);
@@ -242,7 +250,7 @@ namespace TemuKJD.WXForms.ProductForms
             this.btnOut1688ProdSaveDb.Cursor = System.Windows.Forms.Cursors.Hand;
             this.btnOut1688ProdSaveDb.DisabledBackColor = System.Drawing.Color.Empty;
             this.btnOut1688ProdSaveDb.Font = new System.Drawing.Font("微软雅黑", 9F, System.Drawing.FontStyle.Regular, System.Drawing.GraphicsUnit.Point, ((byte)(134)));
-            this.btnOut1688ProdSaveDb.Location = new System.Drawing.Point(1324, 44);
+            this.btnOut1688ProdSaveDb.Location = new System.Drawing.Point(1324, 78);
             this.btnOut1688ProdSaveDb.Name = "btnOut1688ProdSaveDb";
             this.btnOut1688ProdSaveDb.Size = new System.Drawing.Size(105, 25);
             this.btnOut1688ProdSaveDb.Style.Alignment = System.Drawing.StringAlignment.Center;
@@ -267,7 +275,7 @@ namespace TemuKJD.WXForms.ProductForms
             this.btnImportPddOutData.Cursor = System.Windows.Forms.Cursors.Hand;
             this.btnImportPddOutData.DisabledBackColor = System.Drawing.Color.Empty;
             this.btnImportPddOutData.Font = new System.Drawing.Font("微软雅黑", 9F, System.Drawing.FontStyle.Regular, System.Drawing.GraphicsUnit.Point, ((byte)(134)));
-            this.btnImportPddOutData.Location = new System.Drawing.Point(1216, 44);
+            this.btnImportPddOutData.Location = new System.Drawing.Point(1216, 78);
             this.btnImportPddOutData.Name = "btnImportPddOutData";
             this.btnImportPddOutData.Size = new System.Drawing.Size(105, 25);
             this.btnImportPddOutData.Style.Alignment = System.Drawing.StringAlignment.Center;
@@ -292,7 +300,7 @@ namespace TemuKJD.WXForms.ProductForms
             this.btnSelect.Cursor = System.Windows.Forms.Cursors.Hand;
             this.btnSelect.DisabledBackColor = System.Drawing.Color.Empty;
             this.btnSelect.Font = new System.Drawing.Font("微软雅黑", 9F, System.Drawing.FontStyle.Regular, System.Drawing.GraphicsUnit.Point, ((byte)(134)));
-            this.btnSelect.Location = new System.Drawing.Point(997, 44);
+            this.btnSelect.Location = new System.Drawing.Point(997, 43);
             this.btnSelect.Name = "btnSelect";
             this.btnSelect.Size = new System.Drawing.Size(82, 25);
             this.btnSelect.Style.Alignment = System.Drawing.StringAlignment.Center;
@@ -454,6 +462,7 @@ namespace TemuKJD.WXForms.ProductForms
             this.tableLayoutPanel1.ColumnStyles.Add(new System.Windows.Forms.ColumnStyle(System.Windows.Forms.SizeType.Percent, 16.66667F));
             this.tableLayoutPanel1.ColumnStyles.Add(new System.Windows.Forms.ColumnStyle(System.Windows.Forms.SizeType.Absolute, 20F));
             this.tableLayoutPanel1.ColumnStyles.Add(new System.Windows.Forms.ColumnStyle(System.Windows.Forms.SizeType.Absolute, 20F));
+            this.tableLayoutPanel1.Controls.Add(this.label9, 2, 2);
             this.tableLayoutPanel1.Controls.Add(this.cmbHasFission, 11, 1);
             this.tableLayoutPanel1.Controls.Add(this.label8, 10, 1);
             this.tableLayoutPanel1.Controls.Add(this.txtCatBoundLessThan, 9, 1);
@@ -478,6 +487,9 @@ namespace TemuKJD.WXForms.ProductForms
             this.tableLayoutPanel1.Controls.Add(this.cmbWxCat, 9, 0);
             this.tableLayoutPanel1.Controls.Add(this.lblWxSafe, 10, 0);
             this.tableLayoutPanel1.Controls.Add(this.cmbWxSafe, 11, 0);
+            this.tableLayoutPanel1.Controls.Add(this.chkTime, 0, 2);
+            this.tableLayoutPanel1.Controls.Add(this.dtpStart, 1, 2);
+            this.tableLayoutPanel1.Controls.Add(this.dtpEnd, 3, 2);
             this.tableLayoutPanel1.Location = new System.Drawing.Point(4, 6);
             this.tableLayoutPanel1.Name = "tableLayoutPanel1";
             this.tableLayoutPanel1.RowCount = 3;
@@ -496,17 +508,17 @@ namespace TemuKJD.WXForms.ProductForms
             "",
             "是",
             "否"});
-            this.cmbHasFission.Location = new System.Drawing.Point(883, 38);
+            this.cmbHasFission.Location = new System.Drawing.Point(888, 38);
             this.cmbHasFission.Margin = new System.Windows.Forms.Padding(0, 3, 3, 3);
             this.cmbHasFission.Name = "cmbHasFission";
-            this.cmbHasFission.Size = new System.Drawing.Size(106, 25);
+            this.cmbHasFission.Size = new System.Drawing.Size(101, 25);
             this.cmbHasFission.TabIndex = 982;
             // 
             // label8
             // 
             this.label8.Anchor = ((System.Windows.Forms.AnchorStyles)((System.Windows.Forms.AnchorStyles.Top | System.Windows.Forms.AnchorStyles.Right)));
             this.label8.AutoSize = true;
-            this.label8.Location = new System.Drawing.Point(827, 42);
+            this.label8.Location = new System.Drawing.Point(832, 42);
             this.label8.Margin = new System.Windows.Forms.Padding(3, 7, 0, 0);
             this.label8.Name = "label8";
             this.label8.Size = new System.Drawing.Size(56, 17);
@@ -519,17 +531,17 @@ namespace TemuKJD.WXForms.ProductForms
             | System.Windows.Forms.AnchorStyles.Right)));
             this.txtCatBoundLessThan.BorderStyle = System.Windows.Forms.BorderStyle.FixedSingle;
             this.txtCatBoundLessThan.Font = new System.Drawing.Font("微软雅黑", 10F);
-            this.txtCatBoundLessThan.Location = new System.Drawing.Point(715, 38);
+            this.txtCatBoundLessThan.Location = new System.Drawing.Point(723, 38);
             this.txtCatBoundLessThan.Margin = new System.Windows.Forms.Padding(0, 3, 3, 3);
             this.txtCatBoundLessThan.Name = "txtCatBoundLessThan";
-            this.txtCatBoundLessThan.Size = new System.Drawing.Size(102, 25);
+            this.txtCatBoundLessThan.Size = new System.Drawing.Size(99, 25);
             this.txtCatBoundLessThan.TabIndex = 883;
             this.txtCatBoundLessThan.Text = "100000";
             // 
             // chkCatBoundLessThan
             // 
             this.chkCatBoundLessThan.Anchor = ((System.Windows.Forms.AnchorStyles)((System.Windows.Forms.AnchorStyles.Top | System.Windows.Forms.AnchorStyles.Right)));
-            this.chkCatBoundLessThan.Location = new System.Drawing.Point(651, 40);
+            this.chkCatBoundLessThan.Location = new System.Drawing.Point(659, 40);
             this.chkCatBoundLessThan.Margin = new System.Windows.Forms.Padding(3, 5, 0, 0);
             this.chkCatBoundLessThan.Name = "chkCatBoundLessThan";
             this.chkCatBoundLessThan.Size = new System.Drawing.Size(64, 21);
@@ -544,17 +556,17 @@ namespace TemuKJD.WXForms.ProductForms
             | System.Windows.Forms.AnchorStyles.Right)));
             this.txtSPU.BorderStyle = System.Windows.Forms.BorderStyle.FixedSingle;
             this.txtSPU.Font = new System.Drawing.Font("微软雅黑", 10F);
-            this.txtSPU.Location = new System.Drawing.Point(52, 3);
+            this.txtSPU.Location = new System.Drawing.Point(72, 3);
             this.txtSPU.Margin = new System.Windows.Forms.Padding(0, 3, 3, 3);
             this.txtSPU.Name = "txtSPU";
-            this.txtSPU.Size = new System.Drawing.Size(102, 25);
+            this.txtSPU.Size = new System.Drawing.Size(99, 25);
             this.txtSPU.TabIndex = 434;
             // 
             // label5
             // 
             this.label5.Anchor = ((System.Windows.Forms.AnchorStyles)((System.Windows.Forms.AnchorStyles.Top | System.Windows.Forms.AnchorStyles.Right)));
             this.label5.AutoSize = true;
-            this.label5.Location = new System.Drawing.Point(3, 7);
+            this.label5.Location = new System.Drawing.Point(23, 7);
             this.label5.Margin = new System.Windows.Forms.Padding(3, 7, 0, 0);
             this.label5.Name = "label5";
             this.label5.Size = new System.Drawing.Size(49, 17);
@@ -567,17 +579,17 @@ namespace TemuKJD.WXForms.ProductForms
             | System.Windows.Forms.AnchorStyles.Right)));
             this.txtProdName.BorderStyle = System.Windows.Forms.BorderStyle.FixedSingle;
             this.txtProdName.Font = new System.Drawing.Font("微软雅黑", 10F);
-            this.txtProdName.Location = new System.Drawing.Point(220, 3);
+            this.txtProdName.Location = new System.Drawing.Point(237, 3);
             this.txtProdName.Margin = new System.Windows.Forms.Padding(0, 3, 3, 3);
             this.txtProdName.Name = "txtProdName";
-            this.txtProdName.Size = new System.Drawing.Size(102, 25);
+            this.txtProdName.Size = new System.Drawing.Size(99, 25);
             this.txtProdName.TabIndex = 427;
             // 
             // label3
             // 
             this.label3.Anchor = ((System.Windows.Forms.AnchorStyles)((System.Windows.Forms.AnchorStyles.Top | System.Windows.Forms.AnchorStyles.Right)));
             this.label3.AutoSize = true;
-            this.label3.Location = new System.Drawing.Point(160, 7);
+            this.label3.Location = new System.Drawing.Point(177, 7);
             this.label3.Margin = new System.Windows.Forms.Padding(3, 7, 0, 0);
             this.label3.Name = "label3";
             this.label3.Size = new System.Drawing.Size(60, 17);
@@ -588,7 +600,7 @@ namespace TemuKJD.WXForms.ProductForms
             // 
             this.label2.Anchor = ((System.Windows.Forms.AnchorStyles)((System.Windows.Forms.AnchorStyles.Top | System.Windows.Forms.AnchorStyles.Right)));
             this.label2.AutoSize = true;
-            this.label2.Location = new System.Drawing.Point(9, 42);
+            this.label2.Location = new System.Drawing.Point(29, 42);
             this.label2.Margin = new System.Windows.Forms.Padding(3, 7, 0, 0);
             this.label2.Name = "label2";
             this.label2.Size = new System.Drawing.Size(43, 17);
@@ -604,10 +616,10 @@ namespace TemuKJD.WXForms.ProductForms
             this.cmbCat1.DropDownWidth = 1;
             this.cmbCat1.FormattingEnabled = true;
             this.cmbCat1.IntegralHeight = false;
-            this.cmbCat1.Location = new System.Drawing.Point(52, 38);
+            this.cmbCat1.Location = new System.Drawing.Point(72, 38);
             this.cmbCat1.Margin = new System.Windows.Forms.Padding(0, 3, 3, 3);
             this.cmbCat1.Name = "cmbCat1";
-            this.cmbCat1.Size = new System.Drawing.Size(102, 25);
+            this.cmbCat1.Size = new System.Drawing.Size(99, 25);
             this.cmbCat1.TabIndex = 805;
             this.cmbCat1.Text = "全部";
             this.cmbCat1.SelectedIndexChanged += new System.EventHandler(this.cmbCat1_SelectedIndexChanged);
@@ -619,17 +631,17 @@ namespace TemuKJD.WXForms.ProductForms
             | System.Windows.Forms.AnchorStyles.Right)));
             this.txtCatBoundMoreThan.BorderStyle = System.Windows.Forms.BorderStyle.FixedSingle;
             this.txtCatBoundMoreThan.Font = new System.Drawing.Font("微软雅黑", 10F);
-            this.txtCatBoundMoreThan.Location = new System.Drawing.Point(543, 38);
+            this.txtCatBoundMoreThan.Location = new System.Drawing.Point(554, 38);
             this.txtCatBoundMoreThan.Margin = new System.Windows.Forms.Padding(0, 3, 3, 3);
             this.txtCatBoundMoreThan.Name = "txtCatBoundMoreThan";
-            this.txtCatBoundMoreThan.Size = new System.Drawing.Size(102, 25);
+            this.txtCatBoundMoreThan.Size = new System.Drawing.Size(99, 25);
             this.txtCatBoundMoreThan.TabIndex = 882;
             this.txtCatBoundMoreThan.Text = "1000";
             // 
             // chkCatBoundMoreThan
             // 
             this.chkCatBoundMoreThan.Anchor = ((System.Windows.Forms.AnchorStyles)((System.Windows.Forms.AnchorStyles.Top | System.Windows.Forms.AnchorStyles.Right)));
-            this.chkCatBoundMoreThan.Location = new System.Drawing.Point(479, 40);
+            this.chkCatBoundMoreThan.Location = new System.Drawing.Point(490, 40);
             this.chkCatBoundMoreThan.Margin = new System.Windows.Forms.Padding(3, 5, 0, 0);
             this.chkCatBoundMoreThan.Name = "chkCatBoundMoreThan";
             this.chkCatBoundMoreThan.Size = new System.Drawing.Size(64, 21);
@@ -642,7 +654,7 @@ namespace TemuKJD.WXForms.ProductForms
             // 
             this.label14.Anchor = ((System.Windows.Forms.AnchorStyles)((System.Windows.Forms.AnchorStyles.Top | System.Windows.Forms.AnchorStyles.Right)));
             this.label14.AutoSize = true;
-            this.label14.Location = new System.Drawing.Point(177, 42);
+            this.label14.Location = new System.Drawing.Point(194, 42);
             this.label14.Margin = new System.Windows.Forms.Padding(3, 7, 0, 0);
             this.label14.Name = "label14";
             this.label14.Size = new System.Drawing.Size(43, 17);
@@ -658,10 +670,10 @@ namespace TemuKJD.WXForms.ProductForms
             this.cmbCat2.DropDownWidth = 1;
             this.cmbCat2.FormattingEnabled = true;
             this.cmbCat2.IntegralHeight = false;
-            this.cmbCat2.Location = new System.Drawing.Point(220, 38);
+            this.cmbCat2.Location = new System.Drawing.Point(237, 38);
             this.cmbCat2.Margin = new System.Windows.Forms.Padding(0, 3, 3, 3);
             this.cmbCat2.Name = "cmbCat2";
-            this.cmbCat2.Size = new System.Drawing.Size(102, 25);
+            this.cmbCat2.Size = new System.Drawing.Size(99, 25);
             this.cmbCat2.TabIndex = 804;
             this.cmbCat2.Text = "全部";
             this.cmbCat2.SelectedIndexChanged += new System.EventHandler(this.cmbCat2_SelectedIndexChanged);
@@ -671,7 +683,7 @@ namespace TemuKJD.WXForms.ProductForms
             // 
             this.label17.Anchor = ((System.Windows.Forms.AnchorStyles)((System.Windows.Forms.AnchorStyles.Top | System.Windows.Forms.AnchorStyles.Right)));
             this.label17.AutoSize = true;
-            this.label17.Location = new System.Drawing.Point(328, 42);
+            this.label17.Location = new System.Drawing.Point(342, 42);
             this.label17.Margin = new System.Windows.Forms.Padding(3, 7, 0, 0);
             this.label17.Name = "label17";
             this.label17.Size = new System.Drawing.Size(43, 17);
@@ -687,10 +699,10 @@ namespace TemuKJD.WXForms.ProductForms
             this.cmbCat3.DropDownWidth = 1;
             this.cmbCat3.FormattingEnabled = true;
             this.cmbCat3.IntegralHeight = false;
-            this.cmbCat3.Location = new System.Drawing.Point(371, 38);
+            this.cmbCat3.Location = new System.Drawing.Point(385, 38);
             this.cmbCat3.Margin = new System.Windows.Forms.Padding(0, 3, 3, 3);
             this.cmbCat3.Name = "cmbCat3";
-            this.cmbCat3.Size = new System.Drawing.Size(102, 25);
+            this.cmbCat3.Size = new System.Drawing.Size(99, 25);
             this.cmbCat3.TabIndex = 811;
             this.cmbCat3.Text = "全部";
             this.cmbCat3.SelectedIndexChanged += new System.EventHandler(this.cmbCat3_SelectedIndexChanged);
@@ -700,7 +712,7 @@ namespace TemuKJD.WXForms.ProductForms
             // 
             this.lblSourceType.Anchor = ((System.Windows.Forms.AnchorStyles)((System.Windows.Forms.AnchorStyles.Top | System.Windows.Forms.AnchorStyles.Right)));
             this.lblSourceType.AutoSize = true;
-            this.lblSourceType.Location = new System.Drawing.Point(339, 7);
+            this.lblSourceType.Location = new System.Drawing.Point(353, 7);
             this.lblSourceType.Margin = new System.Windows.Forms.Padding(3, 7, 0, 0);
             this.lblSourceType.Name = "lblSourceType";
             this.lblSourceType.Size = new System.Drawing.Size(32, 17);
@@ -717,10 +729,10 @@ namespace TemuKJD.WXForms.ProductForms
             "多多商品",
             "1688商品",
             "微信商品"});
-            this.cmbSourceType.Location = new System.Drawing.Point(371, 3);
+            this.cmbSourceType.Location = new System.Drawing.Point(385, 3);
             this.cmbSourceType.Margin = new System.Windows.Forms.Padding(0, 3, 3, 3);
             this.cmbSourceType.Name = "cmbSourceType";
-            this.cmbSourceType.Size = new System.Drawing.Size(102, 25);
+            this.cmbSourceType.Size = new System.Drawing.Size(99, 25);
             this.cmbSourceType.TabIndex = 654;
             this.cmbSourceType.SelectedIndexChanged += new System.EventHandler(this.cmbSourceType_SelectedIndexChanged);
             this.cmbSourceType.TextChanged += new System.EventHandler(this.cmbSourceType_SelectedIndexChanged);
@@ -729,7 +741,7 @@ namespace TemuKJD.WXForms.ProductForms
             // 
             this.lblNotes.Anchor = ((System.Windows.Forms.AnchorStyles)((System.Windows.Forms.AnchorStyles.Top | System.Windows.Forms.AnchorStyles.Right)));
             this.lblNotes.AutoSize = true;
-            this.lblNotes.Location = new System.Drawing.Point(507, 7);
+            this.lblNotes.Location = new System.Drawing.Point(518, 7);
             this.lblNotes.Margin = new System.Windows.Forms.Padding(3, 7, 0, 0);
             this.lblNotes.Name = "lblNotes";
             this.lblNotes.Size = new System.Drawing.Size(36, 17);
@@ -742,17 +754,17 @@ namespace TemuKJD.WXForms.ProductForms
             | System.Windows.Forms.AnchorStyles.Right)));
             this.txtNotes.BorderStyle = System.Windows.Forms.BorderStyle.FixedSingle;
             this.txtNotes.Font = new System.Drawing.Font("微软雅黑", 10F);
-            this.txtNotes.Location = new System.Drawing.Point(543, 3);
+            this.txtNotes.Location = new System.Drawing.Point(554, 3);
             this.txtNotes.Margin = new System.Windows.Forms.Padding(0, 3, 3, 3);
             this.txtNotes.Name = "txtNotes";
-            this.txtNotes.Size = new System.Drawing.Size(102, 25);
+            this.txtNotes.Size = new System.Drawing.Size(99, 25);
             this.txtNotes.TabIndex = 439;
             // 
             // label12
             // 
             this.label12.Anchor = ((System.Windows.Forms.AnchorStyles)((System.Windows.Forms.AnchorStyles.Top | System.Windows.Forms.AnchorStyles.Right)));
             this.label12.AutoSize = true;
-            this.label12.Location = new System.Drawing.Point(655, 7);
+            this.label12.Location = new System.Drawing.Point(663, 7);
             this.label12.Margin = new System.Windows.Forms.Padding(3, 7, 0, 0);
             this.label12.Name = "label12";
             this.label12.Size = new System.Drawing.Size(60, 17);
@@ -768,17 +780,17 @@ namespace TemuKJD.WXForms.ProductForms
             "",
             "是",
             "否"});
-            this.cmbWxCat.Location = new System.Drawing.Point(715, 3);
+            this.cmbWxCat.Location = new System.Drawing.Point(723, 3);
             this.cmbWxCat.Margin = new System.Windows.Forms.Padding(0, 3, 3, 3);
             this.cmbWxCat.Name = "cmbWxCat";
-            this.cmbWxCat.Size = new System.Drawing.Size(102, 25);
+            this.cmbWxCat.Size = new System.Drawing.Size(99, 25);
             this.cmbWxCat.TabIndex = 802;
             // 
             // lblWxSafe
             // 
             this.lblWxSafe.Anchor = ((System.Windows.Forms.AnchorStyles)((System.Windows.Forms.AnchorStyles.Top | System.Windows.Forms.AnchorStyles.Right)));
             this.lblWxSafe.AutoSize = true;
-            this.lblWxSafe.Location = new System.Drawing.Point(823, 7);
+            this.lblWxSafe.Location = new System.Drawing.Point(828, 7);
             this.lblWxSafe.Margin = new System.Windows.Forms.Padding(3, 7, 0, 0);
             this.lblWxSafe.Name = "lblWxSafe";
             this.lblWxSafe.Size = new System.Drawing.Size(60, 17);
@@ -795,10 +807,10 @@ namespace TemuKJD.WXForms.ProductForms
             "安全+未校验",
             "安全商品",
             "未校验"});
-            this.cmbWxSafe.Location = new System.Drawing.Point(883, 3);
+            this.cmbWxSafe.Location = new System.Drawing.Point(888, 3);
             this.cmbWxSafe.Margin = new System.Windows.Forms.Padding(0, 3, 3, 3);
             this.cmbWxSafe.Name = "cmbWxSafe";
-            this.cmbWxSafe.Size = new System.Drawing.Size(106, 25);
+            this.cmbWxSafe.Size = new System.Drawing.Size(101, 25);
             this.cmbWxSafe.TabIndex = 676;
             this.cmbWxSafe.Text = "安全+未校验";
             // 
@@ -806,7 +818,7 @@ namespace TemuKJD.WXForms.ProductForms
             // 
             this.label7.Anchor = ((System.Windows.Forms.AnchorStyles)((System.Windows.Forms.AnchorStyles.Top | System.Windows.Forms.AnchorStyles.Right)));
             this.label7.AutoSize = true;
-            this.label7.Location = new System.Drawing.Point(1189, 48);
+            this.label7.Location = new System.Drawing.Point(1189, 47);
             this.label7.Margin = new System.Windows.Forms.Padding(3, 0, 0, 0);
             this.label7.Name = "label7";
             this.label7.Size = new System.Drawing.Size(20, 17);
@@ -848,15 +860,15 @@ namespace TemuKJD.WXForms.ProductForms
             // 
             this.splitContainer2.Panel2.Controls.Add(this.ucSplitPage1);
             this.splitContainer2.Panel2.Controls.Add(this.statusBar);
-            this.splitContainer2.Size = new System.Drawing.Size(1438, 608);
-            this.splitContainer2.SplitterDistance = 579;
+            this.splitContainer2.Size = new System.Drawing.Size(1438, 567);
+            this.splitContainer2.SplitterDistance = 538;
             this.splitContainer2.TabIndex = 0;
             // 
             // lblRelation
             // 
             this.lblRelation.Anchor = System.Windows.Forms.AnchorStyles.Right;
             this.lblRelation.AutoSize = true;
-            this.lblRelation.Location = new System.Drawing.Point(246, 89);
+            this.lblRelation.Location = new System.Drawing.Point(246, 69);
             this.lblRelation.Margin = new System.Windows.Forms.Padding(3, 0, 0, 0);
             this.lblRelation.Name = "lblRelation";
             this.lblRelation.Size = new System.Drawing.Size(68, 17);
@@ -868,7 +880,7 @@ namespace TemuKJD.WXForms.ProductForms
             // 
             this.pbLoading.Anchor = System.Windows.Forms.AnchorStyles.None;
             this.pbLoading.Image = global::TemuKJD.Properties.Resources.loading_blue;
-            this.pbLoading.Location = new System.Drawing.Point(694, 264);
+            this.pbLoading.Location = new System.Drawing.Point(694, 244);
             this.pbLoading.Name = "pbLoading";
             this.pbLoading.Size = new System.Drawing.Size(50, 50);
             this.pbLoading.SizeMode = System.Windows.Forms.PictureBoxSizeMode.StretchImage;
@@ -879,7 +891,7 @@ namespace TemuKJD.WXForms.ProductForms
             // 
             this.label16.Anchor = System.Windows.Forms.AnchorStyles.Right;
             this.label16.AutoSize = true;
-            this.label16.Location = new System.Drawing.Point(22, 217);
+            this.label16.Location = new System.Drawing.Point(22, 197);
             this.label16.Margin = new System.Windows.Forms.Padding(3, 0, 0, 0);
             this.label16.Name = "label16";
             this.label16.Size = new System.Drawing.Size(69, 17);
@@ -890,7 +902,7 @@ namespace TemuKJD.WXForms.ProductForms
             // txtRealCoid
             // 
             this.txtRealCoid.Anchor = ((System.Windows.Forms.AnchorStyles)((System.Windows.Forms.AnchorStyles.Left | System.Windows.Forms.AnchorStyles.Right)));
-            this.txtRealCoid.Location = new System.Drawing.Point(91, 149);
+            this.txtRealCoid.Location = new System.Drawing.Point(91, 129);
             this.txtRealCoid.Margin = new System.Windows.Forms.Padding(0, 3, 3, 3);
             this.txtRealCoid.Name = "txtRealCoid";
             this.txtRealCoid.Size = new System.Drawing.Size(133, 23);
@@ -900,7 +912,7 @@ namespace TemuKJD.WXForms.ProductForms
             // txtSKC
             // 
             this.txtSKC.Anchor = ((System.Windows.Forms.AnchorStyles)((System.Windows.Forms.AnchorStyles.Left | System.Windows.Forms.AnchorStyles.Right)));
-            this.txtSKC.Location = new System.Drawing.Point(91, 214);
+            this.txtSKC.Location = new System.Drawing.Point(91, 194);
             this.txtSKC.Margin = new System.Windows.Forms.Padding(0, 3, 3, 3);
             this.txtSKC.Name = "txtSKC";
             this.txtSKC.Size = new System.Drawing.Size(133, 23);
@@ -911,7 +923,7 @@ namespace TemuKJD.WXForms.ProductForms
             // 
             this.label13.Anchor = System.Windows.Forms.AnchorStyles.Right;
             this.label13.AutoSize = true;
-            this.label13.Location = new System.Drawing.Point(23, 183);
+            this.label13.Location = new System.Drawing.Point(23, 163);
             this.label13.Margin = new System.Windows.Forms.Padding(3, 0, 0, 0);
             this.label13.Name = "label13";
             this.label13.Size = new System.Drawing.Size(68, 17);
@@ -922,7 +934,7 @@ namespace TemuKJD.WXForms.ProductForms
             // txtSecretStyleCode
             // 
             this.txtSecretStyleCode.Anchor = ((System.Windows.Forms.AnchorStyles)((System.Windows.Forms.AnchorStyles.Left | System.Windows.Forms.AnchorStyles.Right)));
-            this.txtSecretStyleCode.Location = new System.Drawing.Point(91, 57);
+            this.txtSecretStyleCode.Location = new System.Drawing.Point(91, 37);
             this.txtSecretStyleCode.Margin = new System.Windows.Forms.Padding(0, 3, 3, 3);
             this.txtSecretStyleCode.Name = "txtSecretStyleCode";
             this.txtSecretStyleCode.Size = new System.Drawing.Size(133, 23);
@@ -933,7 +945,7 @@ namespace TemuKJD.WXForms.ProductForms
             // 
             this.label1.Anchor = System.Windows.Forms.AnchorStyles.Right;
             this.label1.AutoSize = true;
-            this.label1.Location = new System.Drawing.Point(22, 153);
+            this.label1.Location = new System.Drawing.Point(22, 133);
             this.label1.Margin = new System.Windows.Forms.Padding(3, 0, 0, 0);
             this.label1.Name = "label1";
             this.label1.Size = new System.Drawing.Size(69, 17);
@@ -944,7 +956,7 @@ namespace TemuKJD.WXForms.ProductForms
             // chkWXComplateProd
             // 
             this.chkWXComplateProd.Anchor = System.Windows.Forms.AnchorStyles.Left;
-            this.chkWXComplateProd.Location = new System.Drawing.Point(25, 253);
+            this.chkWXComplateProd.Location = new System.Drawing.Point(25, 233);
             this.chkWXComplateProd.Margin = new System.Windows.Forms.Padding(6, 3, 3, 3);
             this.chkWXComplateProd.Name = "chkWXComplateProd";
             this.chkWXComplateProd.Size = new System.Drawing.Size(87, 21);
@@ -957,7 +969,7 @@ namespace TemuKJD.WXForms.ProductForms
             // 
             this.lblGroup.Anchor = System.Windows.Forms.AnchorStyles.Right;
             this.lblGroup.AutoSize = true;
-            this.lblGroup.Location = new System.Drawing.Point(270, 57);
+            this.lblGroup.Location = new System.Drawing.Point(270, 37);
             this.lblGroup.Margin = new System.Windows.Forms.Padding(3, 0, 0, 0);
             this.lblGroup.Name = "lblGroup";
             this.lblGroup.Size = new System.Drawing.Size(44, 17);
@@ -969,7 +981,7 @@ namespace TemuKJD.WXForms.ProductForms
             // 
             this.cmbGroupFilter.Anchor = ((System.Windows.Forms.AnchorStyles)((System.Windows.Forms.AnchorStyles.Left | System.Windows.Forms.AnchorStyles.Right)));
             this.cmbGroupFilter.FormattingEnabled = true;
-            this.cmbGroupFilter.Location = new System.Drawing.Point(314, 54);
+            this.cmbGroupFilter.Location = new System.Drawing.Point(314, 34);
             this.cmbGroupFilter.Margin = new System.Windows.Forms.Padding(0, 3, 3, 3);
             this.cmbGroupFilter.Name = "cmbGroupFilter";
             this.cmbGroupFilter.Size = new System.Drawing.Size(146, 25);
@@ -980,7 +992,7 @@ namespace TemuKJD.WXForms.ProductForms
             // 
             this.label15.Anchor = System.Windows.Forms.AnchorStyles.Right;
             this.label15.AutoSize = true;
-            this.label15.Location = new System.Drawing.Point(47, 60);
+            this.label15.Location = new System.Drawing.Point(47, 40);
             this.label15.Margin = new System.Windows.Forms.Padding(3, 0, 0, 0);
             this.label15.Name = "label15";
             this.label15.Size = new System.Drawing.Size(44, 17);
@@ -991,7 +1003,7 @@ namespace TemuKJD.WXForms.ProductForms
             // txtExtCode
             // 
             this.txtExtCode.Anchor = ((System.Windows.Forms.AnchorStyles)((System.Windows.Forms.AnchorStyles.Left | System.Windows.Forms.AnchorStyles.Right)));
-            this.txtExtCode.Location = new System.Drawing.Point(91, 87);
+            this.txtExtCode.Location = new System.Drawing.Point(91, 67);
             this.txtExtCode.Margin = new System.Windows.Forms.Padding(0, 3, 3, 3);
             this.txtExtCode.Name = "txtExtCode";
             this.txtExtCode.Size = new System.Drawing.Size(133, 23);
@@ -1002,7 +1014,7 @@ namespace TemuKJD.WXForms.ProductForms
             // 
             this.label4.Anchor = System.Windows.Forms.AnchorStyles.Right;
             this.label4.AutoSize = true;
-            this.label4.Location = new System.Drawing.Point(47, 90);
+            this.label4.Location = new System.Drawing.Point(47, 70);
             this.label4.Margin = new System.Windows.Forms.Padding(3, 0, 0, 0);
             this.label4.Name = "label4";
             this.label4.Size = new System.Drawing.Size(44, 17);
@@ -1019,7 +1031,7 @@ namespace TemuKJD.WXForms.ProductForms
             "是",
             "否",
             "导出未拉回"});
-            this.cmbExportToOutServer.Location = new System.Drawing.Point(91, 179);
+            this.cmbExportToOutServer.Location = new System.Drawing.Point(91, 159);
             this.cmbExportToOutServer.Margin = new System.Windows.Forms.Padding(0, 3, 3, 3);
             this.cmbExportToOutServer.Name = "cmbExportToOutServer";
             this.cmbExportToOutServer.Size = new System.Drawing.Size(133, 25);
@@ -1034,7 +1046,7 @@ namespace TemuKJD.WXForms.ProductForms
             "",
             "是",
             "否"});
-            this.cmbRelation.Location = new System.Drawing.Point(314, 89);
+            this.cmbRelation.Location = new System.Drawing.Point(314, 69);
             this.cmbRelation.Margin = new System.Windows.Forms.Padding(0, 3, 3, 3);
             this.cmbRelation.Name = "cmbRelation";
             this.cmbRelation.Size = new System.Drawing.Size(146, 25);
@@ -1048,7 +1060,7 @@ namespace TemuKJD.WXForms.ProductForms
             this.cmbSort.Items.AddRange(new object[] {
             "入库时间",
             "认领总数"});
-            this.cmbSort.Location = new System.Drawing.Point(91, 116);
+            this.cmbSort.Location = new System.Drawing.Point(91, 96);
             this.cmbSort.Margin = new System.Windows.Forms.Padding(0, 3, 3, 3);
             this.cmbSort.Name = "cmbSort";
             this.cmbSort.Size = new System.Drawing.Size(133, 25);
@@ -1060,7 +1072,7 @@ namespace TemuKJD.WXForms.ProductForms
             // 
             this.label6.Anchor = System.Windows.Forms.AnchorStyles.Right;
             this.label6.AutoSize = true;
-            this.label6.Location = new System.Drawing.Point(47, 120);
+            this.label6.Location = new System.Drawing.Point(47, 100);
             this.label6.Margin = new System.Windows.Forms.Padding(3, 0, 0, 0);
             this.label6.Name = "label6";
             this.label6.Size = new System.Drawing.Size(44, 17);
@@ -1130,7 +1142,7 @@ namespace TemuKJD.WXForms.ProductForms
             this.dgvDbProduct.Name = "dgvDbProduct";
             this.dgvDbProduct.ReadOnly = true;
             this.dgvDbProduct.RowTemplate.Height = 23;
-            this.dgvDbProduct.Size = new System.Drawing.Size(1430, 579);
+            this.dgvDbProduct.Size = new System.Drawing.Size(1430, 538);
             this.dgvDbProduct.TabIndex = 6;
             this.dgvDbProduct.CellContentClick += new System.Windows.Forms.DataGridViewCellEventHandler(this.dgvDbProduct_CellContentClick);
             this.dgvDbProduct.Scroll += new System.Windows.Forms.ScrollEventHandler(this.dgvDbProduct_Scroll);
@@ -1465,6 +1477,85 @@ namespace TemuKJD.WXForms.ProductForms
             this.statusBar.Size = new System.Drawing.Size(1438, 25);
             this.statusBar.TabIndex = 5;
             // 
+            // txtBatchEditNotes
+            // 
+            this.txtBatchEditNotes.Anchor = ((System.Windows.Forms.AnchorStyles)((System.Windows.Forms.AnchorStyles.Top | System.Windows.Forms.AnchorStyles.Right)));
+            this.txtBatchEditNotes.BorderStyle = System.Windows.Forms.BorderStyle.FixedSingle;
+            this.txtBatchEditNotes.Font = new System.Drawing.Font("微软雅黑", 10F);
+            this.txtBatchEditNotes.Location = new System.Drawing.Point(1216, 43);
+            this.txtBatchEditNotes.Margin = new System.Windows.Forms.Padding(0, 3, 3, 3);
+            this.txtBatchEditNotes.Name = "txtBatchEditNotes";
+            this.txtBatchEditNotes.Size = new System.Drawing.Size(126, 25);
+            this.txtBatchEditNotes.TabIndex = 1226;
+            // 
+            // btnBatchEditNotes
+            // 
+            this.btnBatchEditNotes.Anchor = ((System.Windows.Forms.AnchorStyles)((System.Windows.Forms.AnchorStyles.Top | System.Windows.Forms.AnchorStyles.Right)));
+            this.btnBatchEditNotes.ColorSchemeStyle = DevComponents.DotNetBar.eDotNetBarStyle.StyleManagerControlled;
+            this.btnBatchEditNotes.Cursor = System.Windows.Forms.Cursors.Hand;
+            this.btnBatchEditNotes.DisabledBackColor = System.Drawing.Color.Empty;
+            this.btnBatchEditNotes.Font = new System.Drawing.Font("微软雅黑", 9F, System.Drawing.FontStyle.Regular, System.Drawing.GraphicsUnit.Point, ((byte)(134)));
+            this.btnBatchEditNotes.Location = new System.Drawing.Point(1345, 43);
+            this.btnBatchEditNotes.Name = "btnBatchEditNotes";
+            this.btnBatchEditNotes.Size = new System.Drawing.Size(84, 25);
+            this.btnBatchEditNotes.Style.Alignment = System.Drawing.StringAlignment.Center;
+            this.btnBatchEditNotes.Style.BackColor1.Color = System.Drawing.Color.FromArgb(((int)(((byte)(63)))), ((int)(((byte)(126)))), ((int)(((byte)(255)))));
+            this.btnBatchEditNotes.Style.BackColor2.Color = System.Drawing.Color.FromArgb(((int)(((byte)(63)))), ((int)(((byte)(126)))), ((int)(((byte)(255)))));
+            this.btnBatchEditNotes.Style.BorderColor.ColorSchemePart = DevComponents.DotNetBar.eColorSchemePart.PanelBorder;
+            this.btnBatchEditNotes.Style.BorderDashStyle = System.Drawing.Drawing2D.DashStyle.Dash;
+            this.btnBatchEditNotes.Style.BorderSide = DevComponents.DotNetBar.eBorderSide.None;
+            this.btnBatchEditNotes.Style.ForeColor.Color = System.Drawing.Color.White;
+            this.btnBatchEditNotes.Style.GradientAngle = 90;
+            this.btnBatchEditNotes.StyleMouseOver.Alignment = System.Drawing.StringAlignment.Center;
+            this.btnBatchEditNotes.StyleMouseOver.BackColor1.Color = System.Drawing.Color.FromArgb(((int)(((byte)(25)))), ((int)(((byte)(102)))), ((int)(((byte)(255)))));
+            this.btnBatchEditNotes.StyleMouseOver.BackColor2.Color = System.Drawing.Color.FromArgb(((int)(((byte)(25)))), ((int)(((byte)(102)))), ((int)(((byte)(255)))));
+            this.btnBatchEditNotes.TabIndex = 1230;
+            this.btnBatchEditNotes.Text = "批量修改备注";
+            this.btnBatchEditNotes.Click += new System.EventHandler(this.btnBatchEditNotes_Click);
+            // 
+            // dtpEnd
+            // 
+            this.dtpEnd.Anchor = ((System.Windows.Forms.AnchorStyles)((System.Windows.Forms.AnchorStyles.Left | System.Windows.Forms.AnchorStyles.Right)));
+            this.dtpEnd.CustomFormat = "yyyy-MM-dd HH:mm";
+            this.dtpEnd.Format = System.Windows.Forms.DateTimePickerFormat.Custom;
+            this.dtpEnd.Location = new System.Drawing.Point(237, 76);
+            this.dtpEnd.Margin = new System.Windows.Forms.Padding(0, 3, 3, 3);
+            this.dtpEnd.Name = "dtpEnd";
+            this.dtpEnd.Size = new System.Drawing.Size(99, 23);
+            this.dtpEnd.TabIndex = 982;
+            // 
+            // dtpStart
+            // 
+            this.dtpStart.Anchor = ((System.Windows.Forms.AnchorStyles)((System.Windows.Forms.AnchorStyles.Left | System.Windows.Forms.AnchorStyles.Right)));
+            this.dtpStart.CustomFormat = "yyyy-MM-dd HH:mm";
+            this.dtpStart.Format = System.Windows.Forms.DateTimePickerFormat.Custom;
+            this.dtpStart.Location = new System.Drawing.Point(72, 76);
+            this.dtpStart.Margin = new System.Windows.Forms.Padding(0, 3, 3, 3);
+            this.dtpStart.Name = "dtpStart";
+            this.dtpStart.Size = new System.Drawing.Size(99, 23);
+            this.dtpStart.TabIndex = 981;
+            // 
+            // chkTime
+            // 
+            this.chkTime.Anchor = System.Windows.Forms.AnchorStyles.Right;
+            this.chkTime.Location = new System.Drawing.Point(3, 77);
+            this.chkTime.Name = "chkTime";
+            this.chkTime.Size = new System.Drawing.Size(66, 21);
+            this.chkTime.TabIndex = 980;
+            this.chkTime.Text = "开始时间";
+            this.chkTime.UseVisualStyleBackColor = true;
+            // 
+            // label9
+            // 
+            this.label9.Anchor = ((System.Windows.Forms.AnchorStyles)((System.Windows.Forms.AnchorStyles.Top | System.Windows.Forms.AnchorStyles.Right)));
+            this.label9.AutoSize = true;
+            this.label9.Location = new System.Drawing.Point(181, 77);
+            this.label9.Margin = new System.Windows.Forms.Padding(3, 7, 0, 0);
+            this.label9.Name = "label9";
+            this.label9.Size = new System.Drawing.Size(56, 17);
+            this.label9.TabIndex = 885;
+            this.label9.Text = "结束时间";
+            // 
             // WXUserCollectAuthProdListForm
             // 
             this.AutoScaleMode = System.Windows.Forms.AutoScaleMode.None;
@@ -1598,5 +1689,11 @@ namespace TemuKJD.WXForms.ProductForms
         private System.Windows.Forms.DataGridViewLinkColumn col_edit;
         private System.Windows.Forms.DataGridViewLinkColumn col_delete;
         private System.Windows.Forms.DataGridViewLinkColumn col_select_product;
+        private DevComponents.DotNetBar.PanelEx btnBatchEditNotes;
+        private System.Windows.Forms.TextBox txtBatchEditNotes;
+        private System.Windows.Forms.DateTimePicker dtpStart;
+        private System.Windows.Forms.DateTimePicker dtpEnd;
+        private UserComponent.UcCheckBox chkTime;
+        private System.Windows.Forms.Label label9;
     }
 }

TEMUKJD/WXForms/ProductForms/WXUserCollectAuthProdListForm.cs

@@ -51,6 +51,9 @@ namespace TemuKJD.WXForms.ProductForms
 
         private void ProductListForm_Load(object sender, EventArgs e)
         {
+            dtpStart.Value = DateTime.Now.Date.AddMonths(-1);
+            dtpEnd.Value = DateTime.Now.Date.AddDays(1).AddSeconds(-1);
+
             //chkCatBoundLessThan.Visible = false;
             //chkCatBoundMoreThan.Visible = false;
             //tableLayoutPanel1.SetColumn(lblSourceType, 2);
@@ -391,6 +394,12 @@ namespace TemuKJD.WXForms.ProductForms
                 else if (cmbRelation.Text == "是")
                     data += "&is_relation=1";
 
+                if (chkTime.Checked)
+                {
+                    data += "&add_time_begin=" + dtpStart.Value.ToString("yyyy-MM-dd HH:mm:ss");
+                    data += "&add_time_end=" + dtpEnd.Value.ToString("yyyy-MM-dd HH:mm:ss");
+                }
+
                 //if (chkEditTime.Checked)
                 //{
                 //    data += "&start_time=" + dtpStart.Value.ToString("yyyy-MM-dd HH:mm:ss");
@@ -1192,5 +1201,55 @@ namespace TemuKJD.WXForms.ProductForms
             DouBaoTitleFissionCefForm fissionCefForm = new DouBaoTitleFissionCefForm(prodList);
             fissionCefForm.ShowDialog();
         }
+
+        private void btnBatchEditNotes_Click(object sender, EventArgs e)
+        {
+            var lstProdId = dgvDbProduct.Rows.Cast<DataGridViewRow>().Where(row
+                => row.Cells["colSelect"]?.Value.ParseToBool() == true).Select(r => r.Cells["col_spu_id"]?.Value.ToString()).ToList(); 
+            if (BaseMsgForm.ShowConfirm("确定批量编辑备注吗？").DialogResult == DialogResult.Cancel)
+                return;
+            if (lstProdId.Count == 0)
+            {
+                BaseMsgForm.ShowError("请选择要修改备注的商品");
+                return;
+            }
+
+            this.pbLoading.Visible = true;
+            //int total = 0, successCnt = 0, failCnt = 0;
+            Task.Run(() =>
+            {
+                var prodList = lstTemuDbProduct.Where(p => lstProdId.Contains(p.spu_id)).ToList();
+                //foreach (var dbProd in prodList)
+                //{
+                //    total++;
+                //    var url = BaseClass.BuildPDDObjString("product/mdy_db_product");
+                //    var data = UserLogin.GetSignaturex() +
+                //            "&db_id=" + dbProd.id + "&notes=" + this.txtBatchEditNotes.Text.Trim();
+                //    var html = GetHtml.PostUtf8(url, data);
+                //    if (string.IsNullOrEmpty(html) || !html.Contains("\"code\":200"))
+                //    {
+                //        failCnt++;
+                //    }
+                //    else
+                //    {
+                //        successCnt++;
+                //    }
+                //    Thread.Sleep(100);
+                //}
+                var url = BaseClass.BuildPDDObjString("product/mdy_db_product");
+                var data = UserLogin.GetSignaturex() +
+                        "&in_db_ids=" + string.Join(",", prodList.Select(p => p.id).ToList()) + "&notes=" + this.txtBatchEditNotes.Text.Trim();
+                var html = GetHtml.PostUtf8(url, data);
+                if (string.IsNullOrEmpty(html) || !html.Contains("\"code\":200"))
+                {
+                    BaseMsgForm.ShowError("修改失败");
+                }
+                else
+                {
+                    SearchDbProd(this.ucSplitPage1.CurrentPage);
+                    BaseMsgForm.ShowInfo("修改完成");
+                }
+            });
+        }
     }
 }

TEMUKJD/WXForms/ShopForms/WXGetTopUpQrCode.Designer.cs

@@ -33,37 +33,39 @@ namespace TemuKJD.WXForms.ShopForms
             this.pictureBox1 = new System.Windows.Forms.PictureBox();
             this.btnRefresh = new DevComponents.DotNetBar.PanelEx();
             this.pbLoading = new System.Windows.Forms.PictureBox();
-            this.numAddTopUp = new System.Windows.Forms.NumericUpDown();
-            this.label8 = new System.Windows.Forms.Label();
             this.btnAddPoints = new DevComponents.DotNetBar.PanelEx();
-            this.btnAddBalance = new DevComponents.DotNetBar.PanelEx();
-            this.numericUpDown1 = new System.Windows.Forms.NumericUpDown();
+            this.numAddPoints = new System.Windows.Forms.NumericUpDown();
             this.label2 = new System.Windows.Forms.Label();
+            this.splitContainer1 = new System.Windows.Forms.SplitContainer();
             ((System.ComponentModel.ISupportInitialize)(this.pictureBox1)).BeginInit();
             ((System.ComponentModel.ISupportInitialize)(this.pbLoading)).BeginInit();
-            ((System.ComponentModel.ISupportInitialize)(this.numAddTopUp)).BeginInit();
-            ((System.ComponentModel.ISupportInitialize)(this.numericUpDown1)).BeginInit();
+            ((System.ComponentModel.ISupportInitialize)(this.numAddPoints)).BeginInit();
+            ((System.ComponentModel.ISupportInitialize)(this.splitContainer1)).BeginInit();
+            this.splitContainer1.Panel1.SuspendLayout();
+            this.splitContainer1.SuspendLayout();
             this.SuspendLayout();
             // 
             // label1
             // 
             this.label1.Font = new System.Drawing.Font("微软雅黑", 11F);
             this.label1.ForeColor = System.Drawing.Color.FromArgb(((int)(((byte)(192)))), ((int)(((byte)(64)))), ((int)(((byte)(0)))));
-            this.label1.Location = new System.Drawing.Point(27, 283);
+            this.label1.Location = new System.Drawing.Point(21, 350);
             this.label1.Name = "label1";
             this.label1.Size = new System.Drawing.Size(228, 72);
             this.label1.TabIndex = 1;
             this.label1.Text = "支付宝扫码充值，备注软件登录账户。如忘记备注，请联系购买方充值。";
+            this.label1.Visible = false;
             // 
             // pictureBox1
             // 
             this.pictureBox1.BorderStyle = System.Windows.Forms.BorderStyle.FixedSingle;
-            this.pictureBox1.Location = new System.Drawing.Point(30, 31);
+            this.pictureBox1.Location = new System.Drawing.Point(24, 129);
             this.pictureBox1.Name = "pictureBox1";
             this.pictureBox1.Size = new System.Drawing.Size(212, 212);
             this.pictureBox1.SizeMode = System.Windows.Forms.PictureBoxSizeMode.Zoom;
             this.pictureBox1.TabIndex = 3;
             this.pictureBox1.TabStop = false;
+            this.pictureBox1.Visible = false;
             // 
             // btnRefresh
             // 
@@ -71,7 +73,7 @@ namespace TemuKJD.WXForms.ShopForms
             this.btnRefresh.Cursor = System.Windows.Forms.Cursors.Hand;
             this.btnRefresh.DisabledBackColor = System.Drawing.Color.Empty;
             this.btnRefresh.Font = new System.Drawing.Font("微软雅黑", 9F, System.Drawing.FontStyle.Regular, System.Drawing.GraphicsUnit.Point, ((byte)(134)));
-            this.btnRefresh.Location = new System.Drawing.Point(158, 358);
+            this.btnRefresh.Location = new System.Drawing.Point(152, 425);
             this.btnRefresh.Name = "btnRefresh";
             this.btnRefresh.Size = new System.Drawing.Size(84, 23);
             this.btnRefresh.Style.Alignment = System.Drawing.StringAlignment.Center;
@@ -87,12 +89,13 @@ namespace TemuKJD.WXForms.ShopForms
             this.btnRefresh.StyleMouseOver.BackColor2.Color = System.Drawing.Color.FromArgb(((int)(((byte)(25)))), ((int)(((byte)(102)))), ((int)(((byte)(255)))));
             this.btnRefresh.TabIndex = 1135;
             this.btnRefresh.Text = "刷新";
+            this.btnRefresh.Visible = false;
             this.btnRefresh.Click += new System.EventHandler(this.btnRefresh_Click);
             // 
             // pbLoading
             // 
             this.pbLoading.Image = global::TemuKJD.Properties.Resources.loading_blue;
-            this.pbLoading.Location = new System.Drawing.Point(111, 112);
+            this.pbLoading.Location = new System.Drawing.Point(105, 210);
             this.pbLoading.Name = "pbLoading";
             this.pbLoading.Size = new System.Drawing.Size(50, 50);
             this.pbLoading.SizeMode = System.Windows.Forms.PictureBoxSizeMode.StretchImage;
@@ -100,47 +103,13 @@ namespace TemuKJD.WXForms.ShopForms
             this.pbLoading.TabStop = false;
             this.pbLoading.Visible = false;
             // 
-            // numAddTopUp
-            // 
-            this.numAddTopUp.DecimalPlaces = 2;
-            this.numAddTopUp.Location = new System.Drawing.Point(116, 418);
-            this.numAddTopUp.Maximum = new decimal(new int[] {
-            100000,
-            0,
-            0,
-            0});
-            this.numAddTopUp.Minimum = new decimal(new int[] {
-            1,
-            0,
-            0,
-            131072});
-            this.numAddTopUp.Name = "numAddTopUp";
-            this.numAddTopUp.Size = new System.Drawing.Size(66, 23);
-            this.numAddTopUp.TabIndex = 1140;
-            this.numAddTopUp.Value = new decimal(new int[] {
-            1,
-            0,
-            0,
-            131072});
-            this.numAddTopUp.Visible = false;
-            // 
-            // label8
-            // 
-            this.label8.AutoSize = true;
-            this.label8.Location = new System.Drawing.Point(33, 421);
-            this.label8.Name = "label8";
-            this.label8.Size = new System.Drawing.Size(92, 17);
-            this.label8.TabIndex = 1141;
-            this.label8.Text = "积分充值金额：";
-            this.label8.Visible = false;
-            // 
             // btnAddPoints
             // 
             this.btnAddPoints.ColorSchemeStyle = DevComponents.DotNetBar.eDotNetBarStyle.StyleManagerControlled;
             this.btnAddPoints.Cursor = System.Windows.Forms.Cursors.Hand;
             this.btnAddPoints.DisabledBackColor = System.Drawing.Color.Empty;
             this.btnAddPoints.Font = new System.Drawing.Font("微软雅黑", 9F, System.Drawing.FontStyle.Regular, System.Drawing.GraphicsUnit.Point, ((byte)(134)));
-            this.btnAddPoints.Location = new System.Drawing.Point(186, 418);
+            this.btnAddPoints.Location = new System.Drawing.Point(180, 25);
             this.btnAddPoints.Name = "btnAddPoints";
             this.btnAddPoints.Size = new System.Drawing.Size(56, 23);
             this.btnAddPoints.Style.Alignment = System.Drawing.StringAlignment.Center;
@@ -156,93 +125,83 @@ namespace TemuKJD.WXForms.ShopForms
             this.btnAddPoints.StyleMouseOver.BackColor2.Color = System.Drawing.Color.FromArgb(((int)(((byte)(25)))), ((int)(((byte)(102)))), ((int)(((byte)(255)))));
             this.btnAddPoints.TabIndex = 1145;
             this.btnAddPoints.Text = "充值";
-            this.btnAddPoints.Visible = false;
             this.btnAddPoints.Click += new System.EventHandler(this.btnAddPoints_Click);
             // 
-            // btnAddBalance
+            // numAddPoints
             // 
-            this.btnAddBalance.ColorSchemeStyle = DevComponents.DotNetBar.eDotNetBarStyle.StyleManagerControlled;
-            this.btnAddBalance.Cursor = System.Windows.Forms.Cursors.Hand;
-            this.btnAddBalance.DisabledBackColor = System.Drawing.Color.Empty;
-            this.btnAddBalance.Font = new System.Drawing.Font("微软雅黑", 9F, System.Drawing.FontStyle.Regular, System.Drawing.GraphicsUnit.Point, ((byte)(134)));
-            this.btnAddBalance.Location = new System.Drawing.Point(186, 452);
-            this.btnAddBalance.Name = "btnAddBalance";
-            this.btnAddBalance.Size = new System.Drawing.Size(56, 23);
-            this.btnAddBalance.Style.Alignment = System.Drawing.StringAlignment.Center;
-            this.btnAddBalance.Style.BackColor1.Color = System.Drawing.Color.FromArgb(((int)(((byte)(63)))), ((int)(((byte)(126)))), ((int)(((byte)(255)))));
-            this.btnAddBalance.Style.BackColor2.Color = System.Drawing.Color.FromArgb(((int)(((byte)(63)))), ((int)(((byte)(126)))), ((int)(((byte)(255)))));
-            this.btnAddBalance.Style.BorderColor.ColorSchemePart = DevComponents.DotNetBar.eColorSchemePart.PanelBorder;
-            this.btnAddBalance.Style.BorderDashStyle = System.Drawing.Drawing2D.DashStyle.Dash;
-            this.btnAddBalance.Style.BorderSide = DevComponents.DotNetBar.eBorderSide.None;
-            this.btnAddBalance.Style.ForeColor.Color = System.Drawing.Color.White;
-            this.btnAddBalance.Style.GradientAngle = 90;
-            this.btnAddBalance.StyleMouseOver.Alignment = System.Drawing.StringAlignment.Center;
-            this.btnAddBalance.StyleMouseOver.BackColor1.Color = System.Drawing.Color.FromArgb(((int)(((byte)(25)))), ((int)(((byte)(102)))), ((int)(((byte)(255)))));
-            this.btnAddBalance.StyleMouseOver.BackColor2.Color = System.Drawing.Color.FromArgb(((int)(((byte)(25)))), ((int)(((byte)(102)))), ((int)(((byte)(255)))));
-            this.btnAddBalance.TabIndex = 1151;
-            this.btnAddBalance.Text = "充值";
-            this.btnAddBalance.Visible = false;
-            this.btnAddBalance.Click += new System.EventHandler(this.btnAddBalance_Click);
-            // 
-            // numericUpDown1
-            // 
-            this.numericUpDown1.DecimalPlaces = 2;
-            this.numericUpDown1.Location = new System.Drawing.Point(116, 452);
-            this.numericUpDown1.Maximum = new decimal(new int[] {
+            this.numAddPoints.DecimalPlaces = 2;
+            this.numAddPoints.Location = new System.Drawing.Point(108, 25);
+            this.numAddPoints.Maximum = new decimal(new int[] {
             100000,
             0,
             0,
             0});
-            this.numericUpDown1.Minimum = new decimal(new int[] {
+            this.numAddPoints.Minimum = new decimal(new int[] {
             1,
             0,
             0,
             131072});
-            this.numericUpDown1.Name = "numericUpDown1";
-            this.numericUpDown1.Size = new System.Drawing.Size(66, 23);
-            this.numericUpDown1.TabIndex = 1149;
-            this.numericUpDown1.Value = new decimal(new int[] {
-            1,
+            this.numAddPoints.Name = "numAddPoints";
+            this.numAddPoints.Size = new System.Drawing.Size(66, 23);
+            this.numAddPoints.TabIndex = 1149;
+            this.numAddPoints.Value = new decimal(new int[] {
+            100,
             0,
             0,
-            131072});
-            this.numericUpDown1.Visible = false;
+            0});
             // 
             // label2
             // 
             this.label2.AutoSize = true;
-            this.label2.Location = new System.Drawing.Point(33, 455);
+            this.label2.Location = new System.Drawing.Point(25, 28);
             this.label2.Name = "label2";
             this.label2.Size = new System.Drawing.Size(92, 17);
             this.label2.TabIndex = 1150;
             this.label2.Text = "余额充值金额：";
-            this.label2.Visible = false;
+            // 
+            // splitContainer1
+            // 
+            this.splitContainer1.Dock = System.Windows.Forms.DockStyle.Fill;
+            this.splitContainer1.FixedPanel = System.Windows.Forms.FixedPanel.Panel1;
+            this.splitContainer1.Location = new System.Drawing.Point(0, 0);
+            this.splitContainer1.Name = "splitContainer1";
+            // 
+            // splitContainer1.Panel1
+            // 
+            this.splitContainer1.Panel1.Controls.Add(this.label1);
+            this.splitContainer1.Panel1.Controls.Add(this.pbLoading);
+            this.splitContainer1.Panel1.Controls.Add(this.btnAddPoints);
+            this.splitContainer1.Panel1.Controls.Add(this.numAddPoints);
+            this.splitContainer1.Panel1.Controls.Add(this.label2);
+            this.splitContainer1.Panel1.Controls.Add(this.pictureBox1);
+            this.splitContainer1.Panel1.Controls.Add(this.btnRefresh);
+            // 
+            // splitContainer1.Panel2
+            // 
+            this.splitContainer1.Panel2.Padding = new System.Windows.Forms.Padding(3);
+            this.splitContainer1.Size = new System.Drawing.Size(1288, 522);
+            this.splitContainer1.SplitterDistance = 261;
+            this.splitContainer1.TabIndex = 1162;
             // 
             // WXGetTopUpQrCode
             // 
             this.AutoScaleMode = System.Windows.Forms.AutoScaleMode.None;
             this.BackColor = System.Drawing.Color.White;
-            this.ClientSize = new System.Drawing.Size(800, 522);
-            this.Controls.Add(this.btnAddBalance);
-            this.Controls.Add(this.numericUpDown1);
-            this.Controls.Add(this.label2);
-            this.Controls.Add(this.btnAddPoints);
-            this.Controls.Add(this.numAddTopUp);
-            this.Controls.Add(this.label8);
-            this.Controls.Add(this.pbLoading);
-            this.Controls.Add(this.btnRefresh);
-            this.Controls.Add(this.pictureBox1);
-            this.Controls.Add(this.label1);
+            this.ClientSize = new System.Drawing.Size(1288, 522);
+            this.Controls.Add(this.splitContainer1);
             this.Font = new System.Drawing.Font("微软雅黑", 9F, System.Drawing.FontStyle.Regular, System.Drawing.GraphicsUnit.Point, ((byte)(134)));
+            this.KeyPreview = true;
             this.Name = "WXGetTopUpQrCode";
-            this.Text = "二维码充值";
+            this.Text = "二维码充值用户积分";
             this.Load += new System.EventHandler(this.WXGetTopUpQrCode_Load);
             ((System.ComponentModel.ISupportInitialize)(this.pictureBox1)).EndInit();
             ((System.ComponentModel.ISupportInitialize)(this.pbLoading)).EndInit();
-            ((System.ComponentModel.ISupportInitialize)(this.numAddTopUp)).EndInit();
-            ((System.ComponentModel.ISupportInitialize)(this.numericUpDown1)).EndInit();
+            ((System.ComponentModel.ISupportInitialize)(this.numAddPoints)).EndInit();
+            this.splitContainer1.Panel1.ResumeLayout(false);
+            this.splitContainer1.Panel1.PerformLayout();
+            ((System.ComponentModel.ISupportInitialize)(this.splitContainer1)).EndInit();
+            this.splitContainer1.ResumeLayout(false);
             this.ResumeLayout(false);
-            this.PerformLayout();
 
         }
 
@@ -251,11 +210,9 @@ namespace TemuKJD.WXForms.ShopForms
         private System.Windows.Forms.PictureBox pictureBox1;
         private DevComponents.DotNetBar.PanelEx btnRefresh;
         private System.Windows.Forms.PictureBox pbLoading;
-        private System.Windows.Forms.NumericUpDown numAddTopUp;
-        private System.Windows.Forms.Label label8;
         private DevComponents.DotNetBar.PanelEx btnAddPoints;
-        private DevComponents.DotNetBar.PanelEx btnAddBalance;
-        private System.Windows.Forms.NumericUpDown numericUpDown1;
+        private System.Windows.Forms.NumericUpDown numAddPoints;
         private System.Windows.Forms.Label label2;
+        private System.Windows.Forms.SplitContainer splitContainer1;
     }
 }

TEMUKJD/WXForms/ShopForms/WXGetTopUpQrCode.cs

@@ -1,4 +1,7 @@
 using AllBase;
+using AllBase.Model.Result;
+using NaiBa.Util.Extension;
+using Newtonsoft.Json.Linq;
 using System;
 using System.Collections.Generic;
 using System.ComponentModel;
@@ -11,6 +14,7 @@ using System.Text;
 using System.Threading.Tasks;
 using System.Windows.Forms;
 using TemuKJD.BaseForms;
+using TemuKJD.BLL;
 using TemuKJD.KJDForms.ShopForms;
 using Work;
 using Work.BLL.Tools;
@@ -61,28 +65,57 @@ namespace TemuKJD.WXForms.ShopForms
 
         private void WXGetTopUpQrCode_Load(object sender, EventArgs e)
         {
+            //if (BaseClass.AgentCode.IsNullOrEmpty() && BaseClass.OemId.IsNullOrEmpty())
+            //    this.pictureBox1.Visible = false;
+
             Task.Run(() => { refreshQrcode(); });
         }
 
         private void btnAddPoints_Click(object sender, EventArgs e)
         {
-            try
-            {
-                Process.Start(new ProcessStartInfo("https://excashier.alipay.com/standard/auth.htm?payOrderId=5afc56d40af64001ad2a486cce1ca579.25") { UseShellExecute = true });
-            }
-            catch (Exception ex)
-            {
-                // 处理可能出现的异常，例如找不到浏览器等
-                MessageBox.Show("无法打开浏览器: " + ex.Message);
-            }
-        }
+            // 打开外部浏览器
+            //try
+            //{
+            //    Process.Start(new ProcessStartInfo("https://excashier.alipay.com/standard/auth.htm?payOrderId=5afc56d40af64001ad2a486cce1ca579.25") { UseShellExecute = true });
+            //}
+            //catch (Exception ex)
+            //{
+            //    // 处理可能出现的异常，例如找不到浏览器等
+            //    MessageBox.Show("无法打开浏览器: " + ex.Message);
+            //}
 
-        private void btnAddBalance_Click(object sender, EventArgs e)
-        {
-            ShopLoginForm loginForm = new ShopLoginForm(new AllBase.Model.Result.ShopLoginInfo());
-            loginForm.InitUrl = "https://excashier.alipay.com/standard/auth.htm?payOrderId=5afc56d40af64001ad2a486cce1ca579.25";
-            loginForm.openType = KJDForms.ShopForms.EnumOpenType.manage;
-            loginForm.ShowDialog();
+            string url2 = "https://po.e57.cn/prod-api/api/oms-api/alipay/pay";
+            var data = new JObject();
+            data["userId"] = BaseClass.UserId;
+            data["userName"] = BaseClass.UserName; // 用户名
+            data["nickName"] = BaseClass.NickName; // 用户名
+            data["totalAmount"] = numAddPoints.Value; // 金额点数
+            data["type"] = 2; // type：1：快递余额，2：账户积分
+            var dataStr2 = JsonHelper.SerializeObject(data);
+            var html2 = WXHttpResponseBLL.e57PostResponse(url2, dataStr2, "");
+            //<AjaxResult><msg>支付订单创建成功</msg><code>200</code><data>&lt;form name="punchout_form" method="post" action="https://openapi.alipay.com/gateway.do?charset=UTF-8&amp;method=alipay.trade.page.pay&amp;sign=Z7%2Bv3UQL3B9Q9nH1iNGimA9FL9XPcG9A2oyjTpLbyExJbw52tHEX1LXifNrdJLtBdSjAQaFNyc3qzKUn3J6algYUlcy9e5DMKIG1NPQGSn3FFoSiKM%2FfSKlx8Jbj3zC2JFQAvUoFVUnk89pen078rh2IL2XKNaD300VDq28WiAAE3fX%2FHdd5Tu%2F3yun4tD90KOXzVQ2PFrcQqwefo2Bm%2BQVFCGXM5zxzE%2FvfkHnCwGwlH%2FfLrdsKrQc3s%2B1Gt1NHlS3iyKEP%2F4F7dKB9Iq0GIsyPJu9RINv9XRlk404S60gDRHBHs3avWdMwjMRkoxIdoe%2BPrXX0zxYEEN9hAX5C%2Fw%3D%3D&amp;return_url=https%3A%2F%2Fpo.e57.cn&amp;notify_url=https%3A%2F%2Fpo.e57.cn%2Fprod-api%2Fapi%2Foms-api%2Falipay%2Fnotify&amp;version=1.0&amp;app_id=2021006172644180&amp;sign_type=RSA2&amp;timestamp=2026-07-20+11%3A59%3A55&amp;alipay_sdk=alipay-sdk-java-4.40.909.ALL&amp;format=JSON">
+            //&lt;input type="hidden" name="biz_content" value="{&amp;quot;out_trade_no&amp;quot;:&amp;quot;8f6ece19baf14f7ca8b0b5d8d0c03b57&amp;quot;,&amp;quot;total_amount&amp;quot;:&amp;quot;0.01&amp;quot;,&amp;quot;subject&amp;quot;:&amp;quot;店统领余额充值&amp;quot;,&amp;quot;body&amp;quot;:&amp;quot;店统领余额充值&amp;quot;,&amp;quot;product_code&amp;quot;:&amp;quot;FAST_INSTANT_TRADE_PAY&amp;quot;,&amp;quot;timeout_express&amp;quot;:&amp;quot;15m&amp;quot;}">
+            //&lt;input type="submit" value="立即支付" style="display:none" >
+            //&lt;/form>
+            //&lt;script>document.forms[0].submit();&lt;/script></data></AjaxResult>
+            if (html2.Contains("<code>200</code>") || html2.Contains("<code>0</code>"))
+            {
+                var rstData = BaseRegex.GetStringXml(ref html2, "data").ParseToString();
+                rstData = HttpUtility.HtmlDecode(rstData);
+                //rstData = HttpUtility.HtmlDecode(rstData);
+
+                WXShopLoginForm loginForm = new WXShopLoginForm(new ShopLoginInfo());
+                loginForm.InitUrl = "";
+                loginForm.InitHtml = rstData;
+                loginForm.openType = EnumOpenType.manage;
+                loginForm.ShowDialog();
+
+
+                //if (updateBalanceAction != null)
+                //{
+                //    updateBalanceAction();
+                //}
+            }
         }
     }
 

TEMUKJD/WXForms/ShopForms/WXOemAccountBalanceForm.cs

@@ -0,0 +1,411 @@
+using AllBase;
+using AllBase.Helper;
+using AllBase.Model.DBModel;
+using AllBase.Model.Result;
+using CefSharp;
+using CefSharp.WinForms;
+using DevComponents.WinForms.Drawing;
+using NaiBa.CefHelper;
+using NaiBa.Util.Extension;
+using Newtonsoft.Json.Linq;
+using System;
+using System.Collections.Generic;
+using System.ComponentModel;
+using System.Data;
+using System.Data.SQLite;
+using System.Diagnostics;
+using System.Drawing;
+using System.Drawing.Printing;
+using System.Linq;
+using System.Security.Cryptography.X509Certificates;
+using System.Security.Policy;
+using System.Text;
+using System.Threading;
+using System.Threading.Tasks;
+using System.Windows.Forms;
+using TemuKJD.BaseForms;
+using TemuKJD.BLL;
+using TemuKJD.Extension;
+using Work;
+
+namespace Work._29Tools.Forms.UserForms
+{
+    public partial class WXOemAccountBalanceForm : BaseGeneralForm
+    {
+        // (拍单后)回调函数，更新拍单余额
+        private Action updateBalanceAction = null;
+        public static List<UserSubAccountInfo> AllUsers { get; set; } = new List<UserSubAccountInfo>();
+        CancellationTokenSource cancellationTokenSource = null;
+
+        public WXOemAccountBalanceForm()
+        {
+            InitializeComponent();
+        }
+
+        private async void WXGetTopUpQrCode_Load(object sender, EventArgs e)
+        {
+            var chkAll = this.dgvPayment.AddSelectorColumn("colCheck");
+            chkAll.Click += ChkAll_Click;
+
+            this.dgvUser.AddSelectorColumn("colSelect");
+            this.dtpTimeBegin.Value = DateTime.Now.Date.AddMonths(-3);
+            this.dtpTimeEnd.Value = DateTime.Now.Date.AddDays(1).AddSeconds(-1);
+
+            ucSplitPage1.cmbPageSize.Items.Remove("5000");
+
+            pictureBox2.Visible = true;
+            await Task.Run(() => { GetBalanceList(); });
+            pictureBox2.Visible = false;
+
+            
+        }
+
+        private void ChkAll_Click(object sender, EventArgs e)
+        {
+            this.dgvPayment.CellValueChanged -= this.dgvPayment_CellValueChanged;
+            this.GetProfit();
+            this.dgvPayment.CellValueChanged += this.dgvPayment_CellValueChanged;
+        }
+
+        private void btnBalanceTopUp_Click(object sender, EventArgs e)
+        {
+            
+        }
+
+        public async void GetBalanceList()
+        {
+            Invoke(new Action(() =>
+            {
+                this.dgvPayment.Rows.Clear();
+                dgvPayment.CellValueChanged -= dgvPayment_CellValueChanged;
+            }));
+
+            if (string.IsNullOrEmpty(BaseClass.OemId))
+            {
+                BaseMsgForm.ShowError("没有权限！");
+                return;
+            }
+
+            string url = BaseClass.BuildObjString("user/get_all_user");
+            StringBuilder data = new StringBuilder();
+            data.Append(UserLogin.GetSignaturex());
+            // 查账户
+            //data.Append("&group_id=3");
+            data.Append("&oem_id=" + BaseClass.OemId); 
+            string html = GetHtml.PostUtf8(url, data.ToString());
+            if (string.IsNullOrEmpty(html) || !html.Contains("\"code\":200"))
+                html = GetHtml.PostUtf8(url, data);
+            if (string.IsNullOrEmpty(html) || !html.Contains("\"code\":200"))
+            {
+                BaseMsgForm.ShowError("查询失败：" + BaseRegex.GetStringJsonByRegs(ref html, html, "msg"));
+                return;
+            }
+            var userObj = JObject.Parse(html);
+            var oemUserNames = "";
+            foreach (JObject obj in userObj["data"])
+            {
+                string oStr = JsonHelper.SerializeObject(obj);
+                //UserSubAccountInfo user = new UserSubAccountInfo();
+                //user.id = BaseRegex.GetIntJson(ref oStr, "id");
+                //user.user_name = BaseRegex.GetStringJson(ref oStr, "user_name");
+                var userName = BaseRegex.GetStringJson(ref oStr, "user_name");
+                if (txtUserName.Text.Trim().IsNullOrEmpty() || txtUserName.Text.Contains(userName))
+                oemUserNames += userName + ",";
+            }
+
+            oemUserNames = oemUserNames.Trim(',');
+            if (string.IsNullOrEmpty(oemUserNames))
+                return;
+
+            if (cancellationTokenSource != null)
+                cancellationTokenSource.Cancel();
+            cancellationTokenSource = new CancellationTokenSource();
+            await Task.Run(() =>
+            {
+                var cancellationToken = cancellationTokenSource.Token;
+                int pageCount = 1;
+                int pageSize = 50;
+                var url3 = BaseClass.BuildWXObjString("user/get_user_balance");
+                var data3 = UserLogin.GetSignaturex();
+                Invoke(new Action(() =>
+                {
+                    data3 += "&user_name_in=" + oemUserNames;
+                    data3 += "&create_time_begin=" + dtpTimeBegin.Value.ToString("yyyy-MM-dd HH:mm:ss");
+                    data3 += "&create_time_end=" + dtpTimeEnd.Value.ToString("yyyy-MM-dd HH:mm:ss");
+                    if (cmbType.Text == "充值")
+                        data3 += "&type_in=1,30";
+                    if (cmbType.Text == "管理员充值")
+                        data3 += "&type_in=1";
+                    if (cmbType.Text == "支付宝充值")
+                        data3 += "&type_in=30";
+                    if (cmbType.Text == "拍单扣除/作废返还")
+                        data3 += "&type_in=20,23";
+                    if (cmbType.Text == "超重扣费")
+                        data3 += "&type_in=24";
+                    data3 += "&page=" + ucSplitPage1.CurrentPage;
+                    data3 += "&page_size=" + ucSplitPage1.PageSize;
+                    pageSize = ucSplitPage1.PageSize;
+                }));
+                var html3 = GetHtml.PostUtf8(url3, data3);
+                if (string.IsNullOrEmpty(html3) || !html3.Contains("\"code\":200"))
+                    html3 = GetHtml.PostUtf8(url3, data3);
+                if (string.IsNullOrEmpty(html3) || !html3.Contains("\"code\":200"))
+                {
+                    BaseMsgForm.ShowError("查询失败：" + BaseRegex.GetStringJsonByRegs(ref html3, html3, "msg"));
+                    return;
+                }
+                List<user_payment_record> paymentList = new List<user_payment_record>();
+                paymentList = JsonHelper.DeserializeJsonToList<user_payment_record>(JsonHelper.JObjectParse(html3)["data"].ParseToString());
+
+                Invoke(new Action(() =>
+                {
+                    this.dgvPayment.Rows.Clear();
+                    dgvPayment.CellValueChanged -= dgvPayment_CellValueChanged;
+                }));
+                foreach (var payment in paymentList)
+                {
+                    if (cancellationToken.IsCancellationRequested)
+                        return;
+                    Invoke(new Action(() =>
+                    {
+                        var rowIndex = this.dgvPayment.Rows.Add(
+                            true,
+                            ((EnumOrderPaymentType)payment.type.ParseToInt()).ParseToString(),
+                            payment.user_name,
+                            payment.order_id,
+                            payment.amount,
+                            payment.balance,
+                            payment.create_time.ToString("yyyy-MM-dd HH:mm:ss"),
+                            payment.remark
+                        );
+                        this.dgvPayment.Rows[rowIndex].Height = 60;
+                    }));
+                }
+                int count = BaseRegex.GetIntJson(ref html3, "count");
+                pageCount = Math.Ceiling(1.0 * count / pageSize).ParseToInt();
+                pageCount = Math.Max(pageCount, 1);
+                ucSplitPage1.TotalPage = pageCount;
+            }, cancellationTokenSource.Token);
+            Invoke(new Action(() =>
+            {
+                GetProfit();
+                dgvPayment.CellValueChanged += dgvPayment_CellValueChanged;
+            }));
+        }
+
+        private async void btnSearch_Click(object sender, EventArgs e)
+        {
+            if (cancellationTokenSource != null)
+                cancellationTokenSource.Cancel();
+
+            if (this.ucSplitPage1.CurrentPage != 1)
+                this.ucSplitPage1.CurrentPage = 1;
+
+            pictureBox2.Visible = true;
+            btnSearch.Enabled = false;
+            await Task.Run(() =>
+            {
+                Task.Run(() =>
+                {
+                    Thread.Sleep(500);
+                    Invoke(new Action(() => { btnSearch.Enabled = true; }));
+                });
+                GetBalanceList();
+            });
+            pictureBox2.Visible = false;
+        }
+
+        private async void ucSplitPage1_PageChange(object obj)
+        {
+            pictureBox2.Visible = true;
+            await Task.Run(() => { GetBalanceList(); });
+            pictureBox2.Visible = false;
+        }
+
+        private void btnGetUser_Click(object sender, EventArgs e)
+        {
+            GetUser();
+        }
+
+        private void GetUser()
+        {
+            if (BaseClass.OemId.IsNullOrEmpty() || BaseClass.IsOemOwner == false)
+                return;
+
+            Invoke(new Action(() =>
+            {
+                dgvUser.Rows.Clear();
+                AllUsers.Clear();
+            }));
+            string url = BaseClass.BuildObjString("user/get_all_user");
+            StringBuilder data = new StringBuilder();
+            data.Append(UserLogin.GetSignaturex());
+            Invoke(new Action(() =>
+            {
+                // 账户类型
+                if (cmbGroup.Text == "主账户")
+                    data.Append("&group_id=3");
+                else if (cmbGroup.Text == "客服")
+                    data.Append("&group_id=4");
+                data.Append("&oem_id=" + BaseClass.OemId);
+                if (!string.IsNullOrWhiteSpace(txtSearch.Text))
+                    data.Append("&search=" + txtSearch.Text.Replace("'", "＇"));
+            }));
+            
+            string html = GetHtml.PostUtf8(url, data.ToString());
+            if (string.IsNullOrEmpty(html))
+                return;
+            if (html.Contains("\"data\""))
+            {
+                var userObj = Newtonsoft.Json.Linq.JObject.Parse(html);
+                foreach (Newtonsoft.Json.Linq.JObject obj in userObj["data"])
+                {
+                    string oStr = JsonHelper.SerializeObject(obj);
+                    UserSubAccountInfo user = new UserSubAccountInfo();
+                    user.id = BaseRegex.GetIntJson(ref oStr, "id");
+                    user.user_name = BaseRegex.GetStringJson(ref oStr, "user_name");
+                    user.nick_name = BaseRegex.GetStringJson(ref oStr, "nick_name");
+                    user.mobile = BaseRegex.GetStringJson(ref oStr, "mobile");
+                    user.group_id = BaseRegex.GetStringJson(ref oStr, "group_id");
+                    user.shop_count = BaseRegex.GetIntJson(ref oStr, "shop_count");
+                    user.company_name = BaseRegex.GetStringJson(ref oStr, "company_name");
+                    user.sa_level = BaseRegex.GetIntJson(ref oStr, "sa_level");
+                    user.authority = BaseRegex.GetStringJson(ref oStr, "authority");
+                    user.points = BaseRegex.GetIntJson(ref oStr, "points");
+                    user.balance = BaseRegex.GetDecimalJson(ref oStr, "balance");
+                    user.shop_points_per_month = BaseRegex.GetIntJson(ref oStr, "shop_points_per_month");
+                    user.postage_per_order = BaseRegex.GetDecimalJson(ref oStr, "postage_per_order");
+                    user.oem_id = BaseRegex.GetStringJson(ref oStr, "oem_id");
+                    user.oem_name = BaseRegex.GetStringJson(ref oStr, "oem_name");
+                    var parent_user_name = BaseRegex.GetStringJson(ref oStr, "parent_user_name");
+
+                    AllUsers.Add(user);
+                    dgvUser.Rows.Add(
+                        false,
+                        user.id,
+                        user.nick_name,
+                        user.user_name,
+                        parent_user_name,
+                        user.group_id,
+                        user.group_name,
+                        user.company_name,
+                        user.shop_count,
+                        user.sa_level,
+                        user.sa_level_name /*+ (user.group_id == "4" ? "(客服)" : "")*/,
+                        user.authority,
+                        user.oem_id,
+                        user.oem_name,
+                        (user.authority.Contains("充值用户") && user.group_id == "3") ? (int?)user.points : null,
+                        (user.authority.Contains("充值用户") && user.group_id == "3") ? "+" : null,
+                        (user.authority.Contains("充值用户") && user.group_id == "3") ? (int?)user.shop_points_per_month : null,
+                        (user.authority.Contains("充值用户") && user.group_id == "3") ? "改" : null,
+                        user.balance.ParseToDecimal(),
+                        "+",
+                        Math.Max(2.2m, user.postage_per_order.ParseToDecimal()),
+                        (user.group_id == "3") ? "改" : null,
+                        user.group_id == "3" ? "添加店铺" : "",
+                        "编辑",
+                        "删除");
+                }
+            }
+        }
+
+        void GetProfit()
+        {
+            //foreach (var row in dgvPayment.Rows.Cast<DataGridViewRow>().ToList())
+            //{
+            //    if (row.Cells["colCheck"].Value.ParseToBool() == false)
+            //        continue;
+
+            //    if (row.Cells[""].Value.ParseToString() == "中转仓扣费支出")
+            //    {
+
+            //    }
+            //}
+
+            var checkRows = dgvPayment.Rows.Cast<DataGridViewRow>().Where(r => r.Cells["colCheck"].Value.ParseToBool() == true).ToList();
+
+            lblPostageTotal.Text = checkRows
+                .Where(r => r.Cells["colType"].Value.ParseToString() == EnumOrderPaymentType.中转仓扣费支出.ParseToString())
+                .Sum(r => r.Cells["colAmount"].Value.ParseToDecimal()).ToString();
+            lblPostageReturnTotal.Text = checkRows
+                .Where(r => r.Cells["colType"].Value.ParseToString() == EnumOrderPaymentType.中转仓作废返还收入.ParseToString())
+                .Sum(r => r.Cells["colAmount"].Value.ParseToDecimal()).ToString();
+            lblPostageWeightTotal.Text = checkRows
+                .Where(r => r.Cells["colType"].Value.ParseToString() == EnumOrderPaymentType.中转仓超重支出.ParseToString())
+                .Sum(r => r.Cells["colAmount"].Value.ParseToDecimal()).ToString();
+            lblPostageNotReturnCnt.Text = (checkRows
+                .Where(r => r.Cells["colType"].Value.ParseToString() == EnumOrderPaymentType.中转仓扣费支出.ParseToString()).Count() - checkRows
+                .Where(r => r.Cells["colType"].Value.ParseToString() == EnumOrderPaymentType.中转仓作废返还收入.ParseToString()).Count()).ToString();
+            lblProfit.Text = (lblPostageTotal.Text.ParseToDecimal() - lblPostageReturnTotal.Text.ParseToDecimal() - lblPostageNotReturnCnt.Text.ParseToInt() * 2.2m).ToString(); 
+        }
+
+        private void btnSearchShop_Click(object sender, EventArgs e)
+        {
+            pnlGetUser.Visible = true;
+            GetUser();
+        }
+
+        private void btnClose_Click(object sender, EventArgs e)
+        {
+            this.pnlGetUser.Visible = false;
+        }
+
+        private void btnOk_Click(object sender, EventArgs e)
+        {
+            var ids = dgvUser.Rows.Cast<DataGridViewRow>()
+                .Where(r => r.Cells["colSelect"].Value.ParseToBool() == true)
+                .Select(r => r.Cells["mobileColumn"].Value.ParseToString());
+            this.txtUserName.Text = string.Join(",", ids);
+            this.pnlGetUser.Visible = false;
+        }
+
+        private void dgvUser_CellContentClick(object sender, DataGridViewCellEventArgs e)
+        {
+            if (e.ColumnIndex < 0 || e.RowIndex < 0)
+                return;
+            var row = dgvUser.Rows[e.RowIndex];
+            string headerText = dgvUser.Columns[e.ColumnIndex].HeaderText;
+            string columnName = dgvUser.Columns[e.ColumnIndex].Name;
+            switch (headerText)
+            {
+                case "":
+                    dgvUser.Rows[e.RowIndex].Cells["colSelect"].Value = !(bool)dgvUser.Rows[e.RowIndex].Cells["colSelect"].Value;
+                    break;
+                default:
+                    break;
+            }
+        }
+
+        private void dgvPayment_CellContentClick(object sender, DataGridViewCellEventArgs e)
+        {
+            if (e.ColumnIndex < 0 || e.RowIndex < 0)
+                return;
+            var row = dgvPayment.Rows[e.RowIndex];
+            string headerText = dgvPayment.Columns[e.ColumnIndex].HeaderText;
+            string columnName = dgvPayment.Columns[e.ColumnIndex].Name;
+            switch (headerText)
+            {
+                case "":
+                    dgvPayment.Rows[e.RowIndex].Cells["colCheck"].Value = !(bool)dgvPayment.Rows[e.RowIndex].Cells["colCheck"].Value;
+                    break;
+                default:
+                    break;
+            }
+        }
+
+        private void btnClearFilter_Click(object sender, EventArgs e)
+        {
+            cmbGroup.Text = "全部";
+            this.txtSearch.Text = "";
+        }
+
+        private void dgvPayment_CellValueChanged(object sender, DataGridViewCellEventArgs e)
+        {
+            if (e.ColumnIndex == 0)
+            {
+                GetProfit();
+            }
+        }
+    }
+}

TEMUKJD/WXForms/ShopForms/WXOemAccountBalanceForm.resx

@@ -0,0 +1,394 @@
+<?xml version="1.0" encoding="utf-8"?>
+<root>
+  <!-- 
+    Microsoft ResX Schema 
+    
+    Version 2.0
+    
+    The primary goals of this format is to allow a simple XML format 
+    that is mostly human readable. The generation and parsing of the 
+    various data types are done through the TypeConverter classes 
+    associated with the data types.
+    
+    Example:
+    
+    ... ado.net/XML headers & schema ...
+    <resheader name="resmimetype">text/microsoft-resx</resheader>
+    <resheader name="version">2.0</resheader>
+    <resheader name="reader">System.Resources.ResXResourceReader, System.Windows.Forms, ...</resheader>
+    <resheader name="writer">System.Resources.ResXResourceWriter, System.Windows.Forms, ...</resheader>
+    <data name="Name1"><value>this is my long string</value><comment>this is a comment</comment></data>
+    <data name="Color1" type="System.Drawing.Color, System.Drawing">Blue</data>
+    <data name="Bitmap1" mimetype="application/x-microsoft.net.object.binary.base64">
+        <value>[base64 mime encoded serialized .NET Framework object]</value>
+    </data>
+    <data name="Icon1" type="System.Drawing.Icon, System.Drawing" mimetype="application/x-microsoft.net.object.bytearray.base64">
+        <value>[base64 mime encoded string representing a byte array form of the .NET Framework object]</value>
+        <comment>This is a comment</comment>
+    </data>
+                
+    There are any number of "resheader" rows that contain simple 
+    name/value pairs.
+    
+    Each data row contains a name, and value. The row also contains a 
+    type or mimetype. Type corresponds to a .NET class that support 
+    text/value conversion through the TypeConverter architecture. 
+    Classes that don't support this are serialized and stored with the 
+    mimetype set.
+    
+    The mimetype is used for serialized objects, and tells the 
+    ResXResourceReader how to depersist the object. This is currently not 
+    extensible. For a given mimetype the value must be set accordingly:
+    
+    Note - application/x-microsoft.net.object.binary.base64 is the format 
+    that the ResXResourceWriter will generate, however the reader can 
+    read any of the formats listed below.
+    
+    mimetype: application/x-microsoft.net.object.binary.base64
+    value   : The object must be serialized with 
+            : System.Runtime.Serialization.Formatters.Binary.BinaryFormatter
+            : and then encoded with base64 encoding.
+    
+    mimetype: application/x-microsoft.net.object.soap.base64
+    value   : The object must be serialized with 
+            : System.Runtime.Serialization.Formatters.Soap.SoapFormatter
+            : and then encoded with base64 encoding.
+
+    mimetype: application/x-microsoft.net.object.bytearray.base64
+    value   : The object must be serialized into a byte array 
+            : using a System.ComponentModel.TypeConverter
+            : and then encoded with base64 encoding.
+    -->
+  <xsd:schema id="root" xmlns="" xmlns:xsd="http://www.w3.org/2001/XMLSchema" xmlns:msdata="urn:schemas-microsoft-com:xml-msdata">
+    <xsd:import namespace="http://www.w3.org/XML/1998/namespace" />
+    <xsd:element name="root" msdata:IsDataSet="true">
+      <xsd:complexType>
+        <xsd:choice maxOccurs="unbounded">
+          <xsd:element name="metadata">
+            <xsd:complexType>
+              <xsd:sequence>
+                <xsd:element name="value" type="xsd:string" minOccurs="0" />
+              </xsd:sequence>
+              <xsd:attribute name="name" use="required" type="xsd:string" />
+              <xsd:attribute name="type" type="xsd:string" />
+              <xsd:attribute name="mimetype" type="xsd:string" />
+              <xsd:attribute ref="xml:space" />
+            </xsd:complexType>
+          </xsd:element>
+          <xsd:element name="assembly">
+            <xsd:complexType>
+              <xsd:attribute name="alias" type="xsd:string" />
+              <xsd:attribute name="name" type="xsd:string" />
+            </xsd:complexType>
+          </xsd:element>
+          <xsd:element name="data">
+            <xsd:complexType>
+              <xsd:sequence>
+                <xsd:element name="value" type="xsd:string" minOccurs="0" msdata:Ordinal="1" />
+                <xsd:element name="comment" type="xsd:string" minOccurs="0" msdata:Ordinal="2" />
+              </xsd:sequence>
+              <xsd:attribute name="name" type="xsd:string" use="required" msdata:Ordinal="1" />
+              <xsd:attribute name="type" type="xsd:string" msdata:Ordinal="3" />
+              <xsd:attribute name="mimetype" type="xsd:string" msdata:Ordinal="4" />
+              <xsd:attribute ref="xml:space" />
+            </xsd:complexType>
+          </xsd:element>
+          <xsd:element name="resheader">
+            <xsd:complexType>
+              <xsd:sequence>
+                <xsd:element name="value" type="xsd:string" minOccurs="0" msdata:Ordinal="1" />
+              </xsd:sequence>
+              <xsd:attribute name="name" type="xsd:string" use="required" />
+            </xsd:complexType>
+          </xsd:element>
+        </xsd:choice>
+      </xsd:complexType>
+    </xsd:element>
+  </xsd:schema>
+  <resheader name="resmimetype">
+    <value>text/microsoft-resx</value>
+  </resheader>
+  <resheader name="version">
+    <value>2.0</value>
+  </resheader>
+  <resheader name="reader">
+    <value>System.Resources.ResXResourceReader, System.Windows.Forms, Version=4.0.0.0, Culture=neutral, PublicKeyToken=b77a5c561934e089</value>
+  </resheader>
+  <resheader name="writer">
+    <value>System.Resources.ResXResourceWriter, System.Windows.Forms, Version=4.0.0.0, Culture=neutral, PublicKeyToken=b77a5c561934e089</value>
+  </resheader>
+  <metadata name="colSelect.UserAddedColumn" type="System.Boolean, mscorlib, Version=4.0.0.0, Culture=neutral, PublicKeyToken=b77a5c561934e089">
+    <value>True</value>
+  </metadata>
+  <metadata name="UserIdColumn.UserAddedColumn" type="System.Boolean, mscorlib, Version=4.0.0.0, Culture=neutral, PublicKeyToken=b77a5c561934e089">
+    <value>True</value>
+  </metadata>
+  <metadata name="UserNickNameColumn.UserAddedColumn" type="System.Boolean, mscorlib, Version=4.0.0.0, Culture=neutral, PublicKeyToken=b77a5c561934e089">
+    <value>True</value>
+  </metadata>
+  <metadata name="mobileColumn.UserAddedColumn" type="System.Boolean, mscorlib, Version=4.0.0.0, Culture=neutral, PublicKeyToken=b77a5c561934e089">
+    <value>True</value>
+  </metadata>
+  <metadata name="colParentUserName.UserAddedColumn" type="System.Boolean, mscorlib, Version=4.0.0.0, Culture=neutral, PublicKeyToken=b77a5c561934e089">
+    <value>True</value>
+  </metadata>
+  <metadata name="groupIdColumn.UserAddedColumn" type="System.Boolean, mscorlib, Version=4.0.0.0, Culture=neutral, PublicKeyToken=b77a5c561934e089">
+    <value>True</value>
+  </metadata>
+  <metadata name="groupNameColumn.UserAddedColumn" type="System.Boolean, mscorlib, Version=4.0.0.0, Culture=neutral, PublicKeyToken=b77a5c561934e089">
+    <value>True</value>
+  </metadata>
+  <metadata name="colCompany.UserAddedColumn" type="System.Boolean, mscorlib, Version=4.0.0.0, Culture=neutral, PublicKeyToken=b77a5c561934e089">
+    <value>True</value>
+  </metadata>
+  <metadata name="shopCountColumn.UserAddedColumn" type="System.Boolean, mscorlib, Version=4.0.0.0, Culture=neutral, PublicKeyToken=b77a5c561934e089">
+    <value>True</value>
+  </metadata>
+  <metadata name="colSaLevel.UserAddedColumn" type="System.Boolean, mscorlib, Version=4.0.0.0, Culture=neutral, PublicKeyToken=b77a5c561934e089">
+    <value>True</value>
+  </metadata>
+  <metadata name="colSaLevelName.UserAddedColumn" type="System.Boolean, mscorlib, Version=4.0.0.0, Culture=neutral, PublicKeyToken=b77a5c561934e089">
+    <value>True</value>
+  </metadata>
+  <metadata name="colAuthority.UserAddedColumn" type="System.Boolean, mscorlib, Version=4.0.0.0, Culture=neutral, PublicKeyToken=b77a5c561934e089">
+    <value>True</value>
+  </metadata>
+  <metadata name="colOemId.UserAddedColumn" type="System.Boolean, mscorlib, Version=4.0.0.0, Culture=neutral, PublicKeyToken=b77a5c561934e089">
+    <value>True</value>
+  </metadata>
+  <metadata name="colOemName.UserAddedColumn" type="System.Boolean, mscorlib, Version=4.0.0.0, Culture=neutral, PublicKeyToken=b77a5c561934e089">
+    <value>True</value>
+  </metadata>
+  <metadata name="colPoints.UserAddedColumn" type="System.Boolean, mscorlib, Version=4.0.0.0, Culture=neutral, PublicKeyToken=b77a5c561934e089">
+    <value>True</value>
+  </metadata>
+  <metadata name="colPlus.UserAddedColumn" type="System.Boolean, mscorlib, Version=4.0.0.0, Culture=neutral, PublicKeyToken=b77a5c561934e089">
+    <value>True</value>
+  </metadata>
+  <metadata name="colShopPointsPerMonth.UserAddedColumn" type="System.Boolean, mscorlib, Version=4.0.0.0, Culture=neutral, PublicKeyToken=b77a5c561934e089">
+    <value>True</value>
+  </metadata>
+  <metadata name="colChangePointsPerMonth.UserAddedColumn" type="System.Boolean, mscorlib, Version=4.0.0.0, Culture=neutral, PublicKeyToken=b77a5c561934e089">
+    <value>True</value>
+  </metadata>
+  <metadata name="dataGridViewTextBoxColumn1.UserAddedColumn" type="System.Boolean, mscorlib, Version=4.0.0.0, Culture=neutral, PublicKeyToken=b77a5c561934e089">
+    <value>True</value>
+  </metadata>
+  <metadata name="colBalancePlus.UserAddedColumn" type="System.Boolean, mscorlib, Version=4.0.0.0, Culture=neutral, PublicKeyToken=b77a5c561934e089">
+    <value>True</value>
+  </metadata>
+  <metadata name="colPostagePerOrder.UserAddedColumn" type="System.Boolean, mscorlib, Version=4.0.0.0, Culture=neutral, PublicKeyToken=b77a5c561934e089">
+    <value>True</value>
+  </metadata>
+  <metadata name="colChangePostagePerOrder.UserAddedColumn" type="System.Boolean, mscorlib, Version=4.0.0.0, Culture=neutral, PublicKeyToken=b77a5c561934e089">
+    <value>True</value>
+  </metadata>
+  <metadata name="editColumn.UserAddedColumn" type="System.Boolean, mscorlib, Version=4.0.0.0, Culture=neutral, PublicKeyToken=b77a5c561934e089">
+    <value>True</value>
+  </metadata>
+  <metadata name="deleteColumn.UserAddedColumn" type="System.Boolean, mscorlib, Version=4.0.0.0, Culture=neutral, PublicKeyToken=b77a5c561934e089">
+    <value>True</value>
+  </metadata>
+  <metadata name="colCheck.UserAddedColumn" type="System.Boolean, mscorlib, Version=4.0.0.0, Culture=neutral, PublicKeyToken=b77a5c561934e089">
+    <value>True</value>
+  </metadata>
+  <metadata name="colType.UserAddedColumn" type="System.Boolean, mscorlib, Version=4.0.0.0, Culture=neutral, PublicKeyToken=b77a5c561934e089">
+    <value>True</value>
+  </metadata>
+  <metadata name="colUserName.UserAddedColumn" type="System.Boolean, mscorlib, Version=4.0.0.0, Culture=neutral, PublicKeyToken=b77a5c561934e089">
+    <value>True</value>
+  </metadata>
+  <metadata name="colOrderId.UserAddedColumn" type="System.Boolean, mscorlib, Version=4.0.0.0, Culture=neutral, PublicKeyToken=b77a5c561934e089">
+    <value>True</value>
+  </metadata>
+  <metadata name="colAmount.UserAddedColumn" type="System.Boolean, mscorlib, Version=4.0.0.0, Culture=neutral, PublicKeyToken=b77a5c561934e089">
+    <value>True</value>
+  </metadata>
+  <metadata name="colBalance.UserAddedColumn" type="System.Boolean, mscorlib, Version=4.0.0.0, Culture=neutral, PublicKeyToken=b77a5c561934e089">
+    <value>True</value>
+  </metadata>
+  <metadata name="colCreateTime.UserAddedColumn" type="System.Boolean, mscorlib, Version=4.0.0.0, Culture=neutral, PublicKeyToken=b77a5c561934e089">
+    <value>True</value>
+  </metadata>
+  <metadata name="colRemark.UserAddedColumn" type="System.Boolean, mscorlib, Version=4.0.0.0, Culture=neutral, PublicKeyToken=b77a5c561934e089">
+    <value>True</value>
+  </metadata>
+  <assembly alias="System.Drawing" name="System.Drawing, Version=4.0.0.0, Culture=neutral, PublicKeyToken=b03f5f7f11d50a3a" />
+  <data name="$this.Icon" type="System.Drawing.Icon, System.Drawing" mimetype="application/x-microsoft.net.object.bytearray.base64">
+    <value>
+        AAABAAEAgIAQAAAAAABoKAAAFgAAACgAAACAAAAAAAEAAAEABAAAAAAAACgAAAAAAAAAAAAAAAAAAAAA
+        AAAAAAAAAACAAACAAAAAgIAAgAAAAIAAgACAgAAAgICAAMDAwAAAAP8AAP8AAAD//wD/AAAA/wD/AP//
+        AAD///8AAAAAAAAAAAAAAAAzMzMzMzMzMzMzMzMzMzMzMzMzMzMzMzMzMzMzMzMzMzMzMzMzMzMzMzMQ
+        AAAAAAAAAAAAAAAAAAAAAAAAABM5mZmZmZmZmZmZmZmZmZmZmZmZmZmZmZmZmZmZmZmZmZmZmZmZmZmZ
+        mZmZkzEAAAAAAAAAAAAAAAAAAAAAADOZmZmZmZmZmZmZmZmZmZmZmZmZmZmZmZmZmZmZmZmZmZmZmZmZ
+        mZmZmZmZmZmZMwAAAAAAAAAAAAAAAAAAABOZmZmZmZmZmZmZmZmZmZmZmZmZmZmZmZmZmZmZmZmZmZmZ
+        mZmZmZmZmZmZmZmZmZkzAAAAAAAAAAAAAAAAAAOZmZmZmZmZmZmZmZmZmZmZmZmZmZmZmZmZmZmZmZmZ
+        mZmZmZmZmZmZmZmZmZmZmZmZmTEAAAAAAAAAAAAAAAOZmZmZmZmZmZmZmZmZmZmZmZmZmZmZmZmZmZmZ
+        mZmZmZmZmZmZmZmZmZmZmZmZmZmZmZmZMAAAAAAAAAAAAAA5mZmZmZmZmZmZmZmZmZmZmZmZmZmZmZmZ
+        mZmZmZmZmZmZmZmZmZmZmZmZmZmZmZmZmZmZmZMAAAAAAAAAAAADmZmZmZmZmZmZmZmZmZmZmZmZmZmZ
+        mZmZmZmZmZmZmZmZmZmZmZmZmZmZmZmZmZmZmZmZmZmZMAAAAAAAAAAAOZmZmZmZmZmZmZmZmZmZmZmZ
+        mZmZmZmZmZmZmZmZmZmZmZmZmZmZmZmZmZmZmZmZmZmZmZmZmZMAAAAAAAAAA5mZmZmZmZmZmZmZmZmZ
+        mZmZmZmZmZmZmZmZmZmZmZmZmZmZmZmZmZmZmZmZmZmZmZmZmZmZmZmZMAAAAAAAADmZmZmZmZmZmZmZ
+        mZmZmZmZmZmZmZmZmZmZmZmZmZmZmZmZmZmZmZmZmZmZmZmZmZmZmZmZmZmZmZMAAAAAAAGZmZmZmZmZ
+        mZmZmZmZmZmZmZmZmZmZmZmZmZmZmZmZmZmZmZmZmZmZmZmZmZmZmZmZmZmZmZmZmZmZMAAAAAAJmZmZ
+        mZmZmZmZmZmZmZmZmZmZmZmZmZmZmZmZmZmZmZmZmZmZmZmZmZmZmZmZmZmZmZmZmZmZmZmZmZAAAAAA
+        OZmZmZmZmZmZmZmZmZmZmZmZmZmZmZmZmZmZmZmZmZmZmZmZmZmZmZmZmZmZmZmZmZmZmZmZmZmZmZmT
+        AAAAAZmZmZmZmZmZmZmZmZmZmZmZmZmZmZmZmZmZmZmZmZmZmZmZmZmZmZmZmZmZmZmZmZmZmZmZmZmZ
+        mZmZmRAAAAOZmZmZmZmZmZmZmZmZmZmZmZmZmZmZmZmZmZmZmZmZmZmZmZmZmZmZmZmZmZmZmZmZmZmZ
+        mZmZmZmZmZkwAAAZmZmZmZmZmZmZmZmZmZmZmZmZmZmZmZmZmZmZmZmZmZmZmZmZmZmZmZmZmZmZmZmZ
+        mZmZmZmZmZmZmZmZkwAAOZmZmZmZmZmZmZmZmZmZmZmZmZmZmZmZmZmZmZmZmZmZmZmZmZmZmZmZmZmZ
+        mZmZmZmZmZmZmZmZmZmZmZMAAJmZmZmZmZmZmZmZmZmZmZmZmZmZmZmZmZmZmZmZmZmZmZmZmZmZmZmZ
+        mZmZmZmZmZmZmZmZmZmZmZmZmZmZEAOZmZmZmZmZmZmZmZmZmZmZmZmZmZmZmZmZmZmZmZmZmZmZmZmZ
+        mZmZmZmZmZmZmZmZmZmZmZmZmZmZmZmZmTADmZmZmZmZmZmZmZmZmZmZmZmZmZmZmZmZmZmZmZmZmZmZ
+        mZmZmZmZmZmZmZmZmZmZmZmZmZmZmZmZmZmZmZkwCZmZmZmZmZmZmZmZmZmZmZmZmZmZmZmZmZmZmZmZ
+        mZmZmZmZmZmZmZmZmZmZmZmZmZmZmZmZmZmZmZmZmZmZkRmZmZmZmZmZmZmZmZmZmZmZmZmZmZmZmZmZ
+        mZmZmZmZmZmZmZmZmZmZmZmZmZmZmZmZmZmZmZmZmZmZmZmZmZM5mZmZmZmZmZmZmZmZmZmZmZmZmZmZ
+        mZmZmZmZmZmZmZmZmZmZmZmZmZmZmZmZmZmZmZmZmZmZmZmZmZmZmZmTOZmZmZmZmZmZmZmZmZmZmZmZ
+        mZmZmZmZmZmZmZmZmZmZmZmZmZmZmZmZmZmZmZmZmZmZmZmZmZmZmZmZmZmZkzmZmZmZmZmZmZmZmZmZ
+        mZmZmZmZmZmZmZmZmZmZmZmZmZmZmZmZmZmZmZmZmZmZmZmZmZmZmZmZmZmZmZmZmZM5mZmZmZmZmZmZ
+        mZmZmZmZmZmZmZmZmZmZmZmZmZmZmZmZmZmZmZmZmZmZmZmZmZmZmZmZmZmZmZmZmZmZmZmTOZmZmZmZ
+        mZmZmZmZmZmZmZmZmZmZmZmZmZmZmZmZmZmZmZmZmZmZmZmZmZmZmZmZmZmZmZmZmZmZmZmZmZmZkzmZ
+        mZmZmZmZmZmZmZmZmZmZmZmZmZmZmZmZmZmZmZmZmZmZmZmZmZmZmZmZmZmZmZmZmZmZmZmZmZmZmZmZ
+        mZM5mZmZmZmZmZmZmZmZmZmZmZmZmZmZmZmZmZmZmZmZmZmZmZmZmZmZmZmZmZmZmZmZmZmZmZmZmZmZ
+        mZmZmZmTOZmZmZmZmZmZmZmZmZmZmZmZmZmZmZmZmZmZmZmZmZmZmZmZmZmZmZmZmZmZmZmZmZmZmZmZ
+        mZmZmZmZmZmZkzmZmZmZmZmZmZmZmZmZmZmZmZmZmZmZmZmZmZmZmZmZmZmZmZmZmZmZmZmZmZmZmZmZ
+        mZmZmZmZmZmZmZmZmZM5mZmZmZmZmZmZmZmZmZmZmZmZmZmZmZmZmZmZmZmZmZmZmZmZmZmZmZmZmZmZ
+        mZmZmZmZmZmZmZmZmZmZmZmTOZmZmZmZmZmZmZmZmZmZmZmZmZmZmZmZmZmZmZmZmZmZmZmZmZmZmZmZ
+        mZmZmZmZmZmZmZmZmZmZmZmZmZmZkzmZmZmZmZmZmZmZmZmZmZmZmZmZmZmZmZmZmZmZmZmZmZmZmZmZ
+        mZmZmZmZmZmZmZmZmZmZmZmZmZmZmZmZmZM5mZmZmZmZmZmZmZmZmZmZmZmZmZmZmZmZmZmZmZmZmZmZ
+        mZmZmZmZmZmZmZmZmZmZmZmZmZmZmZmZmZmZmZmTOZmZmZmZmZmZmZmZmZmZmZmZmZmZmZmZmZmZmZmZ
+        mZmZmZmZmZmZmZOZmZOZmZmZmZmZmZmZmZmZmZmZmZmZkzmZmZmZmZmZmZmZmP+JmZmZmZmZj///////
+        ///4OZmZj/eZmZmZmZmZmPg5OZmZmZuI//iIuZmZmZmZmZmZmZM5mZmZmZmZmZmZmb//+JmZmZmZmP//
+        //////////OZmP//uZmZmZmZmY//+ZmZOZf///////h5k5mZmZmZmZmTOZmZmZmZmZmZmZmP//iZmZmZ
+        mZ/////////////4mZ///4mZmZmZmZP///uZmZmP////////+JmZmZmZmZmZkzmZmZmZmZmZmZmZj//4
+        mZmZmZmf////////////+Jmf//+JmZmZmZmb///4mZmY//////////+JmZmZmZmZmZM5mZmZmZmZmZmZ
+        mY//+JmZmZmZn/////////////mZmP//iZmZmZmZk///+5mZj/////iP////+JmZmZmZmZmTOZmZmZmZ
+        mZmZmZmP//iZmZmZmZ////iIiIiIiIiZOZj//4mZmZmZmZP///uZmf////eZmT////+ZmZmZmZmZkzmZ
+        mZmZmZmZmZmZj//4mZmZmZmf//+JmZmZmZmZk5mY//+JmZmZmZmT///7mZj///+ZmZmZj///uZmZmZmZ
+        mZM5mZmZmZmZmZmZmY//+JmZmZmZn///iZmZmZmZmZmZmP//iZmZN5k5k///+5mY///zk5mZOT///4mZ
+        mZmZmZmTOZmZmZmZmZmZmZmP//iZmZmZmZ///4mZmZmZmZmZmZj//4mZmP/5k5P///uZmP//+ZmZmZmY
+        //+JmZmZmZmZkzmZmZmZmZmZmZmZj//4mZmZmZmf///4iIiIiIg5mZmY//+JOb//+JmT///7mZj//4mZ
+        mZmZmP//+ZmZmZmZmZM5mZmZmZmZmZmZmY//+JmZmZmZn///////////85mZmP//iZn///+Jk///+5mf
+        //+JmZmZmZj///mZmZmZmZmTOZmZmZmZmZmZmZmP//iZmZmZmZ////////////+ZmZj//4mY////85v/
+        //uZmP//iZmZmZmY///5mZmZmZmZkzmZmZmZmZmZmZmZj//4mZmZmZmf////////////mZmY//+Jv///
+        //+Z///7mZj//4mZmZmZmP//+ZmZmZmZmZM5mZmZmZmZmZmZmY//+JmZmZmZn///////////+JmZmP//
+        if//////if//+5mY//+JmZmZmZj///mZmZmZmZmTOZmZmZmZmZmZmZmP//iZmZmZmZ///////////4mZ
+        mZj//4j///////j///uZmP//iZmZmZmY///5mZmZmZmZkzmZmZmZmZmZmZmZj//4mZmZmZmf//+JMzMz
+        MzOZOZmY//////+D///////7mZj//4mZmZmZmP//+ZmZmZmZmZM5mZmZmZmZmZmZmY//+JmZmZmZn///
+        iZmZmZmZmZmZmP//////mY//////+5mY//+JmZmZmZj///mZmZmZmZmTOZmZmZmZmZmZmZmP//iZmZmZ
+        mZ///4mZmZmZmZmZmZj/////+5mf//////uZmP//iZmZmZmY///5mZmZmZmZkzmZmZmZmZmZMzM5j//4
+        kzMzmZmf//+JMzMzMzM5mZmY/////4mTk//////7mZj//4mZmZmZmP//+ZmZmZmZmZM5mZmZmZmZmP//
+        /////////4mZn////////////4mZmP////+ZmZmP////+5mY//+JmZmZmZj///mZmZmZmZmTOZmZmZmZ
+        mY/////////////4mZ/////////////7mZj////7mZmZn/////uZmP//iZmZmZmY///5mZmZmZmZkzmZ
+        mZmZmZn//////////////5mf////////////+Jmf////iZmZk5P////4mZ///4mZmZmZmP//+ZmZmZmZ
+        mZM5mZmZmZmZj/////////////iZn/////////////iZmP///5mZmZmZj///+5mY//+JmZmZmZj//4mZ
+        mZmZmZmTOZmZmZmZmZ/////////////zmZP///////////+JmZP///uTmZmZmZj//4mZm///mZmZmZmZ
+        //85mZmZmZmZkzmZmZmZmZOZiIiIiIiIiIiImTmZOIiIiIiIiIiImTmZOIi5mZmZmZOZiIuZmZk4iZOZ
+        mZmZOZiDmZmZmZmZmZM5mZmZmZmZOZmZmZmZmZmZmZOZmZmZmZmZmZmZmZOZmZmZmZmZmZmZOZmZmZmZ
+        mZk5mZmZmZOZmZmZmZmZmZmTOZmZmZmZmZmZmZmZmZmZmZmZmZmZmZmZmZmZmZmZmZmZmZmZmZmZmZmZ
+        mZmZmZmZmZmZmZmZmZmZmZmZmZmZkzmZmZmZmZmZmZmZmZmZmZmZmZmZmZmZmZmZmZmZmZmZmZmZmZmZ
+        mZmZmZmZmZmZmZmZmZmZmZmZmZmZmZmZmZM5mZmZmZmZmZmZmZmZmZmZmZmZmZmZmZmZmZmZmZmZmZmZ
+        mZmZmZmZmZmZmZmZmZmZmZmZmZmZmZmZmZmZmZmTOZmZmZmZmZmZmZmZmZmZmZmZmZmZmZmZmZmZmZmZ
+        mZmZmZmZmZmZmZmZmZmZmZmZmZmZmZmZmZmZmZmZmZmZkzmZmZmZmZmZmZmZmZmZmZmZmZmZmZmZmZmZ
+        mZmZmZmZmZmZmZmZmZmZmZmZmZmZmZmZmZmZmZmZmZmZmZmZmZM5mZmZmZmZmZmTuIiIiIs5mZmZmZmZ
+        mTu4i7mZmZmZmZmZmTMzmZOZmZkzOZmZmZmZmZmZmZmZmZmZmZmZmZmTOZmZmZmZmTmbj///////+HmT
+        mZmZk4j/////iJmZmZk4iP////iZOZmZj/mZOZOIiIiIiIiIiDmZmZmZmZmZkzmZmZmZmZmZj///////
+        ///4mZk5k4///4iI///4OZOY////////iZOZmb/5mZmP///////////4mZmZmZmZmZM5mZmZmZmZn///
+        //////////mZmY///5mZmZP///iZmP////////+ZOZk/iZmY/////////////4mZmZmZmZmTOZmZmZmZ
+        mZ/////////////5mZ////+JmZmY////iZl/////////+ZmZP4mZP//////////////7mZmZmZmZkzmZ
+        mZmZmZmb////////////uZP/j///+HM3j/////+ZmYj///////iZmT+JmY//////////////+JmZmZmZ
+        mZM5mZmZmZmZmY//////////+JmT+Jv///////////iPmTmZOI/4mP//uTk/iZmP//////////////iZ
+        mZmZmZmTOZmZmZmZmZmf//////////mZmZmZ///////////5mZmZmZmTOZk///mZP4mZj///////////
+        ///4mZmZmZmZkzmZmZmZmZmTmP////////+JOZmZOY//////////iZmZmZmZmZk5mf/4mT+JmY//////
+        ////////+JmZmZmZmZM5mZmZmZmZmZn/////////mZmZmZk//////////zmZmZmZmZmZmTmP/zm/iZmP
+        //////////////iZmZmZmZmTOZmZmZmZmZk5v///////85OZmZkzmP////////iZmZmZmZmZmZmZn//4
+        /4mZj/////hzN4/////4mZmZmZmZkzmZmZmZmZmZmZj//////4mZmTmY/4j////////4mZmZmZmZmZmZ
+        mZj///+JmY////+JmZmY////+JmZmZmZmZM5mZmZmZmZmZmZ//////+ZmZmZj////////////4mZmZmZ
+        mZmZmZmb////+ZmP///4mZu5mY////iZmZmZmZmTOZmZmZmZmZmZOb/////4k5mZmP/////////////7
+        mZmZmZmZmZmZk/////OZv///+ZmP+Jmf///4mZmZmZmZkzmZmZmZmZmZmZmf////+ZmZmZj////////4
+        eI//+JmZmZmZmZmZmZP////4mb///4mY//+JmP//+5mZmZmZmZM5mZmZmZmZmZk5v/////uTmZmb////
+        ///4mZmX//iZmZmZmZmZmZmZ////+Jmf//95n///+Zj///OZmZmZmZmTOZmZmZmZmZmZmf//////mZmZ
+        mY//////+ZOZmZiJmZmZmZmZmZmZmY////+ZmP//+I////iP//+JmZmZmZmZkzmZmZmZmZmZmZj/////
+        /4mZmZmf/////5k5mZOZmTmZmZmZmZmZmZmP///4mZP/////////////OZmZmZmZmZM5mZmZmZmZmZk/
+        ///////zmZmZm/////iZmZmZmZmZmZmZmZmZmZmZj///85mZj///////////+JmZmZmZmZmTOZmZmZmZ
+        mZmZv///////+5mZmZmP///5mZmZmZmZmZmZmZmZmZmZmZ///3mZmZj//////////4mZmZmZmZmZkzmZ
+        mZmZmZmZmb///4j///uZmZmZmP//mTmZmZmZmZmZmZmZmZmZmZmY/4OZmZmZeP///////4eZmZmZmZmZ
+        mZM5mZmZmZmZmZmY/4OZOP+JmZmZmZmIiZOZmZmZmZmZmZmZmZmZmZmZmYiZmZmZmZk4iIiIiIOZmZmZ
+        mZmZmZmTOZmZmZmZmZmZmTOZmZkzmZmZmZmZmZk5mZmZmZmZmZmZmZmZmZmZmZmZk5mZmZmZmZmZmZmZ
+        mZmZmZmZmZmZkzmZmZmZmZmZmZmZmZmZmZmZmZmZmZmZmZmZmZmZmZmZmZmZmZmZmZmZmZmZmZmZmZmZ
+        mZmZmZmZmZmZmZmZmZM5mZmZmZmZmZmZmZmZmZmZmZmZmZmZmZmZmZmZmZmZmZmZmZmZmZmZmZmZmZmZ
+        mZmZmZmZmZmZmZmZmZmZmZmTOZmZmZmZmZmZmZmZmZmZmZmZmZmZmZmZmZmZmZmZmZmZmZmZmZmZmZmZ
+        mZmZmZmZmZmZmZmZmZmZmZmZmZmZkzmZmZmZmZmZmZmZmZmZmZmZmZmZmZmZmZmZmZmZmZmZmZmZmZmZ
+        mZmZmZmZmZmZmZmZmZmZmZmZmZmZmZmZmZM5mZmZmZmZmZmZmZmZmZmZmZmZmZmZmZmZmZmZmZmZmZmZ
+        mZmZmZmZmZmZmZmZmZmZmZmZmZmZmZmZmZmZmZmTOZmZmZmZmZmZmZmZmZmZmZmZmZmZmZmZmZmZmZmZ
+        mZmZmZmZmZmZmZmZmZmZmZmZmZmZmZmZmZmZmZmZmZmZkzmZmZmZmZmZmZmZmZmZmZmZmZmZmZmZmZmZ
+        mZmZmZmZmZmZmZmZmZmZmZmZmZmZmZmZmZmZmZmZmZmZmZmZmZM5mZmZmZmZmZmZmZmZmZmZmZmZmZmZ
+        mZmZmZmZmZmZmZmZmZmZmZmZmZmZmZmZmZmZmZmZmZmZmZmZmZmZmZmTOZmZmZmZmZmZmZmZmZmZmZmZ
+        mZmZmZmZmZmZmZmZmZmZmZmZmZmZmZmZmZmZmZmZmZmZmZmZmZmZmZmZmZmZkzmZmZmZmZmZmZmZmZmZ
+        mZmZmZmZmZmZmZmZmZmZmZmZmZmZmZmZmZmZmZmZmZmZmZmZmZmZmZmZmZmZmZmZmZM5mZmZmZmZmZmZ
+        mZmZmZmZmZmZmZmZmZmZmZmZmZmZmZmZmZmZmZmZmZmZmZmZmZmZmZmZmZmZmZmZmZmZmZmTOZmZmZmZ
+        mZmZmZmZmZmZmZmZmZmZmZmZmZmZmZmZmZmZmZmZmZmZmZmZmZmZmZmZmZmZmZmZmZmZmZmZmZmZkzmZ
+        mZmZmZmZmZmZmZmZmZmZmZmZmZmZmZmZmZmZmZmZmZmZmZmZmZmZmZmZmZmZmZmZmZmZmZmZmZmZmZmZ
+        mZM5mZmZmZmZmZmZmZmZmZmZmZmZmZmZmZmZmZmZmZmZmZmZmZmZmZmZmZmZmZmZmZmZmZmZmZmZmZmZ
+        mZmZmZmTGZmZmZmZmZmZmZmZmZmZmZmZmZmZmZmZmZmZmZmZmZmZmZmZmZmZmZmZmZmZmZmZmZmZmZmZ
+        mZmZmZmZmZmZkwmZmZmZmZmZmZmZmZmZmZmZmZmZmZmZmZmZmZmZmZmZmZmZmZmZmZmZmZmZmZmZmZmZ
+        mZmZmZmZmZmZmZmZmZADmZmZmZmZmZmZmZmZmZmZmZmZmZmZmZmZmZmZmZmZmZmZmZmZmZmZmZmZmZmZ
+        mZmZmZmZmZmZmZmZmZmZmZkwA5mZmZmZmZmZmZmZmZmZmZmZmZmZmZmZmZmZmZmZmZmZmZmZmZmZmZmZ
+        mZmZmZmZmZmZmZmZmZmZmZmZmZmZMACZmZmZmZmZmZmZmZmZmZmZmZmZmZmZmZmZmZmZmZmZmZmZmZmZ
+        mZmZmZmZmZmZmZmZmZmZmZmZmZmZmZmZmQAAOZmZmZmZmZmZmZmZmZmZmZmZmZmZmZmZmZmZmZmZmZmZ
+        mZmZmZmZmZmZmZmZmZmZmZmZmZmZmZmZmZmZmZMAABmZmZmZmZmZmZmZmZmZmZmZmZmZmZmZmZmZmZmZ
+        mZmZmZmZmZmZmZmZmZmZmZmZmZmZmZmZmZmZmZmZmZmTAAADmZmZmZmZmZmZmZmZmZmZmZmZmZmZmZmZ
+        mZmZmZmZmZmZmZmZmZmZmZmZmZmZmZmZmZmZmZmZmZmZmZmZMAAAAJmZmZmZmZmZmZmZmZmZmZmZmZmZ
+        mZmZmZmZmZmZmZmZmZmZmZmZmZmZmZmZmZmZmZmZmZmZmZmZmZmZmRAAAAA5mZmZmZmZmZmZmZmZmZmZ
+        mZmZmZmZmZmZmZmZmZmZmZmZmZmZmZmZmZmZmZmZmZmZmZmZmZmZmZmZmZMAAAAACZmZmZmZmZmZmZmZ
+        mZmZmZmZmZmZmZmZmZmZmZmZmZmZmZmZmZmZmZmZmZmZmZmZmZmZmZmZmZmZmZmQAAAAAAGZmZmZmZmZ
+        mZmZmZmZmZmZmZmZmZmZmZmZmZmZmZmZmZmZmZmZmZmZmZmZmZmZmZmZmZmZmZmZmZmZMAAAAAAAOZmZ
+        mZmZmZmZmZmZmZmZmZmZmZmZmZmZmZmZmZmZmZmZmZmZmZmZmZmZmZmZmZmZmZmZmZmZmZmZkwAAAAAA
+        AAOZmZmZmZmZmZmZmZmZmZmZmZmZmZmZmZmZmZmZmZmZmZmZmZmZmZmZmZmZmZmZmZmZmZmZmZmZmTAA
+        AAAAAAAAOZmZmZmZmZmZmZmZmZmZmZmZmZmZmZmZmZmZmZmZmZmZmZmZmZmZmZmZmZmZmZmZmZmZmZmZ
+        mZMAAAAAAAAAAAOZmZmZmZmZmZmZmZmZmZmZmZmZmZmZmZmZmZmZmZmZmZmZmZmZmZmZmZmZmZmZmZmZ
+        mZmZmZkwAAAAAAAAAAAAOZmZmZmZmZmZmZmZmZmZmZmZmZmZmZmZmZmZmZmZmZmZmZmZmZmZmZmZmZmZ
+        mZmZmZmZmZmTAAAAAAAAAAAAAAGZmZmZmZmZmZmZmZmZmZmZmZmZmZmZmZmZmZmZmZmZmZmZmZmZmZmZ
+        mZmZmZmZmZmZmZmZEAAAAAAAAAAAAAAAA5mZmZmZmZmZmZmZmZmZmZmZmZmZmZmZmZmZmZmZmZmZmZmZ
+        mZmZmZmZmZmZmZmZmZmZMAAAAAAAAAAAAAAAAAATmZmZmZmZmZmZmZmZmZmZmZmZmZmZmZmZmZmZmZmZ
+        mZmZmZmZmZmZmZmZmZmZmZmZMQAAAAAAAAAAAAAAAAAAABOZmZmZmZmZmZmZmZmZmZmZmZmZmZmZmZmZ
+        mZmZmZmZmZmZmZmZmZmZmZmZmZmZMQAAAAAAAAAAAAAAAAAAAAAAAzmZmZmZmZmZmZmZmZmZmZmZmZmZ
+        mZmZmZmZmZmZmZmZmZmZmZmZmZmZmZmTMAAAAAAAAAAAAAAAAAAAAAAAAAAAEzMzMzMzMzMzMzMzMzMz
+        MzMzMzMzMzMzMzMzMzMzMzMzMzMzMzMzMzMxAAAAAAAAAAAAAAD////////////////////////4AAAA
+        AAAAAAAAAB//////wAAAAAAAAAAAAAAD/////wAAAAAAAAAAAAAAAP////wAAAAAAAAAAAAAAAA////w
+        AAAAAAAAAAAAAAAAD///4AAAAAAAAAAAAAAAAAf//8AAAAAAAAAAAAAAAAAD//+AAAAAAAAAAAAAAAAA
+        Af//AAAAAAAAAAAAAAAAAAD//gAAAAAAAAAAAAAAAAAAf/wAAAAAAAAAAAAAAAAAAD/4AAAAAAAAAAAA
+        AAAAAAAf+AAAAAAAAAAAAAAAAAAAH/AAAAAAAAAAAAAAAAAAAA/wAAAAAAAAAAAAAAAAAAAP4AAAAAAA
+        AAAAAAAAAAAAB+AAAAAAAAAAAAAAAAAAAAfAAAAAAAAAAAAAAAAAAAADwAAAAAAAAAAAAAAAAAAAA8AA
+        AAAAAAAAAAAAAAAAAAOAAAAAAAAAAAAAAAAAAAABgAAAAAAAAAAAAAAAAAAAAYAAAAAAAAAAAAAAAAAA
+        AAGAAAAAAAAAAAAAAAAAAAABgAAAAAAAAAAAAAAAAAAAAYAAAAAAAAAAAAAAAAAAAAGAAAAAAAAAAAAA
+        AAAAAAABgAAAAAAAAAAAAAAAAAAAAYAAAAAAAAAAAAAAAAAAAAGAAAAAAAAAAAAAAAAAAAABgAAAAAAA
+        AAAAAAAAAAAAAYAAAAAAAAAAAAAAAAAAAAGAAAAAAAAAAAAAAAAAAAABgAAAAAAAAAAAAAAAAAAAAYAA
+        AAAAAAAAAAAAAAAAAAGAAAAAAAAAAAAAAAAAAAABgAAAAAAAAAAAAAAAAAAAAYAAAAAAAAAAAAAAAAAA
+        AAGAAAAAAAAAAAAAAAAAAAABgAAAAAAAAAAAAAAAAAAAAYAAAAAAAAAAAAAAAAAAAAGAAAAAAAAAAAAA
+        AAAAAAABgAAAAAAAAAAAAAAAAAAAAYAAAAAAAAAAAAAAAAAAAAGAAAAAAAAAAAAAAAAAAAABgAAAAAAA
+        AAAAAAAAAAAAAYAAAAAAAAAAAAAAAAAAAAGAAAAAAAAAAAAAAAAAAAABgAAAAAAAAAAAAAAAAAAAAYAA
+        AAAAAAAAAAAAAAAAAAGAAAAAAAAAAAAAAAAAAAABgAAAAAAAAAAAAAAAAAAAAYAAAAAAAAAAAAAAAAAA
+        AAGAAAAAAAAAAAAAAAAAAAABgAAAAAAAAAAAAAAAAAAAAYAAAAAAAAAAAAAAAAAAAAGAAAAAAAAAAAAA
+        AAAAAAABgAAAAAAAAAAAAAAAAAAAAYAAAAAAAAAAAAAAAAAAAAGAAAAAAAAAAAAAAAAAAAABgAAAAAAA
+        AAAAAAAAAAAAAYAAAAAAAAAAAAAAAAAAAAGAAAAAAAAAAAAAAAAAAAABgAAAAAAAAAAAAAAAAAAAAYAA
+        AAAAAAAAAAAAAAAAAAGAAAAAAAAAAAAAAAAAAAABgAAAAAAAAAAAAAAAAAAAAYAAAAAAAAAAAAAAAAAA
+        AAGAAAAAAAAAAAAAAAAAAAABgAAAAAAAAAAAAAAAAAAAAYAAAAAAAAAAAAAAAAAAAAGAAAAAAAAAAAAA
+        AAAAAAABgAAAAAAAAAAAAAAAAAAAAYAAAAAAAAAAAAAAAAAAAAGAAAAAAAAAAAAAAAAAAAABgAAAAAAA
+        AAAAAAAAAAAAAYAAAAAAAAAAAAAAAAAAAAGAAAAAAAAAAAAAAAAAAAABgAAAAAAAAAAAAAAAAAAAAYAA
+        AAAAAAAAAAAAAAAAAAGAAAAAAAAAAAAAAAAAAAABgAAAAAAAAAAAAAAAAAAAAYAAAAAAAAAAAAAAAAAA
+        AAGAAAAAAAAAAAAAAAAAAAABgAAAAAAAAAAAAAAAAAAAAYAAAAAAAAAAAAAAAAAAAAGAAAAAAAAAAAAA
+        AAAAAAABgAAAAAAAAAAAAAAAAAAAAYAAAAAAAAAAAAAAAAAAAAGAAAAAAAAAAAAAAAAAAAABgAAAAAAA
+        AAAAAAAAAAAAAYAAAAAAAAAAAAAAAAAAAAGAAAAAAAAAAAAAAAAAAAABgAAAAAAAAAAAAAAAAAAAAYAA
+        AAAAAAAAAAAAAAAAAAGAAAAAAAAAAAAAAAAAAAABgAAAAAAAAAAAAAAAAAAAAYAAAAAAAAAAAAAAAAAA
+        AAGAAAAAAAAAAAAAAAAAAAABgAAAAAAAAAAAAAAAAAAAAYAAAAAAAAAAAAAAAAAAAAGAAAAAAAAAAAAA
+        AAAAAAABgAAAAAAAAAAAAAAAAAAAAYAAAAAAAAAAAAAAAAAAAAGAAAAAAAAAAAAAAAAAAAABgAAAAAAA
+        AAAAAAAAAAAAAcAAAAAAAAAAAAAAAAAAAAPAAAAAAAAAAAAAAAAAAAAD4AAAAAAAAAAAAAAAAAAAA+AA
+        AAAAAAAAAAAAAAAAAAfgAAAAAAAAAAAAAAAAAAAH8AAAAAAAAAAAAAAAAAAAD/AAAAAAAAAAAAAAAAAA
+        AA/4AAAAAAAAAAAAAAAAAAAf/AAAAAAAAAAAAAAAAAAAH/wAAAAAAAAAAAAAAAAAAD/+AAAAAAAAAAAA
+        AAAAAAB//wAAAAAAAAAAAAAAAAAA//+AAAAAAAAAAAAAAAAAAf//wAAAAAAAAAAAAAAAAAP//+AAAAAA
+        AAAAAAAAAAAH///4AAAAAAAAAAAAAAAAD////AAAAAAAAAAAAAAAAD////8AAAAAAAAAAAAAAAD/////
+        wAAAAAAAAAAAAAAD//////wAAAAAAAAAAAAAH////////////////////////w==
+</value>
+  </data>
+</root>

TEMUKJD/WXForms/ShopForms/WXOemAccountForm.Designer.cs

@@ -97,7 +97,6 @@ namespace TemuKJD.WXForms.ShopForms
             this.btnTopUpCancel = new DevComponents.DotNetBar.PanelEx();
             this.btnTopUpOK = new DevComponents.DotNetBar.PanelEx();
             this.dgvUser = new TemuKJD.UserComponent.DataGridViewEx();
-            this.btnExportShopErp = new DevComponents.DotNetBar.PanelEx();
             this.colCheck = new System.Windows.Forms.DataGridViewCheckBoxColumn();
             this.UserIdColumn = new System.Windows.Forms.DataGridViewTextBoxColumn();
             this.UserNickNameColumn = new System.Windows.Forms.DataGridViewTextBoxColumn();
@@ -122,6 +121,7 @@ namespace TemuKJD.WXForms.ShopForms
             this.colChangePostagePerOrder = new System.Windows.Forms.DataGridViewLinkColumn();
             this.editColumn = new System.Windows.Forms.DataGridViewLinkColumn();
             this.deleteColumn = new System.Windows.Forms.DataGridViewLinkColumn();
+            this.btnExportShopErp = new DevComponents.DotNetBar.PanelEx();
             ((System.ComponentModel.ISupportInitialize)(this.splitContainer5)).BeginInit();
             this.splitContainer5.Panel1.SuspendLayout();
             this.splitContainer5.Panel2.SuspendLayout();
@@ -676,11 +676,6 @@ namespace TemuKJD.WXForms.ShopForms
             0,
             0,
             0});
-            this.numAddBalance.Minimum = new decimal(new int[] {
-            100000,
-            0,
-            0,
-            -2147483648});
             this.numAddBalance.Name = "numAddBalance";
             this.numAddBalance.Size = new System.Drawing.Size(56, 23);
             this.numAddBalance.TabIndex = 1;
@@ -919,11 +914,6 @@ namespace TemuKJD.WXForms.ShopForms
             0,
             0,
             0});
-            this.numAddTopUp.Minimum = new decimal(new int[] {
-            100000,
-            0,
-            0,
-            -2147483648});
             this.numAddTopUp.Name = "numAddTopUp";
             this.numAddTopUp.Size = new System.Drawing.Size(56, 23);
             this.numAddTopUp.TabIndex = 1;
@@ -1040,31 +1030,6 @@ namespace TemuKJD.WXForms.ShopForms
             this.dgvUser.TabIndex = 1;
             this.dgvUser.CellContentClick += new System.Windows.Forms.DataGridViewCellEventHandler(this.dgvUser_CellContentClick);
             // 
-            // btnExportShopErp
-            // 
-            this.btnExportShopErp.ColorSchemeStyle = DevComponents.DotNetBar.eDotNetBarStyle.StyleManagerControlled;
-            this.btnExportShopErp.Cursor = System.Windows.Forms.Cursors.Hand;
-            this.btnExportShopErp.DisabledBackColor = System.Drawing.Color.Empty;
-            this.btnExportShopErp.Font = new System.Drawing.Font("微软雅黑", 9F, System.Drawing.FontStyle.Regular, System.Drawing.GraphicsUnit.Point, ((byte)(134)));
-            this.btnExportShopErp.Location = new System.Drawing.Point(0, 1);
-            this.btnExportShopErp.Name = "btnExportShopErp";
-            this.btnExportShopErp.Size = new System.Drawing.Size(140, 25);
-            this.btnExportShopErp.Style.Alignment = System.Drawing.StringAlignment.Center;
-            this.btnExportShopErp.Style.BackColor1.Color = System.Drawing.Color.FromArgb(((int)(((byte)(63)))), ((int)(((byte)(126)))), ((int)(((byte)(255)))));
-            this.btnExportShopErp.Style.BackColor2.Color = System.Drawing.Color.FromArgb(((int)(((byte)(63)))), ((int)(((byte)(126)))), ((int)(((byte)(255)))));
-            this.btnExportShopErp.Style.BorderColor.ColorSchemePart = DevComponents.DotNetBar.eColorSchemePart.PanelBorder;
-            this.btnExportShopErp.Style.BorderDashStyle = System.Drawing.Drawing2D.DashStyle.Dash;
-            this.btnExportShopErp.Style.BorderSide = DevComponents.DotNetBar.eBorderSide.None;
-            this.btnExportShopErp.Style.ForeColor.Color = System.Drawing.Color.White;
-            this.btnExportShopErp.Style.GradientAngle = 90;
-            this.btnExportShopErp.StyleMouseOver.Alignment = System.Drawing.StringAlignment.Center;
-            this.btnExportShopErp.StyleMouseOver.BackColor1.Color = System.Drawing.Color.FromArgb(((int)(((byte)(25)))), ((int)(((byte)(102)))), ((int)(((byte)(255)))));
-            this.btnExportShopErp.StyleMouseOver.BackColor2.Color = System.Drawing.Color.FromArgb(((int)(((byte)(25)))), ((int)(((byte)(102)))), ((int)(((byte)(255)))));
-            this.btnExportShopErp.TabIndex = 439;
-            this.btnExportShopErp.Text = "导出用户到后台系统";
-            this.btnExportShopErp.Visible = false;
-            this.btnExportShopErp.Click += new System.EventHandler(this.btnExportShopErp_Click);
-            // 
             // colCheck
             // 
             this.colCheck.FillWeight = 30F;
@@ -1253,6 +1218,31 @@ namespace TemuKJD.WXForms.ShopForms
             this.deleteColumn.ReadOnly = true;
             this.deleteColumn.Visible = false;
             // 
+            // btnExportShopErp
+            // 
+            this.btnExportShopErp.ColorSchemeStyle = DevComponents.DotNetBar.eDotNetBarStyle.StyleManagerControlled;
+            this.btnExportShopErp.Cursor = System.Windows.Forms.Cursors.Hand;
+            this.btnExportShopErp.DisabledBackColor = System.Drawing.Color.Empty;
+            this.btnExportShopErp.Font = new System.Drawing.Font("微软雅黑", 9F, System.Drawing.FontStyle.Regular, System.Drawing.GraphicsUnit.Point, ((byte)(134)));
+            this.btnExportShopErp.Location = new System.Drawing.Point(0, 1);
+            this.btnExportShopErp.Name = "btnExportShopErp";
+            this.btnExportShopErp.Size = new System.Drawing.Size(140, 25);
+            this.btnExportShopErp.Style.Alignment = System.Drawing.StringAlignment.Center;
+            this.btnExportShopErp.Style.BackColor1.Color = System.Drawing.Color.FromArgb(((int)(((byte)(63)))), ((int)(((byte)(126)))), ((int)(((byte)(255)))));
+            this.btnExportShopErp.Style.BackColor2.Color = System.Drawing.Color.FromArgb(((int)(((byte)(63)))), ((int)(((byte)(126)))), ((int)(((byte)(255)))));
+            this.btnExportShopErp.Style.BorderColor.ColorSchemePart = DevComponents.DotNetBar.eColorSchemePart.PanelBorder;
+            this.btnExportShopErp.Style.BorderDashStyle = System.Drawing.Drawing2D.DashStyle.Dash;
+            this.btnExportShopErp.Style.BorderSide = DevComponents.DotNetBar.eBorderSide.None;
+            this.btnExportShopErp.Style.ForeColor.Color = System.Drawing.Color.White;
+            this.btnExportShopErp.Style.GradientAngle = 90;
+            this.btnExportShopErp.StyleMouseOver.Alignment = System.Drawing.StringAlignment.Center;
+            this.btnExportShopErp.StyleMouseOver.BackColor1.Color = System.Drawing.Color.FromArgb(((int)(((byte)(25)))), ((int)(((byte)(102)))), ((int)(((byte)(255)))));
+            this.btnExportShopErp.StyleMouseOver.BackColor2.Color = System.Drawing.Color.FromArgb(((int)(((byte)(25)))), ((int)(((byte)(102)))), ((int)(((byte)(255)))));
+            this.btnExportShopErp.TabIndex = 439;
+            this.btnExportShopErp.Text = "导出用户到后台系统";
+            this.btnExportShopErp.Visible = false;
+            this.btnExportShopErp.Click += new System.EventHandler(this.btnExportShopErp_Click);
+            // 
             // WXOemAccountForm
             // 
             this.AutoScaleMode = System.Windows.Forms.AutoScaleMode.None;

TEMUKJD/WXForms/ShopForms/WXOemPointsTopUpListForm.Designer.cs

@@ -0,0 +1,406 @@
+
+using TemuKJD.UserComponent;
+using TemuKJD.UserControls;
+
+namespace Work._29Tools.Forms.UserForms
+{
+    partial class WXOemPointsTopUpListForm
+    {
+        /// <summary>
+        /// Required designer variable.
+        /// </summary>
+        private System.ComponentModel.IContainer components = null;
+
+        /// <summary>
+        /// Clean up any resources being used.
+        /// </summary>
+        /// <param name="disposing">true if managed resources should be disposed; otherwise, false.</param>
+        protected override void Dispose(bool disposing)
+        {
+            if (disposing && (components != null))
+            {
+                components.Dispose();
+            }
+            base.Dispose(disposing);
+        }
+
+        #region Windows Form Designer generated code
+
+        /// <summary>
+        /// Required method for Designer support - do not modify
+        /// the contents of this method with the code editor.
+        /// </summary>
+        private void InitializeComponent()
+        {
+            this.components = new System.ComponentModel.Container();
+            System.Windows.Forms.DataGridViewCellStyle dataGridViewCellStyle1 = new System.Windows.Forms.DataGridViewCellStyle();
+            System.Windows.Forms.DataGridViewCellStyle dataGridViewCellStyle2 = new System.Windows.Forms.DataGridViewCellStyle();
+            System.Windows.Forms.DataGridViewCellStyle dataGridViewCellStyle3 = new System.Windows.Forms.DataGridViewCellStyle();
+            System.ComponentModel.ComponentResourceManager resources = new System.ComponentModel.ComponentResourceManager(typeof(WXOemPointsTopUpListForm));
+            this.panel1 = new System.Windows.Forms.Panel();
+            this.splitContainer2 = new System.Windows.Forms.SplitContainer();
+            this.ucGroupBoxEx1 = new TemuKJD.UserComponent.UcGroupBoxEx(this.components);
+            this.chkNotCurrentAccount = new TemuKJD.UserComponent.UcCheckBox(this.components);
+            this.btnSearch = new DevComponents.DotNetBar.PanelEx();
+            this.dtpTimeEnd = new System.Windows.Forms.DateTimePicker();
+            this.dtpTimeBegin = new System.Windows.Forms.DateTimePicker();
+            this.label5 = new System.Windows.Forms.Label();
+            this.label4 = new System.Windows.Forms.Label();
+            this.cmbType = new System.Windows.Forms.ComboBox();
+            this.splitContainer3 = new System.Windows.Forms.SplitContainer();
+            this.pictureBox2 = new System.Windows.Forms.PictureBox();
+            this.dgvPayment = new TemuKJD.UserComponent.DataGridViewEx();
+            this.ucSplitPage1 = new TemuKJD.UserControls.UcSplitPage();
+            this.colCheck = new System.Windows.Forms.DataGridViewCheckBoxColumn();
+            this.colType = new System.Windows.Forms.DataGridViewTextBoxColumn();
+            this.colUserName = new System.Windows.Forms.DataGridViewTextBoxColumn();
+            this.colShop = new System.Windows.Forms.DataGridViewTextBoxColumn();
+            this.colPoints = new System.Windows.Forms.DataGridViewTextBoxColumn();
+            this.colNewPoints = new System.Windows.Forms.DataGridViewTextBoxColumn();
+            this.colCreateTime = new System.Windows.Forms.DataGridViewTextBoxColumn();
+            this.colRemark = new System.Windows.Forms.DataGridViewTextBoxColumn();
+            this.panel1.SuspendLayout();
+            ((System.ComponentModel.ISupportInitialize)(this.splitContainer2)).BeginInit();
+            this.splitContainer2.Panel1.SuspendLayout();
+            this.splitContainer2.Panel2.SuspendLayout();
+            this.splitContainer2.SuspendLayout();
+            this.ucGroupBoxEx1.SuspendLayout();
+            ((System.ComponentModel.ISupportInitialize)(this.splitContainer3)).BeginInit();
+            this.splitContainer3.Panel1.SuspendLayout();
+            this.splitContainer3.Panel2.SuspendLayout();
+            this.splitContainer3.SuspendLayout();
+            ((System.ComponentModel.ISupportInitialize)(this.pictureBox2)).BeginInit();
+            ((System.ComponentModel.ISupportInitialize)(this.dgvPayment)).BeginInit();
+            this.SuspendLayout();
+            // 
+            // panel1
+            // 
+            this.panel1.BackColor = System.Drawing.Color.White;
+            this.panel1.Controls.Add(this.splitContainer2);
+            this.panel1.Dock = System.Windows.Forms.DockStyle.Fill;
+            this.panel1.Location = new System.Drawing.Point(2, 34);
+            this.panel1.Name = "panel1";
+            this.panel1.Size = new System.Drawing.Size(1220, 529);
+            this.panel1.TabIndex = 1140;
+            // 
+            // splitContainer2
+            // 
+            this.splitContainer2.Dock = System.Windows.Forms.DockStyle.Fill;
+            this.splitContainer2.FixedPanel = System.Windows.Forms.FixedPanel.Panel1;
+            this.splitContainer2.Location = new System.Drawing.Point(0, 0);
+            this.splitContainer2.Name = "splitContainer2";
+            this.splitContainer2.Orientation = System.Windows.Forms.Orientation.Horizontal;
+            // 
+            // splitContainer2.Panel1
+            // 
+            this.splitContainer2.Panel1.Controls.Add(this.ucGroupBoxEx1);
+            // 
+            // splitContainer2.Panel2
+            // 
+            this.splitContainer2.Panel2.Controls.Add(this.splitContainer3);
+            this.splitContainer2.Size = new System.Drawing.Size(1220, 529);
+            this.splitContainer2.SplitterDistance = 86;
+            this.splitContainer2.TabIndex = 1163;
+            // 
+            // ucGroupBoxEx1
+            // 
+            this.ucGroupBoxEx1.Anchor = ((System.Windows.Forms.AnchorStyles)((((System.Windows.Forms.AnchorStyles.Top | System.Windows.Forms.AnchorStyles.Bottom) 
+            | System.Windows.Forms.AnchorStyles.Left) 
+            | System.Windows.Forms.AnchorStyles.Right)));
+            this.ucGroupBoxEx1.BorderColor = System.Drawing.Color.FromArgb(((int)(((byte)(63)))), ((int)(((byte)(126)))), ((int)(((byte)(255)))));
+            this.ucGroupBoxEx1.BorderStyle = TemuKJD.UserComponent.UcGroupBoxEx.GroupBoxBorderStyle.ROUND;
+            this.ucGroupBoxEx1.Controls.Add(this.chkNotCurrentAccount);
+            this.ucGroupBoxEx1.Controls.Add(this.btnSearch);
+            this.ucGroupBoxEx1.Controls.Add(this.dtpTimeEnd);
+            this.ucGroupBoxEx1.Controls.Add(this.dtpTimeBegin);
+            this.ucGroupBoxEx1.Controls.Add(this.label5);
+            this.ucGroupBoxEx1.Controls.Add(this.label4);
+            this.ucGroupBoxEx1.Controls.Add(this.cmbType);
+            this.ucGroupBoxEx1.Location = new System.Drawing.Point(0, 2);
+            this.ucGroupBoxEx1.Name = "ucGroupBoxEx1";
+            this.ucGroupBoxEx1.Size = new System.Drawing.Size(1220, 84);
+            this.ucGroupBoxEx1.TabIndex = 0;
+            this.ucGroupBoxEx1.TabStop = false;
+            this.ucGroupBoxEx1.Text = "查询条件";
+            // 
+            // chkNotCurrentAccount
+            // 
+            this.chkNotCurrentAccount.AutoSize = true;
+            this.chkNotCurrentAccount.Checked = true;
+            this.chkNotCurrentAccount.CheckState = System.Windows.Forms.CheckState.Checked;
+            this.chkNotCurrentAccount.Location = new System.Drawing.Point(585, 36);
+            this.chkNotCurrentAccount.Name = "chkNotCurrentAccount";
+            this.chkNotCurrentAccount.Size = new System.Drawing.Size(87, 21);
+            this.chkNotCurrentAccount.TabIndex = 1157;
+            this.chkNotCurrentAccount.Text = "不含本账户";
+            this.chkNotCurrentAccount.UseVisualStyleBackColor = true;
+            // 
+            // btnSearch
+            // 
+            this.btnSearch.ColorSchemeStyle = DevComponents.DotNetBar.eDotNetBarStyle.StyleManagerControlled;
+            this.btnSearch.Cursor = System.Windows.Forms.Cursors.Hand;
+            this.btnSearch.DisabledBackColor = System.Drawing.Color.Empty;
+            this.btnSearch.Font = new System.Drawing.Font("微软雅黑", 9F, System.Drawing.FontStyle.Regular, System.Drawing.GraphicsUnit.Point, ((byte)(134)));
+            this.btnSearch.Location = new System.Drawing.Point(700, 35);
+            this.btnSearch.Name = "btnSearch";
+            this.btnSearch.Size = new System.Drawing.Size(62, 23);
+            this.btnSearch.Style.Alignment = System.Drawing.StringAlignment.Center;
+            this.btnSearch.Style.BackColor1.Color = System.Drawing.Color.FromArgb(((int)(((byte)(63)))), ((int)(((byte)(126)))), ((int)(((byte)(255)))));
+            this.btnSearch.Style.BackColor2.Color = System.Drawing.Color.FromArgb(((int)(((byte)(63)))), ((int)(((byte)(126)))), ((int)(((byte)(255)))));
+            this.btnSearch.Style.BorderColor.ColorSchemePart = DevComponents.DotNetBar.eColorSchemePart.PanelBorder;
+            this.btnSearch.Style.BorderDashStyle = System.Drawing.Drawing2D.DashStyle.Dash;
+            this.btnSearch.Style.BorderSide = DevComponents.DotNetBar.eBorderSide.None;
+            this.btnSearch.Style.ForeColor.Color = System.Drawing.Color.White;
+            this.btnSearch.Style.GradientAngle = 90;
+            this.btnSearch.StyleMouseOver.Alignment = System.Drawing.StringAlignment.Center;
+            this.btnSearch.StyleMouseOver.BackColor1.Color = System.Drawing.Color.FromArgb(((int)(((byte)(25)))), ((int)(((byte)(102)))), ((int)(((byte)(255)))));
+            this.btnSearch.StyleMouseOver.BackColor2.Color = System.Drawing.Color.FromArgb(((int)(((byte)(25)))), ((int)(((byte)(102)))), ((int)(((byte)(255)))));
+            this.btnSearch.TabIndex = 1153;
+            this.btnSearch.Text = "查询";
+            this.btnSearch.Click += new System.EventHandler(this.btnSearch_Click);
+            // 
+            // dtpTimeEnd
+            // 
+            this.dtpTimeEnd.Location = new System.Drawing.Point(430, 35);
+            this.dtpTimeEnd.Name = "dtpTimeEnd";
+            this.dtpTimeEnd.Size = new System.Drawing.Size(132, 23);
+            this.dtpTimeEnd.TabIndex = 1149;
+            // 
+            // dtpTimeBegin
+            // 
+            this.dtpTimeBegin.Location = new System.Drawing.Point(292, 35);
+            this.dtpTimeBegin.Name = "dtpTimeBegin";
+            this.dtpTimeBegin.Size = new System.Drawing.Size(132, 23);
+            this.dtpTimeBegin.TabIndex = 1148;
+            // 
+            // label5
+            // 
+            this.label5.AutoSize = true;
+            this.label5.Location = new System.Drawing.Point(235, 38);
+            this.label5.Name = "label5";
+            this.label5.Size = new System.Drawing.Size(56, 17);
+            this.label5.TabIndex = 1147;
+            this.label5.Text = "起止时间";
+            // 
+            // label4
+            // 
+            this.label4.AutoSize = true;
+            this.label4.Location = new System.Drawing.Point(39, 37);
+            this.label4.Name = "label4";
+            this.label4.Size = new System.Drawing.Size(32, 17);
+            this.label4.TabIndex = 1145;
+            this.label4.Text = "类型";
+            // 
+            // cmbType
+            // 
+            this.cmbType.FormattingEnabled = true;
+            this.cmbType.Items.AddRange(new object[] {
+            "",
+            "充值",
+            "转入",
+            "转出",
+            "店铺续期"});
+            this.cmbType.Location = new System.Drawing.Point(72, 33);
+            this.cmbType.Name = "cmbType";
+            this.cmbType.Size = new System.Drawing.Size(121, 25);
+            this.cmbType.TabIndex = 0;
+            // 
+            // splitContainer3
+            // 
+            this.splitContainer3.Dock = System.Windows.Forms.DockStyle.Fill;
+            this.splitContainer3.FixedPanel = System.Windows.Forms.FixedPanel.Panel2;
+            this.splitContainer3.Location = new System.Drawing.Point(0, 0);
+            this.splitContainer3.Name = "splitContainer3";
+            this.splitContainer3.Orientation = System.Windows.Forms.Orientation.Horizontal;
+            // 
+            // splitContainer3.Panel1
+            // 
+            this.splitContainer3.Panel1.Controls.Add(this.pictureBox2);
+            this.splitContainer3.Panel1.Controls.Add(this.dgvPayment);
+            this.splitContainer3.Panel1.Padding = new System.Windows.Forms.Padding(2);
+            // 
+            // splitContainer3.Panel2
+            // 
+            this.splitContainer3.Panel2.Controls.Add(this.ucSplitPage1);
+            this.splitContainer3.Size = new System.Drawing.Size(1220, 439);
+            this.splitContainer3.SplitterDistance = 410;
+            this.splitContainer3.TabIndex = 1163;
+            // 
+            // pictureBox2
+            // 
+            this.pictureBox2.Anchor = System.Windows.Forms.AnchorStyles.None;
+            this.pictureBox2.Image = global::TemuKJD.Properties.Resources.loading_blue;
+            this.pictureBox2.Location = new System.Drawing.Point(585, 180);
+            this.pictureBox2.Name = "pictureBox2";
+            this.pictureBox2.Size = new System.Drawing.Size(50, 50);
+            this.pictureBox2.SizeMode = System.Windows.Forms.PictureBoxSizeMode.StretchImage;
+            this.pictureBox2.TabIndex = 1163;
+            this.pictureBox2.TabStop = false;
+            this.pictureBox2.Visible = false;
+            // 
+            // dgvPayment
+            // 
+            this.dgvPayment.AllowUserToAddRows = false;
+            this.dgvPayment.AllowUserToDeleteRows = false;
+            dataGridViewCellStyle1.BackColor = System.Drawing.Color.WhiteSmoke;
+            this.dgvPayment.AlternatingRowsDefaultCellStyle = dataGridViewCellStyle1;
+            this.dgvPayment.AutoRowNumber = true;
+            this.dgvPayment.AutoSizeColumnsMode = System.Windows.Forms.DataGridViewAutoSizeColumnsMode.Fill;
+            this.dgvPayment.BackgroundColor = System.Drawing.Color.White;
+            this.dgvPayment.BorderColor = System.Drawing.Color.FromArgb(((int)(((byte)(63)))), ((int)(((byte)(126)))), ((int)(((byte)(255)))));
+            dataGridViewCellStyle2.Alignment = System.Windows.Forms.DataGridViewContentAlignment.MiddleLeft;
+            dataGridViewCellStyle2.BackColor = System.Drawing.SystemColors.Control;
+            dataGridViewCellStyle2.Font = new System.Drawing.Font("微软雅黑", 9F, System.Drawing.FontStyle.Regular, System.Drawing.GraphicsUnit.Point, ((byte)(134)));
+            dataGridViewCellStyle2.ForeColor = System.Drawing.SystemColors.WindowText;
+            dataGridViewCellStyle2.SelectionBackColor = System.Drawing.SystemColors.Highlight;
+            dataGridViewCellStyle2.SelectionForeColor = System.Drawing.SystemColors.HighlightText;
+            dataGridViewCellStyle2.WrapMode = System.Windows.Forms.DataGridViewTriState.False;
+            this.dgvPayment.ColumnHeadersDefaultCellStyle = dataGridViewCellStyle2;
+            this.dgvPayment.ColumnHeadersHeightSizeMode = System.Windows.Forms.DataGridViewColumnHeadersHeightSizeMode.AutoSize;
+            this.dgvPayment.Columns.AddRange(new System.Windows.Forms.DataGridViewColumn[] {
+            this.colCheck,
+            this.colType,
+            this.colUserName,
+            this.colShop,
+            this.colPoints,
+            this.colNewPoints,
+            this.colCreateTime,
+            this.colRemark});
+            this.dgvPayment.Dock = System.Windows.Forms.DockStyle.Fill;
+            this.dgvPayment.Location = new System.Drawing.Point(2, 2);
+            this.dgvPayment.MultiSelectCheckBox = true;
+            this.dgvPayment.Name = "dgvPayment";
+            this.dgvPayment.ReadOnly = true;
+            this.dgvPayment.RowTemplate.Height = 23;
+            this.dgvPayment.Size = new System.Drawing.Size(1216, 406);
+            this.dgvPayment.TabIndex = 1162;
+            // 
+            // ucSplitPage1
+            // 
+            this.ucSplitPage1.CurrentPage = 1;
+            this.ucSplitPage1.Dock = System.Windows.Forms.DockStyle.Right;
+            this.ucSplitPage1.IsShowPageSize = true;
+            this.ucSplitPage1.Location = new System.Drawing.Point(761, 0);
+            this.ucSplitPage1.Margin = new System.Windows.Forms.Padding(0);
+            this.ucSplitPage1.Name = "ucSplitPage1";
+            this.ucSplitPage1.PageSize = 50;
+            this.ucSplitPage1.Size = new System.Drawing.Size(459, 25);
+            this.ucSplitPage1.TabIndex = 1163;
+            this.ucSplitPage1.TotalPage = 1;
+            this.ucSplitPage1.PageChange += new System.Action<object>(this.ucSplitPage1_PageChange);
+            // 
+            // colCheck
+            // 
+            this.colCheck.FillWeight = 20F;
+            this.colCheck.HeaderText = "选择";
+            this.colCheck.Name = "colCheck";
+            this.colCheck.ReadOnly = true;
+            this.colCheck.Resizable = System.Windows.Forms.DataGridViewTriState.True;
+            this.colCheck.SortMode = System.Windows.Forms.DataGridViewColumnSortMode.Automatic;
+            // 
+            // colType
+            // 
+            this.colType.HeaderText = "类型";
+            this.colType.Name = "colType";
+            this.colType.ReadOnly = true;
+            // 
+            // colUserName
+            // 
+            this.colUserName.HeaderText = "账户";
+            this.colUserName.Name = "colUserName";
+            this.colUserName.ReadOnly = true;
+            // 
+            // colShop
+            // 
+            this.colShop.HeaderText = "店铺";
+            this.colShop.Name = "colShop";
+            this.colShop.ReadOnly = true;
+            // 
+            // colPoints
+            // 
+            dataGridViewCellStyle3.WrapMode = System.Windows.Forms.DataGridViewTriState.True;
+            this.colPoints.DefaultCellStyle = dataGridViewCellStyle3;
+            this.colPoints.FillWeight = 60F;
+            this.colPoints.HeaderText = "点数变化";
+            this.colPoints.Name = "colPoints";
+            this.colPoints.ReadOnly = true;
+            // 
+            // colNewPoints
+            // 
+            this.colNewPoints.FillWeight = 60F;
+            this.colNewPoints.HeaderText = "点数余额";
+            this.colNewPoints.Name = "colNewPoints";
+            this.colNewPoints.ReadOnly = true;
+            // 
+            // colCreateTime
+            // 
+            this.colCreateTime.HeaderText = "创建时间";
+            this.colCreateTime.Name = "colCreateTime";
+            this.colCreateTime.ReadOnly = true;
+            // 
+            // colRemark
+            // 
+            this.colRemark.FillWeight = 120F;
+            this.colRemark.HeaderText = "备注";
+            this.colRemark.Name = "colRemark";
+            this.colRemark.ReadOnly = true;
+            this.colRemark.Resizable = System.Windows.Forms.DataGridViewTriState.True;
+            this.colRemark.SortMode = System.Windows.Forms.DataGridViewColumnSortMode.NotSortable;
+            // 
+            // WXOemPointsTopUpListForm
+            // 
+            this.AutoScaleMode = System.Windows.Forms.AutoScaleMode.None;
+            this.BackColor = System.Drawing.Color.FromArgb(((int)(((byte)(152)))), ((int)(((byte)(99)))), ((int)(((byte)(143)))));
+            this.ClientSize = new System.Drawing.Size(1224, 565);
+            this.Controls.Add(this.panel1);
+            this.Font = new System.Drawing.Font("微软雅黑", 9F, System.Drawing.FontStyle.Regular, System.Drawing.GraphicsUnit.Point, ((byte)(134)));
+            this.Icon = ((System.Drawing.Icon)(resources.GetObject("$this.Icon")));
+            this.KeyPreview = true;
+            this.Name = "WXOemPointsTopUpListForm";
+            this.Padding = new System.Windows.Forms.Padding(2);
+            this.Text = "OEM积分明细";
+            this.TitleText = "OEM积分明细";
+            this.Load += new System.EventHandler(this.WXGetTopUpQrCode_Load);
+            this.Controls.SetChildIndex(this.panel1, 0);
+            this.panel1.ResumeLayout(false);
+            this.splitContainer2.Panel1.ResumeLayout(false);
+            this.splitContainer2.Panel2.ResumeLayout(false);
+            ((System.ComponentModel.ISupportInitialize)(this.splitContainer2)).EndInit();
+            this.splitContainer2.ResumeLayout(false);
+            this.ucGroupBoxEx1.ResumeLayout(false);
+            this.ucGroupBoxEx1.PerformLayout();
+            this.splitContainer3.Panel1.ResumeLayout(false);
+            this.splitContainer3.Panel2.ResumeLayout(false);
+            ((System.ComponentModel.ISupportInitialize)(this.splitContainer3)).EndInit();
+            this.splitContainer3.ResumeLayout(false);
+            ((System.ComponentModel.ISupportInitialize)(this.pictureBox2)).EndInit();
+            ((System.ComponentModel.ISupportInitialize)(this.dgvPayment)).EndInit();
+            this.ResumeLayout(false);
+
+        }
+
+        #endregion
+        private System.Windows.Forms.Panel panel1;
+        private TemuKJD.UserComponent.DataGridViewEx dgvPayment;
+        private System.Windows.Forms.SplitContainer splitContainer2;
+        private System.Windows.Forms.SplitContainer splitContainer3;
+        private TemuKJD.UserControls.UcSplitPage ucSplitPage1;
+        private System.Windows.Forms.PictureBox pictureBox2;
+        private UcGroupBoxEx ucGroupBoxEx1;
+        private System.Windows.Forms.Label label5;
+        private System.Windows.Forms.Label label4;
+        private System.Windows.Forms.ComboBox cmbType;
+        private System.Windows.Forms.DateTimePicker dtpTimeEnd;
+        private System.Windows.Forms.DateTimePicker dtpTimeBegin;
+        private DevComponents.DotNetBar.PanelEx btnSearch;
+        private UcCheckBox chkNotCurrentAccount;
+        private System.Windows.Forms.DataGridViewCheckBoxColumn colCheck;
+        private System.Windows.Forms.DataGridViewTextBoxColumn colType;
+        private System.Windows.Forms.DataGridViewTextBoxColumn colUserName;
+        private System.Windows.Forms.DataGridViewTextBoxColumn colShop;
+        private System.Windows.Forms.DataGridViewTextBoxColumn colPoints;
+        private System.Windows.Forms.DataGridViewTextBoxColumn colNewPoints;
+        private System.Windows.Forms.DataGridViewTextBoxColumn colCreateTime;
+        private System.Windows.Forms.DataGridViewTextBoxColumn colRemark;
+    }
+}

TEMUKJD/WXForms/ShopForms/WXOemPointsTopUpListForm.cs

@@ -0,0 +1,182 @@
+using AllBase;
+using AllBase.Model.DBModel;
+using AllBase.Model.Result;
+using CefSharp;
+using CefSharp.WinForms;
+using DevComponents.WinForms.Drawing;
+using NaiBa.CefHelper;
+using NaiBa.Util.Extension;
+using Newtonsoft.Json.Linq;
+using System;
+using System.Collections.Generic;
+using System.ComponentModel;
+using System.Data;
+using System.Diagnostics;
+using System.Drawing;
+using System.Drawing.Printing;
+using System.Linq;
+using System.Security.Cryptography.X509Certificates;
+using System.Security.Policy;
+using System.Text;
+using System.Threading;
+using System.Threading.Tasks;
+using System.Windows.Forms;
+using TemuKJD.BaseForms;
+using TemuKJD.BLL;
+using Work;
+
+namespace Work._29Tools.Forms.UserForms
+{
+    public partial class WXOemPointsTopUpListForm : BaseGeneralForm
+    {
+        // (拍单后)回调函数，更新拍单余额
+        private Action updateBalanceAction = null;
+
+        public WXOemPointsTopUpListForm()
+        {
+            InitializeComponent();
+        }
+
+        private void btnRefresh_Click(object sender, EventArgs e)
+        {
+        }
+
+        private async void WXGetTopUpQrCode_Load(object sender, EventArgs e)
+        {
+            this.dtpTimeBegin.Value = DateTime.Now.Date.AddMonths(-3);
+            this.dtpTimeEnd.Value = DateTime.Now.Date.AddDays(1).AddSeconds(-1);
+
+            ucSplitPage1.cmbPageSize.Items.Remove("5000");
+
+            pictureBox2.Visible = true;
+            await Task.Run(() => { GetBalanceList(); });
+            pictureBox2.Visible = false;
+
+            
+        }
+
+        public async void GetBalanceList()
+        {
+            Invoke(new Action(() =>
+            {
+                this.dgvPayment.Rows.Clear();
+            }));
+
+            if (string.IsNullOrEmpty(BaseClass.OemId))
+            {
+                BaseMsgForm.ShowError("没有权限！");
+                return;
+            }
+
+            string url = BaseClass.BuildObjString("user/get_all_user");
+            StringBuilder data = new StringBuilder();
+            data.Append(UserLogin.GetSignaturex());
+            // 查账户
+            data.Append("&group_id=3");
+            data.Append("&oem_id=" + BaseClass.OemId); 
+            string html = GetHtml.PostUtf8(url, data.ToString());
+            if (string.IsNullOrEmpty(html) || !html.Contains("\"code\":200"))
+                html = GetHtml.PostUtf8(url, data);
+            if (string.IsNullOrEmpty(html) || !html.Contains("\"code\":200"))
+            {
+                BaseMsgForm.ShowError("查询失败：" + BaseRegex.GetStringJsonByRegs(ref html, html, "msg"));
+                return;
+            }
+            var userObj = JObject.Parse(html);
+            var oemUserNames = "";
+            foreach (JObject obj in userObj["data"])
+            {
+                string oStr = JsonHelper.SerializeObject(obj);
+                //UserSubAccountInfo user = new UserSubAccountInfo();
+                //user.id = BaseRegex.GetIntJson(ref oStr, "id");
+                //user.user_name = BaseRegex.GetStringJson(ref oStr, "user_name");
+                string groupId = BaseRegex.GetStringJson(ref oStr, "group_id");
+                string authority = BaseRegex.GetStringJson(ref oStr, "authority");
+                string userName = BaseRegex.GetStringJson(ref oStr, "user_name");
+
+                if (chkNotCurrentAccount.Checked && userName == BaseClass.UserName)
+                    continue;
+
+                if (groupId == "3" && authority.Contains("充值用户"))
+                    oemUserNames += BaseRegex.GetStringJson(ref oStr, "user_name") + ",";
+            }
+
+            if (string.IsNullOrEmpty(oemUserNames))
+                return;
+            oemUserNames = oemUserNames.Trim(',');
+
+            await Task.Run(() =>
+            {
+                int pageCount = 1;
+                int pageSize = 50;
+                var url3 = BaseClass.BuildWXObjString("user/get_user_points");
+                var data3 = UserLogin.GetSignaturex();
+                Invoke(new Action(() =>
+                {
+                    data3 += "&user_name_in=" + oemUserNames;
+                    data3 += "&create_time_begin=" + dtpTimeBegin.Value.ToString("yyyy-MM-dd HH:mm:ss");
+                    data3 += "&create_time_end=" + dtpTimeEnd.Value.ToString("yyyy-MM-dd HH:mm:ss");
+                    if (cmbType.Text == "充值")
+                        data3 += "&option_type_in=充值";
+                    if (cmbType.Text == "转入")
+                        data3 += "&option_type_in=转入";
+                    if (cmbType.Text == "转出")
+                        data3 += "&option_type_in=转出";
+                    if (cmbType.Text == "店铺续期")
+                        data3 += "&option_type_in=续费";
+                    data3 += "&page=" + ucSplitPage1.CurrentPage;
+                    data3 += "&page_size=" + ucSplitPage1.PageSize;
+                    pageSize = ucSplitPage1.PageSize;
+                }));
+                var html3 = GetHtml.PostUtf8(url3, data3);
+                if (string.IsNullOrEmpty(html3) || !html3.Contains("\"code\":200"))
+                    html3 = GetHtml.PostUtf8(url3, data3);
+                if (string.IsNullOrEmpty(html3) || !html3.Contains("\"code\":200"))
+                {
+                    BaseMsgForm.ShowError("查询失败：" + BaseRegex.GetStringJsonByRegs(ref html3, html3, "msg"));
+                    return;
+                }
+                List<user_points_record_info> paymentList = new List<user_points_record_info>();
+                paymentList = JsonHelper.DeserializeJsonToList<user_points_record_info>(JsonHelper.JObjectParse(html3)["data"].ParseToString());
+                foreach (var payment in paymentList)
+                {
+                    Invoke(new Action(() =>
+                    {
+                        var rowIndex = this.dgvPayment.Rows.Add(
+                            false,
+                            payment.option_type.ParseToString().Replace("续费", "店铺续期"),
+                            payment.user_name,
+                            payment.shop_account,
+                            payment.delta_points,
+                            payment.new_points,
+                            payment.add_time.ToString("yyyy-MM-dd HH:mm:ss"),
+                            payment.remark
+                        );
+                        this.dgvPayment.Rows[rowIndex].Height = 60;
+                    }));
+                }
+                int count = BaseRegex.GetIntJson(ref html3, "count");
+                pageCount = Math.Ceiling(1.0 * count / pageSize).ParseToInt();
+                pageCount = Math.Max(pageCount, 1);
+                ucSplitPage1.TotalPage = pageCount;
+            });
+        }
+
+        private async void btnSearch_Click(object sender, EventArgs e)
+        {
+            if (this.ucSplitPage1.CurrentPage != 1)
+                this.ucSplitPage1.CurrentPage = 1;
+
+            pictureBox2.Visible = true;
+            await Task.Run(() => { GetBalanceList(); });
+            pictureBox2.Visible = false;
+        }
+
+        private async void ucSplitPage1_PageChange(object obj)
+        {
+            pictureBox2.Visible = true;
+            await Task.Run(() => { GetBalanceList(); });
+            pictureBox2.Visible = false;
+        }
+    }
+}

TEMUKJD/WXForms/ShopForms/WXOemPointsTopUpListForm.resx

@@ -0,0 +1,322 @@
+<?xml version="1.0" encoding="utf-8"?>
+<root>
+  <!-- 
+    Microsoft ResX Schema 
+    
+    Version 2.0
+    
+    The primary goals of this format is to allow a simple XML format 
+    that is mostly human readable. The generation and parsing of the 
+    various data types are done through the TypeConverter classes 
+    associated with the data types.
+    
+    Example:
+    
+    ... ado.net/XML headers & schema ...
+    <resheader name="resmimetype">text/microsoft-resx</resheader>
+    <resheader name="version">2.0</resheader>
+    <resheader name="reader">System.Resources.ResXResourceReader, System.Windows.Forms, ...</resheader>
+    <resheader name="writer">System.Resources.ResXResourceWriter, System.Windows.Forms, ...</resheader>
+    <data name="Name1"><value>this is my long string</value><comment>this is a comment</comment></data>
+    <data name="Color1" type="System.Drawing.Color, System.Drawing">Blue</data>
+    <data name="Bitmap1" mimetype="application/x-microsoft.net.object.binary.base64">
+        <value>[base64 mime encoded serialized .NET Framework object]</value>
+    </data>
+    <data name="Icon1" type="System.Drawing.Icon, System.Drawing" mimetype="application/x-microsoft.net.object.bytearray.base64">
+        <value>[base64 mime encoded string representing a byte array form of the .NET Framework object]</value>
+        <comment>This is a comment</comment>
+    </data>
+                
+    There are any number of "resheader" rows that contain simple 
+    name/value pairs.
+    
+    Each data row contains a name, and value. The row also contains a 
+    type or mimetype. Type corresponds to a .NET class that support 
+    text/value conversion through the TypeConverter architecture. 
+    Classes that don't support this are serialized and stored with the 
+    mimetype set.
+    
+    The mimetype is used for serialized objects, and tells the 
+    ResXResourceReader how to depersist the object. This is currently not 
+    extensible. For a given mimetype the value must be set accordingly:
+    
+    Note - application/x-microsoft.net.object.binary.base64 is the format 
+    that the ResXResourceWriter will generate, however the reader can 
+    read any of the formats listed below.
+    
+    mimetype: application/x-microsoft.net.object.binary.base64
+    value   : The object must be serialized with 
+            : System.Runtime.Serialization.Formatters.Binary.BinaryFormatter
+            : and then encoded with base64 encoding.
+    
+    mimetype: application/x-microsoft.net.object.soap.base64
+    value   : The object must be serialized with 
+            : System.Runtime.Serialization.Formatters.Soap.SoapFormatter
+            : and then encoded with base64 encoding.
+
+    mimetype: application/x-microsoft.net.object.bytearray.base64
+    value   : The object must be serialized into a byte array 
+            : using a System.ComponentModel.TypeConverter
+            : and then encoded with base64 encoding.
+    -->
+  <xsd:schema id="root" xmlns="" xmlns:xsd="http://www.w3.org/2001/XMLSchema" xmlns:msdata="urn:schemas-microsoft-com:xml-msdata">
+    <xsd:import namespace="http://www.w3.org/XML/1998/namespace" />
+    <xsd:element name="root" msdata:IsDataSet="true">
+      <xsd:complexType>
+        <xsd:choice maxOccurs="unbounded">
+          <xsd:element name="metadata">
+            <xsd:complexType>
+              <xsd:sequence>
+                <xsd:element name="value" type="xsd:string" minOccurs="0" />
+              </xsd:sequence>
+              <xsd:attribute name="name" use="required" type="xsd:string" />
+              <xsd:attribute name="type" type="xsd:string" />
+              <xsd:attribute name="mimetype" type="xsd:string" />
+              <xsd:attribute ref="xml:space" />
+            </xsd:complexType>
+          </xsd:element>
+          <xsd:element name="assembly">
+            <xsd:complexType>
+              <xsd:attribute name="alias" type="xsd:string" />
+              <xsd:attribute name="name" type="xsd:string" />
+            </xsd:complexType>
+          </xsd:element>
+          <xsd:element name="data">
+            <xsd:complexType>
+              <xsd:sequence>
+                <xsd:element name="value" type="xsd:string" minOccurs="0" msdata:Ordinal="1" />
+                <xsd:element name="comment" type="xsd:string" minOccurs="0" msdata:Ordinal="2" />
+              </xsd:sequence>
+              <xsd:attribute name="name" type="xsd:string" use="required" msdata:Ordinal="1" />
+              <xsd:attribute name="type" type="xsd:string" msdata:Ordinal="3" />
+              <xsd:attribute name="mimetype" type="xsd:string" msdata:Ordinal="4" />
+              <xsd:attribute ref="xml:space" />
+            </xsd:complexType>
+          </xsd:element>
+          <xsd:element name="resheader">
+            <xsd:complexType>
+              <xsd:sequence>
+                <xsd:element name="value" type="xsd:string" minOccurs="0" msdata:Ordinal="1" />
+              </xsd:sequence>
+              <xsd:attribute name="name" type="xsd:string" use="required" />
+            </xsd:complexType>
+          </xsd:element>
+        </xsd:choice>
+      </xsd:complexType>
+    </xsd:element>
+  </xsd:schema>
+  <resheader name="resmimetype">
+    <value>text/microsoft-resx</value>
+  </resheader>
+  <resheader name="version">
+    <value>2.0</value>
+  </resheader>
+  <resheader name="reader">
+    <value>System.Resources.ResXResourceReader, System.Windows.Forms, Version=4.0.0.0, Culture=neutral, PublicKeyToken=b77a5c561934e089</value>
+  </resheader>
+  <resheader name="writer">
+    <value>System.Resources.ResXResourceWriter, System.Windows.Forms, Version=4.0.0.0, Culture=neutral, PublicKeyToken=b77a5c561934e089</value>
+  </resheader>
+  <metadata name="colCheck.UserAddedColumn" type="System.Boolean, mscorlib, Version=4.0.0.0, Culture=neutral, PublicKeyToken=b77a5c561934e089">
+    <value>True</value>
+  </metadata>
+  <metadata name="colType.UserAddedColumn" type="System.Boolean, mscorlib, Version=4.0.0.0, Culture=neutral, PublicKeyToken=b77a5c561934e089">
+    <value>True</value>
+  </metadata>
+  <metadata name="colUserName.UserAddedColumn" type="System.Boolean, mscorlib, Version=4.0.0.0, Culture=neutral, PublicKeyToken=b77a5c561934e089">
+    <value>True</value>
+  </metadata>
+  <metadata name="colShop.UserAddedColumn" type="System.Boolean, mscorlib, Version=4.0.0.0, Culture=neutral, PublicKeyToken=b77a5c561934e089">
+    <value>True</value>
+  </metadata>
+  <metadata name="colPoints.UserAddedColumn" type="System.Boolean, mscorlib, Version=4.0.0.0, Culture=neutral, PublicKeyToken=b77a5c561934e089">
+    <value>True</value>
+  </metadata>
+  <metadata name="colNewPoints.UserAddedColumn" type="System.Boolean, mscorlib, Version=4.0.0.0, Culture=neutral, PublicKeyToken=b77a5c561934e089">
+    <value>True</value>
+  </metadata>
+  <metadata name="colCreateTime.UserAddedColumn" type="System.Boolean, mscorlib, Version=4.0.0.0, Culture=neutral, PublicKeyToken=b77a5c561934e089">
+    <value>True</value>
+  </metadata>
+  <metadata name="colRemark.UserAddedColumn" type="System.Boolean, mscorlib, Version=4.0.0.0, Culture=neutral, PublicKeyToken=b77a5c561934e089">
+    <value>True</value>
+  </metadata>
+  <assembly alias="System.Drawing" name="System.Drawing, Version=4.0.0.0, Culture=neutral, PublicKeyToken=b03f5f7f11d50a3a" />
+  <data name="$this.Icon" type="System.Drawing.Icon, System.Drawing" mimetype="application/x-microsoft.net.object.bytearray.base64">
+    <value>
+        AAABAAEAgIAQAAAAAABoKAAAFgAAACgAAACAAAAAAAEAAAEABAAAAAAAACgAAAAAAAAAAAAAAAAAAAAA
+        AAAAAAAAAACAAACAAAAAgIAAgAAAAIAAgACAgAAAgICAAMDAwAAAAP8AAP8AAAD//wD/AAAA/wD/AP//
+        AAD///8AAAAAAAAAAAAAAAAzMzMzMzMzMzMzMzMzMzMzMzMzMzMzMzMzMzMzMzMzMzMzMzMzMzMzMzMQ
+        AAAAAAAAAAAAAAAAAAAAAAAAABM5mZmZmZmZmZmZmZmZmZmZmZmZmZmZmZmZmZmZmZmZmZmZmZmZmZmZ
+        mZmZkzEAAAAAAAAAAAAAAAAAAAAAADOZmZmZmZmZmZmZmZmZmZmZmZmZmZmZmZmZmZmZmZmZmZmZmZmZ
+        mZmZmZmZmZmZMwAAAAAAAAAAAAAAAAAAABOZmZmZmZmZmZmZmZmZmZmZmZmZmZmZmZmZmZmZmZmZmZmZ
+        mZmZmZmZmZmZmZmZmZkzAAAAAAAAAAAAAAAAAAOZmZmZmZmZmZmZmZmZmZmZmZmZmZmZmZmZmZmZmZmZ
+        mZmZmZmZmZmZmZmZmZmZmZmZmTEAAAAAAAAAAAAAAAOZmZmZmZmZmZmZmZmZmZmZmZmZmZmZmZmZmZmZ
+        mZmZmZmZmZmZmZmZmZmZmZmZmZmZmZmZMAAAAAAAAAAAAAA5mZmZmZmZmZmZmZmZmZmZmZmZmZmZmZmZ
+        mZmZmZmZmZmZmZmZmZmZmZmZmZmZmZmZmZmZmZMAAAAAAAAAAAADmZmZmZmZmZmZmZmZmZmZmZmZmZmZ
+        mZmZmZmZmZmZmZmZmZmZmZmZmZmZmZmZmZmZmZmZmZmZMAAAAAAAAAAAOZmZmZmZmZmZmZmZmZmZmZmZ
+        mZmZmZmZmZmZmZmZmZmZmZmZmZmZmZmZmZmZmZmZmZmZmZmZmZMAAAAAAAAAA5mZmZmZmZmZmZmZmZmZ
+        mZmZmZmZmZmZmZmZmZmZmZmZmZmZmZmZmZmZmZmZmZmZmZmZmZmZmZmZMAAAAAAAADmZmZmZmZmZmZmZ
+        mZmZmZmZmZmZmZmZmZmZmZmZmZmZmZmZmZmZmZmZmZmZmZmZmZmZmZmZmZmZmZMAAAAAAAGZmZmZmZmZ
+        mZmZmZmZmZmZmZmZmZmZmZmZmZmZmZmZmZmZmZmZmZmZmZmZmZmZmZmZmZmZmZmZmZmZMAAAAAAJmZmZ
+        mZmZmZmZmZmZmZmZmZmZmZmZmZmZmZmZmZmZmZmZmZmZmZmZmZmZmZmZmZmZmZmZmZmZmZmZmZAAAAAA
+        OZmZmZmZmZmZmZmZmZmZmZmZmZmZmZmZmZmZmZmZmZmZmZmZmZmZmZmZmZmZmZmZmZmZmZmZmZmZmZmT
+        AAAAAZmZmZmZmZmZmZmZmZmZmZmZmZmZmZmZmZmZmZmZmZmZmZmZmZmZmZmZmZmZmZmZmZmZmZmZmZmZ
+        mZmZmRAAAAOZmZmZmZmZmZmZmZmZmZmZmZmZmZmZmZmZmZmZmZmZmZmZmZmZmZmZmZmZmZmZmZmZmZmZ
+        mZmZmZmZmZkwAAAZmZmZmZmZmZmZmZmZmZmZmZmZmZmZmZmZmZmZmZmZmZmZmZmZmZmZmZmZmZmZmZmZ
+        mZmZmZmZmZmZmZmZkwAAOZmZmZmZmZmZmZmZmZmZmZmZmZmZmZmZmZmZmZmZmZmZmZmZmZmZmZmZmZmZ
+        mZmZmZmZmZmZmZmZmZmZmZMAAJmZmZmZmZmZmZmZmZmZmZmZmZmZmZmZmZmZmZmZmZmZmZmZmZmZmZmZ
+        mZmZmZmZmZmZmZmZmZmZmZmZmZmZEAOZmZmZmZmZmZmZmZmZmZmZmZmZmZmZmZmZmZmZmZmZmZmZmZmZ
+        mZmZmZmZmZmZmZmZmZmZmZmZmZmZmZmZmTADmZmZmZmZmZmZmZmZmZmZmZmZmZmZmZmZmZmZmZmZmZmZ
+        mZmZmZmZmZmZmZmZmZmZmZmZmZmZmZmZmZmZmZkwCZmZmZmZmZmZmZmZmZmZmZmZmZmZmZmZmZmZmZmZ
+        mZmZmZmZmZmZmZmZmZmZmZmZmZmZmZmZmZmZmZmZmZmZkRmZmZmZmZmZmZmZmZmZmZmZmZmZmZmZmZmZ
+        mZmZmZmZmZmZmZmZmZmZmZmZmZmZmZmZmZmZmZmZmZmZmZmZmZM5mZmZmZmZmZmZmZmZmZmZmZmZmZmZ
+        mZmZmZmZmZmZmZmZmZmZmZmZmZmZmZmZmZmZmZmZmZmZmZmZmZmZmZmTOZmZmZmZmZmZmZmZmZmZmZmZ
+        mZmZmZmZmZmZmZmZmZmZmZmZmZmZmZmZmZmZmZmZmZmZmZmZmZmZmZmZmZmZkzmZmZmZmZmZmZmZmZmZ
+        mZmZmZmZmZmZmZmZmZmZmZmZmZmZmZmZmZmZmZmZmZmZmZmZmZmZmZmZmZmZmZmZmZM5mZmZmZmZmZmZ
+        mZmZmZmZmZmZmZmZmZmZmZmZmZmZmZmZmZmZmZmZmZmZmZmZmZmZmZmZmZmZmZmZmZmZmZmTOZmZmZmZ
+        mZmZmZmZmZmZmZmZmZmZmZmZmZmZmZmZmZmZmZmZmZmZmZmZmZmZmZmZmZmZmZmZmZmZmZmZmZmZkzmZ
+        mZmZmZmZmZmZmZmZmZmZmZmZmZmZmZmZmZmZmZmZmZmZmZmZmZmZmZmZmZmZmZmZmZmZmZmZmZmZmZmZ
+        mZM5mZmZmZmZmZmZmZmZmZmZmZmZmZmZmZmZmZmZmZmZmZmZmZmZmZmZmZmZmZmZmZmZmZmZmZmZmZmZ
+        mZmZmZmTOZmZmZmZmZmZmZmZmZmZmZmZmZmZmZmZmZmZmZmZmZmZmZmZmZmZmZmZmZmZmZmZmZmZmZmZ
+        mZmZmZmZmZmZkzmZmZmZmZmZmZmZmZmZmZmZmZmZmZmZmZmZmZmZmZmZmZmZmZmZmZmZmZmZmZmZmZmZ
+        mZmZmZmZmZmZmZmZmZM5mZmZmZmZmZmZmZmZmZmZmZmZmZmZmZmZmZmZmZmZmZmZmZmZmZmZmZmZmZmZ
+        mZmZmZmZmZmZmZmZmZmZmZmTOZmZmZmZmZmZmZmZmZmZmZmZmZmZmZmZmZmZmZmZmZmZmZmZmZmZmZmZ
+        mZmZmZmZmZmZmZmZmZmZmZmZmZmZkzmZmZmZmZmZmZmZmZmZmZmZmZmZmZmZmZmZmZmZmZmZmZmZmZmZ
+        mZmZmZmZmZmZmZmZmZmZmZmZmZmZmZmZmZM5mZmZmZmZmZmZmZmZmZmZmZmZmZmZmZmZmZmZmZmZmZmZ
+        mZmZmZmZmZmZmZmZmZmZmZmZmZmZmZmZmZmZmZmTOZmZmZmZmZmZmZmZmZmZmZmZmZmZmZmZmZmZmZmZ
+        mZmZmZmZmZmZmZOZmZOZmZmZmZmZmZmZmZmZmZmZmZmZkzmZmZmZmZmZmZmZmP+JmZmZmZmZj///////
+        ///4OZmZj/eZmZmZmZmZmPg5OZmZmZuI//iIuZmZmZmZmZmZmZM5mZmZmZmZmZmZmb//+JmZmZmZmP//
+        //////////OZmP//uZmZmZmZmY//+ZmZOZf///////h5k5mZmZmZmZmTOZmZmZmZmZmZmZmP//iZmZmZ
+        mZ/////////////4mZ///4mZmZmZmZP///uZmZmP////////+JmZmZmZmZmZkzmZmZmZmZmZmZmZj//4
+        mZmZmZmf////////////+Jmf//+JmZmZmZmb///4mZmY//////////+JmZmZmZmZmZM5mZmZmZmZmZmZ
+        mY//+JmZmZmZn/////////////mZmP//iZmZmZmZk///+5mZj/////iP////+JmZmZmZmZmTOZmZmZmZ
+        mZmZmZmP//iZmZmZmZ////iIiIiIiIiZOZj//4mZmZmZmZP///uZmf////eZmT////+ZmZmZmZmZkzmZ
+        mZmZmZmZmZmZj//4mZmZmZmf//+JmZmZmZmZk5mY//+JmZmZmZmT///7mZj///+ZmZmZj///uZmZmZmZ
+        mZM5mZmZmZmZmZmZmY//+JmZmZmZn///iZmZmZmZmZmZmP//iZmZN5k5k///+5mY///zk5mZOT///4mZ
+        mZmZmZmTOZmZmZmZmZmZmZmP//iZmZmZmZ///4mZmZmZmZmZmZj//4mZmP/5k5P///uZmP//+ZmZmZmY
+        //+JmZmZmZmZkzmZmZmZmZmZmZmZj//4mZmZmZmf///4iIiIiIg5mZmY//+JOb//+JmT///7mZj//4mZ
+        mZmZmP//+ZmZmZmZmZM5mZmZmZmZmZmZmY//+JmZmZmZn///////////85mZmP//iZn///+Jk///+5mf
+        //+JmZmZmZj///mZmZmZmZmTOZmZmZmZmZmZmZmP//iZmZmZmZ////////////+ZmZj//4mY////85v/
+        //uZmP//iZmZmZmY///5mZmZmZmZkzmZmZmZmZmZmZmZj//4mZmZmZmf////////////mZmY//+Jv///
+        //+Z///7mZj//4mZmZmZmP//+ZmZmZmZmZM5mZmZmZmZmZmZmY//+JmZmZmZn///////////+JmZmP//
+        if//////if//+5mY//+JmZmZmZj///mZmZmZmZmTOZmZmZmZmZmZmZmP//iZmZmZmZ///////////4mZ
+        mZj//4j///////j///uZmP//iZmZmZmY///5mZmZmZmZkzmZmZmZmZmZmZmZj//4mZmZmZmf//+JMzMz
+        MzOZOZmY//////+D///////7mZj//4mZmZmZmP//+ZmZmZmZmZM5mZmZmZmZmZmZmY//+JmZmZmZn///
+        iZmZmZmZmZmZmP//////mY//////+5mY//+JmZmZmZj///mZmZmZmZmTOZmZmZmZmZmZmZmP//iZmZmZ
+        mZ///4mZmZmZmZmZmZj/////+5mf//////uZmP//iZmZmZmY///5mZmZmZmZkzmZmZmZmZmZMzM5j//4
+        kzMzmZmf//+JMzMzMzM5mZmY/////4mTk//////7mZj//4mZmZmZmP//+ZmZmZmZmZM5mZmZmZmZmP//
+        /////////4mZn////////////4mZmP////+ZmZmP////+5mY//+JmZmZmZj///mZmZmZmZmTOZmZmZmZ
+        mY/////////////4mZ/////////////7mZj////7mZmZn/////uZmP//iZmZmZmY///5mZmZmZmZkzmZ
+        mZmZmZn//////////////5mf////////////+Jmf////iZmZk5P////4mZ///4mZmZmZmP//+ZmZmZmZ
+        mZM5mZmZmZmZj/////////////iZn/////////////iZmP///5mZmZmZj///+5mY//+JmZmZmZj//4mZ
+        mZmZmZmTOZmZmZmZmZ/////////////zmZP///////////+JmZP///uTmZmZmZj//4mZm///mZmZmZmZ
+        //85mZmZmZmZkzmZmZmZmZOZiIiIiIiIiIiImTmZOIiIiIiIiIiImTmZOIi5mZmZmZOZiIuZmZk4iZOZ
+        mZmZOZiDmZmZmZmZmZM5mZmZmZmZOZmZmZmZmZmZmZOZmZmZmZmZmZmZmZOZmZmZmZmZmZmZOZmZmZmZ
+        mZk5mZmZmZOZmZmZmZmZmZmTOZmZmZmZmZmZmZmZmZmZmZmZmZmZmZmZmZmZmZmZmZmZmZmZmZmZmZmZ
+        mZmZmZmZmZmZmZmZmZmZmZmZmZmZkzmZmZmZmZmZmZmZmZmZmZmZmZmZmZmZmZmZmZmZmZmZmZmZmZmZ
+        mZmZmZmZmZmZmZmZmZmZmZmZmZmZmZmZmZM5mZmZmZmZmZmZmZmZmZmZmZmZmZmZmZmZmZmZmZmZmZmZ
+        mZmZmZmZmZmZmZmZmZmZmZmZmZmZmZmZmZmZmZmTOZmZmZmZmZmZmZmZmZmZmZmZmZmZmZmZmZmZmZmZ
+        mZmZmZmZmZmZmZmZmZmZmZmZmZmZmZmZmZmZmZmZmZmZkzmZmZmZmZmZmZmZmZmZmZmZmZmZmZmZmZmZ
+        mZmZmZmZmZmZmZmZmZmZmZmZmZmZmZmZmZmZmZmZmZmZmZmZmZM5mZmZmZmZmZmTuIiIiIs5mZmZmZmZ
+        mTu4i7mZmZmZmZmZmTMzmZOZmZkzOZmZmZmZmZmZmZmZmZmZmZmZmZmTOZmZmZmZmTmbj///////+HmT
+        mZmZk4j/////iJmZmZk4iP////iZOZmZj/mZOZOIiIiIiIiIiDmZmZmZmZmZkzmZmZmZmZmZj///////
+        ///4mZk5k4///4iI///4OZOY////////iZOZmb/5mZmP///////////4mZmZmZmZmZM5mZmZmZmZn///
+        //////////mZmY///5mZmZP///iZmP////////+ZOZk/iZmY/////////////4mZmZmZmZmTOZmZmZmZ
+        mZ/////////////5mZ////+JmZmY////iZl/////////+ZmZP4mZP//////////////7mZmZmZmZkzmZ
+        mZmZmZmb////////////uZP/j///+HM3j/////+ZmYj///////iZmT+JmY//////////////+JmZmZmZ
+        mZM5mZmZmZmZmY//////////+JmT+Jv///////////iPmTmZOI/4mP//uTk/iZmP//////////////iZ
+        mZmZmZmTOZmZmZmZmZmf//////////mZmZmZ///////////5mZmZmZmTOZk///mZP4mZj///////////
+        ///4mZmZmZmZkzmZmZmZmZmTmP////////+JOZmZOY//////////iZmZmZmZmZk5mf/4mT+JmY//////
+        ////////+JmZmZmZmZM5mZmZmZmZmZn/////////mZmZmZk//////////zmZmZmZmZmZmTmP/zm/iZmP
+        //////////////iZmZmZmZmTOZmZmZmZmZk5v///////85OZmZkzmP////////iZmZmZmZmZmZmZn//4
+        /4mZj/////hzN4/////4mZmZmZmZkzmZmZmZmZmZmZj//////4mZmTmY/4j////////4mZmZmZmZmZmZ
+        mZj///+JmY////+JmZmY////+JmZmZmZmZM5mZmZmZmZmZmZ//////+ZmZmZj////////////4mZmZmZ
+        mZmZmZmb////+ZmP///4mZu5mY////iZmZmZmZmTOZmZmZmZmZmZOb/////4k5mZmP/////////////7
+        mZmZmZmZmZmZk/////OZv///+ZmP+Jmf///4mZmZmZmZkzmZmZmZmZmZmZmf////+ZmZmZj////////4
+        eI//+JmZmZmZmZmZmZP////4mb///4mY//+JmP//+5mZmZmZmZM5mZmZmZmZmZk5v/////uTmZmb////
+        ///4mZmX//iZmZmZmZmZmZmZ////+Jmf//95n///+Zj///OZmZmZmZmTOZmZmZmZmZmZmf//////mZmZ
+        mY//////+ZOZmZiJmZmZmZmZmZmZmY////+ZmP//+I////iP//+JmZmZmZmZkzmZmZmZmZmZmZj/////
+        /4mZmZmf/////5k5mZOZmTmZmZmZmZmZmZmP///4mZP/////////////OZmZmZmZmZM5mZmZmZmZmZk/
+        ///////zmZmZm/////iZmZmZmZmZmZmZmZmZmZmZj///85mZj///////////+JmZmZmZmZmTOZmZmZmZ
+        mZmZv///////+5mZmZmP///5mZmZmZmZmZmZmZmZmZmZmZ///3mZmZj//////////4mZmZmZmZmZkzmZ
+        mZmZmZmZmb///4j///uZmZmZmP//mTmZmZmZmZmZmZmZmZmZmZmY/4OZmZmZeP///////4eZmZmZmZmZ
+        mZM5mZmZmZmZmZmY/4OZOP+JmZmZmZmIiZOZmZmZmZmZmZmZmZmZmZmZmYiZmZmZmZk4iIiIiIOZmZmZ
+        mZmZmZmTOZmZmZmZmZmZmTOZmZkzmZmZmZmZmZk5mZmZmZmZmZmZmZmZmZmZmZmZk5mZmZmZmZmZmZmZ
+        mZmZmZmZmZmZkzmZmZmZmZmZmZmZmZmZmZmZmZmZmZmZmZmZmZmZmZmZmZmZmZmZmZmZmZmZmZmZmZmZ
+        mZmZmZmZmZmZmZmZmZM5mZmZmZmZmZmZmZmZmZmZmZmZmZmZmZmZmZmZmZmZmZmZmZmZmZmZmZmZmZmZ
+        mZmZmZmZmZmZmZmZmZmZmZmTOZmZmZmZmZmZmZmZmZmZmZmZmZmZmZmZmZmZmZmZmZmZmZmZmZmZmZmZ
+        mZmZmZmZmZmZmZmZmZmZmZmZmZmZkzmZmZmZmZmZmZmZmZmZmZmZmZmZmZmZmZmZmZmZmZmZmZmZmZmZ
+        mZmZmZmZmZmZmZmZmZmZmZmZmZmZmZmZmZM5mZmZmZmZmZmZmZmZmZmZmZmZmZmZmZmZmZmZmZmZmZmZ
+        mZmZmZmZmZmZmZmZmZmZmZmZmZmZmZmZmZmZmZmTOZmZmZmZmZmZmZmZmZmZmZmZmZmZmZmZmZmZmZmZ
+        mZmZmZmZmZmZmZmZmZmZmZmZmZmZmZmZmZmZmZmZmZmZkzmZmZmZmZmZmZmZmZmZmZmZmZmZmZmZmZmZ
+        mZmZmZmZmZmZmZmZmZmZmZmZmZmZmZmZmZmZmZmZmZmZmZmZmZM5mZmZmZmZmZmZmZmZmZmZmZmZmZmZ
+        mZmZmZmZmZmZmZmZmZmZmZmZmZmZmZmZmZmZmZmZmZmZmZmZmZmZmZmTOZmZmZmZmZmZmZmZmZmZmZmZ
+        mZmZmZmZmZmZmZmZmZmZmZmZmZmZmZmZmZmZmZmZmZmZmZmZmZmZmZmZmZmZkzmZmZmZmZmZmZmZmZmZ
+        mZmZmZmZmZmZmZmZmZmZmZmZmZmZmZmZmZmZmZmZmZmZmZmZmZmZmZmZmZmZmZmZmZM5mZmZmZmZmZmZ
+        mZmZmZmZmZmZmZmZmZmZmZmZmZmZmZmZmZmZmZmZmZmZmZmZmZmZmZmZmZmZmZmZmZmZmZmTOZmZmZmZ
+        mZmZmZmZmZmZmZmZmZmZmZmZmZmZmZmZmZmZmZmZmZmZmZmZmZmZmZmZmZmZmZmZmZmZmZmZmZmZkzmZ
+        mZmZmZmZmZmZmZmZmZmZmZmZmZmZmZmZmZmZmZmZmZmZmZmZmZmZmZmZmZmZmZmZmZmZmZmZmZmZmZmZ
+        mZM5mZmZmZmZmZmZmZmZmZmZmZmZmZmZmZmZmZmZmZmZmZmZmZmZmZmZmZmZmZmZmZmZmZmZmZmZmZmZ
+        mZmZmZmTGZmZmZmZmZmZmZmZmZmZmZmZmZmZmZmZmZmZmZmZmZmZmZmZmZmZmZmZmZmZmZmZmZmZmZmZ
+        mZmZmZmZmZmZkwmZmZmZmZmZmZmZmZmZmZmZmZmZmZmZmZmZmZmZmZmZmZmZmZmZmZmZmZmZmZmZmZmZ
+        mZmZmZmZmZmZmZmZmZADmZmZmZmZmZmZmZmZmZmZmZmZmZmZmZmZmZmZmZmZmZmZmZmZmZmZmZmZmZmZ
+        mZmZmZmZmZmZmZmZmZmZmZkwA5mZmZmZmZmZmZmZmZmZmZmZmZmZmZmZmZmZmZmZmZmZmZmZmZmZmZmZ
+        mZmZmZmZmZmZmZmZmZmZmZmZmZmZMACZmZmZmZmZmZmZmZmZmZmZmZmZmZmZmZmZmZmZmZmZmZmZmZmZ
+        mZmZmZmZmZmZmZmZmZmZmZmZmZmZmZmZmQAAOZmZmZmZmZmZmZmZmZmZmZmZmZmZmZmZmZmZmZmZmZmZ
+        mZmZmZmZmZmZmZmZmZmZmZmZmZmZmZmZmZmZmZMAABmZmZmZmZmZmZmZmZmZmZmZmZmZmZmZmZmZmZmZ
+        mZmZmZmZmZmZmZmZmZmZmZmZmZmZmZmZmZmZmZmZmZmTAAADmZmZmZmZmZmZmZmZmZmZmZmZmZmZmZmZ
+        mZmZmZmZmZmZmZmZmZmZmZmZmZmZmZmZmZmZmZmZmZmZmZmZMAAAAJmZmZmZmZmZmZmZmZmZmZmZmZmZ
+        mZmZmZmZmZmZmZmZmZmZmZmZmZmZmZmZmZmZmZmZmZmZmZmZmZmZmRAAAAA5mZmZmZmZmZmZmZmZmZmZ
+        mZmZmZmZmZmZmZmZmZmZmZmZmZmZmZmZmZmZmZmZmZmZmZmZmZmZmZmZmZMAAAAACZmZmZmZmZmZmZmZ
+        mZmZmZmZmZmZmZmZmZmZmZmZmZmZmZmZmZmZmZmZmZmZmZmZmZmZmZmZmZmZmZmQAAAAAAGZmZmZmZmZ
+        mZmZmZmZmZmZmZmZmZmZmZmZmZmZmZmZmZmZmZmZmZmZmZmZmZmZmZmZmZmZmZmZmZmZMAAAAAAAOZmZ
+        mZmZmZmZmZmZmZmZmZmZmZmZmZmZmZmZmZmZmZmZmZmZmZmZmZmZmZmZmZmZmZmZmZmZmZmZkwAAAAAA
+        AAOZmZmZmZmZmZmZmZmZmZmZmZmZmZmZmZmZmZmZmZmZmZmZmZmZmZmZmZmZmZmZmZmZmZmZmZmZmTAA
+        AAAAAAAAOZmZmZmZmZmZmZmZmZmZmZmZmZmZmZmZmZmZmZmZmZmZmZmZmZmZmZmZmZmZmZmZmZmZmZmZ
+        mZMAAAAAAAAAAAOZmZmZmZmZmZmZmZmZmZmZmZmZmZmZmZmZmZmZmZmZmZmZmZmZmZmZmZmZmZmZmZmZ
+        mZmZmZkwAAAAAAAAAAAAOZmZmZmZmZmZmZmZmZmZmZmZmZmZmZmZmZmZmZmZmZmZmZmZmZmZmZmZmZmZ
+        mZmZmZmZmZmTAAAAAAAAAAAAAAGZmZmZmZmZmZmZmZmZmZmZmZmZmZmZmZmZmZmZmZmZmZmZmZmZmZmZ
+        mZmZmZmZmZmZmZmZEAAAAAAAAAAAAAAAA5mZmZmZmZmZmZmZmZmZmZmZmZmZmZmZmZmZmZmZmZmZmZmZ
+        mZmZmZmZmZmZmZmZmZmZMAAAAAAAAAAAAAAAAAATmZmZmZmZmZmZmZmZmZmZmZmZmZmZmZmZmZmZmZmZ
+        mZmZmZmZmZmZmZmZmZmZmZmZMQAAAAAAAAAAAAAAAAAAABOZmZmZmZmZmZmZmZmZmZmZmZmZmZmZmZmZ
+        mZmZmZmZmZmZmZmZmZmZmZmZmZmZMQAAAAAAAAAAAAAAAAAAAAAAAzmZmZmZmZmZmZmZmZmZmZmZmZmZ
+        mZmZmZmZmZmZmZmZmZmZmZmZmZmZmZmTMAAAAAAAAAAAAAAAAAAAAAAAAAAAEzMzMzMzMzMzMzMzMzMz
+        MzMzMzMzMzMzMzMzMzMzMzMzMzMzMzMzMzMxAAAAAAAAAAAAAAD////////////////////////4AAAA
+        AAAAAAAAAB//////wAAAAAAAAAAAAAAD/////wAAAAAAAAAAAAAAAP////wAAAAAAAAAAAAAAAA////w
+        AAAAAAAAAAAAAAAAD///4AAAAAAAAAAAAAAAAAf//8AAAAAAAAAAAAAAAAAD//+AAAAAAAAAAAAAAAAA
+        Af//AAAAAAAAAAAAAAAAAAD//gAAAAAAAAAAAAAAAAAAf/wAAAAAAAAAAAAAAAAAAD/4AAAAAAAAAAAA
+        AAAAAAAf+AAAAAAAAAAAAAAAAAAAH/AAAAAAAAAAAAAAAAAAAA/wAAAAAAAAAAAAAAAAAAAP4AAAAAAA
+        AAAAAAAAAAAAB+AAAAAAAAAAAAAAAAAAAAfAAAAAAAAAAAAAAAAAAAADwAAAAAAAAAAAAAAAAAAAA8AA
+        AAAAAAAAAAAAAAAAAAOAAAAAAAAAAAAAAAAAAAABgAAAAAAAAAAAAAAAAAAAAYAAAAAAAAAAAAAAAAAA
+        AAGAAAAAAAAAAAAAAAAAAAABgAAAAAAAAAAAAAAAAAAAAYAAAAAAAAAAAAAAAAAAAAGAAAAAAAAAAAAA
+        AAAAAAABgAAAAAAAAAAAAAAAAAAAAYAAAAAAAAAAAAAAAAAAAAGAAAAAAAAAAAAAAAAAAAABgAAAAAAA
+        AAAAAAAAAAAAAYAAAAAAAAAAAAAAAAAAAAGAAAAAAAAAAAAAAAAAAAABgAAAAAAAAAAAAAAAAAAAAYAA
+        AAAAAAAAAAAAAAAAAAGAAAAAAAAAAAAAAAAAAAABgAAAAAAAAAAAAAAAAAAAAYAAAAAAAAAAAAAAAAAA
+        AAGAAAAAAAAAAAAAAAAAAAABgAAAAAAAAAAAAAAAAAAAAYAAAAAAAAAAAAAAAAAAAAGAAAAAAAAAAAAA
+        AAAAAAABgAAAAAAAAAAAAAAAAAAAAYAAAAAAAAAAAAAAAAAAAAGAAAAAAAAAAAAAAAAAAAABgAAAAAAA
+        AAAAAAAAAAAAAYAAAAAAAAAAAAAAAAAAAAGAAAAAAAAAAAAAAAAAAAABgAAAAAAAAAAAAAAAAAAAAYAA
+        AAAAAAAAAAAAAAAAAAGAAAAAAAAAAAAAAAAAAAABgAAAAAAAAAAAAAAAAAAAAYAAAAAAAAAAAAAAAAAA
+        AAGAAAAAAAAAAAAAAAAAAAABgAAAAAAAAAAAAAAAAAAAAYAAAAAAAAAAAAAAAAAAAAGAAAAAAAAAAAAA
+        AAAAAAABgAAAAAAAAAAAAAAAAAAAAYAAAAAAAAAAAAAAAAAAAAGAAAAAAAAAAAAAAAAAAAABgAAAAAAA
+        AAAAAAAAAAAAAYAAAAAAAAAAAAAAAAAAAAGAAAAAAAAAAAAAAAAAAAABgAAAAAAAAAAAAAAAAAAAAYAA
+        AAAAAAAAAAAAAAAAAAGAAAAAAAAAAAAAAAAAAAABgAAAAAAAAAAAAAAAAAAAAYAAAAAAAAAAAAAAAAAA
+        AAGAAAAAAAAAAAAAAAAAAAABgAAAAAAAAAAAAAAAAAAAAYAAAAAAAAAAAAAAAAAAAAGAAAAAAAAAAAAA
+        AAAAAAABgAAAAAAAAAAAAAAAAAAAAYAAAAAAAAAAAAAAAAAAAAGAAAAAAAAAAAAAAAAAAAABgAAAAAAA
+        AAAAAAAAAAAAAYAAAAAAAAAAAAAAAAAAAAGAAAAAAAAAAAAAAAAAAAABgAAAAAAAAAAAAAAAAAAAAYAA
+        AAAAAAAAAAAAAAAAAAGAAAAAAAAAAAAAAAAAAAABgAAAAAAAAAAAAAAAAAAAAYAAAAAAAAAAAAAAAAAA
+        AAGAAAAAAAAAAAAAAAAAAAABgAAAAAAAAAAAAAAAAAAAAYAAAAAAAAAAAAAAAAAAAAGAAAAAAAAAAAAA
+        AAAAAAABgAAAAAAAAAAAAAAAAAAAAYAAAAAAAAAAAAAAAAAAAAGAAAAAAAAAAAAAAAAAAAABgAAAAAAA
+        AAAAAAAAAAAAAYAAAAAAAAAAAAAAAAAAAAGAAAAAAAAAAAAAAAAAAAABgAAAAAAAAAAAAAAAAAAAAYAA
+        AAAAAAAAAAAAAAAAAAGAAAAAAAAAAAAAAAAAAAABgAAAAAAAAAAAAAAAAAAAAYAAAAAAAAAAAAAAAAAA
+        AAGAAAAAAAAAAAAAAAAAAAABgAAAAAAAAAAAAAAAAAAAAYAAAAAAAAAAAAAAAAAAAAGAAAAAAAAAAAAA
+        AAAAAAABgAAAAAAAAAAAAAAAAAAAAYAAAAAAAAAAAAAAAAAAAAGAAAAAAAAAAAAAAAAAAAABgAAAAAAA
+        AAAAAAAAAAAAAcAAAAAAAAAAAAAAAAAAAAPAAAAAAAAAAAAAAAAAAAAD4AAAAAAAAAAAAAAAAAAAA+AA
+        AAAAAAAAAAAAAAAAAAfgAAAAAAAAAAAAAAAAAAAH8AAAAAAAAAAAAAAAAAAAD/AAAAAAAAAAAAAAAAAA
+        AA/4AAAAAAAAAAAAAAAAAAAf/AAAAAAAAAAAAAAAAAAAH/wAAAAAAAAAAAAAAAAAAD/+AAAAAAAAAAAA
+        AAAAAAB//wAAAAAAAAAAAAAAAAAA//+AAAAAAAAAAAAAAAAAAf//wAAAAAAAAAAAAAAAAAP//+AAAAAA
+        AAAAAAAAAAAH///4AAAAAAAAAAAAAAAAD////AAAAAAAAAAAAAAAAD////8AAAAAAAAAAAAAAAD/////
+        wAAAAAAAAAAAAAAD//////wAAAAAAAAAAAAAH////////////////////////w==
+</value>
+  </data>
+</root>

TEMUKJD/WXForms/ShopForms/WXShopForm.Designer.cs

@@ -31,12 +31,14 @@
             System.Windows.Forms.TreeNode treeNode1 = new System.Windows.Forms.TreeNode("店铺列表");
             System.Windows.Forms.TreeNode treeNode2 = new System.Windows.Forms.TreeNode("子账号管理");
             System.Windows.Forms.TreeNode treeNode3 = new System.Windows.Forms.TreeNode("OEM账号管理");
-            System.Windows.Forms.TreeNode treeNode4 = new System.Windows.Forms.TreeNode("店铺地址管理");
-            System.Windows.Forms.TreeNode treeNode5 = new System.Windows.Forms.TreeNode("店铺经营统计");
-            System.Windows.Forms.TreeNode treeNode6 = new System.Windows.Forms.TreeNode("评分考核");
-            System.Windows.Forms.TreeNode treeNode7 = new System.Windows.Forms.TreeNode("税务申报");
-            System.Windows.Forms.TreeNode treeNode8 = new System.Windows.Forms.TreeNode("充值二维码");
-            System.Windows.Forms.TreeNode treeNode9 = new System.Windows.Forms.TreeNode("店铺管理", new System.Windows.Forms.TreeNode[] {
+            System.Windows.Forms.TreeNode treeNode4 = new System.Windows.Forms.TreeNode("OEM返现明细");
+            System.Windows.Forms.TreeNode treeNode5 = new System.Windows.Forms.TreeNode("OEM积分明细");
+            System.Windows.Forms.TreeNode treeNode6 = new System.Windows.Forms.TreeNode("店铺地址管理");
+            System.Windows.Forms.TreeNode treeNode7 = new System.Windows.Forms.TreeNode("店铺经营统计");
+            System.Windows.Forms.TreeNode treeNode8 = new System.Windows.Forms.TreeNode("评分考核");
+            System.Windows.Forms.TreeNode treeNode9 = new System.Windows.Forms.TreeNode("税务申报");
+            System.Windows.Forms.TreeNode treeNode10 = new System.Windows.Forms.TreeNode("充值二维码");
+            System.Windows.Forms.TreeNode treeNode11 = new System.Windows.Forms.TreeNode("店铺管理", new System.Windows.Forms.TreeNode[] {
             treeNode1,
             treeNode2,
             treeNode3,
@@ -44,7 +46,9 @@
             treeNode5,
             treeNode6,
             treeNode7,
-            treeNode8});
+            treeNode8,
+            treeNode9,
+            treeNode10});
             this.panel1 = new System.Windows.Forms.Panel();
             this.panel3 = new System.Windows.Forms.Panel();
             this.panel2 = new System.Windows.Forms.Panel();
@@ -142,20 +146,24 @@
             treeNode2.Text = "子账号管理";
             treeNode3.Name = "OEM账号管理";
             treeNode3.Text = "OEM账号管理";
-            treeNode4.Name = "店铺地址管理";
-            treeNode4.Text = "店铺地址管理";
-            treeNode5.Name = "店铺经营统计";
-            treeNode5.Text = "店铺经营统计";
-            treeNode6.Name = "评分考核";
-            treeNode6.Text = "评分考核";
-            treeNode7.Name = "税务申报";
-            treeNode7.Text = "税务申报";
-            treeNode8.Name = "充值二维码";
-            treeNode8.Text = "充值二维码";
-            treeNode9.Name = "店铺管理";
-            treeNode9.Text = "店铺管理";
+            treeNode4.Name = "OEM返现明细";
+            treeNode4.Text = "OEM返现明细";
+            treeNode5.Name = "OEM积分明细";
+            treeNode5.Text = "OEM积分明细";
+            treeNode6.Name = "店铺地址管理";
+            treeNode6.Text = "店铺地址管理";
+            treeNode7.Name = "店铺经营统计";
+            treeNode7.Text = "店铺经营统计";
+            treeNode8.Name = "评分考核";
+            treeNode8.Text = "评分考核";
+            treeNode9.Name = "税务申报";
+            treeNode9.Text = "税务申报";
+            treeNode10.Name = "充值二维码";
+            treeNode10.Text = "充值二维码";
+            treeNode11.Name = "店铺管理";
+            treeNode11.Text = "店铺管理";
             this.tv.Nodes.AddRange(new System.Windows.Forms.TreeNode[] {
-            treeNode9});
+            treeNode11});
             this.tv.OverForeColor = System.Drawing.Color.FromArgb(((int)(((byte)(235)))), ((int)(((byte)(235)))), ((int)(((byte)(235)))));
             this.tv.Size = new System.Drawing.Size(140, 461);
             this.tv.TabIndex = 1;

TEMUKJD/WXForms/ShopForms/WXShopForm.cs

@@ -15,6 +15,7 @@ using TemuKJD.KJDForms.ProductSelectForms;
 using TemuKJD.KJDForms.ProductThirdSelectForms;
 using TemuKJD.KJDForms.ShopForms.Statistics;
 using NaiBa.Util.Extension;
+using Work._29Tools.Forms.UserForms;
 
 namespace TemuKJD.WXForms.ShopForms
 {
@@ -30,6 +31,8 @@ namespace TemuKJD.WXForms.ShopForms
         public Lazy<WXShopDefaultAddressListForm> shopAfterSaleAddressListForm = new Lazy<WXShopDefaultAddressListForm>();
         public Lazy<WXGetTopUpQrCode> getTopUpQrCode = new Lazy<WXGetTopUpQrCode>();
         public Lazy<WXOemAccountForm> oemAccountForm = new Lazy<WXOemAccountForm>();
+        public Lazy<WXOemAccountBalanceForm> oemAccountBalanceForm = new Lazy<WXOemAccountBalanceForm>();
+        public Lazy<WXOemPointsTopUpListForm> oemAccountPointsForm = new Lazy<WXOemPointsTopUpListForm>();
 
 
         public WXShopForm()
@@ -57,7 +60,7 @@ namespace TemuKJD.WXForms.ShopForms
 
         public List<string> getHideTreeNodes()
         {
-            List<string> hideNames = new List<string>() { "OEM账号管理", "充值二维码", "店铺地址管理", "评分考核", "子账号管理", "高级运费模板", "运费模板", "素材库管理", "订单金额统计", "工作明细统计", "店铺经营统计1" };
+            List<string> hideNames = new List<string>() { "充值二维码", "OEM账号管理", "OEM返现明细", "OEM积分明细", "店铺地址管理", "评分考核", "子账号管理", "高级运费模板", "运费模板", "素材库管理", "订单金额统计", "工作明细统计", "店铺经营统计1" };
 
             if (BaseClass.SaLevel == 1)
             {
@@ -73,13 +76,15 @@ namespace TemuKJD.WXForms.ShopForms
             {
                 hideNames.Remove("评分考核");
             }
-            if (BaseClass.UserAuthority.Contains("充值用户") && BaseClass.GroupId == 3)
+            if (BaseClass.UserAuthority.Contains("充值用户") && BaseClass.GroupId == 3 && BaseClass.AgentCode.IsNullOrEmpty() && BaseClass.OemId.IsNullOrEmpty())
             {
                 hideNames.Remove("充值二维码");
             }
             if (!BaseClass.OemId.IsNullOrEmpty() && BaseClass.IsOemOwner)
             {
                 hideNames.Remove("OEM账号管理");
+                hideNames.Remove("OEM返现明细");
+                hideNames.Remove("OEM积分明细");
             }
 
             foreach (var forbiddenPage in BaseClass.ForbiddenPage.Split(','))
@@ -134,6 +139,12 @@ namespace TemuKJD.WXForms.ShopForms
                         case "OEM账号管理":
                             SetForm(oemAccountForm.Value);
                             break;
+                        case "OEM返现明细":
+                            SetForm(oemAccountBalanceForm.Value);
+                            break;
+                        case "OEM积分明细":
+                            SetForm(oemAccountPointsForm.Value);
+                            break;
                     }
                 }));
             }).Start();

TEMUKJD/WXForms/ShopForms/WXShopLoginForm.cs

@@ -46,6 +46,7 @@ namespace TemuKJD.WXForms.ShopForms
         public bool isMultiLogin = false;
         public string MultiLoginCookieName = "";
         public string InitUrl = "";
+        public string InitHtml = "";
         private string shopCookieHead = "qq.com";
         private string shopLoginUrl = "https://store.weixin.qq.com/shop?redirect_url=%2Fhome";
         private string shopMainUrl = "https://store.weixin.qq.com/shop/home";
@@ -87,6 +88,26 @@ namespace TemuKJD.WXForms.ShopForms
                 });
             }
 
+            if (string.IsNullOrEmpty(InitUrl) && !string.IsNullOrEmpty(InitHtml))
+            {
+                btnLoginAgain.Visible = false;
+                foreach(Control ctrl in splitContainer1.Panel2.Controls)
+                ctrl.Visible = false;
+
+
+                cefWebBrowser = new ChromiumWebBrowser(new CefSharp.Web.HtmlString(InitHtml, false, "UTF-8"));
+                CustomResourceRequestHandlerLocal resourceRequestHandler = new CustomResourceRequestHandlerLocal();
+                resourceRequestHandler.ResourceLoadCompleteEvent += RequestHandler_ResourceLoadComplete;
+                cefWebBrowser.RequestHandler = new CustomRequestHandler(resourceRequestHandler);
+                var lifeSapnHandler = new LifeSpanHandlerLocal(PopWindowType.SelfWindow);
+                cefWebBrowser.LifeSpanHandler = lifeSapnHandler;
+                cefWebBrowser.KeyboardHandler = new KeyboardHandler();
+                cefWebBrowser.Dock = DockStyle.Fill;
+                splitContainer1.Panel1.Controls.Add(cefWebBrowser);
+                cefWebBrowser.BringToFront();
+                return;
+            }
+
             if (!isMultiLogin)
                 AutoLogin();
 
@@ -502,6 +523,21 @@ namespace TemuKJD.WXForms.ShopForms
         
         private void RequestHandler_ResourceLoadComplete(object sender, string url, string postData, string responseData, IRequest request)
         {
+            if (responseData.Contains("交易付款成功，正在跳转至商户页面") && !string.IsNullOrEmpty(this.InitHtml))
+            {
+                Invoke(new Action(() =>
+                {
+                    try
+                    {
+                        this.Close();
+                    }
+                    catch
+                    {
+
+                    }
+                }));
+            }
+
             if (url == "https://store.weixin.qq.com/shop/home" && this.openType == EnumOpenType.login)
             {
                 Task.Run(() =>