进件保存创业帮创客编号

Areas/Api/Controllers/Main/MerchantAddInfoController.cs

@@ -39,6 +39,11 @@ namespace MySystem.Areas.Api.Controllers.v1
         {
             function.WriteLog(value, "创客-首页-新增商户");
             JsonData data = JsonMapper.ToObject(value);
+            string CybMakerCode = "";
+            if(value.Contains("CybMakerCode"))
+            {
+                CybMakerCode = data.getItem("CybMakerCode").ToString();
+            }
             string LicenseCopy = data.getItem("LicenseCopy").ToString(); //- 营业执照
             string CertMerchantName = data.getItem("CertMerchantName").ToString(); //- 商户名称
             string LicenseNumber = data.getItem("LicenseNumber").ToString(); //- 商户信用代码
@@ -323,7 +328,8 @@ namespace MySystem.Areas.Api.Controllers.v1
             Fields.Add("ResserveMobile", ResserveMobile); //银行预留手机号
             Fields.Add("PlaceType", PlaceType); // 小微商户经营场所类型(0 固定场所 1 流动动摊贩)
             Fields.Add("BrandId", BrandId); // 品牌(0 银联 1 好哒)
-            MerchantAddInfoId = (int)MerchantInfoUtil.EditMerchantInfo(MerchantAddInfoId, UserId, CertMerchantName, MobilePhone, BizAddressCode, BizStoreAddress, BindStatus, BrandId).Data;
+            Fields.Add("CybMakerCode", CybMakerCode); //创业帮创客编号
+            MerchantAddInfoId = (int)MerchantInfoUtil.EditMerchantInfo(MerchantAddInfoId, UserId, CertMerchantName, MobilePhone, BizAddressCode, BizStoreAddress, BindStatus, BrandId, CybMakerCode).Data;
             MerchantAddInfoUtil.EditMerchantAddInfo(Fields, MerchantAddInfoId);
             if (Finish == 1)
             {

Areas/Api/Controllers/Main/MerchantInfoController.cs

@@ -37,6 +37,11 @@ namespace MySystem.Areas.Api.Controllers.v1
         public List<Dictionary<string, object>> MerchantByStatusDo(string value)
         {
             JsonData data = JsonMapper.ToObject(value);
+            string CybMakerCode = "";
+            if(value.Contains("CybMakerCode"))
+            {
+                CybMakerCode = data.getItem("CybMakerCode").ToString();
+            }
             string SearchKey = data.getItem("SearchKey").ToString();
             int Status = int.Parse(function.CheckInt(data.getItem("Status").ToString()));
             int UserId = int.Parse(function.CheckInt(data.getItem("UserId").ToString())); //所属创客
@@ -63,6 +68,10 @@ namespace MySystem.Areas.Api.Controllers.v1
             {
                 condition.ConditionLike("Name", SearchKey);
             }
+            if(!string.IsNullOrEmpty(CybMakerCode))
+            {
+                condition.Condition("CybMakerCode", CybMakerCode);
+            }
             List<Dictionary<string, object>> list = MerchantInfoService.List(new List<RelationData>(), condition.ToString(), PageNum, PageSize);
             List<Dictionary<string, object>> dataList = new List<Dictionary<string, object>>();
             foreach (Dictionary<string, object> subdata in list)
@@ -657,6 +666,11 @@ namespace MySystem.Areas.Api.Controllers.v1
         public List<Dictionary<string, object>> TmpMerchantListDo(string value)
         {
             JsonData data = JsonMapper.ToObject(value);
+            string CybMakerCode = "";
+            if(value.Contains("CybMakerCode"))
+            {
+                CybMakerCode = data.getItem("CybMakerCode").ToString();
+            }
             int UserId = int.Parse(function.CheckInt(data["UserId"].ToString())); //所属创客
             int BrandId = 0; //品牌(0 银联 1 好哒)
             int PageSize = int.Parse(function.CheckInt(data["PageSize"].ToString()));
@@ -668,6 +682,10 @@ namespace MySystem.Areas.Api.Controllers.v1
             {
                 BrandId = int.Parse(function.CheckInt(data["BrandId"].ToString())); //品牌(0 银联 1 好哒)
             }
+            if(!string.IsNullOrEmpty(CybMakerCode))
+            {
+                query = query.Where(m => m.CybMakerCode == CybMakerCode);
+            }
             query = query.Where(m => m.BrandId == BrandId);
             if (PageNum == 1)
             {

Models/Main/ChangeSettlementCardAuditRecord.cs

@@ -11,10 +11,10 @@ namespace MySystem.Models.Main
         public int Version { get; set; }
         public DateTime? CreateDate { get; set; }
         public DateTime? UpdateDate { get; set; }
+        public string Remark { get; set; }
         public int AuditStatus { get; set; }
         public string MchtNo { get; set; }
         public int MerchantId { get; set; }
         public int TaskId { get; set; }
-        public string Remark { get; set; }
     }
 }

Models/Main/HdRefundOrderNos.cs

@@ -0,0 +1,12 @@
+using System;
+using System.Collections.Generic;
+
+namespace MySystem.Models.Main
+{
+    public partial class HdRefundOrderNos
+    {
+        public int Id { get; set; }
+        public string HdSourceOrderNo { get; set; }
+        public string HdOrderNo { get; set; }
+    }
+}

Models/Main/HdRefundRecord.cs

@@ -0,0 +1,18 @@
+using System;
+using System.Collections.Generic;
+
+namespace MySystem.Models.Main
+{
+    public partial class HdRefundRecord
+    {
+        public int Id { get; set; }
+        public string RefundOrderNo { get; set; }
+        public decimal RefundAmt { get; set; }
+        public string HdOrderNo { get; set; }
+        public string PayMode { get; set; }
+        public string RefundDate { get; set; }
+        public string HdStatus { get; set; }
+        public string HdOrderNo2 { get; set; }
+        public int OrderId { get; set; }
+    }
+}

Models/Main/MerchantAddInfo.cs

@@ -150,5 +150,6 @@ namespace MySystem.Models.Main
         public string MerchantType { get; set; }
         public int PlaceType { get; set; }
         public int BrandId { get; set; }
+        public string CybMakerCode { get; set; }
     }
 }

Models/Main/MerchantChangeSettlementCardRecord.cs

@@ -11,6 +11,11 @@ namespace MySystem.Models.Main
         public int Version { get; set; }
         public DateTime? CreateDate { get; set; }
         public DateTime? UpdateDate { get; set; }
+        public int MerchantId { get; set; }
+        public string MerchantName { get; set; }
+        public string Remark { get; set; }
+        public int AccountType { get; set; }
+        public string Operator { get; set; }
         public string HoldAgentProtocol { get; set; }
         public string AgentIdCardBack { get; set; }
         public string AgentIdCardFront { get; set; }
@@ -28,10 +33,5 @@ namespace MySystem.Models.Main
         public string AccountNo { get; set; }
         public string AccountName { get; set; }
         public string MchtNo { get; set; }
-        public string Operator { get; set; }
-        public int AccountType { get; set; }
-        public string Remark { get; set; }
-        public string MerchantName { get; set; }
-        public int MerchantId { get; set; }
     }
 }

