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
Hide 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
string pathName = Guid.NewGuid().ToString() + ".jpg";
string basepath = AppContext.BaseDirectory;
string path_server = basepath + "\\upfile\\temporary\\" + pathName;
var Robj = HttpHelper.HttpPostForGetWXQRCodePath(GetImageUrl, JsonHelper.Serialize(postData), path_server);
//if (Robj.Length > 100)
//{
return "/upfile/temporary/" + pathName;
////}
////else
////{
//// JObject parms = JObject.Parse(Robj);
//// 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));
//// if (!string.IsNullOrEmpty(token))
//// {
//// GetImageUrl = "https://api.weixin.qq.com/wxa/getwxacode?access_token=" + token;//获取小程序码
//// postData = new
//// {
//// path,
//// width
//// };
//// pathName = Guid.NewGuid().ToString() + ".jpg";
//// basepath = AppContext.BaseDirectory;
//// path_server = basepath + "\\upfile\\temporary\\" + pathName;
//// Robj = HttpHelper.HttpPostForGetWXQRCodePath(GetImageUrl, JsonHelper.Serialize(postData), path_server);
//// return "/upfile/temporary/" + pathName;
//// }
//// }
//// else
//// {
//// return "/upfile/temporary/";
//// }
////}
//var Robj1 = HttpHelper.HttpPost(GetImageUrl, JsonHelper.Serialize(postData), "");
var Robj1 = HttpHelper.HttpPost(GetImageUrl, JsonHelper.Serialize(postData), "");
if (Robj1.Length > 200)
{
var Robj = HttpHelper.HttpPostForGetWXQRCodePath(GetImageUrl, JsonHelper.Serialize(postData), path_server);
if (Robj != null)
{
return "/upfile/temporary/" + pathName;
}
}
else
{
JObject parms = JObject.Parse(Robj1);
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));
if (!string.IsNullOrEmpty(token))
{
GetImageUrl = "https://api.weixin.qq.com/wxa/getwxacode?access_token=" + token;//获取小程序码
postData = new
{
path,
width
};
pathName = Guid.NewGuid().ToString() + ".jpg";
basepath = AppContext.BaseDirectory;
path_server = basepath + "\\upfile\\temporary\\" + pathName;
Robj1 = HttpHelper.HttpPost(GetImageUrl, JsonHelper.Serialize(postData), "");
var Robj = HttpHelper.HttpPostForGetWXQRCodePath(GetImageUrl, JsonHelper.Serialize(postData), path_server);
if (Robj != null)
{
return "/upfile/temporary/" + pathName;
}
}
}
else
{
return "";
}
}
//
}
return "";
......
Mall.WebApi/Controllers/Mall/MallHelper.cs
View file @ 6e2581cb
......@@ -170,19 +170,24 @@ namespace Mall.WebApi.Controllers
{
TenantId = TenantId,
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)
{
lastItem.name = tempGood?.Name ?? lastItem.name;
lastItem.price = Math.Round((tempGood?.SellingPrice ?? lastItem.price), 2);
lastItem.picUrl = tempGood?.CoverImage != null ? Common.Config.GetFileUrl(tempGood.CoverImage) : Common.Config.GetFileUrl(lastItem.picUrl);
lastItem.name = tempGood.Name;
lastItem.price = Math.Round((tempGood?.SellingPrice??0), 2);
lastItem.picUrl = tempGood?.CoverImage != null ? Common.Config.GetFileUrl(tempGood.CoverImage) : "";
lastItem.OriginalPrice = Math.Round((tempGood?.OriginalPrice ?? 0), 2);
newGoodsList.Add(lastItem);
}
}
childItem.goodsList = newGoodsList;
}
}
//自动添加商品
......@@ -193,7 +198,8 @@ namespace Mall.WebApi.Controllers
{
TenantId = TenantId,
MallBaseId = MallBaseId,
CategoryIds = childItem.id.ToString()
CategoryIds = childItem.id.ToString(),
GoodsStatus = 1
});
if (catGoodsList != null && catGoodsList.Count > 0)
{
......@@ -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()
{
TenantId = TenantId,
MallBaseId = MallBaseId
MallBaseId = MallBaseId,
GoodsStatus = 1
});
if (goodsList != null && goodsList.Count > 0)
{
......@@ -250,19 +257,23 @@ namespace Mall.WebApi.Controllers
{
TenantId = TenantId,
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)
{
childItem.name = tempGood?.Name ?? childItem.name;
childItem.price = Math.Round((tempGood?.SellingPrice ?? childItem.price), 2);
childItem.picUrl = tempGood?.CoverImage != null ? Common.Config.GetFileUrl(tempGood.CoverImage) : Common.Config.GetFileUrl(childItem.picUrl);
childItem.name = tempGood?.Name ?? "";
childItem.price = Math.Round((tempGood?.SellingPrice ?? 0), 2);
childItem.picUrl = tempGood?.CoverImage != null ? Common.Config.GetFileUrl(tempGood.CoverImage) : "";
childItem.OriginalPrice = Math.Round((tempGood?.OriginalPrice ?? 0), 2);
newGoodsList.Add(childItem);
}
}
goodsData.list = newGoodsList;
}
}
}
......@@ -732,11 +743,11 @@ namespace Mall.WebApi.Controllers
var goodsList = productModule.GetProductGoodsPageList(1, 6, out long rowsCount, new Model.Extend.Product.RB_Goods_Extend()
{
TenantId = Convert.ToInt32(miniProgram.TenantId),
MallBaseId = miniProgram.MallBaseId
MallBaseId = miniProgram.MallBaseId,
GoodsStatus=1,
});
if (goodsList != null && goodsList.Count > 0)
{
foreach (var gItem in goodsList)
{
cats.goodsList.Add(new GoodsDetailsItem2()
......@@ -756,7 +767,8 @@ namespace Mall.WebApi.Controllers
{
TenantId = Convert.ToInt32(miniProgram.TenantId),
MallBaseId = miniProgram.MallBaseId,
CategoryIds = subitem.relation_id.ToString()
CategoryIds = subitem.relation_id.ToString(),
GoodsStatus = 1,
});
if (goodsList != null && goodsList.Count > 0)
{
......@@ -851,12 +863,13 @@ namespace Mall.WebApi.Controllers
h = 1,
x = 0,
y = 0,
link = new List<rubikLinkItem>() {
new rubikLinkItem()
{
new_link_url = blockSource.MagicDataList[0].Link
}
},
link = new List<rubikLinkItem>()
{
new rubikLinkItem()
{
new_link_url = blockSource.MagicDataList[0].Link
}
},
width = "calc(100%)",
height = "calc(100%)",
left = "0%",
......@@ -882,12 +895,13 @@ namespace Mall.WebApi.Controllers
h = 12,
x = 0,
y = 0,
link = new List<rubikLinkItem>() {
new rubikLinkItem()
{
new_link_url = blockSource.MagicDataList[0].Link
}
},
link = new List<rubikLinkItem>()
{
new rubikLinkItem()
{
new_link_url = blockSource.MagicDataList[0].Link
}
},
width = "calc(40%)",
height = "calc(100%)",
left = "0%",
......@@ -907,12 +921,13 @@ namespace Mall.WebApi.Controllers
h = 12,
x = 10,
y = 0,
link = new List<rubikLinkItem>() {
new rubikLinkItem()
{
new_link_url = blockSource.MagicDataList[1].Link
}
},
link = new List<rubikLinkItem>()
{
new rubikLinkItem()
{
new_link_url = blockSource.MagicDataList[1].Link
}
},
width = "calc(60%)",
height = "calc(100%)",
left = "calc(40%)",
......@@ -939,12 +954,12 @@ namespace Mall.WebApi.Controllers
x = 0,
y = 0,
link = new List<rubikLinkItem>()
{
new rubikLinkItem()
{
new_link_url = blockSource.MagicDataList[0].Link
}
},
{
new rubikLinkItem()
{
new_link_url = blockSource.MagicDataList[0].Link
}
},
width = "calc(40%)",
height = "calc(100%)",
left = "0%",
......@@ -964,12 +979,13 @@ namespace Mall.WebApi.Controllers
h = 6,
x = 10,
y = 0,
link = new List<rubikLinkItem>() {
new rubikLinkItem()
{
new_link_url = blockSource.MagicDataList[1].Link
}
},
link = new List<rubikLinkItem>()
{
new rubikLinkItem()
{
new_link_url = blockSource.MagicDataList[1].Link
}
},
width = "calc(60%)",
height = "calc(50%)",
left = "calc(40%)",
......@@ -990,12 +1006,12 @@ namespace Mall.WebApi.Controllers
x = 10,
y = 6,
link = new List<rubikLinkItem>()
{
new rubikLinkItem()
{
new_link_url = blockSource.MagicDataList[2].Link
}
},
{
new rubikLinkItem()
{
new_link_url = blockSource.MagicDataList[2].Link
}
},
width = "calc(60%)",
height = "calc(50%)",
left = "calc(40%)",
......@@ -1021,12 +1037,13 @@ namespace Mall.WebApi.Controllers
h = 24,
x = 0,
y = 0,
link = new List<rubikLinkItem>() {
new rubikLinkItem()
{
new_link_url = blockSource.MagicDataList[0].Link
}
},
link = new List<rubikLinkItem>()
{
new rubikLinkItem()
{
new_link_url = blockSource.MagicDataList[0].Link
}
},
width = "calc(40%)",
height = "calc(100%)",
left = "0%",
......@@ -1046,12 +1063,13 @@ namespace Mall.WebApi.Controllers
h = 12,
x = 20,
y = 0,
link = new List<rubikLinkItem>() {
new rubikLinkItem()
{
new_link_url = blockSource.MagicDataList[1].Link
}
},
link = new List<rubikLinkItem>()
{
new rubikLinkItem()
{
new_link_url = blockSource.MagicDataList[1].Link
}
},
width = "calc(60%)",
height = "calc(50%)",
left = "calc(40%)",
......@@ -1071,12 +1089,13 @@ namespace Mall.WebApi.Controllers
h = 12,
x = 20,
y = 12,
link = new List<rubikLinkItem>() {
new rubikLinkItem()
{
new_link_url = blockSource.MagicDataList[2].Link
}
},
link = new List<rubikLinkItem>()
{
new rubikLinkItem()
{
new_link_url = blockSource.MagicDataList[2].Link
}
},
width = "calc(30%)",
height = "calc(50%)",
left = "calc(40%)",
......@@ -1096,12 +1115,13 @@ namespace Mall.WebApi.Controllers
h = 12,
x = 35,
y = 12,
link = new List<rubikLinkItem>() {
new rubikLinkItem()
{
new_link_url = blockSource.MagicDataList[3].Link
}
},
link = new List<rubikLinkItem>()
{
new rubikLinkItem()
{
new_link_url = blockSource.MagicDataList[3].Link
}
},
width = "calc(30%)",
height = "calc(50%)",
left = "calc(70%)",
......@@ -1127,12 +1147,13 @@ namespace Mall.WebApi.Controllers
h = 16,
x = 0,
y = 0,
link = new List<rubikLinkItem>() {
new rubikLinkItem()
{
new_link_url = blockSource.MagicDataList[0].Link
}
},
link = new List<rubikLinkItem>()
{
new rubikLinkItem()
{
new_link_url = blockSource.MagicDataList[0].Link
}
},
width = "calc(50%)",
height = "calc(100%)",
left = "0%",
......@@ -1153,12 +1174,12 @@ namespace Mall.WebApi.Controllers
x = 25,
y = 0,
link = new List<rubikLinkItem>()
{
new rubikLinkItem()
{
new_link_url = blockSource.MagicDataList[1].Link
}
},
{
new rubikLinkItem()
{
new_link_url = blockSource.MagicDataList[1].Link
}
},
width = "calc(50%)",
height = "calc(100%)",
left = "0%",
......@@ -1184,12 +1205,13 @@ namespace Mall.WebApi.Controllers
h = 24,
x = 0,
y = 0,
link = new List<rubikLinkItem>() {
new rubikLinkItem()
{
new_link_url = blockSource.MagicDataList[0].Link
}
},
link = new List<rubikLinkItem>()
{
new rubikLinkItem()
{
new_link_url = blockSource.MagicDataList[0].Link
}
},
width = "calc(33.33%)",
height = "calc(100%)",
left = "0%",
......@@ -1210,12 +1232,12 @@ namespace Mall.WebApi.Controllers
x = 25,
y = 0,
link = new List<rubikLinkItem>()
{
new rubikLinkItem()
{
new_link_url = blockSource.MagicDataList[1].Link
}
},
{
new rubikLinkItem()
{
new_link_url = blockSource.MagicDataList[1].Link
}
},
width = "calc(33.33%)",
height = "calc(100%)",
left = "calc(33.33%)",
......@@ -1235,12 +1257,13 @@ namespace Mall.WebApi.Controllers
h = 24,
x = 50,
y = 6,
link = new List<rubikLinkItem>() {
new rubikLinkItem()
{
new_link_url = blockSource.MagicDataList[2].Link
}
},
link = new List<rubikLinkItem>()
{
new rubikLinkItem()
{
new_link_url = blockSource.MagicDataList[2].Link
}
},
width = "calc(33.34%)",
height = "calc(100%)",
left = "calc(66.66%)",
......@@ -1268,12 +1291,12 @@ namespace Mall.WebApi.Controllers
x = 0,
y = 0,
link = new List<rubikLinkItem>()
{
new rubikLinkItem()
{
new_link_url = blockSource.MagicDataList[0].Link
}
},
{
new rubikLinkItem()
{
new_link_url = blockSource.MagicDataList[0].Link
}
},
width = "calc(25%)",
height = "calc(100%)",
left = "0%",
......@@ -1293,12 +1316,13 @@ namespace Mall.WebApi.Controllers
h = 1,
x = 1,
y = 0,
link = new List<rubikLinkItem>() {
new rubikLinkItem()
{
new_link_url = blockSource.MagicDataList[1].Link
}
},
link = new List<rubikLinkItem>()
{
new rubikLinkItem()
{
new_link_url = blockSource.MagicDataList[1].Link
}
},
width = "calc(25%)",
height = "calc(100%)",
left = "calc(25%)",
......@@ -1319,12 +1343,12 @@ namespace Mall.WebApi.Controllers
x = 2,
y = 0,
link = new List<rubikLinkItem>()
{
new rubikLinkItem()
{
new_link_url = blockSource.MagicDataList[2].Link
}
},
{
new rubikLinkItem()
{
new_link_url = blockSource.MagicDataList[2].Link
}
},
width = "calc(25%)",
height = "calc(100%)",
left = "calc(50%)",
......@@ -1345,12 +1369,12 @@ namespace Mall.WebApi.Controllers
x = 3,
y = 0,
link = new List<rubikLinkItem>()
{
new rubikLinkItem()
{
new_link_url = blockSource.MagicDataList[3].Link
}
},
{
new rubikLinkItem()
{
new_link_url = blockSource.MagicDataList[3].Link
}
},
width = "calc(25%)",
height = "calc(100%)",
left = "calc(75%)",
......@@ -1377,12 +1401,12 @@ namespace Mall.WebApi.Controllers
x = 0,
y = 0,
link = new List<rubikLinkItem>()
{
new rubikLinkItem()
{
new_link_url = blockSource.MagicDataList[0].Link
}
},
{
new rubikLinkItem()
{
new_link_url = blockSource.MagicDataList[0].Link
}
},
width = "calc(50%)",
height = "calc(50%)",
left = "0%",
......@@ -1403,12 +1427,12 @@ namespace Mall.WebApi.Controllers
x = 125,
y = 0,
link = new List<rubikLinkItem>()
{
new rubikLinkItem()
{
new_link_url = blockSource.MagicDataList[1].Link
}
},
{
new rubikLinkItem()
{
new_link_url = blockSource.MagicDataList[1].Link
}
},
width = "calc(50%)",
height = "calc(50%)",
left = "calc(50%)",
......@@ -1429,12 +1453,12 @@ namespace Mall.WebApi.Controllers
x = 0,
y = 62,
link = new List<rubikLinkItem>()
{
new rubikLinkItem()
{
new_link_url = blockSource.MagicDataList[2].Link
}
},
{
new rubikLinkItem()
{
new_link_url = blockSource.MagicDataList[2].Link
}
},
width = "calc(50%)",
height = "calc(50%)",
left = "calc(0%)",
......@@ -1455,12 +1479,12 @@ namespace Mall.WebApi.Controllers
x = 125,
y = 62,
link = new List<rubikLinkItem>()
{
new rubikLinkItem()
{
new_link_url = blockSource.MagicDataList[3].Link
}
},
{
new rubikLinkItem()
{
new_link_url = blockSource.MagicDataList[3].Link
}
},
width = "calc(50%)",
height = "calc(50%)",
left = "calc(50%)",
......
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