Skip to content

M
mall.oytour.com
Commit 6e2581cb authored by liudong1993's avatar liudong1993
Browse files
Options

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

parents 2f16851b a0ed2034
Show whitespace changes
Inline Side-by-side
Showing with 222 additions and 189 deletions
Mall.Module.User/UserModule.cs
View file @ 6e2581cb
...@@ -4199,40 +4199,49 @@ namespace Mall.Module.User ...@@ -4199,40 +4199,49 @@ namespace Mall.Module.User
string pathName = Guid.NewGuid().ToString() + ".jpg"; string pathName = Guid.NewGuid().ToString() + ".jpg";
string basepath = AppContext.BaseDirectory; string basepath = AppContext.BaseDirectory;
string path_server = basepath + "\\upfile\\temporary\\" + pathName; string path_server = basepath + "\\upfile\\temporary\\" + pathName;
var Robj1 = HttpHelper.HttpPost(GetImageUrl, JsonHelper.Serialize(postData), "");
if (Robj1.Length > 200)
{
var Robj = HttpHelper.HttpPostForGetWXQRCodePath(GetImageUrl, JsonHelper.Serialize(postData), path_server); var Robj = HttpHelper.HttpPostForGetWXQRCodePath(GetImageUrl, JsonHelper.Serialize(postData), path_server);
//if (Robj.Length > 100) if (Robj != null)
//{ {
return "/upfile/temporary/" + pathName; return "/upfile/temporary/" + pathName;
////} }
////else }
////{ else
//// JObject parms = JObject.Parse(Robj); {
//// string errcode = parms.GetStringValue("errcode");//错误码 JObject parms = JObject.Parse(Robj1);
//// if (errcode == "40001")//access_token失效那就重新在获取一次 string errcode = parms.GetStringValue("errcode");//错误码
//// { if (errcode == "40001")//access_token失效那就重新在获取一次
//// token = Mall.Common.Pay.WeChatPat.TokenHelper.GetLXYToken(token, appletWeChatModel.MiniAppId, appletWeChatModel.MiniAppSecret); {
//// System.Threading.Tasks.Task.Run(() => CacheManager.AppletWeChat.WeiXinReidsCache.Set(appletWeChatModel.MiniAppId, token)); token = Mall.Common.Pay.WeChatPat.TokenHelper.GetLXYToken(token, appletWeChatModel.MiniAppId, appletWeChatModel.MiniAppSecret);
//// if (!string.IsNullOrEmpty(token)) System.Threading.Tasks.Task.Run(() => CacheManager.AppletWeChat.WeiXinReidsCache.Set(appletWeChatModel.MiniAppId, token));
//// { if (!string.IsNullOrEmpty(token))
//// GetImageUrl = "https://api.weixin.qq.com/wxa/getwxacode?access_token=" + token;//获取小程序码 {
//// postData = new GetImageUrl = "https://api.weixin.qq.com/wxa/getwxacode?access_token=" + token;//获取小程序码
//// { postData = new
//// path, {
//// width path,
//// }; width
//// pathName = Guid.NewGuid().ToString() + ".jpg"; };
//// basepath = AppContext.BaseDirectory; pathName = Guid.NewGuid().ToString() + ".jpg";
//// path_server = basepath + "\\upfile\\temporary\\" + pathName; basepath = AppContext.BaseDirectory;
//// Robj = HttpHelper.HttpPostForGetWXQRCodePath(GetImageUrl, JsonHelper.Serialize(postData), path_server); path_server = basepath + "\\upfile\\temporary\\" + pathName;
//// return "/upfile/temporary/" + pathName; Robj1 = HttpHelper.HttpPost(GetImageUrl, JsonHelper.Serialize(postData), "");
//// } var Robj = HttpHelper.HttpPostForGetWXQRCodePath(GetImageUrl, JsonHelper.Serialize(postData), path_server);
//// } if (Robj != null)
//// else {
//// { return "/upfile/temporary/" + pathName;
//// return "/upfile/temporary/"; }
//// } }
////} }
//var Robj1 = HttpHelper.HttpPost(GetImageUrl, JsonHelper.Serialize(postData), ""); else
{
return "";
}
}
//
} }
return ""; return "";
......
Mall.WebApi/Controllers/Mall/MallHelper.cs
View file @ 6e2581cb
...@@ -170,19 +170,24 @@ namespace Mall.WebApi.Controllers ...@@ -170,19 +170,24 @@ namespace Mall.WebApi.Controllers
{ {
TenantId = TenantId, TenantId = TenantId,
MallBaseId = MallBaseId, MallBaseId = MallBaseId,
GoodsIds = Ids GoodsIds = Ids,
GoodsStatus=1
}); });
foreach (var lastItem in childItem.goodsList)
List<GoodsDetailsItem2> newGoodsList = new List<GoodsDetailsItem2>();
foreach (var tempGood in tempGoodsList)
{ {
var tempGood = tempGoodsList?.Where(qitem => qitem.Id == lastItem.id)?.FirstOrDefault(); var lastItem = new GoodsDetailsItem2();
if (tempGood != null && tempGood.Id > 0) if (tempGood != null && tempGood.Id > 0)
{ {
lastItem.name = tempGood?.Name ?? lastItem.name; lastItem.name = tempGood.Name;
lastItem.price = Math.Round((tempGood?.SellingPrice ?? lastItem.price), 2); lastItem.price = Math.Round((tempGood?.SellingPrice??0), 2);
lastItem.picUrl = tempGood?.CoverImage != null ? Common.Config.GetFileUrl(tempGood.CoverImage) : Common.Config.GetFileUrl(lastItem.picUrl); lastItem.picUrl = tempGood?.CoverImage != null ? Common.Config.GetFileUrl(tempGood.CoverImage) : "";
lastItem.OriginalPrice = Math.Round((tempGood?.OriginalPrice ?? 0), 2); lastItem.OriginalPrice = Math.Round((tempGood?.OriginalPrice ?? 0), 2);
newGoodsList.Add(lastItem);
} }
} }
childItem.goodsList = newGoodsList;
} }
} }
//自动添加商品 //自动添加商品
...@@ -193,7 +198,8 @@ namespace Mall.WebApi.Controllers ...@@ -193,7 +198,8 @@ namespace Mall.WebApi.Controllers
{ {
TenantId = TenantId, TenantId = TenantId,
MallBaseId = MallBaseId, MallBaseId = MallBaseId,
CategoryIds = childItem.id.ToString() CategoryIds = childItem.id.ToString(),
GoodsStatus = 1
}); });
if (catGoodsList != null && catGoodsList.Count > 0) if (catGoodsList != null && catGoodsList.Count > 0)
{ {
...@@ -223,7 +229,8 @@ namespace Mall.WebApi.Controllers ...@@ -223,7 +229,8 @@ namespace Mall.WebApi.Controllers
var goodsList = productModule.GetProductGoodsPageList(1, goodsData.goodsLength, out long rowsCount, new Model.Extend.Product.RB_Goods_Extend() var goodsList = productModule.GetProductGoodsPageList(1, goodsData.goodsLength, out long rowsCount, new Model.Extend.Product.RB_Goods_Extend()
{ {
TenantId = TenantId, TenantId = TenantId,
MallBaseId = MallBaseId MallBaseId = MallBaseId,
GoodsStatus = 1
}); });
if (goodsList != null && goodsList.Count > 0) if (goodsList != null && goodsList.Count > 0)
{ {
...@@ -250,19 +257,23 @@ namespace Mall.WebApi.Controllers ...@@ -250,19 +257,23 @@ namespace Mall.WebApi.Controllers
{ {
TenantId = TenantId, TenantId = TenantId,
MallBaseId = MallBaseId, MallBaseId = MallBaseId,
GoodsIds = Ids GoodsIds = Ids,
GoodsStatus = 1
}); });
foreach (var childItem in goodsData.list) List<GoodsDetailsItem2> newGoodsList = new List<GoodsDetailsItem2>();
foreach (var tempGood in tempGoodsList)
{ {
var tempGood = tempGoodsList?.Where(qitem => qitem.Id == childItem.id)?.FirstOrDefault(); var childItem = new GoodsDetailsItem2();
if (tempGood != null && tempGood.Id > 0) if (tempGood != null && tempGood.Id > 0)
{ {
childItem.name = tempGood?.Name ?? childItem.name; childItem.name = tempGood?.Name ?? "";
childItem.price = Math.Round((tempGood?.SellingPrice ?? childItem.price), 2); childItem.price = Math.Round((tempGood?.SellingPrice ?? 0), 2);
childItem.picUrl = tempGood?.CoverImage != null ? Common.Config.GetFileUrl(tempGood.CoverImage) : Common.Config.GetFileUrl(childItem.picUrl); childItem.picUrl = tempGood?.CoverImage != null ? Common.Config.GetFileUrl(tempGood.CoverImage) : "";
childItem.OriginalPrice = Math.Round((tempGood?.OriginalPrice ?? 0), 2); childItem.OriginalPrice = Math.Round((tempGood?.OriginalPrice ?? 0), 2);
newGoodsList.Add(childItem);
} }
} }
goodsData.list = newGoodsList;
} }
} }
} }
...@@ -732,11 +743,11 @@ namespace Mall.WebApi.Controllers ...@@ -732,11 +743,11 @@ namespace Mall.WebApi.Controllers
var goodsList = productModule.GetProductGoodsPageList(1, 6, out long rowsCount, new Model.Extend.Product.RB_Goods_Extend() var goodsList = productModule.GetProductGoodsPageList(1, 6, out long rowsCount, new Model.Extend.Product.RB_Goods_Extend()
{ {
TenantId = Convert.ToInt32(miniProgram.TenantId), TenantId = Convert.ToInt32(miniProgram.TenantId),
MallBaseId = miniProgram.MallBaseId MallBaseId = miniProgram.MallBaseId,
GoodsStatus=1,
}); });
if (goodsList != null && goodsList.Count > 0) if (goodsList != null && goodsList.Count > 0)
{ {
foreach (var gItem in goodsList) foreach (var gItem in goodsList)
{ {
cats.goodsList.Add(new GoodsDetailsItem2() cats.goodsList.Add(new GoodsDetailsItem2()
...@@ -756,7 +767,8 @@ namespace Mall.WebApi.Controllers ...@@ -756,7 +767,8 @@ namespace Mall.WebApi.Controllers
{ {
TenantId = Convert.ToInt32(miniProgram.TenantId), TenantId = Convert.ToInt32(miniProgram.TenantId),
MallBaseId = miniProgram.MallBaseId, MallBaseId = miniProgram.MallBaseId,
CategoryIds = subitem.relation_id.ToString() CategoryIds = subitem.relation_id.ToString(),
GoodsStatus = 1,
}); });
if (goodsList != null && goodsList.Count > 0) if (goodsList != null && goodsList.Count > 0)
{ {
...@@ -851,7 +863,8 @@ namespace Mall.WebApi.Controllers ...@@ -851,7 +863,8 @@ namespace Mall.WebApi.Controllers
h = 1, h = 1,
x = 0, x = 0,
y = 0, y = 0,
link = new List<rubikLinkItem>() { link = new List<rubikLinkItem>()
{
new rubikLinkItem() new rubikLinkItem()
{ {
new_link_url = blockSource.MagicDataList[0].Link new_link_url = blockSource.MagicDataList[0].Link
...@@ -882,7 +895,8 @@ namespace Mall.WebApi.Controllers ...@@ -882,7 +895,8 @@ namespace Mall.WebApi.Controllers
h = 12, h = 12,
x = 0, x = 0,
y = 0, y = 0,
link = new List<rubikLinkItem>() { link = new List<rubikLinkItem>()
{
new rubikLinkItem() new rubikLinkItem()
{ {
new_link_url = blockSource.MagicDataList[0].Link new_link_url = blockSource.MagicDataList[0].Link
...@@ -907,7 +921,8 @@ namespace Mall.WebApi.Controllers ...@@ -907,7 +921,8 @@ namespace Mall.WebApi.Controllers
h = 12, h = 12,
x = 10, x = 10,
y = 0, y = 0,
link = new List<rubikLinkItem>() { link = new List<rubikLinkItem>()
{
new rubikLinkItem() new rubikLinkItem()
{ {
new_link_url = blockSource.MagicDataList[1].Link new_link_url = blockSource.MagicDataList[1].Link
...@@ -964,7 +979,8 @@ namespace Mall.WebApi.Controllers ...@@ -964,7 +979,8 @@ namespace Mall.WebApi.Controllers
h = 6, h = 6,
x = 10, x = 10,
y = 0, y = 0,
link = new List<rubikLinkItem>() { link = new List<rubikLinkItem>()
{
new rubikLinkItem() new rubikLinkItem()
{ {
new_link_url = blockSource.MagicDataList[1].Link new_link_url = blockSource.MagicDataList[1].Link
...@@ -1021,7 +1037,8 @@ namespace Mall.WebApi.Controllers ...@@ -1021,7 +1037,8 @@ namespace Mall.WebApi.Controllers
h = 24, h = 24,
x = 0, x = 0,
y = 0, y = 0,
link = new List<rubikLinkItem>() { link = new List<rubikLinkItem>()
{
new rubikLinkItem() new rubikLinkItem()
{ {
new_link_url = blockSource.MagicDataList[0].Link new_link_url = blockSource.MagicDataList[0].Link
...@@ -1046,7 +1063,8 @@ namespace Mall.WebApi.Controllers ...@@ -1046,7 +1063,8 @@ namespace Mall.WebApi.Controllers
h = 12, h = 12,
x = 20, x = 20,
y = 0, y = 0,
link = new List<rubikLinkItem>() { link = new List<rubikLinkItem>()
{
new rubikLinkItem() new rubikLinkItem()
{ {
new_link_url = blockSource.MagicDataList[1].Link new_link_url = blockSource.MagicDataList[1].Link
...@@ -1071,7 +1089,8 @@ namespace Mall.WebApi.Controllers ...@@ -1071,7 +1089,8 @@ namespace Mall.WebApi.Controllers
h = 12, h = 12,
x = 20, x = 20,
y = 12, y = 12,
link = new List<rubikLinkItem>() { link = new List<rubikLinkItem>()
{
new rubikLinkItem() new rubikLinkItem()
{ {
new_link_url = blockSource.MagicDataList[2].Link new_link_url = blockSource.MagicDataList[2].Link
...@@ -1096,7 +1115,8 @@ namespace Mall.WebApi.Controllers ...@@ -1096,7 +1115,8 @@ namespace Mall.WebApi.Controllers
h = 12, h = 12,
x = 35, x = 35,
y = 12, y = 12,
link = new List<rubikLinkItem>() { link = new List<rubikLinkItem>()
{
new rubikLinkItem() new rubikLinkItem()
{ {
new_link_url = blockSource.MagicDataList[3].Link new_link_url = blockSource.MagicDataList[3].Link
...@@ -1127,7 +1147,8 @@ namespace Mall.WebApi.Controllers ...@@ -1127,7 +1147,8 @@ namespace Mall.WebApi.Controllers
h = 16, h = 16,
x = 0, x = 0,
y = 0, y = 0,
link = new List<rubikLinkItem>() { link = new List<rubikLinkItem>()
{
new rubikLinkItem() new rubikLinkItem()
{ {
new_link_url = blockSource.MagicDataList[0].Link new_link_url = blockSource.MagicDataList[0].Link
...@@ -1184,7 +1205,8 @@ namespace Mall.WebApi.Controllers ...@@ -1184,7 +1205,8 @@ namespace Mall.WebApi.Controllers
h = 24, h = 24,
x = 0, x = 0,
y = 0, y = 0,
link = new List<rubikLinkItem>() { link = new List<rubikLinkItem>()
{
new rubikLinkItem() new rubikLinkItem()
{ {
new_link_url = blockSource.MagicDataList[0].Link new_link_url = blockSource.MagicDataList[0].Link
...@@ -1235,7 +1257,8 @@ namespace Mall.WebApi.Controllers ...@@ -1235,7 +1257,8 @@ namespace Mall.WebApi.Controllers
h = 24, h = 24,
x = 50, x = 50,
y = 6, y = 6,
link = new List<rubikLinkItem>() { link = new List<rubikLinkItem>()
{
new rubikLinkItem() new rubikLinkItem()
{ {
new_link_url = blockSource.MagicDataList[2].Link new_link_url = blockSource.MagicDataList[2].Link
...@@ -1293,7 +1316,8 @@ namespace Mall.WebApi.Controllers ...@@ -1293,7 +1316,8 @@ namespace Mall.WebApi.Controllers
h = 1, h = 1,
x = 1, x = 1,
y = 0, y = 0,
link = new List<rubikLinkItem>() { link = new List<rubikLinkItem>()
{
new rubikLinkItem() new rubikLinkItem()
{ {
new_link_url = blockSource.MagicDataList[1].Link new_link_url = blockSource.MagicDataList[1].Link
......
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