Models/Main/MerchantInfo.cs

@@ -56,5 +56,6 @@ namespace MySystem.Models.Main
         public decimal Latitude { get; set; }
         public decimal Longitude { get; set; }
         public int BrandId { get; set; }
+        public string CybMakerCode { get; set; }
     }
 }

Models/Main/OrderAdd.cs

@@ -0,0 +1,19 @@
+using System;
+using System.Collections.Generic;
+
+namespace MySystem.Models.Main
+{
+    public partial class OrderAdd
+    {
+        public int Id { get; set; }
+        public string Merchantno { get; set; }
+        public string Fd61 { get; set; }
+        public string Merchantname { get; set; }
+        public string Orderno { get; set; }
+        public string Tradedate { get; set; }
+        public string Tradetime { get; set; }
+        public decimal Money { get; set; }
+        public string Status { get; set; }
+        public string Reason { get; set; }
+    }
+}

Models/Main/WebCMSEntities.cs

@@ -58,6 +58,8 @@ namespace MySystem.Models.Main
         public virtual DbSet<FluxProfitDetail> FluxProfitDetail { get; set; }
         public virtual DbSet<FluxProfitSummary> FluxProfitSummary { get; set; }
         public virtual DbSet<HaoDaAreaCode> HaoDaAreaCode { get; set; }
