Skip to content

M
mall.oytour.com
Commit 0abec82f authored by 吴春's avatar 吴春
Browse files
Options

提交代码

parent e4b3dfd2
Hide whitespace changes
Inline Side-by-side
Showing with 96 additions and 87 deletions
Mall.Module.Product/OrderModule.cs
View file @ 0abec82f
......@@ -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
View file @ 0abec82f
......@@ -13,91 +13,92 @@
"ThinkConnection": "server=192.168.10.214;user id=reborn;password=Reborn@2018;database=reborn_think;CharSet=utf8mb4; Convert Zero Datetime=true; ",
"ThinkConnectionPName": "MySql.Data.MySqlClient"
},
"Logging": {
"LogLevel": {
"Default": "Information",
"Microsoft": "Warning",
"Microsoft.Hosting.Lifetime": "Information"
}
},
"AliSms": {
"signName": "印象之旅",
"accessKeyId": "LTAIwE7l9dImZSa3",
"accessKeySecret": "j47Ajn0d0WzUCIX8Biyj3P2r8QDltI"
},
"JwtSecretKey": "@VIITTOREBORN*2018123",
"JwtExpirTime": 2592000,
"ApiExpirTime": 2592000,
"AllowedHosts": "*",
"OpenValidation": "False",
"UploadSiteUrl": "http://192.168.10.214:8120",
"ViewFileSiteUrl": "https://viitto-1301420277.cos.ap-chengdu.myqcloud.com",
"AliFileSiteUrl": "https://vt-im-bucket.oss-cn-chengdu.aliyuncs.com",
"ImKey": "b612b31e837c79c68f141aeb719d2b20",
"ImSecret": "66000451fb72",
"Mongo": "mongodb://47.96.23.199:27017",
"MongoDBName": "Mall",
"ProjectUrl": "D:/project/GitProject/mallapp",
"DeveloperKitsPort": "15720",
"FirstPage": "pages/index/index.html",
"ByteDanceSendTemplate": "https://developer.toutiao.com/api/apps/game/template/send",
"sTenpayNotify": "http://mallapi.oytour.com/api/WeChatNotify/Notify", //微信商品回调地址
"sTenpayRechargeNotify": "http://mallapi.oytour.com/api/WeChatNotify/RechargeNotify", //微信充值回调地址
"sTenpayMemberBuyNotify": "http://mallapi.oytour.com/api/WeChatNotify/MemberBuyNotify", //微信充值回调地址
"sTenpayVipBuyNotify": "http://mallapi.oytour.com/api/WeChatNotify/VipBuyNotify", //微信购买VIP回调地址
"sTenpayActivityNotify": "http://mallapi.oytour.com/api/WeChatNotify/ActivityNotify", //赞羊教育活动在线支付回调地址
"NetworkDirector": 1756, //网络主管的id，用于新建供应商账户的时候的创建人
"RB_Branch_Id": 49, //所属公司id
"IncomeDirector": 1756, //财务收入创建人
"IncomeBranchId": 49, //财务收入创建人公司
"IncomeDepartment": 331,
"ExpendDirector": 1756, //财务支出创建人
"ExpendBranchId": 49, //财务支出创建人公司
"ExpendDepartment": 331,
"XuZongUserId": 111790, //徐总的id，用于区分线下订单
"RebornDMC": "reborn_dmc",
"PropertyDB": "test_property",
"IncomeFinanceApi": "http://192.168.10.2:8083/api/Mall/InsertFinanceBatchForMallIn",
"PaymentFinanceApi": "http://192.168.10.2:8083/api/Mall/InsertFinanceBatchForMallOut",
"ZYRefundFinanceApi": "http://192.168.10.2:8083/api/Mall/SetMallOrderSalesTheWayRefund",
"PropertyApi": "http://192.168.10.2:8087/api/ECWorkFlow/SetECSuppliesStockInFlow",
"EduOrderApi": "http://192.168.10.2:8017/api/Order/SetBatchClassOrder",
"EduUpdateGoodsSpecification": "http://192.168.10.17:8017/api/Order/UpdateGoodsSpecification",
"EduPushOrderProperty": "http://192.168.10.2:8085/api/EudGoods/SetMallOrderWeChatMessage",
"FinanceKey": "FinanceMallInsertToERPViitto2020",
"SettlementRate": "0.60",
"EduSettlementRate": "0.54",
"EduXuZongId": 2602, //徐总的id，用于区分线下订单
"EduActivityIncomeFinanceId": "9",
"EduActivityExpendFinanceId": "9",
"EduRollCallActionCode": "ActivityRollCall",
"RedisSetting": {
"RedisServer": "192.168.10.214",
"RedisPort": "6379",
"RedisPwd": "Viitto2018"
},
"VirtualDirectory": "WebFile",
"FileService": "2",
"IsNormalServer": 2,
"IsFirtsShopAutoExamine": 1, //首店企业认证是否字段审核
"FinanceSetting": {
"TenantId": 1,
"MallBaseId": 1,
"RemitTypeId": 10,
"RemitAccountId": 3012,
"ProcurementCTId": 224, //以下采购
"ProcurementFWId": 127,
"ProcurementDirector": 1756,
"ProcurementBranchId": 49,
"ProcurementDepartment": 331,
"ProcurementCurrencyId": 1
},
"MinProfitRate": {
"TenantId1": 0.1
},
"InitializeImages": {
"GradeEntranceImage": "1234566778"
},
"Logging": {
"LogLevel": {
"Default": "Information",
"Microsoft": "Warning",
"Microsoft.Hosting.Lifetime": "Information"
}
},
"AliSms": {
"signName": "印象之旅",
"accessKeyId": "LTAIwE7l9dImZSa3",
"accessKeySecret": "j47Ajn0d0WzUCIX8Biyj3P2r8QDltI"
},
"CustomerFormId": "6",
"JwtSecretKey": "@VIITTOREBORN*2018123",
"JwtExpirTime": 2592000,
"ApiExpirTime": 2592000,
"AllowedHosts": "*",
"OpenValidation": "False",
"UploadSiteUrl": "http://192.168.10.214:8120",
"ViewFileSiteUrl": "https://viitto-1301420277.cos.ap-chengdu.myqcloud.com",
"AliFileSiteUrl": "https://vt-im-bucket.oss-cn-chengdu.aliyuncs.com",
"ImKey": "b612b31e837c79c68f141aeb719d2b20",
"ImSecret": "66000451fb72",
"Mongo": "mongodb://47.96.23.199:27017",
"MongoDBName": "Mall",
"ProjectUrl": "D:/project/GitProject/mallapp",
"DeveloperKitsPort": "15720",
"FirstPage": "pages/index/index.html",
"ByteDanceSendTemplate": "https://developer.toutiao.com/api/apps/game/template/send",
"sTenpayNotify": "http://mallapi.oytour.com/api/WeChatNotify/Notify", //微信商品回调地址
"sTenpayRechargeNotify": "http://mallapi.oytour.com/api/WeChatNotify/RechargeNotify", //微信充值回调地址
"sTenpayMemberBuyNotify": "http://mallapi.oytour.com/api/WeChatNotify/MemberBuyNotify", //微信充值回调地址
"sTenpayVipBuyNotify": "http://mallapi.oytour.com/api/WeChatNotify/VipBuyNotify", //微信购买VIP回调地址
"sTenpayActivityNotify": "http://mallapi.oytour.com/api/WeChatNotify/ActivityNotify", //赞羊教育活动在线支付回调地址
"NetworkDirector": 1756, //网络主管的id，用于新建供应商账户的时候的创建人
"RB_Branch_Id": 49, //所属公司id
"IncomeDirector": 1756, //财务收入创建人
"IncomeBranchId": 49, //财务收入创建人公司
"IncomeDepartment": 331,
"ExpendDirector": 1756, //财务支出创建人
"ExpendBranchId": 49, //财务支出创建人公司
"ExpendDepartment": 331,
"XuZongUserId": 111790, //徐总的id，用于区分线下订单
"RebornDMC": "reborn_dmc",
"PropertyDB": "test_property",
"IncomeFinanceApi": "http://192.168.10.2:8083/api/Mall/InsertFinanceBatchForMallIn",
"PaymentFinanceApi": "http://192.168.10.2:8083/api/Mall/InsertFinanceBatchForMallOut",
"ZYRefundFinanceApi": "http://192.168.10.2:8083/api/Mall/SetMallOrderSalesTheWayRefund",
"PropertyApi": "http://192.168.10.2:8087/api/ECWorkFlow/SetECSuppliesStockInFlow",
"EduOrderApi": "http://192.168.10.2:8017/api/Order/SetBatchClassOrder",
"EduUpdateGoodsSpecification": "http://192.168.10.17:8017/api/Order/UpdateGoodsSpecification",
"EduPushOrderProperty": "http://192.168.10.2:8085/api/EudGoods/SetMallOrderWeChatMessage",
"FinanceKey": "FinanceMallInsertToERPViitto2020",
"SettlementRate": "0.60",
"EduSettlementRate": "0.54",
"EduXuZongId": 2602, //徐总的id，用于区分线下订单
"EduActivityIncomeFinanceId": "9",
"EduActivityExpendFinanceId": "9",
"EduRollCallActionCode": "ActivityRollCall",
"RedisSetting": {
"RedisServer": "192.168.10.214",
"RedisPort": "6379",
"RedisPwd": "Viitto2018"
},
"VirtualDirectory": "WebFile",
"FileService": "2",
"IsNormalServer": 2,
"IsFirtsShopAutoExamine": 1, //首店企业认证是否字段审核
"FinanceSetting": {
"TenantId": 1,
"MallBaseId": 1,
"RemitTypeId": 10,
"RemitAccountId": 3012,
"ProcurementCTId": 224, //以下采购
"ProcurementFWId": 127,
"ProcurementDirector": 1756,
"ProcurementBranchId": 49,
"ProcurementDepartment": 331,
"ProcurementCurrencyId": 1
},
"MinProfitRate": {
"TenantId1": 0.1
},
"InitializeImages": {
"GradeEntranceImage": "1234566778"
},
"ShareConfig": {
"ShareImg": "https://viitto-1301420277.cos.ap-chengdu.myqcloud.com/Static/zanyang.png"
},
......
Mall.WindowsService/appsettings.json
View file @ 0abec82f
......@@ -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, //财务收入创建人
......
Markdown is supported
0% or
You are about to add 0 people to the discussion. Proceed with caution.
Finish editing this message first!
Please register or to comment