提交代码

Mall.Module.Product/OrderModule.cs

@@ -1963,6 +1963,10 @@ namespace Mall.Module.Product
                         customFormList = custom_FormRepository.GetCustomFormByIdsListRepository(new Model.Extend.TradePavilion.RB_Custom_Form_Extend { TenantId = demodel.TenantId, MallBaseId = demodel.MallBaseId }, formsIds);
                         //   var dataList = AnalyzeFormComponent(customFormModel.FormData, isGetAnswer: false);
                     }
+                    else
+                    {
+                        customFormList = custom_FormRepository.GetCustomFormByIdsListRepository(new Model.Extend.TradePavilion.RB_Custom_Form_Extend { TenantId = demodel.TenantId, MallBaseId = demodel.MallBaseId }, Config.CustomerFormId);
+                    }
                 }
                 #endregion
 
@@ -2945,7 +2949,12 @@ namespace Mall.Module.Product
                     if (customFormList != null && customFormList.Any())
                     {
                         customFormModel = customFormList?.FirstOrDefault(x => x.Id == gmodel.FormsId);
+                        if ((customFormModel?.Id ?? 0) == 0)
+                        {
+                            customFormModel= customFormList?.FirstOrDefault();
+                        }
                     }
+
                     goods_list.Add(new
                     {
                         id = gmodel.Id,
@@ -3015,7 +3024,7 @@ namespace Mall.Module.Product
                         sign = "",
                         confine_order_count = gmodel.LimitBuyOrderNum,//限制订单数量
                         form_id = gmodel.FormsId,//表单id
-                        form_data_json = (customFormModel?.Id ?? 0) > 1 ? AnalyzeFormComponent(customFormModel.FormData, isGetAnswer: false) : AnalyzeFormComponent(Mall.Common.Config.CustomerForms, isGetAnswer: false),
+                        form_data_json = (customFormModel?.Id ?? 0) > 1 ? AnalyzeFormComponent(customFormModel.FormData, isGetAnswer: false) : new List<Model.Extend.TradePavilion.FormDataItem>(),
                         marketingLogo = JsonHelper.Serialize(tempLogo),
                     });
                 }

Mall.WebApi/appsettings.json

@@ -25,6 +25,7 @@
     "accessKeyId": "LTAIwE7l9dImZSa3",
     "accessKeySecret": "j47Ajn0d0WzUCIX8Biyj3P2r8QDltI"
   },
+  "CustomerFormId": "6",
   "JwtSecretKey": "@VIITTOREBORN*2018123",
   "JwtExpirTime": 2592000,
   "ApiExpirTime": 2592000,

Mall.WindowsService/appsettings.json

@@ -28,7 +28,6 @@
   "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, //财务收入创建人