+        public virtual DbSet<HdRefundOrderNos> HdRefundOrderNos { get; set; }
+        public virtual DbSet<HdRefundRecord> HdRefundRecord { get; set; }
         public virtual DbSet<HelpProfitAccountRecord> HelpProfitAccountRecord { get; set; }
         public virtual DbSet<HelpProfitAmountSummary> HelpProfitAmountSummary { get; set; }
         public virtual DbSet<HelpProfitExchange> HelpProfitExchange { get; set; }
@@ -131,6 +133,7 @@ namespace MySystem.Models.Main
         public virtual DbSet<OpenSnSnapshot> OpenSnSnapshot { get; set; }
         public virtual DbSet<OperateLog> OperateLog { get; set; }
         public virtual DbSet<OperateRightList> OperateRightList { get; set; }
+        public virtual DbSet<OrderAdd> OrderAdd { get; set; }
         public virtual DbSet<OrderForNo> OrderForNo { get; set; }
         public virtual DbSet<OrderProduct> OrderProduct { get; set; }
         public virtual DbSet<OrderRefund> OrderRefund { get; set; }
@@ -3384,6 +3387,60 @@ namespace MySystem.Models.Main
                     .HasCollation("utf8_general_ci");
             });
 
+            modelBuilder.Entity<HdRefundOrderNos>(entity =>
+            {
+                entity.Property(e => e.Id).HasColumnType("int(11)");
+
+                entity.Property(e => e.HdOrderNo)
+                    .HasColumnType("varchar(50)")
+                    .HasCharSet("utf8")
+                    .HasCollation("utf8_general_ci");
+
+                entity.Property(e => e.HdSourceOrderNo)
+                    .HasColumnType("varchar(50)")
+                    .HasCharSet("utf8")
+                    .HasCollation("utf8_general_ci");
+            });
+
+            modelBuilder.Entity<HdRefundRecord>(entity =>
+            {
+                entity.Property(e => e.Id).HasColumnType("int(11)");
+
+                entity.Property(e => e.HdOrderNo)
+                    .HasColumnType("varchar(50)")
+                    .HasCharSet("utf8")
+                    .HasCollation("utf8_general_ci");
+
+                entity.Property(e => e.HdOrderNo2)
+                    .HasColumnType("varchar(50)")
+                    .HasCharSet("utf8")
+                    .HasCollation("utf8_general_ci");
+
+                entity.Property(e => e.HdStatus)
+                    .HasColumnType("varchar(20)")
+                    .HasCharSet("utf8")
+                    .HasCollation("utf8_general_ci");
+
+                entity.Property(e => e.OrderId).HasColumnType("int(11)");
+
+                entity.Property(e => e.PayMode)
+                    .HasColumnType("varchar(20)")
+                    .HasCharSet("utf8")
+                    .HasCollation("utf8_general_ci");
+
+                entity.Property(e => e.RefundAmt).HasColumnType("decimal(18,2)");
+
+                entity.Property(e => e.RefundDate)
+                    .HasColumnType("varchar(200)")
+                    .HasCharSet("utf8")
+                    .HasCollation("utf8_general_ci");
+
+                entity.Property(e => e.RefundOrderNo)
+                    .HasColumnType("varchar(50)")
+                    .HasCharSet("utf8")
+                    .HasCollation("utf8_general_ci");
+            });
+
             modelBuilder.Entity<HelpProfitAccountRecord>(entity =>
             {
                 entity.Property(e => e.Id).HasColumnType("int(11)");
@@ -5691,6 +5748,12 @@ namespace MySystem.Models.Main
                     .HasCharSet("utf8")
                     .HasCollation("utf8_general_ci");
 
+                entity.Property(e => e.CybMakerCode)
+                    .HasColumnType("varchar(20)")
+                    .HasComment("创业帮创客编号")
+                    .HasCharSet("utf8")
+                    .HasCollation("utf8_general_ci");
+
                 entity.Property(e => e.Extra1)
                     .HasColumnName("extra1")
                     .HasColumnType("varchar(2000)")
@@ -7190,6 +7253,12 @@ namespace MySystem.Models.Main
                     .HasCharSet("utf8")
                     .HasCollation("utf8_general_ci");
 
+                entity.Property(e => e.CybMakerCode)
+                    .HasColumnType("varchar(20)")
+                    .HasComment("创业帮创客编号")
+                    .HasCharSet("utf8")
+                    .HasCollation("utf8_general_ci");
+
                 entity.Property(e => e.EndTime)
                     .HasColumnType("datetime")
                     .HasComment("营业结束时间");
@@ -9246,6 +9315,65 @@ namespace MySystem.Models.Main
                 entity.Property(e => e.Version).HasColumnType("int(11)");
             });
 
