Skip to content

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

Merge branch 'master' of http://gitlab.oytour.com/Kui2/mall.oytour.com

parents 2309e33e bc6b9c26
Expand all Show whitespace changes
Inline Side-by-side
Showing with 413 additions and 43 deletions
Mall.Common/Plugin/ImportExcelNPOIHelper.cs
View file @ 7963d5ea
using NPOI.SS.Formula.Eval;
using NPOI.SS.UserModel;
using NPOI.XWPF.UserModel;
using System;
using System.Collections.Generic;
using System.Data;
......@@ -161,7 +162,7 @@ namespace Mall.Common.Plugin
case CellType.Numeric:
if (DateUtil.IsCellDateFormatted(row.GetCell(j)))
{
dataRow[j] = DateTime.FromOADate(row.GetCell(j).NumericCellValue);
dataRow[j] = row.GetCell(j).DateCellValue.ToString("yyyy-MM-dd HH:mm:ss");
}
else
{
......
Mall.Module.TradePavilion/CarrierModule.cs
View file @ 7963d5ea
......@@ -1085,7 +1085,27 @@ namespace Mall.Module.TradePavilion
List<object> secondResultList = new List<object>();
foreach (var secondItem in subList)
{
string secondUrl = "/pages/kotra/CarrierBuildingIndex?cat_id=" + firstItem.Id + "&CategoryIds=" + secondItem.ID;
string secondUrl ="";
//载体
if (firstItem.Id == 1)
{
secondUrl = "/pages/kotra/carrier/list?id=" + secondItem.ID;
}
//楼宇
else if (firstItem.Id == 2)
{
secondUrl = "/pages/kotra/carrier/list?id=" + secondItem.ID;
}
//消费品牌
else if (firstItem.Id == 3)
{
secondUrl = "/pages/kotra/brand/list?id=" + secondItem.ID;
}
//企业服务
else
{
secondUrl = "/pages/kotra/brand/list?id=" + secondItem.ID;
}
secondResultList.Add(new
{
PageId = secondItem.ID + 300000,
......@@ -1100,7 +1120,27 @@ namespace Mall.Module.TradePavilion
});
}
string rootUrl = @"/pages/kotra/CarrierBuildingIndex?cat_id=" + firstItem.Id;
string rootUrl = "";
//载体
if (firstItem.Id == 1)
{
rootUrl = "/pages/kotra/carrier/list";
}
//楼宇
else if (firstItem.Id == 2)
{
rootUrl = "/pages/kotra/carrier/list";
}
//消费品牌
else if (firstItem.Id == 3)
{
rootUrl = "/pages/kotra/brand/list";
}
//企业服务
else
{
rootUrl = "/pages/kotra/brand/list";
}
resultList.Add(new
{
PageId = firstItem.Id + 200000,
......
Mall.Repository/TradePavilion/RB_Brand_EnterpriseRepository.cs
View file @ 7963d5ea
using Mall.Model.Entity.TradePavilion;
using Mall.Common.Enum;
using Mall.Model.Entity.TradePavilion;
using Mall.Model.Extend.TradePavilion;
using System;
using System.Collections.Generic;
......@@ -27,8 +28,9 @@ namespace Mall.Repository.TradePavilion
StringBuilder builder = new StringBuilder();
builder.AppendFormat(@"
SELECT A.*,IFNULL(B.ClassName,'') AS CategoryName
FROM rb_brand_Enterprise AS A LEFT JOIN rb_brandclass AS B ON A.CategoryId=B.ID WHERE 1=1 ");
FROM rb_brand_Enterprise AS A LEFT JOIN rb_brandclass AS B ON A.CategoryId=B.ID
WHERE 1=1 ");
builder.AppendFormat(" AND A.{0}={1} ", nameof(RB_Brand_Enterprise_Extend.Status), (int)DateStateEnum.Normal);
if (query != null)
{
if (query.TenantId > 0)
......@@ -119,7 +121,7 @@ SELECT A.*,IFNULL(B.ClassName,'') AS CategoryName
FROM rb_brand_Enterprise AS A LEFT JOIN rb_brandclass AS B ON A.CategoryId=B.ID
WHERE 1=1
");
builder.AppendFormat(" AND A.{0}={1} ", nameof(RB_Brand_Enterprise_Extend.Status), (int)DateStateEnum.Normal);
if (query != null)
{
if (query.TenantId > 0)
......
Mall.Repository/TradePavilion/RB_Building_CarrierRepository.cs
View file @ 7963d5ea
......@@ -41,10 +41,10 @@ WHERE 1=1
{
builder.AppendFormat(" AND A.{0}={1} ", nameof(RB_Building_Carrier_Extend.MallBaseId), query.MallBaseId);
}
if (query.BuildingCarrierType > 0)
{
builder.AppendFormat(" AND A.{0}={1} ", nameof(RB_Building_Carrier_Extend.BuildingCarrierType), query.BuildingCarrierType);
}
//if (query.BuildingCarrierType > 0)
//{
// builder.AppendFormat(" AND A.{0}={1} ", nameof(RB_Building_Carrier_Extend.BuildingCarrierType), query.BuildingCarrierType);
//}
if (!string.IsNullOrEmpty(query.CarrierName))
{
builder.AppendFormat(" AND A.{0} LIKE @CarrierName ", nameof(RB_Building_Carrier_Extend.CarrierName));
......@@ -133,10 +133,10 @@ WHERE 1=1
{
builder.AppendFormat(" AND A.{0} in ({1}) ", nameof(RB_Building_Carrier_Extend.ID), query.SelectIds);
}
if (query.BuildingCarrierType > 0)
{
builder.AppendFormat(" AND A.{0}={1} ", nameof(RB_Building_Carrier_Extend.BuildingCarrierType), query.BuildingCarrierType);
}
//if (query.BuildingCarrierType > 0)
//{
// builder.AppendFormat(" AND A.{0}={1} ", nameof(RB_Building_Carrier_Extend.BuildingCarrierType), query.BuildingCarrierType);
//}
if (!string.IsNullOrEmpty(query.CarrierName))
{
builder.AppendFormat(" AND A.{0} LIKE @CarrierName ", nameof(RB_Building_Carrier_Extend.CarrierName));
......
Mall.ThirdCore/Oss/TencentOss.cs
View file @ 7963d5ea
......@@ -52,7 +52,7 @@ namespace Mall.ThirdCore.Oss
/// <summary>
/// 上传文件
/// </summary>
/// <param name="fileName">文件名</param>
/// <param name="filePath">文件名</param>
/// <param name="stream">文件流</param>
/// <returns></returns>
public OssResult UploadFile(string filePath, System.IO.Stream stream)
......@@ -76,7 +76,7 @@ namespace Mall.ThirdCore.Oss
{
string fileExtention = System.IO.Path.GetExtension(filePath);
string bucket = this.bucketName; //存储桶，格式：BucketName-APPID
string key = @"/SaleBefore/Goods/"+DateTime.Now.Ticks.ToString()+fileExtention; //对象在存储桶中的位置，即称对象键
string key = @"/YB2024/Goods/"+DateTime.Now.Ticks.ToString()+fileExtention; //对象在存储桶中的位置，即称对象键
PutObjectRequest request = new PutObjectRequest(bucket, key, filePath);
//设置签名有效时长
request.SetSign(TimeUtils.GetCurrentTime(TimeUnit.SECONDS), 600);
......
Test/App.config
View file @ 7963d5ea
<?xml version="1.0" encoding="utf-8"?>
<?xml version="1.0" encoding="utf-8"?>
<configuration>
<startup>
<supportedRuntime version="v4.0" sku=".NETFramework,Version=v4.6" />
<supportedRuntime version="v4.0" sku=".NETFramework,Version=v4.8"/>
</startup>
<connectionStrings>
<add name="DefaultConnection" providerName="MySql.Data.MySqlClient" connectionString="server=192.168.10.214;user id=reborn;password=Reborn@2018;database=reborn_mall;CharSet=utf8; Convert Zero Datetime=true; " />
<add name="DefaultConnection" providerName="MySql.Data.MySqlClient" connectionString="server=192.168.10.214;user id=reborn;password=Reborn@2018;database=reborn_mall;CharSet=utf8; Convert Zero Datetime=true; "/>
</connectionStrings>
<system.data>
<DbProviderFactories>
<remove invariant="MySql.Data.MySqlClient" />
<add name="MySQL Data Provider" invariant="MySql.Data.MySqlClient" description=".Net Framework Data Provider for MySQL" type="MySql.Data.MySqlClient.MySqlClientFactory, MySql.Data, Version=6.7.9.0, Culture=neutral, PublicKeyToken=c5687fc88969c44d" />
<remove invariant="MySql.Data.MySqlClient"/>
<add name="MySQL Data Provider" invariant="MySql.Data.MySqlClient" description=".Net Framework Data Provider for MySQL" type="MySql.Data.MySqlClient.MySqlClientFactory, MySql.Data, Version=6.7.9.0, Culture=neutral, PublicKeyToken=c5687fc88969c44d"/>
</DbProviderFactories>
</system.data></configuration>
TestCore/Program.cs
View file @ 7963d5ea
This diff is collapsed.
TestCore/TestCore.csproj
View file @ 7963d5ea
<Project Sdk="Microsoft.NET.Sdk">
<Project Sdk="Microsoft.NET.Sdk">
<PropertyGroup>
<OutputType>Exe</OutputType>
......@@ -6,7 +6,39 @@
</PropertyGroup>
<ItemGroup>
<None Remove="appsettings.json" />
</ItemGroup>
<ItemGroup>
<Content Include="appsettings.json">
<CopyToOutputDirectory>PreserveNewest</CopyToOutputDirectory>
<ExcludeFromSingleFile>true</ExcludeFromSingleFile>
<CopyToPublishDirectory>PreserveNewest</CopyToPublishDirectory>
</Content>
</ItemGroup>
<ItemGroup>
<ProjectReference Include="..\Mall.AOP\Mall.AOP.csproj" />
<ProjectReference Include="..\Mall.CacheManager\Mall.CacheManager.csproj" />
<ProjectReference Include="..\Mall.Common\Mall.Common.csproj" />
<ProjectReference Include="..\Mall.DataHelper\Mall.DataHelper.csproj" />
<ProjectReference Include="..\Mall.IM\Mall.IM.csproj" />
<ProjectReference Include="..\Mall.Model\Mall.Model.csproj" />
<ProjectReference Include="..\Mall.Module.BaseSetUp\Mall.Module.BaseSetUp.csproj" />
<ProjectReference Include="..\Mall.Module.Education\Mall.Module.Education.csproj" />
<ProjectReference Include="..\Mall.Module.MarketingCenter\Mall.Module.MarketingCenter.csproj" />
<ProjectReference Include="..\Mall.Module.Miai\Mall.Module.Miai.csproj" />
<ProjectReference Include="..\Mall.Module.Product\Mall.Module.Product.csproj" />
<ProjectReference Include="..\Mall.Module.Property\Mall.Module.Property.csproj" />
<ProjectReference Include="..\Mall.Module.Reserve\Mall.Module.Reserve.csproj" />
<ProjectReference Include="..\Mall.Module.TradePavilion\Mall.Module.TradePavilion.csproj" />
<ProjectReference Include="..\Mall.Module.User\Mall.Module.User.csproj" />
<ProjectReference Include="..\Mall.Repository\Mall.Repository.csproj" />
<ProjectReference Include="..\Mall.ThirdCore\Mall.ThirdCore.csproj" />
</ItemGroup>
<ItemGroup>
<Folder Include="upfile\" />
</ItemGroup>
</Project>
TestCore/UploadHelper.cs 0 → 100644
View file @ 7963d5ea
using Mall.ThirdCore.Oss;
using Microsoft.AspNetCore.Server.IISIntegration;
using System;
using System.Collections.Generic;
using System.Text;
namespace TestCore
{
public class UploadHelper
{
/// <summary>
/// 文件上传搭配腾讯
/// </summary>
/// <param name="filePath"></param>
/// <returns></returns>
public static OssResult UploadFileToTencent(string filePath)
{
string Region = "ap-chengdu";
string SecretId = "AKIDDPnbIzi8C1eqEOPP8dw6MNAg9H9ldDKd";
string SecretKey = "PdcLtOjslUzNFYdU4OSI1fKtdHpFT2Ob";
string Bucket = "viitto-1301420277";
IOssService ossService = OssService.GetTencent(Region, SecretId, SecretKey, Bucket);
OssResult result = ossService.UploadFile(filePath, null);
return result;
}
}
}
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