diff --git a/CoreCms.Net.CodeGenerator/GeneratorCodeHelper.cs b/CoreCms.Net.CodeGenerator/GeneratorCodeHelper.cs index 0c2d9a043b8c55ac03e8dc2bd0fdfb893db9b293..57725bd384360dce9d656e3a744e86aa6a46fba4 100644 --- a/CoreCms.Net.CodeGenerator/GeneratorCodeHelper.cs +++ b/CoreCms.Net.CodeGenerator/GeneratorCodeHelper.cs @@ -28,6 +28,11 @@ namespace CoreCms.Net.CodeGenerator //ModelClassName //ModelName //ModelFields Name Comment + foreach (var item in columns) + { + item.DbColumnName = item.DbColumnName.Substring(0, 1).ToLower() + item.DbColumnName.Substring(1); + } + var dt = DateTime.Now; byte[] data; var obj = new diff --git a/CoreCms.Net.Uni-App/CoreShop/common/setting/constVarsHelper.js b/CoreCms.Net.Uni-App/CoreShop/common/setting/constVarsHelper.js index 9b978782bd3eb25f678397a94d7673a6deaf7115..7ab9fd9b6a418a2f736644a7c8c281e4eaadbe8d 100644 --- a/CoreCms.Net.Uni-App/CoreShop/common/setting/constVarsHelper.js +++ b/CoreCms.Net.Uni-App/CoreShop/common/setting/constVarsHelper.js @@ -4,7 +4,7 @@ */ //接口请求地址，如果需要不部署接口端的情况下测试uni-app，可以直接替换为官方测试接口：https://api.demo.coreshop.cn -export const apiBaseUrl = 'https://api.demo.coreshop.cn'; +export const apiBaseUrl = 'http://localhost:2015'; //项目静态资源请求地址，如果使用官方的静态文件地址可以直接替换为：https://files.cdn.coreshop.cn export const apiFilesUrl = 'https://files.cdn.coreshop.cn'; diff --git a/CoreCms.Net.Uni-App/CoreShop/manifest.json b/CoreCms.Net.Uni-App/CoreShop/manifest.json index 4fe48522ef5942a41c26acf3895846db50f819e4..e1492ff3ac1f59579bc4e4252b6da7606418a877 100644 --- a/CoreCms.Net.Uni-App/CoreShop/manifest.json +++ b/CoreCms.Net.Uni-App/CoreShop/manifest.json @@ -102,7 +102,7 @@ "quickapp" : {}, /* 快应用特有相关 */ "mp-weixin" : { - "appid" : "wx6fc139d4de0b470f", + "appid" : "wxa53f990d87cb6cc3", "setting" : { "urlCheck" : true, "postcss" : true, diff --git a/CoreCms.Net.Uni-App/CoreShop/pages/member/afterSales/submit/submit.vue b/CoreCms.Net.Uni-App/CoreShop/pages/member/afterSales/submit/submit.vue index 072da8c45b70f20aef7122a78c1f33d8fa57c1c0..552266a7ed0f05b8c1ac4c05d7ea203ffea6ba19 100644 --- a/CoreCms.Net.Uni-App/CoreShop/pages/member/afterSales/submit/submit.vue +++ b/CoreCms.Net.Uni-App/CoreShop/pages/member/afterSales/submit/submit.vue @@ -1,421 +1,530 @@ diff --git a/CoreCms.Net.Uni-App/CoreShop/uview-ui/package.json b/CoreCms.Net.Uni-App/CoreShop/uview-ui/package.json index f911d315892363e3021add4bb3693e0f4921f8cd..6b2270b9f79e8814f7da1d77c27fee27cf2e9970 100644 --- a/CoreCms.Net.Uni-App/CoreShop/uview-ui/package.json +++ b/CoreCms.Net.Uni-App/CoreShop/uview-ui/package.json @@ -1,5 +1,5 @@ { - "name": "uView", + "name": "uview-ui", "version": "1.8.6", "description": "uView UI，是uni-app生态优秀的UI框架，全面的组件和便捷的工具会让您信手拈来，如鱼得水", "main": "index.js", diff --git a/CoreCms.Net.Web.Admin/Controllers/PinTuan/CoreCmsPintuanRuleController.cs b/CoreCms.Net.Web.Admin/Controllers/PinTuan/CoreCmsPintuanRuleController.cs index 911d95f71792239ac4937b95c3c57a0bc8032ad7..53fd727f0df7a6d73e03f31830b7550b0d17f5b6 100644 --- a/CoreCms.Net.Web.Admin/Controllers/PinTuan/CoreCmsPintuanRuleController.cs +++ b/CoreCms.Net.Web.Admin/Controllers/PinTuan/CoreCmsPintuanRuleController.cs @@ -166,6 +166,9 @@ namespace CoreCms.Net.Web.Admin.Controllers @where = @where.And(p => p.isStatusOpen == false); //获取数据 var list = await _coreCmsPinTuanRuleServices.QueryPageAsync(where, orderEx, orderBy, pageCurrent, pageSize); + + + //返回数据 jm.data = list; jm.code = 0; @@ -232,19 +235,44 @@ namespace CoreCms.Net.Web.Admin.Controllers return jm; } + var bl=false; entity.createTime = DateTime.Now; - var id = await _coreCmsPinTuanRuleServices.InsertAsync(entity); - var bl = id > 0; - if (bl && entity.goods.Any()) + + //判断所选的商品不为空 + if (entity!=null&&entity.goods.Any()) { var list = new List(); + //循环列表得到所选的值 foreach (var good in entity.goods) - list.Add(new CoreCmsPinTuanGoods + { + + //根据商品id查询商品是否存在 + var istrue = await _coreCmsPinTuanRuleServices.GetPinTuanInfo(good); + //istrue不为空时存在该商品提示：拼团商品不能重复 + if (istrue!=null) { - goodsId = good, - ruleId = id - }); - await _coreCmsPinTuanGoodsServices.InsertAsync(list); + jm.msg = "拼团商品不能重复"; + return jm; + } + //istrue为空时不存在该商品的拼团 则对商品进行添加 + else if (istrue == null) + { + var id = await _coreCmsPinTuanRuleServices.InsertAsync(entity); + bl = id > 0; + + list.Add(new CoreCmsPinTuanGoods + { + goodsId = good, + ruleId = id + }); + await _coreCmsPinTuanGoodsServices.InsertAsync(list); + } + + } + + + + } jm.code = bl ? 0 : 1; diff --git a/CoreCms.Net.Web.Admin/Controllers/Promotion/CoreCmsPromotionController.cs b/CoreCms.Net.Web.Admin/Controllers/Promotion/CoreCmsPromotionController.cs index dc09afc07ef09e718ec8842642c228e97565438e..591737722af4b775b5b8546cd1e3bd2ad4cf8787 100644 --- a/CoreCms.Net.Web.Admin/Controllers/Promotion/CoreCmsPromotionController.cs +++ b/CoreCms.Net.Web.Admin/Controllers/Promotion/CoreCmsPromotionController.cs @@ -375,67 +375,82 @@ namespace CoreCms.Net.Web.Admin.Controllers public async Task DoEdit([FromBody] CoreCmsPromotion entity) { var jm = new AdminUiCallBack(); - - if (entity.startTime >= entity.endTime) - { - jm.msg = "开始时间必须小于结束时间"; - return jm; - } - - var oldModel = await _coreCmsPromotionServices.QueryByIdAsync(entity.id); - if (oldModel == null) + var where = PredicateBuilder.True(); + where = where.And(p => p.isDel == false); + where = where.And(p => p.parameters == entity.parameters); + //根据条件查询数据中是否存在该商品 ListReturn 中不为空则存在该商品的秒杀 若为空则不存在则进行编辑添加。 + var ListReturn = await _coreCmsPromotionServices.QueryPageAsync(where,p=>p.id,OrderByType.Asc,1,30); + //不存在该商品进行修改添加 + if (ListReturn.Count==0) { - jm.msg = "不存在此信息"; - return jm; - } - //事物处理过程开始 - oldModel.name = entity.name; - oldModel.type = entity.type; - oldModel.sort = entity.sort; - oldModel.parameters = entity.parameters; - oldModel.startTime = entity.startTime; - oldModel.endTime = entity.endTime; + if (entity.startTime >= entity.endTime) + { + jm.msg = "开始时间必须小于结束时间"; + return jm; + } - oldModel.maxNums = entity.maxNums > 0 ? entity.maxNums : 0; - oldModel.maxGoodsNums = entity.maxGoodsNums > 0 ? entity.maxGoodsNums : 0; - oldModel.maxRecevieNums = entity.maxRecevieNums > 0 ? entity.maxRecevieNums : 0; + var oldModel = await _coreCmsPromotionServices.QueryByIdAsync(entity.id); + if (oldModel == null) + { + jm.msg = "不存在此信息"; + return jm; + } + //事物处理过程开始 + oldModel.name = entity.name; + oldModel.type = entity.type; + oldModel.sort = entity.sort; + oldModel.parameters = entity.parameters; + oldModel.startTime = entity.startTime; + oldModel.endTime = entity.endTime; + + oldModel.maxNums = entity.maxNums > 0 ? entity.maxNums : 0; + oldModel.maxGoodsNums = entity.maxGoodsNums > 0 ? entity.maxGoodsNums : 0; + oldModel.maxRecevieNums = entity.maxRecevieNums > 0 ? entity.maxRecevieNums : 0; + + oldModel.effectiveDays = entity.effectiveDays; + oldModel.effectiveHours = entity.effectiveHours; + + if (entity.type == (int)GlobalEnumVars.PromotionType.Promotion) + { + oldModel.isExclusive = entity.isExclusive; + } - oldModel.effectiveDays = entity.effectiveDays; - oldModel.effectiveHours = entity.effectiveHours; + if (entity.type == (int)GlobalEnumVars.PromotionType.Coupon) + { + oldModel.isAutoReceive = entity.isAutoReceive; - if (entity.type == (int)GlobalEnumVars.PromotionType.Promotion) - { - oldModel.isExclusive = entity.isExclusive; - } + if (oldModel.effectiveDays == 0 && oldModel.effectiveHours == 0) + { + jm.msg = "优惠券有效时间不能为0"; + return jm; + } + } - if (entity.type == (int)GlobalEnumVars.PromotionType.Coupon) - { - oldModel.isAutoReceive = entity.isAutoReceive; + oldModel.isEnable = entity.isEnable; - if (oldModel.effectiveDays == 0 && oldModel.effectiveHours == 0) + if (oldModel.type == (int)GlobalEnumVars.PromotionType.Group || oldModel.type == (int)GlobalEnumVars.PromotionType.Seckill) { - jm.msg = "优惠券有效时间不能为0"; - return jm; + await _coreCmsPromotionConditionServices.DeleteAsync(p => p.promotionId == oldModel.id && p.code == "GOODS_IDS"); + var coreCmsPromotionResult = new CoreCmsPromotionCondition(); + coreCmsPromotionResult.promotionId = oldModel.id; + coreCmsPromotionResult.code = "GOODS_IDS"; + coreCmsPromotionResult.parameters = entity.parameters; + await _coreCmsPromotionConditionServices.InsertAsync(coreCmsPromotionResult); } - } - oldModel.isEnable = entity.isEnable; + //事物处理过程结束 + var bl = await _coreCmsPromotionServices.UpdateAsync(oldModel); + jm.code = bl ? 0 : 1; + jm.msg = bl ? GlobalConstVars.EditSuccess : GlobalConstVars.EditFailure; - if (oldModel.type == (int)GlobalEnumVars.PromotionType.Group || oldModel.type == (int)GlobalEnumVars.PromotionType.Seckill) + } + //存在该商品返回提示 + else { - await _coreCmsPromotionConditionServices.DeleteAsync(p => p.promotionId == oldModel.id && p.code == "GOODS_IDS"); - var coreCmsPromotionResult = new CoreCmsPromotionCondition(); - coreCmsPromotionResult.promotionId = oldModel.id; - coreCmsPromotionResult.code = "GOODS_IDS"; - coreCmsPromotionResult.parameters = entity.parameters; - await _coreCmsPromotionConditionServices.InsertAsync(coreCmsPromotionResult); + jm.msg = "秒杀区已存在该商品"; + return jm; } - //事物处理过程结束 - var bl = await _coreCmsPromotionServices.UpdateAsync(oldModel); - jm.code = bl ? 0 : 1; - jm.msg = bl ? GlobalConstVars.EditSuccess : GlobalConstVars.EditFailure; - return jm; } #endregion diff --git a/CoreCms.Net.Web.Admin/Doc.xml b/CoreCms.Net.Web.Admin/Doc.xml index 1c461808046aecc89faf0cda2cfedef09d9575bc..dbcc2ca72b33a0c52f9277fb08db44185f93e03d 100644 --- a/CoreCms.Net.Web.Admin/Doc.xml +++ b/CoreCms.Net.Web.Admin/Doc.xml @@ -2924,7 +2924,7 @@ 服务购买表 - + 构造函数 @@ -2941,43 +2941,9 @@ - + - 创建数据 - - - - - - 创建提交 - - - - - - - 编辑数据 - - - - - - - 编辑提交 - - - - - - - 单选删除 - - - - - - - 批量删除 + 作废订单 @@ -3009,176 +2975,36 @@ - - - 服务消费券 - - - - - 构造函数 - - - - - 获取列表 - - - - - - 首页数据 - - - - - - 创建数据 - - - - - - 创建提交 - - - - - - - 编辑数据 - - - - - - - 编辑提交 - - - - - + - 单选删除 + 获取核销码列表 - - + - 批量删除 + 作废核销码记录 - + - 预览数据 + 设置核销码是否核销 - + - 选择导出 + 选择核销码导出 - + - 查询导出 - - - - - - 设置是否核销 - - - - - - - 服务券核验日志 - - - - - 构造函数 - - - - - 获取列表 - - - - - - 首页数据 - - - - - - 创建数据 - - - - - - 创建提交 - - - - - - - 编辑数据 - - - - - - - 编辑提交 - - - - - - - 单选删除 - - - - - - - 批量删除 - - - - - - - 预览数据 - - - - - - - 选择导出 - - - - - - - 查询导出 + 查询核销码导出 diff --git a/CoreCms.Net.Web.Admin/NLog.config b/CoreCms.Net.Web.Admin/NLog.config index dd97751f2c87c16b2f8b29006354d4eaead82393..1a2906c7d03e0d7dbf32c42dd415fa3a31fcf9b4 100644 --- a/CoreCms.Net.Web.Admin/NLog.config +++ b/CoreCms.Net.Web.Admin/NLog.config @@ -14,7 +14,7 @@ dbProvider="Microsoft.Data.SqlClient.SqlConnection, Microsoft.Data.SqlClient" connectionString="Server=127.0.0.1;Database=BaseMIS;User ID=sa;Password=123456" --> - + INSERT INTO SysNLogRecords (LogDate,LogLevel,LogType,LogTitle,Logger,Message,MachineName,MachineIp,NetRequestMethod diff --git a/CoreCms.Net.Web.WebApi/Controllers/OrderController.cs b/CoreCms.Net.Web.WebApi/Controllers/OrderController.cs index 02d24721f298f2adf5d85f49670d76c54364f776..f486ac9f2e184e01d4a45a45e68ed352a1098f31 100644 --- a/CoreCms.Net.Web.WebApi/Controllers/OrderController.cs +++ b/CoreCms.Net.Web.WebApi/Controllers/OrderController.cs @@ -10,6 +10,7 @@ using System; +using System.Collections.Generic; using System.Linq; using System.Threading.Tasks; using CoreCms.Net.Auth.HttpContextUser; @@ -323,6 +324,34 @@ namespace CoreCms.Net.Web.WebApi.Controllers return jm; } + //public async Task AddAftersales([FromBody] List entity) + //{ + // var jm = new WebApiCallBack(); + + // foreach (var item in entity) + // { + // jm.otherData = entity; + // if (string.IsNullOrEmpty(item.orderId)) + // { + // jm.msg = GlobalErrorCodeVars.Code13100; + // jm.code = 13100; + // return jm; + // } + // if (item.type == 0) + // { + // jm.msg = GlobalErrorCodeVars.Code10051; + // jm.code = 10051; + // return jm; + // } + // jm = await _aftersalesServices.ToAdd(_user.ID, item.orderId, item.type, item.items, item.images, + // item.reason, item.refund); + // } + + + + // return jm; + + //} #endregion @@ -339,7 +368,7 @@ namespace CoreCms.Net.Web.WebApi.Controllers var jm = new WebApiCallBack(); jm.status = true; - jm.msg = "数据获取成功"; + jm.msg = "数据获取成功"; var where = PredicateBuilder.True(); where = where.And(p => p.userId == _user.ID); diff --git a/CoreCms.Net.Web.WebApi/NLog.config b/CoreCms.Net.Web.WebApi/NLog.config index 66ef6225bec5172bcec45072b25f5f7beb3f2d79..1a2906c7d03e0d7dbf32c42dd415fa3a31fcf9b4 100644 --- a/CoreCms.Net.Web.WebApi/NLog.config +++ b/CoreCms.Net.Web.WebApi/NLog.config @@ -14,7 +14,7 @@ dbProvider="Microsoft.Data.SqlClient.SqlConnection, Microsoft.Data.SqlClient" connectionString="Server=127.0.0.1;Database=BaseMIS;User ID=sa;Password=123456" --> - + INSERT INTO SysNLogRecords (LogDate,LogLevel,LogType,LogTitle,Logger,Message,MachineName,MachineIp,NetRequestMethod diff --git a/CoreCms.Net.Web.WebApi/appsettings.json b/CoreCms.Net.Web.WebApi/appsettings.json index f756f66d09777b3828c9b04fc21a7b8f5535b50f..0f1bd5540462eaa2f456fec91da0fda1761e8e7f 100644 --- a/CoreCms.Net.Web.WebApi/appsettings.json +++ b/CoreCms.Net.Web.WebApi/appsettings.json @@ -163,8 +163,8 @@ "EncodingAESKey": "", "Token": "", //小程序 - "WxOpenAppId": "", - "WxOpenAppSecret": "", + "WxOpenAppId": "wxa53f990d87cb6cc3", + "WxOpenAppSecret": "4a5d1f6a98181a8f7b9225e65b3adc40", "WxOpenToken": "", "WxOpenEncodingAESKey": "" } diff --git a/CoreCms.Net.Web.WebApi/wwwroot/static/qrCode/weChat/BE29AA98FEBD2169C9C07823DED851401664244081553.jpg b/CoreCms.Net.Web.WebApi/wwwroot/static/qrCode/weChat/BE29AA98FEBD2169C9C07823DED851401664244081553.jpg new file mode 100644 index 0000000000000000000000000000000000000000..ab44271c50507df8030d5116f89d047cab54c314 --- /dev/null +++ b/CoreCms.Net.Web.WebApi/wwwroot/static/qrCode/weChat/BE29AA98FEBD2169C9C07823DED851401664244081553.jpg @@ -0,0 +1 @@ +{"errcode":41030,"errmsg":"invalid page rid: 63325970-5fb391ca-45720e64"} \ No newline at end of file diff --git a/CoreCms.Net.Web.WebApi/wwwroot/upload/20220923/20220923104458_2370.png b/CoreCms.Net.Web.WebApi/wwwroot/upload/20220923/20220923104458_2370.png new file mode 100644 index 0000000000000000000000000000000000000000..8a6b9943652be005756132338f95958f0538723d Binary files /dev/null and b/CoreCms.Net.Web.WebApi/wwwroot/upload/20220923/20220923104458_2370.png differ diff --git a/CoreCms.Net.Web.WebApi/wwwroot/upload/20220923/20220923104937_8992.jpg b/CoreCms.Net.Web.WebApi/wwwroot/upload/20220923/20220923104937_8992.jpg new file mode 100644 index 0000000000000000000000000000000000000000..5e43b13216a01ad3cc63d74c4df5078559d0eb52 Binary files /dev/null and b/CoreCms.Net.Web.WebApi/wwwroot/upload/20220923/20220923104937_8992.jpg differ diff --git a/CoreCms.Net.Web.WebApi/wwwroot/upload/20220923/20220923105726_0132.jpg b/CoreCms.Net.Web.WebApi/wwwroot/upload/20220923/20220923105726_0132.jpg new file mode 100644 index 0000000000000000000000000000000000000000..5e43b13216a01ad3cc63d74c4df5078559d0eb52 Binary files /dev/null and b/CoreCms.Net.Web.WebApi/wwwroot/upload/20220923/20220923105726_0132.jpg differ diff --git a/CoreCms.Net.Web.WebApi/wwwroot/upload/20220923/20220923110043_0033.jpg b/CoreCms.Net.Web.WebApi/wwwroot/upload/20220923/20220923110043_0033.jpg new file mode 100644 index 0000000000000000000000000000000000000000..5e43b13216a01ad3cc63d74c4df5078559d0eb52 Binary files /dev/null and b/CoreCms.Net.Web.WebApi/wwwroot/upload/20220923/20220923110043_0033.jpg differ diff --git a/CoreCms.Net.Web.WebApi/wwwroot/upload/20220923/20220923110325_4310.jpg b/CoreCms.Net.Web.WebApi/wwwroot/upload/20220923/20220923110325_4310.jpg new file mode 100644 index 0000000000000000000000000000000000000000..5e43b13216a01ad3cc63d74c4df5078559d0eb52 Binary files /dev/null and b/CoreCms.Net.Web.WebApi/wwwroot/upload/20220923/20220923110325_4310.jpg differ diff --git a/CoreCms.Net.Web.WebApi/wwwroot/upload/20220923/20220923111853_1847.jpg b/CoreCms.Net.Web.WebApi/wwwroot/upload/20220923/20220923111853_1847.jpg new file mode 100644 index 0000000000000000000000000000000000000000..5e43b13216a01ad3cc63d74c4df5078559d0eb52 Binary files /dev/null and b/CoreCms.Net.Web.WebApi/wwwroot/upload/20220923/20220923111853_1847.jpg differ diff --git a/CoreCms.Net.Web.WebApi/wwwroot/upload/20220923/20220923111914_8972.jpg b/CoreCms.Net.Web.WebApi/wwwroot/upload/20220923/20220923111914_8972.jpg new file mode 100644 index 0000000000000000000000000000000000000000..5e43b13216a01ad3cc63d74c4df5078559d0eb52 Binary files /dev/null and b/CoreCms.Net.Web.WebApi/wwwroot/upload/20220923/20220923111914_8972.jpg differ