+            modelBuilder.Entity<OrderAdd>(entity =>
+            {
+                entity.Property(e => e.Id)
+                    .HasColumnName("id")
+                    .HasColumnType("int(11)");
+
+                entity.Property(e => e.Fd61)
+                    .HasColumnName("fd61")
+                    .HasColumnType("varchar(255)")
+                    .HasCharSet("utf8")
+                    .HasCollation("utf8_general_ci");
+
+                entity.Property(e => e.Merchantname)
+                    .HasColumnName("merchantname")
+                    .HasColumnType("varchar(255)")
+                    .HasCharSet("utf8")
+                    .HasCollation("utf8_general_ci");
+
+                entity.Property(e => e.Merchantno)
+                    .HasColumnName("merchantno")
+                    .HasColumnType("varchar(255)")
+                    .HasCharSet("utf8")
+                    .HasCollation("utf8_general_ci");
+
+                entity.Property(e => e.Money)
+                    .HasColumnName("money")
+                    .HasColumnType("decimal(10,2)");
+
+                entity.Property(e => e.Orderno)
+                    .HasColumnName("orderno")
+                    .HasColumnType("varchar(255)")
+                    .HasCharSet("utf8")
+                    .HasCollation("utf8_general_ci");
+
+                entity.Property(e => e.Reason)
+                    .HasColumnName("reason")
+                    .HasColumnType("varchar(255)")
+                    .HasCharSet("utf8")
+                    .HasCollation("utf8_general_ci");
+
+                entity.Property(e => e.Status)
+                    .HasColumnName("status")
+                    .HasColumnType("varchar(255)")
+                    .HasCharSet("utf8")
+                    .HasCollation("utf8_general_ci");
+
+                entity.Property(e => e.Tradedate)
+                    .HasColumnName("tradedate")
+                    .HasColumnType("varchar(255)")
+                    .HasCharSet("utf8")
+                    .HasCollation("utf8_general_ci");
+
+                entity.Property(e => e.Tradetime)
+                    .HasColumnName("tradetime")
+                    .HasColumnType("varchar(255)")
+                    .HasCharSet("utf8")
+                    .HasCollation("utf8_general_ci");
+            });
+
             modelBuilder.Entity<OrderForNo>(entity =>
             {
                 entity.HasKey(e => e.OrderNo)

Util/Main/MerchantInfoUtil.cs

@@ -21,7 +21,7 @@ namespace MySystem
         /// <param name="Address">门店地址</param>
         /// <param name="BrandId">品牌(0 银联 1 好哒)</param>
         /// <returns></returns>
-        public static AppResultJson EditMerchantInfo(int Id, int UserId, string Name, string Mobile, string Areas, string Address, int BindStatus, int BrandId = 0)
+        public static AppResultJson EditMerchantInfo(int Id, int UserId, string Name, string Mobile, string Areas, string Address, int BindStatus, int BrandId = 0, string CybMakerCode = "")
         {
             Dictionary<string, object> Fields = new Dictionary<string, object>();
             Fields.Add("UserId", UserId);
@@ -31,6 +31,7 @@ namespace MySystem
             Fields.Add("Address", Address);
             Fields.Add("BindStatus", BindStatus);
             Fields.Add("BrandId", BrandId);
+            Fields.Add("CybMakerCode", CybMakerCode);
             AppResultJson info = new AppResultJson();
             if (Id == 0)
             {