提交和平商旅设置默认的自定义表单

Mall.Module.Product/OrderModule.cs

@@ -2941,7 +2941,11 @@ namespace Mall.Module.Product
                     }
                     //进阶小课堂扩展字段
                     var eduData = goodsRepository.ParsingEduJsonRepository(gmodel.EduJsonData);
-                    var customFormModel = customFormList?.FirstOrDefault(x => x.Id == gmodel.FormsId);
+                    Model.Extend.TradePavilion.RB_Custom_Form_Extend customFormModel = new Model.Extend.TradePavilion.RB_Custom_Form_Extend();
+                    if (customFormList != null && customFormList.Any())
+                    {
+                        customFormModel = customFormList?.FirstOrDefault(x => x.Id == gmodel.FormsId);
+                    }
                     goods_list.Add(new
                     {
                         id = gmodel.Id,
@@ -3011,7 +3015,7 @@ namespace Mall.Module.Product
                         sign = "",
                         confine_order_count = gmodel.LimitBuyOrderNum,//限制订单数量
                         form_id = gmodel.FormsId,//表单id
-                        form_data_json = (customFormModel?.Id ?? 0) > 0 ? AnalyzeFormComponent(customFormModel.FormData, isGetAnswer: false) : new List<Model.Extend.TradePavilion.FormDataItem>(),
+                        form_data_json = (customFormModel?.Id ?? 0) > 1 ? AnalyzeFormComponent(customFormModel.FormData, isGetAnswer: false) : AnalyzeFormComponent(Mall.Common.Config.CustomerForms, isGetAnswer: false),
                         marketingLogo = JsonHelper.Serialize(tempLogo),
                     });
                 }

Mall.WindowsService/appsettings.json

@@ -7,53 +7,54 @@
     "EduConnection": "server=192.168.10.214;user id=reborn;password=Reborn@2018;database=test_edu2;CharSet=utf8mb4; Convert Zero Datetime=true; ",
     "EduConnectionPName": "MySql.Data.MySqlClient"
   },
