退款，分账，需要商家的token

AppStart/Alipay/AlipayFunction.cs

@@ -341,7 +341,7 @@ namespace MySystem
 
         #region 退款
 
-        public string Refund(string TradeNo, string Amount, string MerPid, string Reason = "")
+        public string Refund(string TradeNo, string Amount, string Reason, string MerToken)
         {
             IAopClient client = new DefaultAopClient("https://openapi.alipay.com/gateway.do", AppId, PrivateKey, "json", "1.0", "RSA2", AlipayPublicKey, "utf-8", false);
             AlipayTradeRefundRequest request = new AlipayTradeRefundRequest();
@@ -349,19 +349,19 @@ namespace MySystem
             "\"trade_no\":\"" + TradeNo + "\"," +
             "\"refund_amount\":" + Amount + "," +
             "\"out_request_no\":\"" + DateTime.Now.ToString("yyyyMMddHHmmssfff") + function.get_Random(8) + "\"," +
-            "\"refund_reason\":\"" + Reason + "\"," +
-            "\"refund_royalty_parameters\":[{" +
-            "\"royalty_type\":\"transfer\"," +
-            "\"trans_out_type\":\"userId\"," +
-            "\"trans_out\":\"" + MerPid + "\"," +
-            "\"amount\":" + Amount + "," +
-            "\"desc\":\"" + Reason + "\"" +
-            "}]" +
+            "\"refund_reason\":\"" + Reason + "\"" +
+            // "\"refund_royalty_parameters\":[{" +
+            // "\"royalty_type\":\"transfer\"," +
+            // "\"trans_out_type\":\"userId\"," +
+            // "\"trans_out\":\"" + MerPid + "\"," +
+            // "\"amount\":" + Amount + "," +
+            // "\"desc\":\"" + Reason + "\"" +
+            // "}]" +
             "}";
             string result = "";
             try
             {
-                AlipayTradeRefundResponse response = client.Execute(request, null, "202306BB117e046cfc29434c8f4acfd2a43aeX03");
+                AlipayTradeRefundResponse response = client.Execute(request, null, MerToken);
                 result = response.Body;
             }
             catch (Exception ex)
@@ -375,7 +375,7 @@ namespace MySystem
         #endregion
 
         #region 分账
-        public string Settle(string OrderNo, string TradeNo, List<RoyaltyParameters> Parameters)
+        public string Settle(string OrderNo, string TradeNo, List<RoyaltyParameters> Parameters, string MerToken)
         {
             IAopClient client = new DefaultAopClient("https://openapi.alipay.com/gateway.do", AppId, PrivateKey, "json", "1.0", "RSA2", AlipayPublicKey, "utf-8", false);
             AlipayTradeOrderSettleRequest  request= new AlipayTradeOrderSettleRequest();
@@ -400,7 +400,7 @@ namespace MySystem
             string result = "";
             try
             {
-                AlipayTradeOrderSettleResponse response = client.Execute(request, null, "202306BB117e046cfc29434c8f4acfd2a43aeX03");
+                AlipayTradeOrderSettleResponse response = client.Execute(request, null, MerToken);
                 result = response.Body;
             }
             catch (Exception ex)
@@ -414,7 +414,7 @@ namespace MySystem
         #endregion
 
         #region 绑定分账关系
-        public string BindSettleRelation(string RequestNo, string Account)
+        public string BindSettleRelation(string RequestNo, string Account, string MerToken)
         {
             IAopClient client = new DefaultAopClient("https://openapi.alipay.com/gateway.do", AppId, PrivateKey, "json", "1.0", "RSA2", AlipayPublicKey, "utf-8", false);
             AlipayTradeRoyaltyRelationBindRequest request = new AlipayTradeRoyaltyRelationBindRequest();
@@ -434,7 +434,7 @@ namespace MySystem
             string result = "";
             try
             {
-                AlipayTradeRoyaltyRelationBindResponse response = client.Execute(request, null, "202306BB117e046cfc29434c8f4acfd2a43aeX03");
+                AlipayTradeRoyaltyRelationBindResponse response = client.Execute(request, null, MerToken);
                 result = response.Body;
             }
             catch (Exception ex)
@@ -448,19 +448,18 @@ namespace MySystem
         #endregion
 
         #region 查看分账
-        public string QuerySettle(string OrderNo, string TradeNo)
+        public string QuerySettle(string OrderNo, string TradeNo, string MerToken)
         {
             IAopClient client = new DefaultAopClient("https://openapi.alipay.com/gateway.do", AppId, PrivateKey, "json", "1.0", "RSA2", AlipayPublicKey, "utf-8", false);
             AlipayTradeOrderSettleQueryRequest request = new AlipayTradeOrderSettleQueryRequest();
             request.BizContent="{" +
-            "  \"settle_no\":\"20210706002530020036530021395831\"," +
-            "  \"out_request_no\":\"20210727001\"," +
-            "  \"trade_no\":\"2021112611001004680 073956707\"" +
+            "  \"out_request_no\":\"" + OrderNo + "\"," +
+            "  \"trade_no\":\"" + TradeNo + "\"" +
             "}";
             string result = "";
             try
             {
-                AlipayTradeOrderSettleQueryResponse response = client.Execute(request, null, "202306BB117e046cfc29434c8f4acfd2a43aeX03");
+                AlipayTradeOrderSettleQueryResponse response = client.Execute(request, null, MerToken);
                 result = response.Body;
             }
             catch (Exception ex)

AppStart/Helper/AlipayPayBackService.cs

@@ -1,7 +1,7 @@
 using System;
 using System.Collections.Generic;
 using System.Linq;
-using MySystem.PxcModels;
+using MySystem.Models;
 using Library;
 using LitJson;
 using System.Threading;
@@ -117,7 +117,7 @@ namespace MySystem
                                 //添加分账接收方
                                 if(merchant.Sort == 0)
                                 {
-                                    string content = AlipayFunction.Instance.BindSettleRelation(DateTime.Now.ToString("yyyyMMddHHmmssfff") + function.get_Random(8), merchantAdd.SeoTitle);
+                                    string content = AlipayFunction.Instance.BindSettleRelation(DateTime.Now.ToString("yyyyMMddHHmmssfff") + function.get_Random(8), merchantAdd.AlipayPid, merchantAdd.AlipayAuthToken);
                                     merchantAdd.Sort = 1;
                                     db.SaveChanges();
                                 }
@@ -133,12 +133,13 @@ namespace MySystem
                                         Account = merchantAdd.SeoTitle,
                                         Amount = fee.ToString("f2"),
                                     });
-                                    AlipayFunction.Instance.Settle(OrderNo, TradeNo, Parameters);
+                                    AlipayFunction.Instance.Settle(OrderNo, TradeNo, Parameters, merchantAdd.AlipayAuthToken);
 
                                     //开始监听分账状态
                                     Dictionary<string, object> req = new Dictionary<string, object>();
                                     req.Add("TradeNo", TradeNo); //支付宝订单号
                                     req.Add("OrderNo", OrderNo); //商户订单号
+                                    req.Add("AuthToken", merchantAdd.AlipayAuthToken);
                                     RedisDbconn.Instance.AddList("AlipayShareQueue", Newtonsoft.Json.JsonConvert.SerializeObject(req));
                                 }
                                 else

AppStart/Helper/AlipayShareService.cs

@@ -1,7 +1,7 @@
 using System;
 using System.Collections.Generic;
 using System.Linq;
-using MySystem.PxcModels;
+using MySystem.Models;
 using Library;
 using LitJson;
 using System.Text.RegularExpressions;
@@ -45,7 +45,8 @@ namespace MySystem
                 JsonData jsonObj = JsonMapper.ToObject(content);
                 string TradeNo = jsonObj["TradeNo"].ToString(); //支付宝订单号
                 string OrderNo = jsonObj["OrderNo"].ToString(); //商户订单号
-                string result = AlipayFunction.Instance.QuerySettle(OrderNo, TradeNo);
+                string AuthToken = jsonObj["AuthToken"].ToString();
+                string result = AlipayFunction.Instance.QuerySettle(OrderNo, TradeNo, AuthToken);
                 JsonData resultObj = JsonMapper.ToObject(result);
                 if(result.Contains("\"alipay_trade_order_settle_query_response\""))
                 {

AppStart/Helper/BalancePayBackService.cs

@@ -3,7 +3,7 @@ using System.Collections.Generic;
 using System.Linq;
 using System.Data;
 using System.Threading;
-using MySystem.PxcModels;
+using MySystem.Models;
 using Library;
 using LitJson;
 

AppStart/Helper/CheckAlipaySignService.cs

@@ -1,7 +1,7 @@
 using System;
 using System.Collections.Generic;
 using System.Linq;
-using MySystem.PxcModels;
+using MySystem.Models;
 using Library;
 using LitJson;
 using System.Text.RegularExpressions;
@@ -47,7 +47,7 @@ namespace MySystem
         {
             try
             {
-                PxcModels.WebCMSEntities db = new PxcModels.WebCMSEntities();
+                WebCMSEntities db = new WebCMSEntities();
                 string content = AlipayFunction.Instance.QuerySignStatus(sign.BusinessCode);
                 JsonData dic = JsonMapper.ToObject(content);
                 if (dic["alipay_open_agent_order_query_response"]["code"].ToString() == "10000")
@@ -55,31 +55,22 @@ namespace MySystem
                     if (dic["alipay_open_agent_order_query_response"]["order_status"].ToString() == "MERCHANT_CONFIRM")
                     {
                         string sign_url = dic["alipay_open_agent_order_query_response"]["confirm_url"].ToString();
-                        PxcModels.MerchantAddInfo merchantadd = db.MerchantAddInfo.FirstOrDefault(m => m.Id == sign.MerchantAddInfoId && m.QueryCount == 0);
+                        MerchantAddInfo merchantadd = db.MerchantAddInfo.FirstOrDefault(m => m.Id == sign.MerchantAddInfoId && m.QueryCount == 0);
                         if (merchantadd != null)
                         {
                             merchantadd.QueryCount = 1;
                             string confirm_url = "/static/alipay_confirm_url/";
                             string fileName = function.MD5_16(Guid.NewGuid().ToString());
                             function.CreateQRCode2(sign_url, fileName, "/" + confirm_url);
-                            string SignUrlList = function.CheckNull(merchantadd.SeoKeyword);
-                            if (string.IsNullOrEmpty(SignUrlList))
-                            {
-                                SignUrlList = "Alipay:" + confirm_url + ";";
-                            }
-                            else
-                            {
-                                SignUrlList = "Alipay:" + confirm_url+ ";" + SignUrlList;
-                            }
-                            merchantadd.SeoKeyword = SignUrlList;
-                            merchantadd.SeoTitle = dic["alipay_open_agent_order_query_response"]["merchant_pid"].ToString();
+                            merchantadd.AlipaySignUrl = confirm_url;
+                            merchantadd.AlipayPid = dic["alipay_open_agent_order_query_response"]["merchant_pid"].ToString();
                             db.SaveChanges();
                         }
                         return "wait";
                     }
                     else if (dic["alipay_open_agent_order_query_response"]["order_status"].ToString() == "MERCHANT_CONFIRM_SUCCESS")
                     {
-                        PxcModels.MerchantAddInfo merchantadd = db.MerchantAddInfo.FirstOrDefault(m => m.Id == sign.MerchantAddInfoId && m.QueryCount < 2);
+                        MerchantAddInfo merchantadd = db.MerchantAddInfo.FirstOrDefault(m => m.Id == sign.MerchantAddInfoId && m.QueryCount < 2);
                         if (merchantadd != null)
                         {
                             merchantadd.QueryCount = 2;
@@ -88,7 +79,7 @@ namespace MySystem
                     }
                     else if (dic["alipay_open_agent_order_query_response"]["order_status"].ToString() == "MERCHANT_APPLY_ORDER_CANCELED")
                     { 
-                        PxcModels.MerchantAddInfo merchantadd = db.MerchantAddInfo.FirstOrDefault(m => m.Id == sign.MerchantAddInfoId);
+                        MerchantAddInfo merchantadd = db.MerchantAddInfo.FirstOrDefault(m => m.Id == sign.MerchantAddInfoId);
                         if (merchantadd != null)
                         {
                             string Season = function.CheckNull(merchantadd.SeoDescription);
@@ -103,7 +94,7 @@ namespace MySystem
                             }
                             merchantadd.SeoDescription = Season;
                             merchantadd.QueryCount = -1;
-                            PxcModels.MerchantInfo merchant = db.MerchantInfo.FirstOrDefault(m => m.Id == sign.MerchantAddInfoId);
+                            MerchantInfo merchant = db.MerchantInfo.FirstOrDefault(m => m.Id == sign.MerchantAddInfoId);
                             if (merchant != null)
                             {
                                 merchant.Status = -1;

AppStart/Helper/CheckWeChatSignService.cs

@@ -1,7 +1,7 @@
 using System;
 using System.Collections.Generic;
 using System.Linq;
-using MySystem.PxcModels;
+using MySystem.Models;
 using Library;
 using LitJson;
 using System.Text.RegularExpressions;
@@ -47,13 +47,13 @@ namespace MySystem
         {
             try
             {
-                PxcModels.WebCMSEntities db = new PxcModels.WebCMSEntities();
+                WebCMSEntities db = new WebCMSEntities();
                 List<MerchantSign> deletes = new List<MerchantSign>();
                 Dictionary<string, object> dic = WeChatFunction.Instance.QueryMerchant(sign.BusinessCode);
                 if (dic["applyment_state"].ToString() == "APPLYMENT_STATE_TO_BE_SIGNED")
                 {
                     string sign_url = dic["sign_url"].ToString();
-                    PxcModels.MerchantAddInfo merchantadd = db.MerchantAddInfo.FirstOrDefault(m => m.Id == sign.MerchantAddInfoId && m.Status == 0);
+                    MerchantAddInfo merchantadd = db.MerchantAddInfo.FirstOrDefault(m => m.Id == sign.MerchantAddInfoId && m.Status == 0);
                     if (merchantadd != null)
                     {
                         merchantadd.Status = 1;
@@ -68,7 +68,7 @@ namespace MySystem
                             SignUrlList += "WeChat:" + sign_url+ ";";
                         }
                         merchantadd.SeoKeyword = SignUrlList;
-                        PxcModels.MerchantInfo merchant = db.MerchantInfo.FirstOrDefault(m => m.Id == sign.MerchantAddInfoId);
+                        MerchantInfo merchant = db.MerchantInfo.FirstOrDefault(m => m.Id == sign.MerchantAddInfoId);
                         if (merchantadd.Status > 0 && merchantadd.QueryCount > 0)
                         {
                             merchant.Status = 1;
@@ -91,7 +91,7 @@ namespace MySystem
                                 SignUrlList += "WeChat:" + sign_url+ ";";
                             }
                             merchantadd.SeoKeyword = SignUrlList;
-                            PxcModels.MerchantInfo merchant = db.MerchantInfo.FirstOrDefault(m => m.Id == sign.MerchantAddInfoId);
+                            MerchantInfo merchant = db.MerchantInfo.FirstOrDefault(m => m.Id == sign.MerchantAddInfoId);
                             if (merchantadd.Status > 0 && merchantadd.QueryCount > 0)
                             {
                                 merchant.Status = 1;
@@ -104,7 +104,7 @@ namespace MySystem
                 else if (dic["applyment_state"].ToString() == "APPLYMENT_STATE_TO_BE_CONFIRMED")
                 {
                     string sign_url = dic["sign_url"].ToString();
-                    PxcModels.MerchantAddInfo merchantadd = db.MerchantAddInfo.FirstOrDefault(m => m.Id == sign.MerchantAddInfoId && m.Status == 0);
+                    MerchantAddInfo merchantadd = db.MerchantAddInfo.FirstOrDefault(m => m.Id == sign.MerchantAddInfoId && m.Status == 0);
                     if (merchantadd != null)
                     {
                         merchantadd.Status = 1;
@@ -118,7 +118,7 @@ namespace MySystem
                             SignUrlList += "WeChat:" + sign_url+ ";";
                         }
                         merchantadd.SeoKeyword = SignUrlList;
-                        PxcModels.MerchantInfo merchant = db.MerchantInfo.FirstOrDefault(m => m.Id == sign.MerchantAddInfoId);
+                        MerchantInfo merchant = db.MerchantInfo.FirstOrDefault(m => m.Id == sign.MerchantAddInfoId);
                         if (merchantadd.Status > 0 && merchantadd.QueryCount > 0)
                         {
                             merchant.Status = 1;
@@ -129,13 +129,13 @@ namespace MySystem
                 }
                 else if (dic["applyment_state"].ToString() == "APPLYMENT_STATE_FINISHED")
                 { 
-                    PxcModels.MerchantAddInfo merchantadd = db.MerchantAddInfo.FirstOrDefault(m => m.Id == sign.MerchantAddInfoId && m.Status == 1);
+                    MerchantAddInfo merchantadd = db.MerchantAddInfo.FirstOrDefault(m => m.Id == sign.MerchantAddInfoId && m.Status == 1);
                     if (merchantadd != null)
                     {
                         merchantadd.Status = 2;
                         // merchantadd.SubMchid = dic["sub_mchid"].ToString();
                         RedisDbconn.Instance.Set("MerchantAddInfo:" + sign.MerchantAddInfoId, merchantadd);
-                        PxcModels.MerchantInfo merchant = db.MerchantInfo.FirstOrDefault(m => m.Id == sign.MerchantAddInfoId);
+                        MerchantInfo merchant = db.MerchantInfo.FirstOrDefault(m => m.Id == sign.MerchantAddInfoId);
                         if (merchantadd.Status == 2 && merchantadd.QueryCount == 2)
                         {
                             merchant.Status = 2;
@@ -145,7 +145,7 @@ namespace MySystem
                 }
                 else if (dic["applyment_state"].ToString() == "APPLYMENT_STATE_REJECTED")
                 {
-                    PxcModels.MerchantAddInfo merchantadd = db.MerchantAddInfo.FirstOrDefault(m => m.Id == sign.MerchantAddInfoId);
+                    MerchantAddInfo merchantadd = db.MerchantAddInfo.FirstOrDefault(m => m.Id == sign.MerchantAddInfoId);
                     if (merchantadd != null)
                     {
                         string Season = function.CheckNull(merchantadd.SeoDescription);
@@ -160,7 +160,7 @@ namespace MySystem
                         }
                         merchantadd.SeoDescription = Season;
                         merchantadd.Status = -1;
-                        PxcModels.MerchantInfo merchant = db.MerchantInfo.FirstOrDefault(m => m.Id == sign.MerchantAddInfoId);
+                        MerchantInfo merchant = db.MerchantInfo.FirstOrDefault(m => m.Id == sign.MerchantAddInfoId);
                         if (merchant != null)
                         {
                             merchant.Status = -1;
@@ -179,7 +179,7 @@ namespace MySystem
                     if (dic.ContainsKey("sub_mchid"))
                     {
                         sub_mchid = dic["sub_mchid"].ToString();
-                        PxcModels.MerchantAddInfo merchantadd = db.MerchantAddInfo.FirstOrDefault(m => m.Id == sign.MerchantAddInfoId);
+                        MerchantAddInfo merchantadd = db.MerchantAddInfo.FirstOrDefault(m => m.Id == sign.MerchantAddInfoId);
                         if (merchantadd != null)
                         {
                             merchantadd.SubMchid = sub_mchid;

AppStart/Helper/ConsumerOrdersReturnDoService.cs

@@ -4,7 +4,7 @@ using Library;
 using LitJson;
 using System.Linq;
 using System.Threading;
-using MySystem.PxcModels;
+using MySystem.Models;
 
 namespace MySystem
 {

AppStart/Helper/ConsumerOrdersReturnStatService.cs

@@ -3,7 +3,7 @@ using System.Collections.Generic;
 using Library;
 using LitJson;
 using System.Linq;
-using MySystem.PxcModels;
+using MySystem.Models;
 
 namespace MySystem
 {

AppStart/Helper/ConsumerOrdersStatService.cs

@@ -3,7 +3,7 @@ using System.Collections.Generic;
 using Library;
 using LitJson;
 using System.Linq;
-using MySystem.PxcModels;
+using MySystem.Models;
 
 namespace MySystem
 {

AppStart/Helper/DelMySql/DeleteMySqlDataService.cs

@@ -1,6 +1,6 @@
 using System;
 using System.Linq;
-using MySystem.PxcModels;
+using MySystem.Models;
 using Library;
 
 namespace MySystem

AppStart/Helper/DepositReturnService.cs

@@ -5,7 +5,7 @@ using LitJson;
 using System.Linq;
 using System.Data;
 using System.Threading;
-using MySystem.PxcModels;
+using MySystem.Models;
 
 namespace MySystem
 {

AppStart/Helper/DepositReturnStatService.cs

@@ -5,7 +5,7 @@ using LitJson;
 using System.Linq;
 using System.Data;
 using System.Threading;
-using MySystem.PxcModels;
+using MySystem.Models;
 
 namespace MySystem
 {

AppStart/Helper/LeaderPrizeService.cs

@@ -5,7 +5,7 @@ using LitJson;
 using System.Linq;
 using System.Data;
 using System.Threading;
-using MySystem.PxcModels;
+using MySystem.Models;
 
 namespace MySystem
 {

AppStart/Helper/MakeReferenceQrCodeService.cs

@@ -2,7 +2,7 @@
 using System.Collections.Generic;
 using System.Linq;
 using System.Threading;
-using MySystem.PxcModels;
+using MySystem.Models;
 using Library;
 using LitJson;
 using System.Drawing.Imaging;
@@ -54,8 +54,8 @@ namespace MySystem
                         string resultpath = MergeQrCode(user);
                         user.ReferenceQrCode = resultpath;
                         db.SaveChanges();
-                        PxcModels.WebCMSEntities pxcdb = new PxcModels.WebCMSEntities();
-                        PxcModels.Users tmpuser = pxcdb.Users.FirstOrDefault(m => m.Id == UserId);
+                        WebCMSEntities pxcdb = new WebCMSEntities();
+                        Users tmpuser = pxcdb.Users.FirstOrDefault(m => m.Id == UserId);
                         if (tmpuser != null)
                         {
                             tmpuser.ReferenceQrCode = user.ReferenceQrCode;

AppStart/Helper/MerchantConfirmService.cs

@@ -2,7 +2,7 @@
 using System.Collections.Generic;
 using System.Linq;
 using System.Text.RegularExpressions;
-using MySystem.PxcModels;
+using MySystem.Models;
 using Library;
 using LitJson;
 using System.Threading;
@@ -54,9 +54,9 @@ namespace MySystem
 
         public void StartDo(int MerchantId, int Kind = 0)
         {
-            PxcModels.WebCMSEntities db = new PxcModels.WebCMSEntities();
-            PxcModels.MerchantAddInfo AddInfo = db.MerchantAddInfo.FirstOrDefault(m => m.Id == MerchantId);
-            PxcModels.MerchantInfo merchant = db.MerchantInfo.FirstOrDefault(m => m.Id == MerchantId);
+            WebCMSEntities db = new WebCMSEntities();
+            MerchantAddInfo AddInfo = db.MerchantAddInfo.FirstOrDefault(m => m.Id == MerchantId);
+            MerchantInfo merchant = db.MerchantInfo.FirstOrDefault(m => m.Id == MerchantId);
             if (AddInfo != null && merchant != null)
             {
                 string BusinessCode = AddInfo.BusinessCode;
@@ -66,18 +66,18 @@ namespace MySystem
                     AddInfo.BusinessCode = BusinessCode;
                 }
                 merchant.LoginPwd = function.MD532(AddInfo.MobilePhone.Substring(5));
-                PxcModels.MerchantParamSet query = db.MerchantParamSet.FirstOrDefault(m => m.Id == MerchantId);
+                MerchantParamSet query = db.MerchantParamSet.FirstOrDefault(m => m.Id == MerchantId);
                 if (query == null)
                 {
-                    query = new PxcModels.MerchantParamSet();
+                    query = new MerchantParamSet();
                     query.IsAll = 1;
                     db.MerchantParamSet.Add(query);
                     db.SaveChanges();
                 }
-                PxcModels.MerchantForMobile merchantForMobile = db.MerchantForMobile.FirstOrDefault(m => m.Mobile == AddInfo.MobilePhone);
+                MerchantForMobile merchantForMobile = db.MerchantForMobile.FirstOrDefault(m => m.Mobile == AddInfo.MobilePhone);
                 if (merchantForMobile == null)
                 {
-                    merchantForMobile = db.MerchantForMobile.Add(new PxcModels.MerchantForMobile()
+                    merchantForMobile = db.MerchantForMobile.Add(new MerchantForMobile()
                     {
                         Mobile = AddInfo.MobilePhone,
                     }).Entity;

AppStart/Helper/MessageCenterService.cs

@@ -5,7 +5,7 @@ using LitJson;
 using System.Linq;
 using System.Data;
 using System.Threading;
-using MySystem.PxcModels;
+using MySystem.Models;
 
 namespace MySystem
 {

AppStart/Helper/OperatePrizeService.cs

@@ -5,7 +5,7 @@ using LitJson;
 using System.Linq;
 using System.Data;
 using System.Threading;
-using MySystem.PxcModels;
+using MySystem.Models;
 
 namespace MySystem
 {

AppStart/Helper/OperateService.cs

@@ -3,7 +3,7 @@ using System.Collections.Generic;
 using System.Data;
 using System.Linq;
 using System.Threading;
-using MySystem.PxcModels;
+using MySystem.Models;
 using Library;
 
 namespace MySystem

AppStart/Helper/Profit/ActiveService.cs

@@ -1,7 +1,7 @@
 using System;
 using System.Collections.Generic;
 using System.Linq;
-using MySystem.PxcModels;
+using MySystem.Models;
 using Library;
 using LitJson;
 

AppStart/Helper/Profit/DiviService.cs

@@ -1,7 +1,7 @@
 using System;
 using System.Collections.Generic;
 using System.Linq;
-using MySystem.PxcModels;
+using MySystem.Models;
 using Library;
 using LitJson;
 

AppStart/Helper/Profit/FluxService.cs

@@ -1,7 +1,7 @@
 using System;
 using System.Collections.Generic;
 using System.Linq;
-using MySystem.PxcModels;
+using MySystem.Models;
 using Library;
 using LitJson;
 

AppStart/Helper/Profit/HelpProfitHelper.cs

@@ -2,7 +2,7 @@
 using System.Collections.Generic;
 using System.Linq;
 using System.Data;
-using MySystem.PxcModels;
+using MySystem.Models;
 using Library;
 using System.Threading;
 using Microsoft.Extensions.Hosting;

AppStart/Helper/Profit/HelpProfitPreMerchantHelper.cs

@@ -2,7 +2,7 @@
 using System.Collections.Generic;
 using System.Linq;
 using System.Data;
-using MySystem.PxcModels;
+using MySystem.Models;
 using Library;
 using System.Threading;
 using Microsoft.Extensions.Hosting;

AppStart/Helper/Profit/OpenService.cs

@@ -1,7 +1,7 @@
 using System;
 using System.Collections.Generic;
 using System.Linq;
-using MySystem.PxcModels;
+using MySystem.Models;
 using Library;
 using LitJson;
 

AppStart/Helper/Profit/ProfitCheckHelper.cs

@@ -2,7 +2,7 @@
 using System.Collections.Generic;
 using System.Linq;
 using System.Data;
-using MySystem.PxcModels;
+using MySystem.Models;
 using Library;
 using LitJson;
 

AppStart/Helper/Profit/ProfitHelper.cs

@@ -2,7 +2,7 @@
 using System.Collections.Generic;
 using System.Linq;
 using System.Data;
-using MySystem.PxcModels;
+using MySystem.Models;
 using Library;
 using System.Threading;
 using Microsoft.Extensions.Hosting;
@@ -270,7 +270,7 @@ namespace MySystem
                                                     MerchantAddInfo merchantAdd = db.MerchantAddInfo.FirstOrDefault(m => m.Id == suborder.MerchantId) ?? new MerchantAddInfo();
                                                     if(order.PayMode == 1)
                                                     {
-                                                        AlipayFunction.Instance.Refund(suborder.SeoTitle, GetMoney.ToString("f2"), merchantAdd.SeoTitle, "客小爽来客吧项目盛大来袭");
+                                                        AlipayFunction.Instance.Refund(suborder.SeoTitle, GetMoney.ToString("f2"), "客小爽来客吧项目盛大来袭", merchantAdd.AlipayAuthToken);
                                                     }
                                                     else
                                                     {

AppStart/Helper/Profit/ProfitHelperV2.cs

@@ -2,7 +2,7 @@
 using System.Collections.Generic;
 using System.Linq;
 using System.Data;
-using MySystem.PxcModels;
+using MySystem.Models;
 using Library;
 using System.Threading;
 using Microsoft.Extensions.Hosting;

AppStart/Helper/Profit/ProfitService.cs

@@ -1,7 +1,7 @@
 using System;
 using System.Collections.Generic;
 using System.Linq;
-using MySystem.PxcModels;
+using MySystem.Models;
 using Library;
 using LitJson;
 

AppStart/Helper/Profit/StandardService.cs

@@ -1,7 +1,7 @@
 using System;
 using System.Collections.Generic;
 using System.Linq;
-using MySystem.PxcModels;
+using MySystem.Models;
 using Library;
 using LitJson;
 

AppStart/Helper/Profit/TeamTopService.cs

@@ -2,7 +2,7 @@
 using System.Threading.Tasks;
 using System.Linq;
 using Microsoft.Extensions.Hosting;
-using MySystem.PxcModels;
+using MySystem.Models;
 using MySystem;
 
 public class TeamTopService : BackgroundService

AppStart/Helper/ProfitShareService.cs

@@ -1,7 +1,7 @@
 using System;
 using System.Collections.Generic;
 using System.Linq;
-using MySystem.PxcModels;
+using MySystem.Models;
 using Library;
 using LitJson;
 using System.Text.RegularExpressions;

AppStart/Helper/RecommendActStatService.cs

@@ -5,7 +5,7 @@ using LitJson;
 using System.Linq;
 using System.Data;
 using System.Threading;
-using MySystem.PxcModels;
+using MySystem.Models;
 
 namespace MySystem
 {

AppStart/Helper/ReservePayBackService.cs

@@ -3,7 +3,7 @@ using System.Collections.Generic;
 using System.Linq;
 using System.Data;
 using System.Threading;
-using MySystem.PxcModels;
+using MySystem.Models;
 using Library;
 using LitJson;
 

AppStart/Helper/SetDepositPostService.cs

@@ -5,7 +5,7 @@ using LitJson;
 using System.Linq;
 using System.Data;
 using System.Threading;
-using MySystem.PxcModels;
+using MySystem.Models;
 using System.Security.Cryptography;
 using System.Text;
 

AppStart/Helper/SetDepositService.cs

@@ -5,7 +5,7 @@ using LitJson;
 using System.Linq;
 using System.Data;
 using System.Threading;
-using MySystem.PxcModels;
+using MySystem.Models;
 using System.Security.Cryptography;
 using System.Text;
 

AppStart/Helper/StatDataService.cs

@@ -5,7 +5,7 @@ using LitJson;
 using System.Linq;
 using System.Data;
 using System.Threading;
-using MySystem.PxcModels;
+using MySystem.Models;
 
 namespace MySystem
 {

AppStart/Helper/StatService.cs

@@ -5,7 +5,7 @@ using LitJson;
 using System.Linq;
 using System.Data;
 using System.Threading;
-using MySystem.PxcModels;
+using MySystem.Models;
 
 namespace MySystem
 {
@@ -154,19 +154,19 @@ namespace MySystem
                 {
                     Name = bind.SeoTitle;
                 }
-                PxcModels.Users user = db.Users.FirstOrDefault(m => m.Mobile.StartsWith(BeforeNum) && m.Mobile.EndsWith(AfterNum) && m.RealName == Name && m.AuthFlag == 1 && m.MerchantType == 0);
+                Users user = db.Users.FirstOrDefault(m => m.Mobile.StartsWith(BeforeNum) && m.Mobile.EndsWith(AfterNum) && m.RealName == Name && m.AuthFlag == 1 && m.MerchantType == 0);
                 if (user != null)
                 {
                     bool checkPos = db.PosMachinesTwo.Any(m => m.UserId == user.Id);
                     if (!checkPos)
                     {
-                        PxcModels.MachineForSnNo forSnNo = db.MachineForSnNo.FirstOrDefault(m => m.SnNo == bind.MerSnNo) ?? new PxcModels.MachineForSnNo();
-                        PxcModels.PosMachinesTwo pos = db.PosMachinesTwo.FirstOrDefault(m => m.Id == forSnNo.SnId && m.UserId != user.Id);
+                        MachineForSnNo forSnNo = db.MachineForSnNo.FirstOrDefault(m => m.SnNo == bind.MerSnNo) ?? new MachineForSnNo();
+                        PosMachinesTwo pos = db.PosMachinesTwo.FirstOrDefault(m => m.Id == forSnNo.SnId && m.UserId != user.Id);
                         if (pos != null)
                         {
                             pos.UserId = user.Id;
                             user.MerchantType = 1;
-                            PxcModels.PosMerchantInfo merchant = db.PosMerchantInfo.FirstOrDefault(m => m.KqMerNo == MerNo) ?? new PxcModels.PosMerchantInfo();
+                            PosMerchantInfo merchant = db.PosMerchantInfo.FirstOrDefault(m => m.KqMerNo == MerNo) ?? new PosMerchantInfo();
                             merchant.UserId = user.Id;
                             merchant.MerUserType = 1;
                             pos.SeoTitle = user.Id.ToString(); // 记录商户型创客的Id

AppStart/Helper/StatServiceTmp.cs

@@ -5,7 +5,7 @@ using LitJson;
 using System.Linq;
 using System.Data;
 using System.Threading;
-using MySystem.PxcModels;
+using MySystem.Models;
 
 namespace MySystem
 {

AppStart/Helper/StatStoreDataService.cs

@@ -5,7 +5,7 @@ using LitJson;
 using System.Linq;
 using System.Data;
 using System.Threading;
-using MySystem.PxcModels;
+using MySystem.Models;
 
 namespace MySystem
 {

AppStart/Helper/StatTimerService.cs

@@ -4,7 +4,7 @@ using Library;
 using LitJson;
 using System.Linq;
 using System.Data;
-using MySystem.PxcModels;
+using MySystem.Models;
 
 namespace MySystem
 {

AppStart/Helper/SycnMysql/ConsumerOpenIdsHelper.cs

@@ -1,5 +1,5 @@
 using Library;
-using MySystem.PxcModels;
+using MySystem.Models;
 using System;
 using System.Linq;
 

AppStart/Helper/SycnMysql/ConsumersHelper.cs

@@ -1,5 +1,5 @@
 using Library;
-using MySystem.PxcModels;
+using MySystem.Models;
 using System;
 using System.Linq;
 

AppStart/Helper/SycnMysql/MachineApplyHelper.cs

@@ -1,5 +1,5 @@
 using Library;
-using MySystem.PxcModels;
+using MySystem.Models;
 using System;
 using System.Linq;
 

AppStart/Helper/SycnMysql/MerchantParamSetHelper.cs

@@ -1,5 +1,5 @@
 using Library;
-using MySystem.PxcModels;
+using MySystem.Models;
 using System;
 using System.Linq;
 

AppStart/Helper/SycnMysql/OrderProductHelper.cs

@@ -1,5 +1,5 @@
 using Library;
-using MySystem.PxcModels;
+using MySystem.Models;
 using System;
 using System.Linq;
 

AppStart/Helper/SycnMysql/OrdersHelper.cs

@@ -1,5 +1,5 @@
 using Library;
-using MySystem.PxcModels;
+using MySystem.Models;
 using System;
 using System.Linq;
 

AppStart/Helper/SycnMysql/PosMachinesHelper.cs

@@ -1,5 +1,5 @@
 using Library;
-using MySystem.PxcModels;
+using MySystem.Models;
 using System;
 using System.Linq;
 

AppStart/Helper/SycnMysql/ProductsHelper.cs

@@ -1,5 +1,5 @@
 using Library;
-using MySystem.PxcModels;
+using MySystem.Models;
 using System;
 using System.Linq;
 

AppStart/Helper/SycnMysql/PublicTableHelper.cs

@@ -1,4 +1,4 @@
-using MySystem.PxcModels;
+using MySystem.Models;
 using System;
 using System.Data;
 using Library;

AppStart/Helper/SycnMysql/StoreChangeHistoryHelper.cs

@@ -1,5 +1,5 @@
 using Library;
-using MySystem.PxcModels;
+using MySystem.Models;
 using System;
 using System.Linq;
 

AppStart/Helper/SycnMysql/StoreStockChangeHelper.cs

@@ -1,5 +1,5 @@
 using Library;
-using MySystem.PxcModels;
+using MySystem.Models;
 using System;
 using System.Linq;
 

AppStart/Helper/SycnMysql/TeamApplyHelper.cs

@@ -1,5 +1,5 @@
 using Library;
-using MySystem.PxcModels;
+using MySystem.Models;
 using System;
 using System.Linq;
 

AppStart/Helper/SycnMysql/TeamOfferApplyHelper.cs

@@ -1,5 +1,5 @@
 using Library;
-using MySystem.PxcModels;
+using MySystem.Models;
 using System;
 using System.Linq;
 

AppStart/Helper/SycnMysql/UserAddressHelper.cs

@@ -1,5 +1,5 @@
 using Library;
-using MySystem.PxcModels;
+using MySystem.Models;
 using System;
 using System.Linq;
 

AppStart/Helper/SycnMysql/UserBackHelper.cs

@@ -1,5 +1,5 @@
 using Library;
-using MySystem.PxcModels;
+using MySystem.Models;
 using System;
 using System.Linq;
 

AppStart/Helper/SycnMysql/UserCashRecordHelper.cs

@@ -1,5 +1,5 @@
 using Library;
-using MySystem.PxcModels;
+using MySystem.Models;
 using System;
 using System.Linq;
 

AppStart/Helper/SycnMysql/UserLoginRecordHelper.cs

@@ -1,5 +1,5 @@
 using Library;
-using MySystem.PxcModels;
+using MySystem.Models;
 using System;
 using System.Linq;
 

AppStart/Helper/SycnMysql/UserMachineDataHelper.cs

@@ -1,5 +1,5 @@
 using Library;
-using MySystem.PxcModels;
+using MySystem.Models;
 using System;
 using System.Linq;
 

AppStart/Helper/SycnMysql/UserStoreChangeHelper.cs

@@ -1,5 +1,5 @@
 using Library;
-using MySystem.PxcModels;
+using MySystem.Models;
 using System;
 using System.Linq;
 

AppStart/Helper/SycnMysql/UsersHelper.cs

@@ -1,5 +1,5 @@
 using Library;
-using MySystem.PxcModels;
+using MySystem.Models;
 using System;
 using System.Linq;
 

AppStart/Helper/WeChatPayBackService.cs

@@ -3,7 +3,7 @@ using System.Collections.Generic;
 using Library;
 using LitJson;
 using System.Linq;
-using MySystem.PxcModels;
+using MySystem.Models;
 using Org.BouncyCastle.Crypto.Modes;
 using Org.BouncyCastle.Crypto.Engines;
 using Org.BouncyCastle.Crypto.Parameters;

AppStart/PublicFunction.cs

@@ -3,7 +3,7 @@ using System.Collections.Generic;
 using System.Linq;
 using System.Data;
 using System.Text.RegularExpressions;
-using MySystem.PxcModels;
+using MySystem.Models;
 using Library;
 
 namespace MySystem

AppStart/RelationClass.cs

@@ -1,7 +1,7 @@
 using System;
 using System.Collections.Generic;
 using System.Linq;
-using MySystem.PxcModels;
+using MySystem.Models;
 
 namespace MySystem
 {

AppStart/Tables/Alipay/RoyaltyParameters.cs

@@ -5,6 +5,7 @@ namespace MySystem
     public class RoyaltyParameters
     {
         public string Account { get; set; }
+        public string OutAccount { get; set; }
         public string Name { get; set; }
         public string Amount { get; set; }
     }

AppStart/Timer/ChangePosTimer.cs

@@ -5,7 +5,7 @@ using System.Threading.Tasks;
 using System.Linq;
 using Microsoft.Extensions.Hosting;
 using MySystem;
-using MySystem.PxcModels;
+using MySystem.Models;
 using LitJson;
 using Library;
 

AppStart/Timer/PosTradeStatTimer.cs

@@ -5,7 +5,7 @@ using System.Threading.Tasks;
 using System.Linq;
 using Microsoft.Extensions.Hosting;
 using MySystem;
-using MySystem.PxcModels;
+using MySystem.Models;
 using Library;
 using LitJson;
 

AppStart/Timer/RedPackageHelper.cs

@@ -4,7 +4,7 @@ using System.Threading;
 using System.Linq;
 using System.Data;
 using MySystem;
-using MySystem.PxcModels;
+using MySystem.Models;
 using Library;
 
 public class RedPackageHelper

AppStart/Timer/RedPackageV2Helper.cs

@@ -4,7 +4,7 @@ using System.Threading;
 using System.Linq;
 using System.Data;
 using MySystem;
-using MySystem.PxcModels;
+using MySystem.Models;
 using Library;
 
 public class RedPackageV2Helper

AppStart/Timer/ResetSmallStoreHelper.cs

@@ -4,7 +4,7 @@ using System.Threading;
 using System.Linq;
 using System.Data;
 using MySystem;
-using MySystem.PxcModels;
+using MySystem.Models;
 using Library;
 using LitJson;
 

AppStart/Timer/StoreApplyHelper.cs

@@ -4,7 +4,7 @@ using System.Threading;
 using System.Linq;
 using System.Data;
 using MySystem;
-using MySystem.PxcModels;
+using MySystem.Models;
 using Library;
 using LitJson;
 

AppStart/Timer/TestHelper.cs

@@ -4,7 +4,7 @@ using System.Threading;
 using System.Linq;
 using System.Data;
 using MySystem;
-using MySystem.PxcModels;
+using MySystem.Models;
 using Library;
 
 public class TestHelper

AppStart/Timer/TradeStatTimer.cs

@@ -5,7 +5,7 @@ using System.Threading.Tasks;
 using System.Linq;
 using Microsoft.Extensions.Hosting;
 using MySystem;
-using MySystem.PxcModels;
+using MySystem.Models;
 using LitJson;
 using Library;
 

AppStart/Timer/TradeStatTimer2.cs

@@ -5,7 +5,7 @@ using System.Threading.Tasks;
 using System.Linq;
 using Microsoft.Extensions.Hosting;
 using MySystem;
-using MySystem.PxcModels;
+using MySystem.Models;
 using LitJson;
 using Library;
 

AppStart/WeChatFunction.cs

@@ -8,6 +8,7 @@ using System.Security.Cryptography;
 using System.Text;
 using System.IO;
 using System.Net;
+using MySystem.Models;
 using Org.BouncyCastle.Crypto.Modes;
 using Org.BouncyCastle.Crypto.Parameters;
 using Org.BouncyCastle.Crypto.Engines;
@@ -26,14 +27,14 @@ namespace MySystem
 
         #region 服务商平台商户进件提交申请单API
 
-        public string MerchantCreate(PxcModels.MerchantAddInfo info, PxcModels.MerchantInfo merchant)
+        public string MerchantCreate(MerchantAddInfo info, MerchantInfo merchant)
         {
             // pubkey = GetPublicKey();
 
             Dictionary<string, object> result = new Dictionary<string, object>();
             result.Add("business_code", info.BusinessCode); //业务申请编号
 
-            PxcModels.WebCMSEntities dbpxc = new PxcModels.WebCMSEntities();
+            WebCMSEntities dbpxc = new WebCMSEntities();
             //超级管理员信息
             Dictionary<string, object> contact_info = new Dictionary<string, object>();
             contact_info.Add("contact_type", "LEGAL"); //超级管理员姓名
@@ -119,7 +120,7 @@ namespace MySystem
 
             Dictionary<string, object> biz_store_info = new Dictionary<string, object>();
             biz_store_info.Add("biz_store_name", info.BizStoreName); //门店名称
-            PxcModels.OpenBankCityTable BizAddress = dbpxc.OpenBankCityTable.FirstOrDefault(m => m.CityName.EndsWith(info.BizAddressCode)) ?? new PxcModels.OpenBankCityTable();
+            OpenBankCityTable BizAddress = dbpxc.OpenBankCityTable.FirstOrDefault(m => m.CityName.EndsWith(info.BizAddressCode)) ?? new OpenBankCityTable();
             biz_store_info.Add("biz_address_code", BizAddress.Code); //门店省市编码
             biz_store_info.Add("biz_store_address", info.BizStoreAddress); //门店地址
             List<string> store_entrance_pic = new List<string>();
@@ -188,9 +189,9 @@ namespace MySystem
             bank_account_info.Add("bank_account_type", info.BankAccountType); //账户类型
             bank_account_info.Add("account_name", RSAEncrypt(info.AccountName)); //开户名称
             bank_account_info.Add("account_bank", info.AccountBank); //开户银行
-            PxcModels.OpenBankCityTable BankAddress = dbpxc.OpenBankCityTable.FirstOrDefault(m => m.CityName.EndsWith(info.BankAddressCode)) ?? new PxcModels.OpenBankCityTable();
+            OpenBankCityTable BankAddress = dbpxc.OpenBankCityTable.FirstOrDefault(m => m.CityName.EndsWith(info.BankAddressCode)) ?? new OpenBankCityTable();
             bank_account_info.Add("bank_address_code", BankAddress.Code); //开户银行省市编码
-            PxcModels.OpenBankTable BankBranch = dbpxc.OpenBankTable.FirstOrDefault(m => m.BankName == info.BankName) ?? new PxcModels.OpenBankTable();
+            OpenBankTable BankBranch = dbpxc.OpenBankTable.FirstOrDefault(m => m.BankName == info.BankName) ?? new OpenBankTable();
             bank_account_info.Add("bank_branch_id", BankBranch.BankCode); //开户银行联行号
             bank_account_info.Add("bank_name", info.BankName); //开户银行全称（含支行）
             bank_account_info.Add("account_number", RSAEncrypt(info.AccountNumber)); //银行账号

Controllers/HomeController.cs

@@ -6,7 +6,7 @@ using System.Data;
 using System.Threading.Tasks;
 using Microsoft.AspNetCore.Mvc;
 using Microsoft.Extensions.Logging;
-using MySystem.PxcModels;
+using MySystem.Models;
 using System.Threading;
 using Library;
 using LitJson;
@@ -87,13 +87,13 @@ namespace MySystem.Controllers
             // List<RoyaltyParameters> Parameters = new List<RoyaltyParameters>();
             // Parameters.Add(new RoyaltyParameters()
             // {
-            //     Account = "2088641405724089",
-            //     Amount = "0.60",
+            //     Account = "2088141704579033",
+            //     Amount = "0.01",
             // });
-            // string content = AlipayFunction.Instance.Settle("2023061517455619986938439", "2023061522001451251430528719", Parameters);
-            // string content = AlipayFunction.Instance.BindSettleRelation(DateTime.Now.ToString("yyyyMMddHHmmssfff") + function.get_Random(8), "2088641405724089");
-            // string content = AlipayFunction.Instance.Refund("2023061522001451251430528719", "0.10", "2088641405724089", "客小爽来客吧项目盛大来袭");
-            string content = AlipayFunction.Instance.QuerySettle("2023061517455619986938439", "2023061522001451251430528719");
+            // string content = AlipayFunction.Instance.Settle("2023061615441556447868073", "2023061622001451251436120885", Parameters);
+            // string content = AlipayFunction.Instance.BindSettleRelation(DateTime.Now.ToString("yyyyMMddHHmmssfff") + function.get_Random(8), "2088141704579033");
+            // string content = AlipayFunction.Instance.Refund("2023061622001451251436120885", "0.01", "客小爽来客吧项目盛大来袭");
+            string content = AlipayFunction.Instance.QuerySettle("2023061517455619986938439", "2023061522001451251430528719", "");
             return content;
         }
     

Models/MerchantAddInfo.cs

@@ -97,5 +97,11 @@ namespace MySystem.Models
         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; }
     }
 }

Models/WebCMSEntities.cs

@@ -4935,6 +4935,26 @@ namespace MySystem.Models
                     .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.Models
 
                 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")

PublicClass/GraphQL/IRepository.cs

@@ -1,6 +1,6 @@
 using System;
 using System.Collections.Generic;
-using MySystem.PxcModels;
+using MySystem.Models;
 
 namespace MySystem.PublicClass.GraphQL
 {

PublicClass/GraphQL/Query.cs

@@ -1,6 +1,6 @@
 using System;
 using GraphQL.Types;
-using MySystem.PxcModels;
+using MySystem.Models;
 
 namespace MySystem.PublicClass.GraphQL
 {

PublicClass/GraphQL/Repository.cs

@@ -1,7 +1,7 @@
 using System;
 using System.Collections.Generic;
 using System.Linq;
-using MySystem.PxcModels;
+using MySystem.Models;
 
 namespace MySystem.PublicClass.GraphQL
 {

PxcModels/ActiveReward.cs

@@ -1,49 +0,0 @@
-using System;
-using System.Collections.Generic;
-
-namespace MySystem.PxcModels
-{
-    public partial class ActiveReward
-    {
-        public int Id { get; set; }
-        public int Sort { get; set; }
-        public int QueryCount { get; set; }
-        public int Status { get; set; }
-        public int Version { get; set; }
-        public DateTime? CreateDate { get; set; }
-        public DateTime? UpdateDate { get; set; }
-        public string CreateMan { get; set; }
-        public string UpdateMan { get; set; }
-        public string SeoTitle { get; set; }
-        public string SeoKeyword { get; set; }
-        public string SeoDescription { get; set; }
-        public int ParentParentUserId { get; set; }
-        public int ParentUserId { get; set; }
-        public int MerUserId { get; set; }
-        public int TopUserId { get; set; }
-        public DateTime? ActDate { get; set; }
-        public string Remark { get; set; }
-        public string City { get; set; }
-        public string Province { get; set; }
-        public string RewardTips { get; set; }
-        public int RewardRef { get; set; }
-        public int SnStoreId { get; set; }
-        public string ActTypeDesc { get; set; }
-        public int ActType { get; set; }
-        public int SnApplyUserId { get; set; }
-        public int SnType { get; set; }
-        public string KqSnNo { get; set; }
-        public string KqMerNo { get; set; }
-        public string MerUserNav { get; set; }
-        public int DirectBuddyNo { get; set; }
-        public string UserNav { get; set; }
-        public int BrandId { get; set; }
-        public decimal RuleRewardAmount { get; set; }
-        public decimal DivideAmount { get; set; }
-        public decimal RewardAmount { get; set; }
-        public int RewardSourceUserId { get; set; }
-        public DateTime? StandardDate { get; set; }
-        public int MerchantId { get; set; }
-        public int UserId { get; set; }
-    }
-}

PxcModels/ActivityEnrolRecord.cs

@@ -1,26 +0,0 @@
-using System;
-using System.Collections.Generic;
-
-namespace MySystem.PxcModels
-{
-    public partial class ActivityEnrolRecord
-    {
-        public int Id { get; set; }
-        public int Sort { get; set; }
-        public int QueryCount { get; set; }
-        public int Status { get; set; }
-        public int Version { get; set; }
-        public DateTime? CreateDate { get; set; }
-        public DateTime? UpdateDate { get; set; }
-        public string CreateMan { get; set; }
-        public string UpdateMan { get; set; }
-        public string SeoTitle { get; set; }
-        public string SeoKeyword { get; set; }
-        public string SeoDescription { get; set; }
-        public string EffectEndTime { get; set; }
-        public string EffectStartTime { get; set; }
-        public string EnrolMonth { get; set; }
-        public int UserId { get; set; }
-        public int ActId { get; set; }
-    }
-}

PxcModels/ActivityInfo.cs

@@ -1,37 +0,0 @@
-using System;
-using System.Collections.Generic;
-
-namespace MySystem.PxcModels
-{
-    public partial class ActivityInfo
-    {
-        public int Id { get; set; }
-        public int Sort { get; set; }
-        public int QueryCount { get; set; }
-        public int Status { get; set; }
-        public int Version { get; set; }
-        public DateTime? CreateDate { get; set; }
-        public DateTime? UpdateDate { get; set; }
-        public string CreateMan { get; set; }
-        public string UpdateMan { get; set; }
-        public string SeoTitle { get; set; }
-        public string SeoKeyword { get; set; }
-        public string SeoDescription { get; set; }
-        public string Remark { get; set; }
-        public string ActContent { get; set; }
-        public string ActBanner { get; set; }
-        public string ActReferUrl { get; set; }
-        public string EnrolEndTime { get; set; }
-        public string EnrolStartTime { get; set; }
-        public DateTime? EnrolEndDate { get; set; }
-        public DateTime? EnrolStartDate { get; set; }
-        public DateTime? EffectEndDate { get; set; }
-        public DateTime? EffectStartDate { get; set; }
-        public int IsTop { get; set; }
-        public string LimitTopBuddy { get; set; }
-        public string BrandId { get; set; }
-        public string ActName { get; set; }
-        public int ActType { get; set; }
-        public string ActCode { get; set; }
-    }
-}

PxcModels/ActivityPrizeDetail.cs

@@ -1,32 +0,0 @@
-using System;
-using System.Collections.Generic;
-
-namespace MySystem.PxcModels
-{
-    public partial class ActivityPrizeDetail
-    {
-        public int Id { get; set; }
-        public int Sort { get; set; }
-        public int QueryCount { get; set; }
-        public int Status { get; set; }
-        public int Version { get; set; }
-        public DateTime? CreateDate { get; set; }
-        public DateTime? UpdateDate { get; set; }
-        public string CreateMan { get; set; }
-        public string UpdateMan { get; set; }
-        public string SeoTitle { get; set; }
-        public string SeoKeyword { get; set; }
-        public string SeoDescription { get; set; }
-        public int TopUserId { get; set; }
-        public decimal ProfitRate { get; set; }
-        public decimal ActRewardAmt { get; set; }
-        public decimal CreditTradeAmt { get; set; }
-        public decimal OtherProdCreditTradeAmt { get; set; }
-        public string TradeMonth { get; set; }
-        public int CheckStatus { get; set; }
-        public decimal TradeAmt { get; set; }
-        public int BrandId { get; set; }
-        public int UserId { get; set; }
-        public int ActivityId { get; set; }
-    }
-}

PxcModels/ActivityRedPackageJoins.cs

@@ -1,24 +0,0 @@
-using System;
-using System.Collections.Generic;
-
-namespace MySystem.PxcModels
-{
-    public partial class ActivityRedPackageJoins
-    {
-        public int Id { get; set; }
-        public int Sort { get; set; }
-        public int QueryCount { get; set; }
-        public int Status { get; set; }
-        public int Version { get; set; }
-        public DateTime? CreateDate { get; set; }
-        public DateTime? UpdateDate { get; set; }
-        public string CreateMan { get; set; }
-        public string UpdateMan { get; set; }
-        public string SeoTitle { get; set; }
-        public string SeoKeyword { get; set; }
-        public string SeoDescription { get; set; }
-        public decimal PrizeAmt { get; set; }
-        public string ActivityDate { get; set; }
-        public int UserId { get; set; }
-    }
-}

PxcModels/ActivityRedPackageJoinss.cs

@@ -1,24 +0,0 @@
-using System;
-using System.Collections.Generic;
-
-namespace MySystem.PxcModels
-{
-    public partial class ActivityRedPackageJoinss
-    {
-        public int Id { get; set; }
-        public int Sort { get; set; }
-        public int QueryCount { get; set; }
-        public int Status { get; set; }
-        public int Version { get; set; }
-        public DateTime? CreateDate { get; set; }
-        public DateTime? UpdateDate { get; set; }
-        public string CreateMan { get; set; }
-        public string UpdateMan { get; set; }
-        public string SeoTitle { get; set; }
-        public string SeoKeyword { get; set; }
-        public string SeoDescription { get; set; }
-        public decimal PrizeAmt { get; set; }
-        public string ActivityDate { get; set; }
-        public int UserId { get; set; }
-    }
-}

PxcModels/ActivityRedPackageStock.cs

@@ -1,24 +0,0 @@
-using System;
-using System.Collections.Generic;
-
-namespace MySystem.PxcModels
-{
-    public partial class ActivityRedPackageStock
-    {
-        public int Id { get; set; }
-        public int Sort { get; set; }
-        public int QueryCount { get; set; }
-        public int Status { get; set; }
-        public int Version { get; set; }
-        public DateTime? CreateDate { get; set; }
-        public DateTime? UpdateDate { get; set; }
-        public string CreateMan { get; set; }
-        public string UpdateMan { get; set; }
-        public string SeoTitle { get; set; }
-        public string SeoKeyword { get; set; }
-        public string SeoDescription { get; set; }
-        public string ActivityDate { get; set; }
-        public decimal PrizeAmt { get; set; }
-        public int UserId { get; set; }
-    }
-}

PxcModels/ActivityRedPackageStocks.cs

@@ -1,24 +0,0 @@
-using System;
-using System.Collections.Generic;
-
-namespace MySystem.PxcModels
-{
-    public partial class ActivityRedPackageStocks
-    {
-        public int Id { get; set; }
-        public int Sort { get; set; }
-        public int QueryCount { get; set; }
-        public int Status { get; set; }
-        public int Version { get; set; }
-        public DateTime? CreateDate { get; set; }
-        public DateTime? UpdateDate { get; set; }
-        public string CreateMan { get; set; }
-        public string UpdateMan { get; set; }
-        public string SeoTitle { get; set; }
-        public string SeoKeyword { get; set; }
-        public string SeoDescription { get; set; }
-        public string ActivityDate { get; set; }
-        public decimal PrizeAmt { get; set; }
-        public int UserId { get; set; }
-    }
-}

PxcModels/ActivityRedPackageTop10.cs

@@ -1,25 +0,0 @@
-using System;
-using System.Collections.Generic;
-
-namespace MySystem.PxcModels
-{
-    public partial class ActivityRedPackageTop10
-    {
-        public int Id { get; set; }
-        public int Sort { get; set; }
-        public int QueryCount { get; set; }
-        public int Status { get; set; }
-        public int Version { get; set; }
-        public DateTime? CreateDate { get; set; }
-        public DateTime? UpdateDate { get; set; }
-        public string CreateMan { get; set; }
-        public string UpdateMan { get; set; }
-        public string SeoTitle { get; set; }
-        public string SeoKeyword { get; set; }
-        public string SeoDescription { get; set; }
-        public int Kind { get; set; }
-        public int TimeNum { get; set; }
-        public decimal PrizeAmt { get; set; }
-        public int UserId { get; set; }
-    }
-}

PxcModels/ActivityRedPackageTop10s.cs

@@ -1,25 +0,0 @@
-using System;
-using System.Collections.Generic;
-
-namespace MySystem.PxcModels
-{
-    public partial class ActivityRedPackageTop10s
-    {
-        public int Id { get; set; }
-        public int Sort { get; set; }
-        public int QueryCount { get; set; }
-        public int Status { get; set; }
-        public int Version { get; set; }
-        public DateTime? CreateDate { get; set; }
-        public DateTime? UpdateDate { get; set; }
-        public string CreateMan { get; set; }
-        public string UpdateMan { get; set; }
-        public string SeoTitle { get; set; }
-        public string SeoKeyword { get; set; }
-        public string SeoDescription { get; set; }
-        public int Kind { get; set; }
-        public int TimeNum { get; set; }
-        public decimal PrizeAmt { get; set; }
-        public int UserId { get; set; }
-    }
-}

PxcModels/Advertisment.cs

@@ -1,26 +0,0 @@
-using System;
-using System.Collections.Generic;
-
-namespace MySystem.PxcModels
-{
-    public partial class Advertisment
-    {
-        public int Id { get; set; }
-        public int Sort { get; set; }
-        public int QueryCount { get; set; }
-        public int Status { get; set; }
-        public int Version { get; set; }
-        public DateTime? CreateDate { get; set; }
-        public DateTime? UpdateDate { get; set; }
-        public string CreateMan { get; set; }
-        public string UpdateMan { get; set; }
-        public string SeoTitle { get; set; }
-        public string SeoKeyword { get; set; }
-        public string SeoDescription { get; set; }
-        public string Url { get; set; }
-        public string Contents { get; set; }
-        public string PicPath { get; set; }
-        public string ColId { get; set; }
-        public string Title { get; set; }
-    }
-}

PxcModels/AgentLevelSet.cs

@@ -1,25 +0,0 @@
-using System;
-using System.Collections.Generic;
-
-namespace MySystem.PxcModels
-{
-    public partial class AgentLevelSet
-    {
-        public int Id { get; set; }
-        public int Sort { get; set; }
-        public int QueryCount { get; set; }
-        public int Status { get; set; }
-        public int Version { get; set; }
-        public DateTime? CreateDate { get; set; }
-        public DateTime? UpdateDate { get; set; }
-        public string CreateMan { get; set; }
-        public string UpdateMan { get; set; }
-        public string SeoTitle { get; set; }
-        public string SeoKeyword { get; set; }
-        public string SeoDescription { get; set; }
-        public decimal AreasProfitPercent { get; set; }
-        public ulong LevelDiff { get; set; }
-        public decimal ProfitPercent { get; set; }
-        public string Name { get; set; }
-    }
-}

PxcModels/AppBottomNavs.cs

@@ -1,32 +0,0 @@
-using System;
-using System.Collections.Generic;
-
-namespace MySystem.PxcModels
-{
-    public partial class AppBottomNavs
-    {
-        public int Id { get; set; }
-        public int Sort { get; set; }
-        public int QueryCount { get; set; }
-        public int Status { get; set; }
-        public int Version { get; set; }
-        public DateTime? CreateDate { get; set; }
-        public DateTime? UpdateDate { get; set; }
-        public string CreateMan { get; set; }
-        public string UpdateMan { get; set; }
-        public string SeoTitle { get; set; }
-        public string SeoKeyword { get; set; }
-        public string SeoDescription { get; set; }
-        public string BgColor { get; set; }
-        public string NoPageHint { get; set; }
-        public string PageName { get; set; }
-        public string NormalTextColor { get; set; }
-        public string SelectTextColor { get; set; }
-        public string NormalIcon { get; set; }
-        public string SelectIcon { get; set; }
-        public string Title { get; set; }
-        public string PagPath { get; set; }
-        public string ScrollerAnimationImages { get; set; }
-        public string Style { get; set; }
-    }
-}

PxcModels/AppVersion.cs

@@ -1,28 +0,0 @@
-using System;
-using System.Collections.Generic;
-
-namespace MySystem.PxcModels
-{
-    public partial class AppVersion
-    {
-        public int Id { get; set; }
-        public int Sort { get; set; }
-        public int QueryCount { get; set; }
-        public int Status { get; set; }
-        public int Version { get; set; }
-        public DateTime? CreateDate { get; set; }
-        public DateTime? UpdateDate { get; set; }
-        public string CreateMan { get; set; }
-        public string UpdateMan { get; set; }
-        public string SeoTitle { get; set; }
-        public string SeoKeyword { get; set; }
-        public string SeoDescription { get; set; }
-        public string DownloadUrl { get; set; }
-        public string CancelText { get; set; }
-        public string ConfirmText { get; set; }
-        public string Info { get; set; }
-        public string Title { get; set; }
-        public string VersionNum { get; set; }
-        public string TerminalKind { get; set; }
-    }
-}

PxcModels/AppVideo.cs

@@ -1,24 +0,0 @@
-using System;
-using System.Collections.Generic;
-
-namespace MySystem.PxcModels
-{
-    public partial class AppVideo
-    {
-        public int Id { get; set; }
-        public int Sort { get; set; }
-        public int QueryCount { get; set; }
-        public int Status { get; set; }
-        public int Version { get; set; }
-        public DateTime? CreateDate { get; set; }
-        public DateTime? UpdateDate { get; set; }
-        public string CreateMan { get; set; }
-        public string UpdateMan { get; set; }
-        public string SeoTitle { get; set; }
-        public string SeoKeyword { get; set; }
-        public string SeoDescription { get; set; }
-        public string Remark { get; set; }
-        public string BannerPic { get; set; }
-        public string Name { get; set; }
-    }
-}

PxcModels/AppVideoList.cs

@@ -1,26 +0,0 @@
-using System;
-using System.Collections.Generic;
-
-namespace MySystem.PxcModels
-{
-    public partial class AppVideoList
-    {
-        public int Id { get; set; }
-        public int Sort { get; set; }
-        public int QueryCount { get; set; }
-        public int Status { get; set; }
-        public int Version { get; set; }
-        public DateTime? CreateDate { get; set; }
-        public DateTime? UpdateDate { get; set; }
-        public string CreateMan { get; set; }
-        public string UpdateMan { get; set; }
-        public string SeoTitle { get; set; }
-        public string SeoKeyword { get; set; }
-        public string SeoDescription { get; set; }
-        public string BgPic { get; set; }
-        public int VideoId { get; set; }
-        public string Remark { get; set; }
-        public string VideoUrl { get; set; }
-        public string Title { get; set; }
-    }
-}

PxcModels/BackEndOpRecord.cs

@@ -1,28 +0,0 @@
-using System;
-using System.Collections.Generic;
-
-namespace MySystem.PxcModels
-{
-    public partial class BackEndOpRecord
-    {
-        public int Id { get; set; }
-        public int Sort { get; set; }
-        public int QueryCount { get; set; }
-        public int Status { get; set; }
-        public DateTime? CreateDate { get; set; }
-        public DateTime? UpdateDate { get; set; }
-        public string SeoTitle { get; set; }
-        public string SeoKeyword { get; set; }
-        public string SeoDescription { get; set; }
-        public string Remark { get; set; }
-        public string AfterData { get; set; }
-        public string BeforeData { get; set; }
-        public string TableEnName { get; set; }
-        public string TableChName { get; set; }
-        public string SysRealName { get; set; }
-        public string SysUserName { get; set; }
-        public string CreateMan { get; set; }
-        public string UpdateMan { get; set; }
-        public int Version { get; set; }
-    }
-}

PxcModels/BankInfo.cs

@@ -1,26 +0,0 @@
-using System;
-using System.Collections.Generic;
-
-namespace MySystem.PxcModels
-{
-    public partial class BankInfo
-    {
-        public int Id { get; set; }
-        public int Sort { get; set; }
-        public int QueryCount { get; set; }
-        public int Status { get; set; }
-        public int Version { get; set; }
-        public DateTime? CreateDate { get; set; }
-        public DateTime? UpdateDate { get; set; }
-        public string CreateMan { get; set; }
-        public string UpdateMan { get; set; }
-        public string SeoTitle { get; set; }
-        public string SeoKeyword { get; set; }
-        public string SeoDescription { get; set; }
-        public string BankNameAbbr { get; set; }
-        public string UnitedBankName { get; set; }
-        public string UnitedBankNo { get; set; }
-        public string BankCode { get; set; }
-        public string BankName { get; set; }
-    }
-}