分红金额暂时扩大10000，测试

Areas/Api/Controllers/v1/MainServer/ConsumerOrdersController.cs

@@ -274,7 +274,7 @@ namespace MySystem.Areas.Api.Controllers.v1
                 PayMoney = PayMoney, //支付金额
                 SnNo = SnNo, //SN号
                 OrderNo = OrderNo,
-                MaxDivi = PayMoney * merchantset.DiviPercent / 100,
+                MaxDivi = PayMoney * merchantset.DiviPercent * 100,
                 IsAct = merchantset.IsAll == 1 ? 0u : 1u,
                 SeoDescription = Newtonsoft.Json.JsonConvert.SerializeObject(merchantset),
             }).Entity;

Areas/Api/Controllers/v1/MainServer/MerchantQrCodeController.cs

@@ -87,6 +87,7 @@ namespace MySystem.Areas.Api.Controllers.v1
             Dictionary<string, object> Obj = new Dictionary<string, object>();
             MerchantQrCode query = new MerchantQrCodeService().Query(SnNo);
             PosMachinesTwo pos = new PosMachinesTwoService().Query(SnNo);
+            MerchantInfo merchant = new MerchantInfoService().Query(MerchantId);
             if(pos.Id == 0)
             {
                 return new AppResultJson() { Status = "-1", Info = "绑定失败" };
@@ -105,26 +106,27 @@ namespace MySystem.Areas.Api.Controllers.v1
                 SnNo = SnNo,
             }).Entity;
             maindb.SaveChanges();
-            PosMachines machine = maindb.PosMachines.FirstOrDefault(m => m.PosSn == MachineNo);
-            if (machine != null)
-            {
-                if (machine.BindMerchantId > 0)
-                { 
-                    return new AppResultJson() { Status = "-1", Info = "音箱码已被绑定，请勿重复绑定" };
-                }
-                return new AppResultJson() { Status = "1", Info = "绑定成功，收款码暂未关联音箱", Data = Obj };
-            }
-            else if (!string.IsNullOrEmpty(MachineNo))
-            {
-                machine = maindb.PosMachines.Add(new PosMachines(){
-                    PosSn = MachineNo,
-                    BindMerchantId = MerchantId,
-                    BindingState = 1,
-                    BindingTime = DateTime.Now,
-                }).Entity;
-                maindb.SaveChanges();
-
-                string DataId = query.Id + "_" + machine.Id;
+            // PosMachines machine = maindb.PosMachines.FirstOrDefault(m => m.PosSn == MachineNo);
+            // if (machine != null)
+            // {
+            //     if (machine.BindMerchantId > 0)
+            //     { 
+            //         return new AppResultJson() { Status = "-1", Info = "音箱码已被绑定，请勿重复绑定" };
+            //     }
+            //     return new AppResultJson() { Status = "1", Info = "绑定成功，收款码暂未关联音箱", Data = Obj };
+            // }
+            // else if (!string.IsNullOrEmpty(MachineNo))
+            // {
+                // machine = maindb.PosMachines.Add(new PosMachines(){
+                //     PosSn = MachineNo,
+                //     BindMerchantId = MerchantId,
+                //     BindingState = 1,
+                //     BindingTime = DateTime.Now,
+                // }).Entity;
+                // maindb.SaveChanges();
+
+                // string DataId = query.Id + "_" + machine.Id;
+                string DataId = query.Id + "_0";
                 MachineForQrCode forQrCode = maindb.MachineForQrCode.FirstOrDefault(m => m.DataId == DataId);
                 if (forQrCode == null)
                 {
@@ -144,8 +146,9 @@ namespace MySystem.Areas.Api.Controllers.v1
                     forQrCode.MerchantId = MerchantId;
                 }
                 maindb.SaveChanges();
-                return new AppResultJson() { Status = "2", Info = "", Data = Obj };
-            }
+            // }
+            pos.BuyUserId = merchant.UserId;
+            pos.UserId = merchant.UserId;
             pos.BindingTime = DateTime.Now;
             pos.BindingState = 1;
             pos.BindMerchantId = MerchantId;

Services/MerchantInfoService.cs

