From 006befd766c2cd872735c0cb2337c81fe3789b07 Mon Sep 17 00:00:00 2001 From: "AERWEN\\26795" <123456789a> Date: Wed, 25 Oct 2023 22:32:17 +0800 Subject: [PATCH] init --- .../ShopGoodsCategorys/ShopGoodsCategoryDto.cs | 2 ++ .../ShopGoodsCategorys/ShopGoodsCategory.cs | 9 +++++++++ .../ShopGoodsCategorys/ShopGoodsCategoryVo.cs | 6 ++++++ .../ShopGoodsCategorys/ShopGoodsCategoryService.cs | 2 ++ .../BusinessService/ShopManager/Shops/ShopService.cs | 9 ++++----- ARW.WebApi/appsettings.json | 10 +++++----- 6 files changed, 28 insertions(+), 10 deletions(-) diff --git a/ARW.Model/Dto/Business/GoodsManager/ShopGoodsCategorys/ShopGoodsCategoryDto.cs b/ARW.Model/Dto/Business/GoodsManager/ShopGoodsCategorys/ShopGoodsCategoryDto.cs index 6c45944..b8e5c34 100644 --- a/ARW.Model/Dto/Business/GoodsManager/ShopGoodsCategorys/ShopGoodsCategoryDto.cs +++ b/ARW.Model/Dto/Business/GoodsManager/ShopGoodsCategorys/ShopGoodsCategoryDto.cs @@ -28,6 +28,8 @@ namespace ARW.Model.Dto.Business.GoodsManager.ShopGoodsCategorys [Required(ErrorMessage = "名称不能为空")] public string ShopGoodsCategoryName { get; set; } + public string ShopGoodsCategoryImg { get; set; } + [Required(ErrorMessage = "显示状态不能为空")] public int ShopGoodsCategoryDisplayStatus { get; set; } diff --git a/ARW.Model/Models/Business/GoodsManager/ShopGoodsCategorys/ShopGoodsCategory.cs b/ARW.Model/Models/Business/GoodsManager/ShopGoodsCategorys/ShopGoodsCategory.cs index 296dede..7110d7f 100644 --- a/ARW.Model/Models/Business/GoodsManager/ShopGoodsCategorys/ShopGoodsCategory.cs +++ b/ARW.Model/Models/Business/GoodsManager/ShopGoodsCategorys/ShopGoodsCategory.cs @@ -74,6 +74,15 @@ namespace ARW.Model.Models.Business.GoodsManager.ShopGoodsCategorys public string ShopGoodsCategoryName { get; set; } + /// + /// 描述 :图标 + /// 空值 : false + /// + [EpplusTableColumn(Header = "图标")] + [SugarColumn(ColumnName = "shop_goods_category_img")] + public string ShopGoodsCategoryImg { get; set; } + + /// /// 描述 :显示状态 /// 空值 : false diff --git a/ARW.Model/Vo/Business/GoodsManager/ShopGoodsCategorys/ShopGoodsCategoryVo.cs b/ARW.Model/Vo/Business/GoodsManager/ShopGoodsCategorys/ShopGoodsCategoryVo.cs index 3e5233b..21a7a82 100644 --- a/ARW.Model/Vo/Business/GoodsManager/ShopGoodsCategorys/ShopGoodsCategoryVo.cs +++ b/ARW.Model/Vo/Business/GoodsManager/ShopGoodsCategorys/ShopGoodsCategoryVo.cs @@ -77,6 +77,12 @@ namespace ARW.Model.Vo.Business.GoodsManager.ShopGoodsCategorys public string ShopGoodsCategoryName { get; set; } + /// + /// 描述 :图标 + /// + [EpplusTableColumn(Header = "商品类目图标")] + public string ShopGoodsCategoryImg { get; set; } + /// /// 描述 :显示状态 /// diff --git a/ARW.Service/Business/BusinessService/GoodsManager/ShopGoodsCategorys/ShopGoodsCategoryService.cs b/ARW.Service/Business/BusinessService/GoodsManager/ShopGoodsCategorys/ShopGoodsCategoryService.cs index 52c8ae1..5d2997f 100644 --- a/ARW.Service/Business/BusinessService/GoodsManager/ShopGoodsCategorys/ShopGoodsCategoryService.cs +++ b/ARW.Service/Business/BusinessService/GoodsManager/ShopGoodsCategorys/ShopGoodsCategoryService.cs @@ -74,6 +74,7 @@ namespace ARW.Service.Business.BusinessService.GoodsManager.ShopGoodsCategorys ShopGoodsCategoryDisplayStatus = s.ShopGoodsCategoryDisplayStatus, ShopGoodsCategorySort = s.ShopGoodsCategorySort, ParentName = c.ShopGoodsCategoryName, + ShopGoodsCategoryImg = s.ShopGoodsCategoryImg }); return await query.ToTreeAsync(it => it.Children, it => it.ShopGoodsCategoryParentGuid, 0); @@ -110,6 +111,7 @@ namespace ARW.Service.Business.BusinessService.GoodsManager.ShopGoodsCategorys ShopGoodsCategoryDisplayStatus = s.ShopGoodsCategoryDisplayStatus, ShopGoodsCategorySort = s.ShopGoodsCategorySort, ParentName = c.ShopGoodsCategoryName, + ShopGoodsCategoryImg = s.ShopGoodsCategoryImg }); diff --git a/ARW.Service/Business/BusinessService/ShopManager/Shops/ShopService.cs b/ARW.Service/Business/BusinessService/ShopManager/Shops/ShopService.cs index 2266e20..9eb5506 100644 --- a/ARW.Service/Business/BusinessService/ShopManager/Shops/ShopService.cs +++ b/ARW.Service/Business/BusinessService/ShopManager/Shops/ShopService.cs @@ -82,14 +82,13 @@ namespace ARW.Service.Business.BusinessService.ShopManager.Shops predicate = predicate.AndIF(parm.ShopAuditStatus != null, s => s.ShopAuditStatus == parm.ShopAuditStatus); var query = _ShopRepository .Queryable() - .LeftJoin((s, c) => s.ShopUserId == c.UserId) - .LeftJoin((s, c, d) => s.ShopCustomerGuid == d.CustomerGuid) - .LeftJoin((s, c, d, f) => s.ShopBusinessCategoryGuid == f.GoodsCategoryGuid) + //.LeftJoin((s, c) => s.ShopUserId == c.UserId) + .LeftJoin((s, d) => s.ShopCustomerGuid == d.CustomerGuid) + .LeftJoin((s, d, f) => s.ShopBusinessCategoryGuid == f.GoodsCategoryGuid) .Where(predicate.ToExpression()) .OrderBy(s => s.ShopSort, OrderByType.Asc) - .Select((s, c, d, f) => new ShopVo + .Select((s, d, f) => new ShopVo { - UserName = c.UserName, CustomerNickname = d.CustomerNickname, ShopBusinessCategoryName = f.GoodsCategoryName, ShopId = s.ShopId, diff --git a/ARW.WebApi/appsettings.json b/ARW.WebApi/appsettings.json index 5b727c1..7b7d233 100644 --- a/ARW.WebApi/appsettings.json +++ b/ARW.WebApi/appsettings.json @@ -7,7 +7,7 @@ } }, "ConnectionStrings": { - "conn_db": "server=47.242.159.172;Database=shop_template;Uid=shop_template;Pwd=tKFJjWwL2kxMYtJK;SslMode=none;CharSet=utf8mb4;AllowLoadLocalInfile=true;AllowUserVariables=true;", + "conn_db": "server=47.242.159.172;Database=micro_mall_demo;Uid=micro_mall_demo;Pwd=MC6brabBGEWrTDZZ;SslMode=none;CharSet=utf8mb4;AllowLoadLocalInfile=true;AllowUserVariables=true;", //"conn_db": "server=127.0.0.1;Database=shop;Uid=root;Pwd=root;SslMode=none;CharSet=utf8mb4;AllowLoadLocalInfile=true;AllowUserVariables=true;", "conn_db_type": "8" //数据库类型 MySql = 0, SqlServer = 1 }, @@ -41,13 +41,13 @@ "templateCode": "SMS_154950909" }, "gen": { - "conn": "server=47.242.159.172;Database=shop_template;Uid=shop_template;Pwd=tKFJjWwL2kxMYtJK;SslMode=none;CharSet=utf8mb4;AllowLoadLocalInfile=true;AllowUserVariables=true;", - //"conn": "server=127.0.0.1;Database= shop_template;Uid=root;Pwd=root;SslMode=none;CharSet=utf8mb4;AllowLoadLocalInfile=true;AllowUserVariables=true;", + "conn": "server=47.242.159.172;Database=micro_mall_demo;Uid=micro_mall_demo;Pwd=MC6brabBGEWrTDZZ;SslMode=none;CharSet=utf8mb4;AllowLoadLocalInfile=true;AllowUserVariables=true;", + //"conn": "server=127.0.0.1;Database= micro_mall_demo;Uid=root;Pwd=root;SslMode=none;CharSet=utf8mb4;AllowLoadLocalInfile=true;AllowUserVariables=true;", "dbType": 8, //MySql = 0, SqlServer = 1 "autoPre": true, //自动去除表前缀 "author": "admin", "tablePrefix": "tb_", //"表前缀（生成类名不会包含表前缀，多个用逗号分隔）", - "vuePath": "D:\\Programming\\Net\\Aerwen\\template\\shop\\shop_back" //前端代码存储路径eg：D:\Work\ARWAdmin-Vue3 + "vuePath": "D:\\.Net\\Aerwen\\micro_mall\\micro_mall_back" //前端代码存储路径eg：D:\Work\ARWAdmin-Vue3 }, //邮箱配置信息 "MailOptions": { @@ -154,7 +154,7 @@ "TenPayV3_MchId": "1645875842", //商户号 "TenPayV3_SubMchId": "", //子商户，没有可留空 "TenPayV3_Key": "", // (旧) Key - "TenPayV3_CertPath": "D:\\.Net\\Aerwen\\shop_template\\wecaht_information\\cert\\apiclient_cert.p12", //支付证书物理路径，如：D:\\cert\\apiclient_cert.p12 + "TenPayV3_CertPath": "D:\\.Net\\Aerwen\\micro_mall_api\\wecaht_information\\cert\\apiclient_cert.p12", //支付证书物理路径，如：D:\\cert\\apiclient_cert.p12 "TenPayV3_CertSecret": "1645875842", //支付证书密码（原始密码和 MchId 相同） "TenPayV3_TenpayNotify": "http://shop.api.aerwen.net/api/WxPay/Notify", // 回调方法 "TenPayV3_RefundNotify": "http://shop.api.aerwen.net/api/WxPay/refundNotifyUrl", // 退款回调方法