调整支付到商家账户

AppStart/Alipay/AlipayFunction.cs

@@ -1,4 +1,4 @@
-using System;
+using System;
 using System.Collections.Generic;
 using System.Linq;
 using Aop.Api;
@@ -195,7 +195,7 @@ namespace MySystem
             return result;
         }
 
-        public string CreateTrade(string OrderNo, string Subject, decimal Amount, string BuyerId, string MerPid, string Notify_Url)
+        public string CreateTrade(string OrderNo, string Subject, decimal Amount, string BuyerId, string MerToken, string Notify_Url)
         {
             IAopClient client = new DefaultAopClient("https://openapi.alipay.com/gateway.do", AppId, PrivateKey, "json", "1.0", "RSA2", AlipayPublicKey, "utf-8", false);
             AlipayTradeCreateRequest request = new AlipayTradeCreateRequest();
@@ -204,7 +204,7 @@ namespace MySystem
             bizContent.Add("out_trade_no", OrderNo);
             bizContent.Add("total_amount", Amount);
             bizContent.Add("subject", Subject);
-            // bizContent.Add("seller_id", MerPid);
+            // bizContent.Add("seller_id", "2088641405724089");
             bizContent.Add("buyer_id", BuyerId);
             bizContent.Add("timeout_express", "10m");
 
@@ -224,9 +224,9 @@ namespace MySystem
             string result = "";
             try
             {
-                AlipayTradeCreateResponse response = client.Execute(request, null, "202306BB117e046cfc29434c8f4acfd2a43aeX03");
+                AlipayTradeCreateResponse response = client.Execute(request, null, MerToken);
                 result = response.Body;
-                function.WriteLog(DateTime.Now.ToString() + "\n" + result, "支付宝统一收单交易创建");
+                function.WriteLog(DateTime.Now.ToString() + "\n" + Contentjson + "\n" + result, "支付宝统一收单交易创建");
             }
             catch (Exception ex)
             {

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

@@ -300,7 +300,7 @@ namespace MySystem.Areas.Api.Controllers.v1
             maindb.SaveChanges();
             if (PayMode == 1)
             { 
-                string backString = new AlipayFunction(_accessor.HttpContext).CreateTrade(OrderNo, merchant.Name, PayMoney, openid, merchantAdd.SeoTitle, SourceHost + "api/alipay/notice");
+                string backString = new AlipayFunction(_accessor.HttpContext).CreateTrade(OrderNo, merchant.Name, PayMoney, openid, merchantAdd.AlipayAuthToken, SourceHost + "api/alipay/notice");
                 JsonData obj = JsonMapper.ToObject(backString);
                 if (obj["alipay_trade_create_response"]["code"].ToString() == "10000")
                 {

MainModels/MerchantAddInfo.cs

@@ -97,5 +97,11 @@ namespace MySystem.MainModels
         public string ContactName { get; set; }
         public string BusinessCode { get; set; }
         public string IdCardAddress { get; set; }
+        public string WeChatRemark { get; set; }
+        public string AlipayRemark { get; set; }
+        public string WeChatSignUrl { get; set; }
+        public string AlipaySignUrl { get; set; }
+        public string AlipayAuthToken { get; set; }
+        public string AlipayPid { get; set; }
     }
 }

MainModels/MerchantInfo.cs

@@ -38,5 +38,7 @@ namespace MySystem.MainModels
         public int BindStatus { get; set; }
         public DateTime? ActivationDate { get; set; }
         public int ActivationStatus { get; set; }
+        public decimal TotalActActual { get; set; }
+        public decimal TotalActAmount { get; set; }
     }
 }

MainModels/WebCMSEntities.cs

@@ -4935,6 +4935,26 @@ namespace MySystem.MainModels
                     .HasCharSet("utf8")
                     .HasCollation("utf8_general_ci");
 
+                entity.Property(e => e.AlipayAuthToken)
+                    .HasColumnType("varchar(100)")
+                    .HasCharSet("utf8")
+                    .HasCollation("utf8_general_ci");
+
+                entity.Property(e => e.AlipayPid)
+                    .HasColumnType("varchar(50)")
+                    .HasCharSet("utf8")
+                    .HasCollation("utf8_general_ci");
+
+                entity.Property(e => e.AlipayRemark)
+                    .HasColumnType("varchar(500)")
+                    .HasCharSet("utf8")
+                    .HasCollation("utf8_general_ci");
+
+                entity.Property(e => e.AlipaySignUrl)
+                    .HasColumnType("varchar(500)")
+                    .HasCharSet("utf8")
+                    .HasCollation("utf8_general_ci");
+
                 entity.Property(e => e.AppAppid)
                     .HasColumnType("varchar(50)")
                     .HasCharSet("utf8")
@@ -5302,6 +5322,16 @@ namespace MySystem.MainModels
 
                 entity.Property(e => e.Version).HasColumnType("int(11)");
 
+                entity.Property(e => e.WeChatRemark)
+                    .HasColumnType("varchar(500)")
+                    .HasCharSet("utf8")
+                    .HasCollation("utf8_general_ci");
+
+                entity.Property(e => e.WeChatSignUrl)
+                    .HasColumnType("varchar(500)")
+                    .HasCharSet("utf8")
+                    .HasCollation("utf8_general_ci");
+
                 entity.Property(e => e.WebAppId)
                     .HasColumnType("varchar(50)")
                     .HasCharSet("utf8")
@@ -5969,6 +5999,10 @@ namespace MySystem.MainModels
 
                 entity.Property(e => e.Status).HasColumnType("int(11)");
 
+                entity.Property(e => e.TotalActActual).HasColumnType("decimal(18,2)");
+
+                entity.Property(e => e.TotalActAmount).HasColumnType("decimal(18,2)");
+
                 entity.Property(e => e.TotalActual).HasColumnType("decimal(18,2)");
 
                 entity.Property(e => e.TotalAmount).HasColumnType("decimal(18,2)");