@@ -0,0 +1,132 @@
+using System;
+using System.Collections.Generic;
+using System.Linq;
+using MySystem.MainModels;
+using Library;
+using LitJson;
+
+namespace MySystem
+{
+    public class MerchantInfoService
+    {
+        string _conn = "";
+        public MerchantInfoService()
+        {
+            _conn = ConfigurationManager.AppSettings["SqlConnStr"].ToString();
+        }
+
+        /// <summary>
+        /// 查询列表
+        /// </summary>
+        /// <param name="fields">查询条件(单个字段)</param>
+        /// <param name="condition">查询条件(sql语句)</param>
+        /// <param name="page">页码</param>
+        /// <param name="limit">每页条数</param>
+        /// <returns></returns>
+        public List<MerchantInfo> List(List<FieldItem> fields, string condition, int page = 1, int limit = 30, string orderby = "Id desc")
+        {
+            Dictionary<string, object> obj = new DbService(AppConfig.Base.mainTables, _conn).IndexData("MerchantInfo", fields, orderby, "0", page, limit, condition);
+            List<MerchantInfo> diclist = obj["data"] as List<MerchantInfo>;
+            return diclist;
+        }
+
+        /// <summary>
+        /// 查询一条记录
+        /// </summary>
+        /// <param name="Id">主键Id</param>
+        /// <returns></returns>
+        public MerchantInfo Query(int Id)
+        {
+            WebCMSEntities db = new WebCMSEntities();
+            MerchantInfo editData = db.MerchantInfo.FirstOrDefault(m => m.Id == Id) ?? new MerchantInfo();
+            db.Dispose();
+            return editData;
+        }
+
+        /// <summary>
+        /// 添加数据
+        /// </summary>
+        /// <param name="Fields">要设置的字段</param>
+        /// <returns></returns>
+        public int Add(Dictionary<string, object> Fields)
+        {
+            return new DbService(AppConfig.Base.mainTables, _conn).Add("MerchantInfo", Fields, 0);
+        }
+
+        /// <summary>
+        /// 修改数据
+        /// </summary>
+        /// <param name="Fields">要设置的字段</param>
+        /// <param name="Id">主键Id</param>
+        public void Edit(Dictionary<string, object> Fields, int Id)
+        {
+            new DbService(AppConfig.Base.mainTables, _conn).Edit("MerchantInfo", Fields, Id);
+        }
+
+        /// <summary>
+        /// 删除数据
+        /// </summary>
+        /// <param name="Id">主键Id</param>
+        public void Delete(int Id)
+        {
+            new DbService(AppConfig.Base.mainTables, _conn).Delete("MerchantInfo", Id);
+        }
+
+        /// <summary>
+        /// 排序
+        /// </summary>
+        /// <param name="Id">主键Id</param>
+        /// <param name="Sort">排序序号</param>
+        public void Sort(int Id, int Sort)
+        {
+            new DbService(AppConfig.Base.mainTables, _conn).Sort("MerchantInfo", Sort, Id);
+        }
+
+        /// <summary>
+        /// 导入数据
+        /// </summary>
+        /// <param name="ExcelData">json数据</param>
+        public void Import(string ExcelData)
+        {
+            WebCMSEntities db = new WebCMSEntities();
+            JsonData list = JsonMapper.ToObject(ExcelData);
+            for (int i = 1; i < list.Count;i++ )
+            {
+                JsonData dr = list[i];
+                
+                db.MerchantInfo.Add(new MerchantInfo()
+                {
+                    CreateDate = DateTime.Now,
+                    UpdateDate = DateTime.Now,
+                    
+                });
+                db.SaveChanges();
+            }
+            db.Dispose();
+        }
+
+        /// <summary>
+        /// 导出excel表格
+        /// </summary>
+        /// <param name="fields">查询条件(单个字段)</param>
+        /// <param name="condition">查询条件(sql语句)</param>
+        /// <returns></returns>
+        public Dictionary<string, object> ExportExcel(List<FieldItem> fields, string condition, string orderby = "Id desc")
+        {
+            Dictionary<string, object> obj = new DbService(AppConfig.Base.mainTables, _conn).IndexData("MerchantInfo", fields, orderby, "0", 1, 20000, condition, "Id", false);
+            List<Dictionary<string, object>> diclist = obj["data"] as List<Dictionary<string, object>>;
+            foreach (Dictionary<string, object> dic in diclist)
+            {
+            }
+
+            Dictionary<string, object> result = new Dictionary<string, object>();
+            result.Add("Status", "1");
+            result.Add("Info", "Excel报表-" + DateTime.Now.ToString("yyyy-MM-ddTHH:mm:ss") + ".xlsx");
+            result.Add("Obj", diclist);
+            Dictionary<string, object> ReturnFields = new Dictionary<string, object>();
+
+            result.Add("Fields", ReturnFields);
+            return result;
+        }
+    }
+}