-    "Logging": {
-        "LogLevel": {
-            "Default": "Information",
-            "Microsoft": "Warning",
-            "Microsoft.Hosting.Lifetime": "Information"
-        }
-    },
-    "JwtSecretKey": "@VIITTOREBORN*2018",
-    "JwtExpirTime": 2592000,
-    "ApiExpirTime": 2592000,
-    "AllowedHosts": "*",
-    "OpenValidation": "False",
-    "UploadSiteUrl": "http://192.168.2.214:8120",
-    "ViewFileSiteUrl": "https://viitto-1301420277.cos.ap-chengdu.myqcloud.com",
-    "ImKey": "b612b31e837c79c68f141aeb719d2b20",
-    "ImSecret": "66000451fb72",
-    "Mongo": "mongodb://192.168.2.214:27017",
-    "MongoDBName": "Mall",
-    "ProjectUrl": "D:/project/GitProject/tripfriend",
-    "DeveloperKitsPort": "63994",
-    "FirstPage": "pages/index/index.html",
-    "ByteDanceSendTemplate": "https://developer.toutiao.com/api/apps/game/template/send",
-    "sTenpayNotify": "http://mallapi.oytour.com/api/WeChatNotify/Notify", //微信回调地址
-    "IncomeDirector": 1756, //财务收入创建人
-    "IncomeBranchId": 49, //财务收入创建人公司
-    "IncomeDepartment": 331,
-    "ExpendDirector": 1756, //财务支出创建人
-    "ExpendBranchId": 49, //财务支出创建人公司
-    "ExpendDepartment": 331,
-    "NetworkDirector": 1756, //网络主管的id，用于新建供应商账户的时候的创建人
-    "RB_Branch_Id": 49, //所属公司id
-    "RebornDMC": "reborn_dmc",
-    "IncomeFinanceApi": "http://192.168.2.16:8083/api/Mall/InsertFinanceBatchForMallIn",
-    "PaymentFinanceApi": "http://192.168.2.16:8083/api/Mall/InsertFinanceBatchForMallOut",
-    "EduUpdateGoodsSpecification": "http://192.168.10.17:8017/api/Order/UpdateGoodsSpecification",
-    "PayCertificateUrl": "D:/project/GitProject/Shopping/Mall.WebApi/",
-    "SettlementRate": "0.60",
-    //"FinanceKey": "FinanceMallInsertToERPViitto2020",
-    "FinanceKey": "FinanceMallInsertToERPViitto2020",
-    "RedisSetting": {
-        "RedisServer": "192.168.2.214",
-        "RedisPort": "6379",
-        "RedisPwd": "123456"
-    },
-    "VirtualDirectory": "WebFile",
-    "FileService": "2",
-    "InitializeImages": {
-        "GradeEntranceImage": "1234566778"
+  "Logging": {
+    "LogLevel": {
+      "Default": "Information",
+      "Microsoft": "Warning",
+      "Microsoft.Hosting.Lifetime": "Information"
     }
+  },
+  "JwtSecretKey": "@VIITTOREBORN*2018",
+  "JwtExpirTime": 2592000,
+  "ApiExpirTime": 2592000,
+  "AllowedHosts": "*",
+  "OpenValidation": "False",
+  "UploadSiteUrl": "http://192.168.10.214:8120",
+  "ViewFileSiteUrl": "https://viitto-1301420277.cos.ap-chengdu.myqcloud.com",
+  "ImKey": "b612b31e837c79c68f141aeb719d2b20",
+  "ImSecret": "66000451fb72",
+  "Mongo": "mongodb://192.168.2.214:27017",
+  "MongoDBName": "Mall",
+  "ProjectUrl": "D:/project/GitProject/tripfriend",
+  "DeveloperKitsPort": "63994",
+  "FirstPage": "pages/index/index.html",
+  "CustomerForms": "[{'CompKey':'SingleLineText','isCked': false,'CompData': {'Name': '姓名','WordsLength': 0,'IsRequire': true,'TextValue': '','Remark': ''}},{'CompKey':'MultiLineText','isCked': false, 'CompData': {'Name': '电话', 'WordsLength': 0, 'IsRequire': false, 'TextValue': '','Remark': ''  } }]",
+  "ByteDanceSendTemplate": "https://developer.toutiao.com/api/apps/game/template/send",
+  "sTenpayNotify": "http://mallapi.oytour.com/api/WeChatNotify/Notify", //微信回调地址
+  "IncomeDirector": 1756, //财务收入创建人
+  "IncomeBranchId": 49, //财务收入创建人公司
+  "IncomeDepartment": 331,
+  "ExpendDirector": 1756, //财务支出创建人
+  "ExpendBranchId": 49, //财务支出创建人公司
+  "ExpendDepartment": 331,
+  "NetworkDirector": 1756, //网络主管的id，用于新建供应商账户的时候的创建人
+  "RB_Branch_Id": 49, //所属公司id
+  "RebornDMC": "reborn_dmc",
+  "IncomeFinanceApi": "http://192.168.10.16:8083/api/Mall/InsertFinanceBatchForMallIn",
+  "PaymentFinanceApi": "http://192.168.10.16:8083/api/Mall/InsertFinanceBatchForMallOut",
+  "EduUpdateGoodsSpecification": "http://192.168.10.17:8017/api/Order/UpdateGoodsSpecification",
+  "PayCertificateUrl": "D:/project/GitProject/Shopping/Mall.WebApi/",
+  "SettlementRate": "0.60",
+  //"FinanceKey": "FinanceMallInsertToERPViitto2020",
+  "FinanceKey": "FinanceMallInsertToERPViitto2020",
+  "RedisSetting": {
+    "RedisServer": "192.168.2.214",
+    "RedisPort": "6379",
+    "RedisPwd": "123456"
+  },
+  "VirtualDirectory": "WebFile",
+  "FileService": "2",
+  "InitializeImages": {
+    "GradeEntranceImage": "1234566778"
+  }
 }
\ No newline at end of file